diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index 5f524f9e1..bf100a1c9 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -14,7 +14,7 @@ use Response;
 use Exception;
 use BackendAuth;
 use Backend\Models\UserPreference;
-use Backend\Models\Preferences as BackendPreferences;
+use Backend\Models\Preference as BackendPreference;
 use Cms\Widgets\MediaManager;
 use System\Classes\ErrorHandler;
 use October\Rain\Exception\AjaxException;
@@ -218,8 +218,8 @@ class Controller extends Extendable
         /*
          * Set the admin preference locale
          */
-        BackendPreferences::setAppLocale();
-        BackendPreferences::setAppFallbackLocale();
+        BackendPreference::setAppLocale();
+        BackendPreference::setAppFallbackLocale();
 
         /*
          * Execute AJAX event
diff --git a/modules/backend/controllers/Preferences.php b/modules/backend/controllers/Preferences.php
index 4ff5555ae..fb6618adb 100644
--- a/modules/backend/controllers/Preferences.php
+++ b/modules/backend/controllers/Preferences.php
@@ -6,7 +6,7 @@ use Backend;
 use BackendMenu;
 use Backend\Classes\Controller;
 use System\Classes\SettingsManager;
-use Backend\Models\Preferences as PreferencesModel;
+use Backend\Models\Preference as PreferenceModel;
 
 /**
  * Editor Settings controller
@@ -73,6 +73,6 @@ class Preferences extends Controller
 
     public function formFindModelObject()
     {
-        return PreferencesModel::instance();
+        return PreferenceModel::instance();
     }
 }
diff --git a/modules/backend/controllers/preferences/config_form.yaml b/modules/backend/controllers/preferences/config_form.yaml
index 493d90893..c9647efa7 100644
--- a/modules/backend/controllers/preferences/config_form.yaml
+++ b/modules/backend/controllers/preferences/config_form.yaml
@@ -3,6 +3,6 @@
 # ===================================
 
 name: backend::lang.backend_preferences.menu_label
-form: ~/modules/backend/models/preferences/fields.yaml
-modelClass: Backend\Models\Preferences
+form: ~/modules/backend/models/preference/fields.yaml
+modelClass: Backend\Models\Preference
 defaultRedirect: system/settings
diff --git a/modules/backend/formwidgets/CodeEditor.php b/modules/backend/formwidgets/CodeEditor.php
index bc8ab7172..be6434613 100644
--- a/modules/backend/formwidgets/CodeEditor.php
+++ b/modules/backend/formwidgets/CodeEditor.php
@@ -1,6 +1,6 @@
 <?php namespace Backend\FormWidgets;
 
-use Backend\Models\Preferences as BackendPreferences;
+use Backend\Models\Preference as BackendPreference;
 use Backend\Classes\FormWidgetBase;
 
 /**
@@ -182,7 +182,7 @@ class CodeEditor extends FormWidgetBase
     protected function applyEditorPreferences()
     {
         // Load the editor system settings
-        $preferences = BackendPreferences::instance();
+        $preferences = BackendPreference::instance();
 
         $this->fontSize = $preferences->editor_font_size;
         $this->wordWrap = $preferences->editor_word_wrap;
diff --git a/modules/backend/layouts/_head.htm b/modules/backend/layouts/_head.htm
index 5b309b318..80e7a701a 100644
--- a/modules/backend/layouts/_head.htm
+++ b/modules/backend/layouts/_head.htm
@@ -3,8 +3,8 @@
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="app-timezone" content="<?= e(Config::get('app.timezone')) ?>">
 <meta name="backend-base-path" content="<?= Backend::baseUrl() ?>">
-<meta name="backend-timezone" content="<?= e(Backend\Models\Preferences::get('timezone')) ?>">
-<meta name="backend-locale" content="<?= e(Backend\Models\Preferences::get('locale')) ?>">
+<meta name="backend-timezone" content="<?= e(Backend\Models\Preference::get('timezone')) ?>">
+<meta name="backend-locale" content="<?= e(Backend\Models\Preference::get('locale')) ?>">
 <meta name="csrf-token" content="<?= csrf_token() ?>">
 <link rel="icon" type="image/png" href="<?= Backend::skinAsset('assets/images/favicon.png') ?>">
 <title data-title-template="<?= empty($this->pageTitleTemplate) ? '%s' : e($this->pageTitleTemplate) ?> | <?= e(Backend\Models\BrandSetting::get('app_name')) ?>">
diff --git a/modules/backend/models/BrandSetting.php b/modules/backend/models/BrandSetting.php
index 80a77f809..718ecc880 100644
--- a/modules/backend/models/BrandSetting.php
+++ b/modules/backend/models/BrandSetting.php
@@ -108,7 +108,7 @@ class BrandSetting extends Model
         $parser->ModifyVars($vars);
 
         $parser->parse(
-            File::get(base_path().'/modules/backend/models/brandsettings/custom.less') .
+            File::get(base_path().'/modules/backend/models/brandsetting/custom.less') .
             self::get('custom_css')
         );
 
diff --git a/modules/backend/models/Preferences.php b/modules/backend/models/Preference.php
similarity index 99%
rename from modules/backend/models/Preferences.php
rename to modules/backend/models/Preference.php
index a4d1feb9b..bed6bce80 100644
--- a/modules/backend/models/Preferences.php
+++ b/modules/backend/models/Preference.php
@@ -17,7 +17,7 @@ use Carbon\Carbon;
  * @package october\backend
  * @author Alexey Bobkov, Samuel Georges
  */
-class Preferences extends Model
+class Preference extends Model
 {
     use \October\Rain\Database\Traits\Validation;
 
diff --git a/modules/backend/models/brandsettings/custom.less b/modules/backend/models/brandsetting/custom.less
similarity index 100%
rename from modules/backend/models/brandsettings/custom.less
rename to modules/backend/models/brandsetting/custom.less
diff --git a/modules/backend/models/brandsettings/fields.yaml b/modules/backend/models/brandsetting/fields.yaml
similarity index 100%
rename from modules/backend/models/brandsettings/fields.yaml
rename to modules/backend/models/brandsetting/fields.yaml
diff --git a/modules/backend/models/preferences/fields.yaml b/modules/backend/models/preference/fields.yaml
similarity index 100%
rename from modules/backend/models/preferences/fields.yaml
rename to modules/backend/models/preference/fields.yaml