diff --git a/source/configuration_manual/mail_crypt_plugin.rst b/source/configuration_manual/mail_crypt_plugin.rst
index 4f3bf642a6..10e9c3d2f5 100644
--- a/source/configuration_manual/mail_crypt_plugin.rst
+++ b/source/configuration_manual/mail_crypt_plugin.rst
@@ -350,7 +350,7 @@ It works similarly to the :ref:`fs-compress wrapper <fs-compress>`.
 It can be used to encrypt e.g.:
 
 * FTS index objects (:dovecot_plugin:ref:`fts_dovecot`)
-* External mail attachments (:dovecot_core:ref:`mail_attachment`)
+* External mail attachments (:dovecot_core:ref:`mail_ext_attachment`)
 
 Note that fs-crypt and the fs-compress wrapper can be also combined.
 Please make sure that compression is always applied before encryption. See
diff --git a/source/installation_guide/upgrading/from-2.3-to-3.0.rst b/source/installation_guide/upgrading/from-2.3-to-3.0.rst
index f41ac7f70e..6716be5c9f 100644
--- a/source/installation_guide/upgrading/from-2.3-to-3.0.rst
+++ b/source/installation_guide/upgrading/from-2.3-to-3.0.rst
@@ -33,7 +33,7 @@ Deprecated features and their replacements
 +------------------------------------------------------------+------------------------------------------------------------------------------------------+
 | Feature                                                    | Notes                                                                                    |
 +============================================================+==========================================================================================+
-| :dovecot_core:ref:`fs-sis <mail_attachment>`               | Saving new mails' attachments via fs-sis is disabled,                                    |
+| :dovecot_core:ref:`fs-sis <mail_ext_attachment>`           | Saving new mails' attachments via fs-sis is disabled,                                    |
 |                                                            | but reading SIS attachments is still supported.                                          |
 |                                                            | Missing SIS attachments are replaced with files filled with spaces.                      |
 +------------------------------------------------------------+------------------------------------------------------------------------------------------+
diff --git a/source/settings/core.rst b/source/settings/core.rst
index 42464f15ce..2e4c210c51 100644
--- a/source/settings/core.rst
+++ b/source/settings/core.rst
@@ -2012,7 +2012,7 @@ See :ref:`settings` for list of all setting groups.
      Do not consider any attachment with disposition inlined.
 
 
-.. dovecot_core:setting:: mail_attachment_dir
+.. dovecot_core:setting:: mail_ext_attachment_path
    :values: @string
 
    The directory in which to store mail attachments.
@@ -2025,10 +2025,10 @@ See :ref:`settings` for list of all setting groups.
    :ref:`Mail user variables <variables-mail_user>` can be used.
 
 
-.. dovecot_core:setting_filter:: mail_attachment
-   :filter: mail_attachment
+.. dovecot_core:setting_filter:: mail_ext_attachment
+   :filter: mail_ext_attachment
    :setting: fs_driver
-   :seealso: @mail_attachment_dir;dovecot_core
+   :seealso: @mail_ext_attachment_path;dovecot_core
    :values: @named_filter
 
    Named filter for initializing :ref:`FS driver <fs>` for external attachments.
@@ -2057,9 +2057,9 @@ See :ref:`settings` for list of all setting groups.
         SIS attachments are replaced with files filled with spaces.
 
 
-.. dovecot_core:setting:: mail_attachment_hash
+.. dovecot_core:setting:: mail_ext_attachment_hash
    :default: %{sha1}
-   :seealso: @mail_attachment_dir;dovecot_core
+   :seealso: @mail_ext_attachment_path;dovecot_core
    :values: %{md4}, %{md5}, %{sha1}, %{sha256}, %{sha512}, %{size}
 
    The hash format to use in attachment filenames when saving attachments
@@ -2071,9 +2071,9 @@ See :ref:`settings` for list of all setting groups.
    will return only the first 80 bits of the SHA256 output.
 
 
-.. dovecot_core:setting:: mail_attachment_min_size
+.. dovecot_core:setting:: mail_ext_attachment_min_size
    :default: 128k
-   :seealso: @mail_attachment_dir;dovecot_core
+   :seealso: @mail_ext_attachment_path;dovecot_core
    :values: @size
 
    Attachments below this size will not be saved externally.