diff --git a/source/configuration_manual/authentication/allow_nets.rst b/source/configuration_manual/authentication/allow_nets.rst
index 2ea3282f3..0a0c05a07 100644
--- a/source/configuration_manual/authentication/allow_nets.rst
+++ b/source/configuration_manual/authentication/allow_nets.rst
@@ -35,8 +35,7 @@ Postfix to verify the email account:
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = static
+  passdb static {
     args = password=test allow_nets=local,127.0.0.1/32
   }
 
diff --git a/source/configuration_manual/authentication/authentication_via_remote_imap_server.rst b/source/configuration_manual/authentication/authentication_via_remote_imap_server.rst
index af0dcd3b3..41337ee28 100644
--- a/source/configuration_manual/authentication/authentication_via_remote_imap_server.rst
+++ b/source/configuration_manual/authentication/authentication_via_remote_imap_server.rst
@@ -27,7 +27,6 @@ Authenticates users against remote IMAP server in IP address 192.168.1.123:
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = imap
+  passdb imap {
     args = host=192.168.1.123
   }
diff --git a/source/configuration_manual/authentication/caching.rst b/source/configuration_manual/authentication/caching.rst
index 265b4c648..f20ef1f49 100644
--- a/source/configuration_manual/authentication/caching.rst
+++ b/source/configuration_manual/authentication/caching.rst
@@ -82,8 +82,7 @@ use:
 
 ::
 
