diff --git a/docs/usage/create.rst.inc b/docs/usage/create.rst.inc
index 6b50d9af2..9389249f2 100644
--- a/docs/usage/create.rst.inc
+++ b/docs/usage/create.rst.inc
@@ -79,7 +79,7 @@ The archive name needs to be unique. It must not end in '.checkpoint' or
 checkpoints and treated in special ways.
 
 In the archive name, you may use the following format tags:
-{now}, {utcnow}, {fqdn}, {hostname}, {user}, {pid}, {uuid}
+{now}, {utcnow}, {fqdn}, {hostname}, {user}, {pid}, {uuid4}
 
 To speed up pulling backups over sshfs and similar network file systems which do
 not provide correct inode information the --ignore-inode flag can be used. This
diff --git a/src/borg/archiver.py b/src/borg/archiver.py
index 9450ef6a1..f0087ceda 100644
--- a/src/borg/archiver.py
+++ b/src/borg/archiver.py
@@ -1362,7 +1362,7 @@ class Archiver:
         checkpoints and treated in special ways.
 
         In the archive name, you may use the following format tags:
-        {now}, {utcnow}, {fqdn}, {hostname}, {user}, {pid}, {uuid}
+        {now}, {utcnow}, {fqdn}, {hostname}, {user}, {pid}, {uuid4}
 
         To speed up pulling backups over sshfs and similar network file systems which do
         not provide correct inode information the --ignore-inode flag can be used. This
diff --git a/src/borg/helpers.py b/src/borg/helpers.py
index 54183ef8e..4176825d6 100644
--- a/src/borg/helpers.py
+++ b/src/borg/helpers.py
@@ -742,7 +742,7 @@ class Location:
             'now': current_time.now(),
             'utcnow': current_time.utcnow(),
             'user': uid2user(os.getuid(), os.getuid()),
-            'uuid': str(uuid.uuid4())
+            'uuid4': str(uuid.uuid4())
             }
         return format_line(text, data)