diff --git a/src/calibre/db/cli/cmd_add.py b/src/calibre/db/cli/cmd_add.py
index 9a2680ef81..b68e3c18dc 100644
--- a/src/calibre/db/cli/cmd_add.py
+++ b/src/calibre/db/cli/cmd_add.py
@@ -394,9 +394,9 @@ the folder related options below.
 
     g = OptionGroup(
         parser,
-        _('ADDING FROM DIRECTORIES'),
+        _('ADDING FROM FOLDERS'),
         _(
-            'Options to control the adding of books from directories. By default only files that have extensions of known e-book file types are added.'
+            'Options to control the adding of books from folders. By default only files that have extensions of known e-book file types are added.'
         )
     )
 
diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index f4b4137141..ea8e419b01 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -214,10 +214,10 @@ class ANDROID(USBMS):
             }
     EBOOK_DIR_MAIN = ['eBooks/import', 'wordplayer/calibretransfer', 'Books',
             'sdcard/ebooks']
-    EXTRA_CUSTOMIZATION_MESSAGE = [_('Comma separated list of directories to '
+    EXTRA_CUSTOMIZATION_MESSAGE = [_('Comma separated list of folders to '
             'send e-books to on the device\'s <b>main memory</b>. The first one that exists will '
             'be used'),
-            _('Comma separated list of directories to '
+            _('Comma separated list of folders to '
             'send e-books to on the device\'s <b>storage cards</b>. The first one that exists will '
             'be used')
             ]
diff --git a/src/calibre/devices/hanlin/driver.py b/src/calibre/devices/hanlin/driver.py
index a0349cb24a..e25f577f05 100644
--- a/src/calibre/devices/hanlin/driver.py
+++ b/src/calibre/devices/hanlin/driver.py
@@ -136,7 +136,7 @@ class BOOX(HANLINV3):
     STORAGE_CARD_VOLUME_LABEL = 'BOOX Storage Card'
 
     EBOOK_DIR_MAIN = ['MyBooks']
-    EXTRA_CUSTOMIZATION_MESSAGE = _('Comma separated list of directories to '
+    EXTRA_CUSTOMIZATION_MESSAGE = _('Comma separated list of folders to '
             'send e-books to on the device. The first one that exists will '
             'be used.')
     EXTRA_CUSTOMIZATION_DEFAULT = ', '.join(EBOOK_DIR_MAIN)
diff --git a/src/calibre/gui2/add_filters.py b/src/calibre/gui2/add_filters.py
index 9be6a323b7..b00fe84d0f 100644
--- a/src/calibre/gui2/add_filters.py
+++ b/src/calibre/gui2/add_filters.py
@@ -107,7 +107,7 @@ class Rules(RulesBase):
     RuleItemClass = RuleItem
     RuleEditDialogClass = RuleEditDialog
     MSG = _('You can specify rules to add/ignore files here. They will be used'
-            ' when recursively adding files from directories/archives and also'
+            ' when recursively adding files from folders/archives and also'
             ' when auto-adding. Click the "Add Rule" button'
             ' below to get started. The rules will be processed in order for every file until either an'
             ' "add" or an "ignore" rule matches. If no rules match, the file will be added only'
diff --git a/src/calibre/gui2/preferences/adding.ui b/src/calibre/gui2/preferences/adding.ui
index 8063ac32c5..af9caed037 100644
--- a/src/calibre/gui2/preferences/adding.ui
+++ b/src/calibre/gui2/preferences/adding.ui
@@ -267,7 +267,7 @@ Author matching is exact.</string>
        <item row="18" column="1">
         <widget class="QPushButton" name="add_filter_rules_button">
          <property name="toolTip">
-          <string>&lt;p&gt;You can specify rules to add/ignore files here. These will be used when recursively adding books from directories.</string>
+          <string>&lt;p&gt;You can specify rules to add/ignore files here. These will be used when recursively adding books from folders.</string>
          </property>
          <property name="text">
           <string>Rules to filter added &amp;files</string>