diff --git a/ext/bg/js/settings/anki.js b/ext/bg/js/settings/anki-controller.js
similarity index 100%
rename from ext/bg/js/settings/anki.js
rename to ext/bg/js/settings/anki-controller.js
diff --git a/ext/bg/js/settings/anki-templates.js b/ext/bg/js/settings/anki-templates-controller.js
similarity index 100%
rename from ext/bg/js/settings/anki-templates.js
rename to ext/bg/js/settings/anki-templates-controller.js
diff --git a/ext/bg/js/settings/audio.js b/ext/bg/js/settings/audio-controller.js
similarity index 100%
rename from ext/bg/js/settings/audio.js
rename to ext/bg/js/settings/audio-controller.js
diff --git a/ext/bg/js/settings/backup.js b/ext/bg/js/settings/backup-controller.js
similarity index 99%
rename from ext/bg/js/settings/backup.js
rename to ext/bg/js/settings/backup-controller.js
index 57963cec..ac1294e7 100644
--- a/ext/bg/js/settings/backup.js
+++ b/ext/bg/js/settings/backup-controller.js
@@ -20,7 +20,7 @@
  * api
  */
 
-class SettingsBackup {
+class BackupController {
     constructor(settingsController) {
         this._settingsController = settingsController;
         this._settingsExportToken = null;
diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionary-controller.js
similarity index 100%
rename from ext/bg/js/settings/dictionaries.js
rename to ext/bg/js/settings/dictionary-controller.js
diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js
index 4932586b..37c6375d 100644
--- a/ext/bg/js/settings/main.js
+++ b/ext/bg/js/settings/main.js
@@ -19,6 +19,7 @@
  * AnkiController
  * AnkiTemplatesController
  * AudioController
+ * BackupController
  * ClipboardPopupsController
  * DictionaryController
  * DictionaryImportController
@@ -26,7 +27,6 @@
  * PopupPreviewController
  * ProfileController
  * ScanInputsController
- * SettingsBackup
  * SettingsController
  * StorageController
  * api
@@ -90,7 +90,7 @@ async function setupEnvironmentInfo() {
         const ankiTemplatesController = new AnkiTemplatesController(settingsController, ankiController);
         ankiTemplatesController.prepare();
 
-        const settingsBackup = new SettingsBackup(settingsController);
+        const settingsBackup = new BackupController(settingsController);
         settingsBackup.prepare();
 
         const scanInputsController = new ScanInputsController(settingsController);
diff --git a/ext/bg/js/settings/popup-preview.js b/ext/bg/js/settings/popup-preview-controller.js
similarity index 100%
rename from ext/bg/js/settings/popup-preview.js
rename to ext/bg/js/settings/popup-preview-controller.js
diff --git a/ext/bg/js/settings/profiles.js b/ext/bg/js/settings/profile-controller.js
similarity index 100%
rename from ext/bg/js/settings/profiles.js
rename to ext/bg/js/settings/profile-controller.js
diff --git a/ext/bg/js/settings/storage.js b/ext/bg/js/settings/storage-controller.js
similarity index 100%
rename from ext/bg/js/settings/storage.js
rename to ext/bg/js/settings/storage-controller.js
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index ae89ca1f..b01fbf73 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -1165,39 +1165,40 @@
         <script src="/mixed/js/api.js"></script>
         <script src="/mixed/js/japanese.js"></script>
 
+        <script src="/mixed/js/audio-system.js"></script>
+        <script src="/mixed/js/cache-map.js"></script>
+        <script src="/mixed/js/dictionary-data-util.js"></script>
+        <script src="/mixed/js/document-util.js"></script>
+        <script src="/mixed/js/dom-data-binder.js"></script>
+        <script src="/mixed/js/object-property-accessor.js"></script>
+        <script src="/mixed/js/task-accumulator.js"></script>
+
         <script src="/bg/js/anki.js"></script>
         <script src="/bg/js/anki-note-builder.js"></script>
         <script src="/bg/js/options.js"></script>
         <script src="/bg/js/util.js"></script>
-        <script src="/mixed/js/audio-system.js"></script>
-        <script src="/mixed/js/document-util.js"></script>
-
         <script src="/bg/js/database.js"></script>
         <script src="/bg/js/dictionary-database.js"></script>
         <script src="/bg/js/dictionary-importer.js"></script>
         <script src="/bg/js/json-schema.js"></script>
         <script src="/bg/js/media-utility.js"></script>
-        <script src="/mixed/js/cache-map.js"></script>
 
-        <script src="/bg/js/settings/anki.js"></script>
-        <script src="/bg/js/settings/anki-templates.js"></script>
-        <script src="/bg/js/settings/audio.js"></script>
-        <script src="/bg/js/settings/backup.js"></script>
+        <script src="/bg/js/settings/keyboard-mouse-input-field.js"></script>
+        <script src="/bg/js/settings/profile-conditions-ui.js"></script>
+
+        <script src="/bg/js/settings/anki-controller.js"></script>
+        <script src="/bg/js/settings/anki-templates-controller.js"></script>
+        <script src="/bg/js/settings/audio-controller.js"></script>
+        <script src="/bg/js/settings/backup-controller.js"></script>
         <script src="/bg/js/settings/clipboard-popups-controller.js"></script>
-        <script src="/bg/js/settings/dictionaries.js"></script>
+        <script src="/bg/js/settings/dictionary-controller.js"></script>
         <script src="/bg/js/settings/dictionary-import-controller.js"></script>
         <script src="/bg/js/settings/generic-setting-controller.js"></script>
-        <script src="/bg/js/settings/keyboard-mouse-input-field.js"></script>
-        <script src="/bg/js/settings/popup-preview.js"></script>
-        <script src="/bg/js/settings/profiles.js"></script>
-        <script src="/bg/js/settings/profile-conditions-ui.js"></script>
+        <script src="/bg/js/settings/popup-preview-controller.js"></script>
+        <script src="/bg/js/settings/profile-controller.js"></script>
         <script src="/bg/js/settings/scan-inputs-controller.js"></script>
         <script src="/bg/js/settings/settings-controller.js"></script>
-        <script src="/bg/js/settings/storage.js"></script>
-        <script src="/mixed/js/dictionary-data-util.js"></script>
-        <script src="/mixed/js/object-property-accessor.js"></script>
-        <script src="/mixed/js/task-accumulator.js"></script>
-        <script src="/mixed/js/dom-data-binder.js"></script>
+        <script src="/bg/js/settings/storage-controller.js"></script>
 
         <script src="/bg/js/settings/main.js"></script>
     </body>