diff --git a/data/settings.js b/data/settings.js
index 9d9a93b02..1c5d8a884 100644
--- a/data/settings.js
+++ b/data/settings.js
@@ -8785,7 +8785,7 @@ Must end with [[setting,namespace_separator]].
 Example:
 
 \`\`\`
-namespace {
+namespace shared {
   prefix = Shared/
   separator = /
 }
diff --git a/docs/core/admin/migration.md b/docs/core/admin/migration.md
index c44701f27..b2835eb52 100644
--- a/docs/core/admin/migration.md
+++ b/docs/core/admin/migration.md
@@ -257,7 +257,7 @@ pop3c_port = 995
 pop3c_ssl = starttls
 pop3c_port = 110
 
-namespace {
+namespace pop3-migration {
   prefix = POP3-MIGRATION-NS/
   mail_driver = pop3c
   mail_path =
diff --git a/docs/core/config/namespaces.md b/docs/core/config/namespaces.md
index 8b7c0b8ed..a718568a8 100644
--- a/docs/core/config/namespaces.md
+++ b/docs/core/config/namespaces.md
@@ -182,7 +182,7 @@ trouble with different IMAP clients. The `^` separator is troublesome with
 Thunderbird. If `\` has to be used, it needs to be escaped in configuration:
 
 ```[dovecot.conf]
-namespace {
+namespace inbox {
   separator = "\\"
 }
 ```
@@ -226,7 +226,7 @@ mailboxes in Maildir format under `~/Maildir`, you can do this by creating two
 namespaces:
 
 ```[dovecot.conf]
-namespace {
+namespace inbox {
   separator = /
   prefix = "#mbox/"
   mail_driver = mbox
@@ -237,7 +237,7 @@ namespace {
   list = no
 }
 
-namespace {
+namespace maildir {
   separator = /
   prefix =
   mail_driver = maildir
@@ -424,7 +424,7 @@ namespace inbox {
   }
 }
 
-namespace {
+namespace shared {
   type = shared
   prefix = shared/$user/
   mail_driver = mdbox
@@ -434,7 +434,7 @@ namespace {
   subscriptions = no
 }
 
-namespace {
+namespace public {
   type = public
   separator = /
   prefix = public/
diff --git a/docs/core/config/shared_mailboxes.md b/docs/core/config/shared_mailboxes.md
index 3f1667867..26218d79a 100644
--- a/docs/core/config/shared_mailboxes.md
+++ b/docs/core/config/shared_mailboxes.md
@@ -47,7 +47,7 @@ mail_driver = maildir
 mail_path = ~/Maildir
 
 # When creating any namespaces, you must also have a private namespace:
-namespace {
+namespace inbox {
   type = private
   separator = /
   prefix =
@@ -55,7 +55,7 @@ namespace {
   inbox = yes
 }
 
-namespace {
+namespace public {
   type = public
   separator = /
   prefix = Public/
@@ -87,7 +87,7 @@ files, which contain only the message UIDs and the private flags. Currently the
 list of private flags is hardcoded only to the \\Seen flag.
 
 ```[dovecot.conf]
-namespace {
+namespace public {
   type = public
   separator = /
   prefix = Public/
@@ -133,7 +133,7 @@ If you have a read-only directory structure containing mbox files,
 you'll need to store index files elsewhere:
 
 ```[dovecot.conf]
-namespace {
+namespace public {
   type = public
   prefix = Public/
   mail_driver = mbox
@@ -168,7 +168,7 @@ is however possible to use shared control files but per-user index
 files, assuming you've set up permissions properly.
 
 ```[dovecot.conf]
-namespace {
+namespace public {
   type = public
   separator = /
   prefix = Public/
@@ -179,7 +179,7 @@ namespace {
   subscriptions = no
 }
 
-namespace {
+namespace public {
   type = public
   separator = /
   prefix = Team/
@@ -196,7 +196,7 @@ namespace {
 See [[plugin,acl]] for more information about ACLs.
 
 ```[dovecot.conf]
-namespace {
+namespace public {
   type = public
   separator = .
   prefix = public.
@@ -230,7 +230,7 @@ mail_driver = maildir
 mail_path = ~/Maildir
 
 # When creating any namespaces, you must also have a private namespace:
-namespace {
+namespace inbox {
   type = private
   separator = /
   prefix =
@@ -238,7 +238,7 @@ namespace {
   inbox = yes
 }
 
-namespace {
+namespace shared {
   type = shared
   separator = /
   prefix = shared/$user/
diff --git a/docs/core/plugins/virtual.md b/docs/core/plugins/virtual.md
index 6ebe4b706..8576b4d66 100644
--- a/docs/core/plugins/virtual.md
+++ b/docs/core/plugins/virtual.md
@@ -32,7 +32,7 @@ Then, you'll have to create a [[link,namespaces,namespace]] for the virtual
 mailboxes, for example:
 
 ```[dovecot.conf]
-namespace {
+namespace virtual {
   prefix = virtual/
   separator = /
   mail_driver = virtual
diff --git a/docs/howto/virtual/postfix.md b/docs/howto/virtual/postfix.md
index 015a428fc..3b7239e06 100644
--- a/docs/howto/virtual/postfix.md
+++ b/docs/howto/virtual/postfix.md
@@ -39,7 +39,7 @@ mail_plugins {
   quota = yes
 }
 
-namespace {
+namespace inbox {
   type = private
   separator = /
   prefix =
@@ -47,7 +47,7 @@ namespace {
   inbox = yes
 }
 
-namespace {
+namespace public {
   type = public
   separator = /
   prefix = Public/
diff --git a/docs/installation/upgrade/include/2.4-acls.inc b/docs/installation/upgrade/include/2.4-acls.inc
index 21f9330a1..2913aa9fa 100644
--- a/docs/installation/upgrade/include/2.4-acls.inc
+++ b/docs/installation/upgrade/include/2.4-acls.inc
@@ -4,7 +4,7 @@ With the following starting configuration:
 
 ::: code-group
 ```[dovecot.conf]
-namespace {
+namespace inbox {
   prefix = INBOX/
   separator = /
 }