diff --git a/src/base/scanfoldersmodel.cpp b/src/base/scanfoldersmodel.cpp
index 5349bb85d..d2844506a 100644
--- a/src/base/scanfoldersmodel.cpp
+++ b/src/base/scanfoldersmodel.cpp
@@ -153,10 +153,10 @@ QVariant ScanFoldersModel::headerData(int section, Qt::Orientation orientation,
 
     switch (section) {
     case WATCH:
-        title = tr("Watched Folder");
+        title = tr("Monitored Folder");
         break;
     case DOWNLOAD:
-        title = tr("Save Files to");
+        title = tr("Override Save Location");
         break;
     }
 
diff --git a/src/gui/options.ui b/src/gui/options.ui
index 7e6649e89..0182c4917 100644
--- a/src/gui/options.ui
+++ b/src/gui/options.ui
@@ -1248,7 +1248,7 @@
                    <item>
                     <widget class="QPushButton" name="addScanFolderButton">
                      <property name="text">
-                      <string>Add folder...</string>
+                      <string>Add entry</string>
                      </property>
                     </widget>
                    </item>
@@ -1258,7 +1258,7 @@
                       <bool>false</bool>
                      </property>
                      <property name="text">
-                      <string>Remove folder</string>
+                      <string>Remove entry</string>
                      </property>
                     </widget>
                    </item>
diff --git a/src/gui/scanfoldersdelegate.cpp b/src/gui/scanfoldersdelegate.cpp
index 0d331ce7e..5ad14f641 100644
--- a/src/gui/scanfoldersdelegate.cpp
+++ b/src/gui/scanfoldersdelegate.cpp
@@ -63,8 +63,8 @@ QWidget *ScanFoldersDelegate::createEditor(QWidget *parent, const QStyleOptionVi
     QComboBox* editor = new QComboBox(parent);
 
     editor->setFocusPolicy(Qt::StrongFocus);
-    editor->addItem(tr("Watch Folder"));
-    editor->addItem(tr("Default Folder"));
+    editor->addItem(tr("Same as monitored folder"));
+    editor->addItem(tr("Default save location"));
     editor->addItem(tr("Browse..."));
     if (index.data(Qt::UserRole).toInt() == ScanFoldersModel::CUSTOM_LOCATION) {
         editor->insertSeparator(3);
@@ -99,7 +99,7 @@ void ScanFoldersDelegate::setModelData(QWidget *editor, QAbstractItemModel *mode
         model->setData(
                     index,
                     QFileDialog::getExistingDirectory(
-                        0, tr("Choose save path"),
+                        0, tr("Select save location"),
                         index.data(Qt::UserRole).toInt() == ScanFoldersModel::CUSTOM_LOCATION ?
                             index.data().toString() :
                             BitTorrent::Session::instance()->defaultSavePath()),