-   passdb db1 {
-     driver = pam
+   passdb pam {
      args = cache_key=%{protocol}%u *
    }
 
diff --git a/source/configuration_manual/authentication/dict.rst b/source/configuration_manual/authentication/dict.rst
index 57e348aff..6cbdf60ec 100644
--- a/source/configuration_manual/authentication/dict.rst
+++ b/source/configuration_manual/authentication/dict.rst
@@ -19,12 +19,10 @@ Auth configuration
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = dict
+  passdb dict {
     args = /etc/dovecot/dovecot-dict-auth.conf
   }
-  userdb db1 {
-    driver = dict
+  userdb dict {
     args = /etc/dovecot/dovecot-dict-auth.conf
   }
 
@@ -221,13 +219,11 @@ Auth configuration
     auth = cdb:/etc/dovecot/auth.cdb
   }
 
-  passdb db1 {
-    driver = dict
+  passdb dict {
     args = /etc/dovecot/dovecot-cdb.conf
   }
 
-  userdb db1 {
-    driver = dict
+  userdb dict {
     args = /etc/dovecot/dovecot-cdb.conf
   }
 
@@ -275,16 +271,13 @@ Auth configuration
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = dict
+  passdb dict {
     args = /etc/dovecot/dovecot-dict-auth.conf
   }
-  userdb db1 {
-    # optional
-    driver = prefetch
+  # optional
+  userdb prefetch {
   }
-  userdb db2 {
-    driver = dict
+  userdb dict {
     args = /etc/dovecot/dovecot-dict-auth.conf
   }
 
diff --git a/source/configuration_manual/authentication/domain_lost.rst b/source/configuration_manual/authentication/domain_lost.rst
index de29b3363..57381f778 100644
--- a/source/configuration_manual/authentication/domain_lost.rst
+++ b/source/configuration_manual/authentication/domain_lost.rst
@@ -77,27 +77,22 @@ user lookup.
 ::
 
    ## Your virtual passdb
-   passdb db1 {
-      driver = ldap
+   passdb ldap {
       args = /path/to/ldap/config
    }
 
-   passdb db2 {
-      driver = static
+   passdb static {
       args = user=%Ld noauthenticate
       skip = authenticated
    }
 
-   passdb db3 {
-      driver = pam
+   passdb pam {
       skip = authenticated
    }
 
-   userdb db1 {
-      driver = ldap
+   userdb ldap {
       args = /path/to/ldap/config
    }
 
-   userdb db2 {
-      driver = passwd
+   userdb passwd {
    }
diff --git a/source/configuration_manual/authentication/kerberos.rst b/source/configuration_manual/authentication/kerberos.rst
index b203b20c9..f915aea33 100644
--- a/source/configuration_manual/authentication/kerberos.rst
+++ b/source/configuration_manual/authentication/kerberos.rst
@@ -87,8 +87,7 @@ If you only want to use Kerberos ticket-based authentication:
    auth_mechanisms = gssapi
    auth_krb5_keytab = /etc/dovecot/dovecot.keytab
 
-   userdb db1 {
-     driver = static
+   userdb static {
      args = uid=vmail gid=vmail home=/var/vmail/%u
    }
 
@@ -104,11 +103,9 @@ ticket-based authentication, you will need something like:
    auth_gssapi_hostname = "$ALL"
    auth_mechanisms = gssapi
    auth_krb5_keytab = /etc/dovecot/dovecot.keytab
-   passdb db1 {
-     driver = pam
+   passdb pam {
    }
-   userdb db1 {
-     driver = passwd
+   userdb passwd {
    }
 
 (Note that in this example, you will also need to configure PAM to use
@@ -131,8 +128,7 @@ Then enable PAM passdb:
 
 ::
 
-   passdb db1 {
-     driver = pam
+   passdb pam {
    }
 
 Check ``/var/log/auth.log`` if you have any problems logging in. The
diff --git a/source/configuration_manual/authentication/ldap.rst b/source/configuration_manual/authentication/ldap.rst
index 0ed459323..0348c1bc8 100644
--- a/source/configuration_manual/authentication/ldap.rst
+++ b/source/configuration_manual/authentication/ldap.rst
@@ -84,9 +84,8 @@ LDAP Backend Configuration
 
 .. code-block:: none
 
-  passdb db1 {
+  passdb ldap {
     args = /etc/dovecot/dovecot-ldap.conf.ext
-    driver = ldap
   }
 
 This enables LDAP to be used as passdb.
@@ -256,13 +255,11 @@ dovecot.conf:
 
 .. code-block:: none
 
-   userdb db1 {
-     driver = ldap
+   userdb ldap {
      args = /etc/dovecot/dovecot-users-ldap.conf.ext
      result_success = continue-ok
    }
-   userdb db2 {
-     driver = ldap
+   userdb ldap {
      args = /etc/dovecot/dovecot-class-ldap.conf.ext
      skip = notfound
    }
diff --git a/source/configuration_manual/authentication/ldap_authentication.rst b/source/configuration_manual/authentication/ldap_authentication.rst
index 62da357c8..21ff033dd 100644
--- a/source/configuration_manual/authentication/ldap_authentication.rst
+++ b/source/configuration_manual/authentication/ldap_authentication.rst
@@ -8,16 +8,13 @@ See :ref:`LDAP <authentication-ldap>` for more details.
 
 .. code-block:: none
 
-  passdb db1 {
+  passdb ldap {
     args = /etc/dovecot/dovecot-ldap.conf.ext
-    driver = ldap
   }
-  userdb db1 {
-    driver = prefetch
+  userdb prefetch {
   }
-  userdb db2 {
+  userdb ldap {
     args = /etc/dovecot/dovecot-ldap.conf.ext
-    driver = ldap
   }
 
 These enable ``LDAP`` to be used as ``passdb`` and ``userdb``. The userdb
diff --git a/source/configuration_manual/authentication/ldap_bind.rst b/source/configuration_manual/authentication/ldap_bind.rst
index 745f90947..40f108b2a 100644
--- a/source/configuration_manual/authentication/ldap_bind.rst
+++ b/source/configuration_manual/authentication/ldap_bind.rst
@@ -76,12 +76,10 @@ symlink to the first one. For example:
 
 ::
 
-   passdb db1 {
-     driver = ldap
+   passdb ldap {
      args = /etc/dovecot/dovecot-ldap.conf.ext
    }
-   userdb db1 {
-     driver = ldap
+   userdb ldap {
      args = /etc/dovecot/dovecot-ldap-userdb.conf.ext
    }
 
diff --git a/source/configuration_manual/authentication/ldap_userdb.rst b/source/configuration_manual/authentication/ldap_userdb.rst
index d1eb40580..b68fe8cb9 100644
--- a/source/configuration_manual/authentication/ldap_userdb.rst
+++ b/source/configuration_manual/authentication/ldap_userdb.rst
@@ -135,13 +135,11 @@ dovecot.conf:
 
 ::
 
-   userdb db1 {
-     driver = ldap
+   userdb ldap {
      args = /etc/dovecot/dovecot-users-ldap.conf.ext
      result_success = continue-ok
    }
-   userdb db2 {
-     driver = ldap
+   userdb ldap {
      args = /etc/dovecot/dovecot-class-ldap.conf.ext
      skip = notfound
    }
diff --git a/source/configuration_manual/authentication/lua_based_authentication.rst b/source/configuration_manual/authentication/lua_based_authentication.rst
index e86440c96..0bcf63304 100644
--- a/source/configuration_manual/authentication/lua_based_authentication.rst
+++ b/source/configuration_manual/authentication/lua_based_authentication.rst
@@ -59,8 +59,7 @@ Example
 
 .. code:: none
 
-  passdb db1 {
-    driver = lua
+  passdb lua {
     args = file=/etc/dovecot/auth.lua password={PLAIN}test
   }
 
@@ -184,8 +183,7 @@ To configure passdb in dovecot, use
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = lua
+  passdb lua {
     args = file=/path/to/lua blocking=yes # default is yes
   }
 
@@ -218,8 +216,7 @@ To configure userdb in dovecot, use
 
 .. code-block:: none
 
-  userdb db1 {
-    driver = lua
+  userdb lua {
     args = file=/path/to/lua blocking=yes # default is yes
   }
 
diff --git a/source/configuration_manual/authentication/master_users.rst b/source/configuration_manual/authentication/master_users.rst
index 6c87fee30..dd5ebe368 100644
--- a/source/configuration_manual/authentication/master_users.rst
+++ b/source/configuration_manual/authentication/master_users.rst
@@ -72,14 +72,12 @@ Example configuration:
 .. code-block:: none
 
   auth_master_user_separator = *
-  passdb db1 {
-    driver = passwd-file
+  passdb passwd-file {
     passwd_file_path = /etc/dovecot/passwd.masterusers
     master = yes
     result_success = continue
   }
-  userdb db1 {
-    driver = passwd
+  userdb passwd {
   }
 
 To grant the masteruser access to all Mailboxes, the ``dovecot-acl`` file can
@@ -112,18 +110,17 @@ well:
 .. code-block:: none
 
   auth_master_user_separator = *
-  passdb db1 {
+  passdb sql1 {
     driver = sql
     args = /etc/dovecot/dovecot-sql-master.conf.ext
     master = yes
     result_success = continue
   }
-  passdb db2 {
+  passdb sql2 {
     driver = sql
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
-  userdb db1 {
-    driver = sql
+  userdb sql {
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
 
@@ -155,14 +152,12 @@ exists and get other extra fields.
 .. code-block:: none
 
    # master password passdb
-   passdb db1 {
-      driver = static
+   passdb static {
       args = password=master-password
       result_success = continue
    }
    # primary passdb
-   passdb db2 {
-      driver = pam
+   passdb pam {
    }
 
 Advanced SQL Examples
diff --git a/source/configuration_manual/authentication/multiple_authentication_databases.rst b/source/configuration_manual/authentication/multiple_authentication_databases.rst
index 48de9e289..dc1b76c61 100644
--- a/source/configuration_manual/authentication/multiple_authentication_databases.rst
+++ b/source/configuration_manual/authentication/multiple_authentication_databases.rst
@@ -43,23 +43,19 @@ dovecot.conf:
   mail_path = ~/Maildir
 
   # try to authenticate using SQL database first
-  passdb db1 {
-    driver = sql
+  passdb sql {
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
   # fallback to PAM
-  passdb db2 {
-    driver = pam
+  passdb pam {
   }
 
   # look up users from SQL first (even if authentication was done using PAM!)
-  userdb db1 {
-    driver = sql
+  userdb sql {
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
   # if not found, fallback to /etc/passwd
-  userdb db2 {
-    driver = passwd
+  userdb passwd {
   }
 
 dovecot-sql.conf.ext:
diff --git a/source/configuration_manual/authentication/oauth2.rst b/source/configuration_manual/authentication/oauth2.rst
index 98d7e91c2..9d5ff9edf 100644
--- a/source/configuration_manual/authentication/oauth2.rst
+++ b/source/configuration_manual/authentication/oauth2.rst
@@ -25,8 +25,7 @@ In ``dovecot.conf`` put
     xoauth2 = yes
   }
 
-  passdb db1 {
-    driver = oauth2
+  passdb oauth2 {
     mechanisms = xoauth2 oauthbearer
     args = /etc/dovecot/dovecot-oauth2.conf.ext
   }
@@ -75,8 +74,7 @@ Without proxy authentication
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = static
+  passdb static {
     args = nopassword=y proxy=y proxy_mech=%m ...
   }
 
@@ -98,14 +96,12 @@ passdb settings
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = oauth2
+  passdb oauth2 {
     mechanisms = oauthbearer xoauth2
     args = /usr/local/etc/dovecot/dovecot-oauth2.token.conf.ext
   }
 
-  passdb db2 {
-    driver = oauth2
+  passdb oauth2 {
     mechanisms = plain login
     args = /usr/local/etc/dovecot/dovecot-oauth2.plain.conf.ext
   }
diff --git a/source/configuration_manual/authentication/pam.rst b/source/configuration_manual/authentication/pam.rst
index c520ee153..165b3169b 100644
--- a/source/configuration_manual/authentication/pam.rst
+++ b/source/configuration_manual/authentication/pam.rst
@@ -34,8 +34,7 @@ Here are a few examples:
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = pam
+  passdb pam {
     args = %{protocol}
   }
 
@@ -43,8 +42,7 @@ Here are a few examples:
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = pam
+  passdb pam {
     args = mail
   }
 
@@ -58,8 +56,7 @@ like this:
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = pam
+  passdb pam {
     args = session=yes dovecot
   }
 
@@ -82,8 +79,7 @@ lookups done by the auth worker process before it dies:
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = pam
+  passdb pam {
     args = max_requests=100
   }
 
@@ -102,8 +98,7 @@ reply by setting:
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = pam
+  passdb pam {
     args = failure_show_msg=yes
   }
 
@@ -122,8 +117,7 @@ You can restrict the IP-Addresses allowed to connect via PAM:
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = pam
+  passdb pam {
     override_fields = allow_nets=10.1.100.0/23,2001:db8:a0b:12f0::/64
   }
 
@@ -151,8 +145,7 @@ Examples:
 
   # 1MB auth cache size
   auth_cache_size = 1024
-  passdb db1 {
-    driver = pam
+  passdb pam {
     # username and service
     args = cache_key=%u%s *
   }
@@ -161,8 +154,7 @@ Examples:
 
   # 1MB auth cache size
   auth_cache_size = 1024
-  passdb db1 {
-    driver = pam
+  passdb pam {
     # username, remote IP and local IP
     args = cache_key=%u%r%l dovecot
   }
@@ -218,8 +210,7 @@ the on that OS:
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = pam
+  passdb pam {
     args = login
   }
 
@@ -231,6 +222,5 @@ homedir mail storage, without resorting to a single virtual mail user or LDAP:
 
 .. code-block:: none
 
-  userdb db1 {
-    driver = passwd
+  userdb passwd {
   }
diff --git a/source/configuration_manual/authentication/passwd.rst b/source/configuration_manual/authentication/passwd.rst
index dd8943e35..ec9a6efcd 100644
--- a/source/configuration_manual/authentication/passwd.rst
+++ b/source/configuration_manual/authentication/passwd.rst
@@ -17,8 +17,7 @@ disabling it:
 
 .. code-block:: none
 
-  userdb db1 {
-    driver = passwd
+  userdb passwd {
     args = blocking=no
   }
 
@@ -32,8 +31,7 @@ For example:
 
 .. code-block:: none
 
-  userdb db1 {
-    driver = passwd
+  userdb passwd {
     override_fields {
       home = /var/mail/%u
       mail_driver = maildir
diff --git a/source/configuration_manual/authentication/passwd_file.rst b/source/configuration_manual/authentication/passwd_file.rst
index 75fc335f9..d89e2e51a 100644
--- a/source/configuration_manual/authentication/passwd_file.rst
+++ b/source/configuration_manual/authentication/passwd_file.rst
@@ -46,8 +46,7 @@ passwd-file filenames, for example:
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = passwd-file
+  passdb passwd-file {
     # Each domain has a separate passwd-file:
     passwd_file_path = /etc/auth/%d/passwd
   }
@@ -73,14 +72,12 @@ Examples
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = passwd-file
+  passdb passwd-file {
     passdb_default_password_scheme = plain-md5
     auth_username_format = %n
     passwd_file_path = /etc/imap.passwd
   }
-  userdb db1 {
-    driver = passwd-file
+  userdb passwd-file {
     auth_username_format = %n
     passwd_file_path = /etc/imap.passwd
     default_fields = uid=vmail gid=vmail home=/home/vmail/%u
@@ -151,13 +148,11 @@ other ``userdb`` and ``passdb`` sections
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = passwd-file
+  passdb passwd-file {
     auth_username_format = %n
     passwd_file_path = /path/to/file-with-encrypted-passwords
   }
-  userdb db1 {
-    driver = passwd-file
+  userdb passwd-file {
     auth_username_format = %n
     passwd_file_path = /path/to/file-with-encrypted-passwords
   }
diff --git a/source/configuration_manual/authentication/password_databases_passdb.rst b/source/configuration_manual/authentication/password_databases_passdb.rst
index 2abd6164a..ce4296b81 100644
--- a/source/configuration_manual/authentication/password_databases_passdb.rst
+++ b/source/configuration_manual/authentication/password_databases_passdb.rst
@@ -193,7 +193,6 @@ Passdb setting
    .. code-block:: none
 
       passdb passwd-file {
-	driver = passwd-file
 	mechanisms = PLAIN LOGIN
 	# ...
       }
diff --git a/source/configuration_manual/authentication/prefetch_userdb.rst b/source/configuration_manual/authentication/prefetch_userdb.rst
index f35a64dcf..ef02d104b 100644
--- a/source/configuration_manual/authentication/prefetch_userdb.rst
+++ b/source/configuration_manual/authentication/prefetch_userdb.rst
@@ -32,16 +32,13 @@ SQL example
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = sql
+  passdb sql {
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
-  userdb db1 {
-    driver = prefetch
+  userdb prefetch {
   }
   # The userdb below is used only by lda.
-  userdb db2 {
-    driver = sql
+  userdb sql {
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
 
@@ -64,16 +61,13 @@ LDAP example
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = ldap
+  passdb ldap {
     args = /etc/dovecot/dovecot-ldap.conf.ext
   }
-  userdb db1 {
-    driver = prefetch
+  userdb prefetch {
   }
   # The userdb below is used only by LDA.
-  userdb db2 {
-    driver = ldap
+  userdb ldap {
     args = /etc/dovecot/dovecot-ldap.conf.ext
   }
 
diff --git a/source/configuration_manual/authentication/proxies.rst b/source/configuration_manual/authentication/proxies.rst
index 1800f483b..504adf9fd 100644
--- a/source/configuration_manual/authentication/proxies.rst
+++ b/source/configuration_manual/authentication/proxies.rst
@@ -294,8 +294,7 @@ The important parts of ``dovecot.conf``:
   auth_cache_size = 4096
 
   auth_mechanisms = plain
-  passdb db1 {
-    driver = sql
+  passdb sql {
     args = /usr/local/etc/dovecot/dovecot-sql.conf.ext
   }
 
@@ -333,12 +332,10 @@ The important parts of ``dovecot.conf``:
 
   auth_mechanisms = plain
 
-  passdb db1 {
-    driver = sql
+  passdb sql {
     args = /usr/local/etc/dovecot/dovecot-sql.conf.ext
   }
   userdb sql {
-    driver = sql
     args = /usr/local/etc/dovecot/dovecot-sql.conf.ext
   }
 
diff --git a/source/configuration_manual/authentication/restrict_access.rst b/source/configuration_manual/authentication/restrict_access.rst
index 51c4af10c..6687a58f5 100644
--- a/source/configuration_manual/authentication/restrict_access.rst
+++ b/source/configuration_manual/authentication/restrict_access.rst
@@ -14,8 +14,7 @@ Set PAM service name to ``%{protocol}``, ie.:
 
 ::
 
-   passdb db1 {
-     driver = pam
+   passdb pam {
      args = %{protocol}
    }
 
@@ -59,8 +58,7 @@ You can create a deny passwd-file based on the service:
 
 ::
 
-   passdb db1 {
-     driver = passwd-file
+   passdb passwd-file {
      passwd_file_path = /etc/dovecot/deny.%{protocol}
      deny = yes
    }
diff --git a/source/configuration_manual/authentication/shadow.rst b/source/configuration_manual/authentication/shadow.rst
index 62dbc4c9c..bcd517e42 100644
--- a/source/configuration_manual/authentication/shadow.rst
+++ b/source/configuration_manual/authentication/shadow.rst
@@ -15,8 +15,7 @@ This uses auth-worker processes:
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = shadow
+  passdb shadow {
   }
 
 By default the auth-worker processes are run as dovecot user though, which
@@ -37,7 +36,6 @@ really no need to use auth-workers. You can disable them with:
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = shadow
+  passdb shadow {
     args = blocking=no
   }
diff --git a/source/configuration_manual/authentication/sql.rst b/source/configuration_manual/authentication/sql.rst
index 5bd7e1fd7..de80a48b5 100644
--- a/source/configuration_manual/authentication/sql.rst
+++ b/source/configuration_manual/authentication/sql.rst
@@ -17,8 +17,7 @@ Dovecot configuration
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = sql
+  passdb sql {
     args = /etc/dovecot/dovecot-sql.conf.ext
   }
 
diff --git a/source/configuration_manual/authentication/static_password_database.rst b/source/configuration_manual/authentication/static_password_database.rst
index 0c7e1ca05..04d2570ed 100644
--- a/source/configuration_manual/authentication/static_password_database.rst
+++ b/source/configuration_manual/authentication/static_password_database.rst
@@ -18,8 +18,7 @@ Example:
 
 .. code-block:: none
 
-  passdb db1 {
-    driver = static
+  passdb static {
     args = nopassword=y
     default_fields = proxy=y host=127.0.0.1
   }
diff --git a/source/configuration_manual/authentication/static_user_database.rst b/source/configuration_manual/authentication/static_user_database.rst
index c84648f0c..f727d37f9 100644
--- a/source/configuration_manual/authentication/static_user_database.rst
+++ b/source/configuration_manual/authentication/static_user_database.rst
@@ -8,8 +8,7 @@ Static user database can be used when you want to use only single UID and GID va
 
 .. code-block:: none
 
- userdb db1 {
-  driver = static
+ userdb static {
   args = uid=<uid> gid=<gid> home=<dir template>
  }
 
@@ -25,7 +24,6 @@ Example
 
 .. code-block:: none 
 
- userdb db1 {
-  driver = static
+ userdb static {
   args = uid=500 gid=500 home=/home/%u
  }
diff --git a/source/configuration_manual/basic_configuration.rst b/source/configuration_manual/basic_configuration.rst
index 5a99f6361..3486742d4 100644
--- a/source/configuration_manual/basic_configuration.rst
+++ b/source/configuration_manual/basic_configuration.rst
@@ -73,12 +73,10 @@ In ``conf.d/auth-passwdfile.conf.ext`` you should have:
 
 ::
 
-   passdb {
-     driver = passwd-file
+   passdb passwd-file {
      args = scheme=CRYPT /etc/dovecot/users
    }
-   userdb {
-     driver = passwd-file
+   userdb passwd-file {
      args = /etc/dovecot/users
    }
 
diff --git a/source/configuration_manual/howto/convert_password_schemes.rst b/source/configuration_manual/howto/convert_password_schemes.rst
index cf24f02af..5c2bef1fb 100644
--- a/source/configuration_manual/howto/convert_password_schemes.rst
+++ b/source/configuration_manual/howto/convert_password_schemes.rst
@@ -52,8 +52,7 @@ Example
 
 ::
 
-    userdb {
-     driver = prefetch
+    userdb prefetch {
    }
 
 *  Now reload dovecot, and see everything is still working
@@ -254,13 +253,11 @@ Enable the ``plain_pass`` variable in the auth-passwdfile configuration.
 
 .. code:: bash
 
-   passdb {
-     driver = passwd-file
+   passdb passwd-file {
      args = /var/vmail/auth.d/%d/passwd
    }
 
-   userdb {
-     driver = passwd-file
+   userdb passwd-file {
      args = /var/vmail/auth.d/%d/passwd
      default_fields = plain_pass=%w
    }
diff --git a/source/configuration_manual/howto/director_with_lua.rst b/source/configuration_manual/howto/director_with_lua.rst
index 94e87578f..1da196d9e 100644
--- a/source/configuration_manual/howto/director_with_lua.rst
+++ b/source/configuration_manual/howto/director_with_lua.rst
@@ -77,8 +77,7 @@ First, and the most simple, is drop-in replacement for director with no authenti
 
 .. code::
 
-  passdb db1 {
-    driver = lua
+  passdb lua {
     args = file=/etc/dovecot/director.lua nopassword
     # or password=masterpass
     # you can include other keys here too, they will be
@@ -89,14 +88,12 @@ If you wish to do authentication, you can do
 
 .. code::
 
-  passdb db1 {
-    driver = pam
+  passdb pam {
     result_success = continue-ok
   }
 
-  passdb db2 {
+  passdb lua {
     skip = unauthenticated
-    driver = lua
     args = file=/etc/dovecot/director.lua noauthenticate
   }
 
diff --git a/source/configuration_manual/howto/dovecot_postgresql.rst b/source/configuration_manual/howto/dovecot_postgresql.rst
index 55917cb3c..7a4fdda6f 100644
--- a/source/configuration_manual/howto/dovecot_postgresql.rst
+++ b/source/configuration_manual/howto/dovecot_postgresql.rst
@@ -300,13 +300,11 @@ In dovecot.conf, set:
    mail_driver = maildir
    mail_path = ~/
 
-   passdb db1 {
-      driver = sql
+   passdb sql {
       args = /usr/local/etc/dovecot-sql.conf 
    }
 
-   userdb db1 {
-      driver = sql
+   userdb sql {
       args = /usr/local/etc/dovecot-sql.conf
    }
  
diff --git a/source/configuration_manual/howto/imapc_proxy.rst b/source/configuration_manual/howto/imapc_proxy.rst
index b18dcd1d8..29b974f25 100644
--- a/source/configuration_manual/howto/imapc_proxy.rst
+++ b/source/configuration_manual/howto/imapc_proxy.rst
@@ -53,14 +53,12 @@ This is based on already having Dovecot already compiled and installed.
       imapc_host = 10.1.2.3
       imapc_port = 143
 
-      passdb {
-        driver = imap
+      passdb imap {
         # Change the line below to reflect the IP address of your Exchange Server.
         args = host=10.1.2.3
         default_fields = userdb_imapc_user=%u userdb_imapc_password=%w
       }
-      userdb {
-        driver = prefetch
+      userdb prefetch {
       }
 
       # /home/imapproxy is the home directory for the imapproxy user, and
diff --git a/source/configuration_manual/howto/rootless.rst b/source/configuration_manual/howto/rootless.rst
index 442f45fe7..3ea9178cb 100644
--- a/source/configuration_manual/howto/rootless.rst
+++ b/source/configuration_manual/howto/rootless.rst
@@ -134,12 +134,10 @@ The important settings to change for rootless installation are:
 
    ::
 
-      passdb db1 {
-        driver = passwd-file
+      passdb passwd-file {
         passwd_file_path = /home/user/dovecot/etc/passwd
       }
-      userdb db1 {
-        driver = passwd
+      userdb passwd {
       }
 
    Where the ``passwd`` file contains the username and password for your
diff --git a/source/configuration_manual/howto/simple_virtual_install.rst b/source/configuration_manual/howto/simple_virtual_install.rst
index ec9cfb54b..1f6caf8bd 100644
--- a/source/configuration_manual/howto/simple_virtual_install.rst
+++ b/source/configuration_manual/howto/simple_virtual_install.rst
@@ -52,12 +52,10 @@ If you want to configure SSL, see :ref:`SSL <ssl>`.
    # Authentication configuration:
    auth_verbose = yes
    auth_mechanisms = plain
-   passdb db1 {
-     driver = passwd-file
+   passdb passwd-file {
      passwd_file_path = /etc/dovecot/passwd
    }
-   userdb db1 {
-     driver = static
+   userdb static {
      args = uid=vmail gid=vmail home=/home/vmail/%u
    }
 
diff --git a/source/configuration_manual/howto/virtual_user_flat_files_postfix.rst b/source/configuration_manual/howto/virtual_user_flat_files_postfix.rst
index c99754a2e..76ad24d7d 100644
--- a/source/configuration_manual/howto/virtual_user_flat_files_postfix.rst
+++ b/source/configuration_manual/howto/virtual_user_flat_files_postfix.rst
@@ -75,12 +75,10 @@ or mailbox formats.
 ::
 
    auth_mechanisms = plain
-   passdb db1 {
-     driver = passwd-file
+   passdb passwd-file {
      passwd_file_path = /var/vmail/auth.d/%d/passwd
    }
-   userdb db1 {
-     driver = passwd-file
+   userdb passwd-file {
      passwd_file_path = /var/vmail/auth.d/%d/passwd
    }
 
diff --git a/source/configuration_manual/mail_crypt_plugin.rst b/source/configuration_manual/mail_crypt_plugin.rst
index 7d71b4b4a..5a1ceb835 100644
--- a/source/configuration_manual/mail_crypt_plugin.rst
+++ b/source/configuration_manual/mail_crypt_plugin.rst
@@ -325,8 +325,7 @@ Hence, this is possible:
     # create the filter, but leave its settings empty
   }
 
-  passdb db1 {
-    driver = static
+  passdb static {
     args = password=pass crypt_global_public_key=<content of ecpubkey.pem> crypt_global_private_key/main/private_key=<content of ecprivkey.pem>
   }
 
diff --git a/source/configuration_manual/namespace/index.rst b/source/configuration_manual/namespace/index.rst
index cffb56a88..8a351a6f5 100644
--- a/source/configuration_manual/namespace/index.rst
+++ b/source/configuration_manual/namespace/index.rst
@@ -305,8 +305,7 @@ given list.
 
 ::
 
-  userdb db1 {
-    driver = static
+  userdb static {
     args = namespace+=special namespace/special/mail_path=/var/special/%u namespace/special/prefix=special/
   }
 
diff --git a/source/configuration_manual/quick_configuration.rst b/source/configuration_manual/quick_configuration.rst
index 2e4a98e2d..16d17b5ba 100644
--- a/source/configuration_manual/quick_configuration.rst
+++ b/source/configuration_manual/quick_configuration.rst
@@ -30,12 +30,10 @@ You need to create group vmail and user vmail.
   #first_valid_uid = uid-of-vmail-user
 
   # if you want to use system users
-  passdb db1 {
-    driver = pam
+  passdb pam {
   }
 
-  userdb db1 {
-    driver = passwd
+  userdb passwd {
     args = blocking=no
     override_fields = uid=vmail gid=vmail
   }
diff --git a/source/configuration_manual/virtual_users.rst b/source/configuration_manual/virtual_users.rst
index cd539a42c..6c42a3c8b 100644
--- a/source/configuration_manual/virtual_users.rst
+++ b/source/configuration_manual/virtual_users.rst
@@ -228,13 +228,11 @@ Note that the default :dovecot_core:ref:`auth_username_format` is ``%Lu``.
 
    mail_driver = maildir
    mail_path = /home/%d/%n/Maildir
-   passdb db1 {
-     driver = passwd-file
+   passdb passwd-file {
      auth_username_format = %Ln
      passwd_file_path = /home/%d/etc/shadow
    }
-   userdb db1 {
-     driver = passwd-file
+   userdb passwd-file {
      auth_username_format = %Ln
      passwd_file_path = /home/%d/etc/passwd
    }
@@ -250,11 +248,9 @@ get Dovecot running is to use the :ref:`static userdb <authentication-static_use
 
    mail_driver = maildir
    mail_path = ~/Maildir
-   passdb db1 {
-     driver = pam
+   passdb pam {
    }
-   userdb db1 {
-     driver = static
+   userdb static {
      args = uid=vmail gid=vmail home=/var/mail/virtual/%d/%n
    }
 
diff --git a/source/installation_guide/upgrading/from-2.2-to-2.3.rst b/source/installation_guide/upgrading/from-2.2-to-2.3.rst
index 4d873e838..b95fa3e77 100644
--- a/source/installation_guide/upgrading/from-2.2-to-2.3.rst
+++ b/source/installation_guide/upgrading/from-2.2-to-2.3.rst
@@ -61,8 +61,7 @@ Dovecot no longer disables auth penalty waits for clients connecting from localh
 
 If the old behavior is still wanted, it's possible to do nowadays even more generically with e.g. setting following as the first passdb::
 
-   passdb db1 {
-    driver = passwd-file
+   passdb passwd-file {
     auth_username_format = %{rip}
      passwd_file_path = /etc/dovecot/passdb
     default_fields = noauthenticate=y
diff --git a/source/man/doveadm-user.1.rst.in b/source/man/doveadm-user.1.rst.in
index 33930055f..f740666c9 100644
--- a/source/man/doveadm-user.1.rst.in
+++ b/source/man/doveadm-user.1.rst.in
@@ -28,8 +28,7 @@ like this:
 
 .. parsed-literal::
 
-   userdb db1 {
-     driver = passwd-file
+   userdb passwd-file {
      passwd_file_path = /etc/%{protocol}.passwd
    }