diff --git a/modules/backend/behaviors/UserPreferencesModel.php b/modules/backend/behaviors/UserPreferencesModel.php
index b9bb6dc01..b8173350b 100644
--- a/modules/backend/behaviors/UserPreferencesModel.php
+++ b/modules/backend/behaviors/UserPreferencesModel.php
@@ -1,11 +1,11 @@
 <?php namespace Backend\Behaviors;
 
 use System\Behaviors\SettingsModel;
-use Backend\Models\UserPreferences;
+use Backend\Models\UserPreference;
 
 /**
  * User Preferences model extension, identical to System.Behaviors.SettingsModel
- * except values are set against the logged in user's preferences via Backend\Models\UserPreferences.
+ * except values are set against the logged in user's preferences via Backend\Models\UserPreference.
  *
  * Usage:
  *
@@ -64,7 +64,7 @@ class UserPreferencesModel extends SettingsModel
      */
     public function getSettingsRecord()
     {
-        $item = UserPreferences::forUser();
+        $item = UserPreference::forUser();
         $record = $item
             ->scopeApplyKeyAndUser($this->model, $this->recordCode, $item->userContext)
             ->remember(1440, $this->getCacheKey())
@@ -79,7 +79,7 @@ class UserPreferencesModel extends SettingsModel
      */
     public function beforeModelSave()
     {
-        $preferences = UserPreferences::forUser();
+        $preferences = UserPreference::forUser();
         list($namespace, $group, $item) = $preferences->parseKey($this->recordCode);
         $this->model->item = $item;
         $this->model->group = $group;
@@ -112,7 +112,7 @@ class UserPreferencesModel extends SettingsModel
      */
     protected function getCacheKey()
     {
-        $item = UserPreferences::forUser();
+        $item = UserPreference::forUser();
         $userId = $item->userContext ? $item->userContext->id : 0;
         return $this->recordCode.'-userpreference-'.$userId;
     }
diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index 436a0a1fe..5f524f9e1 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -13,7 +13,7 @@ use Session;
 use Response;
 use Exception;
 use BackendAuth;
-use Backend\Models\UserPreferences;
+use Backend\Models\UserPreference;
 use Backend\Models\Preferences as BackendPreferences;
 use Cms\Widgets\MediaManager;
 use System\Classes\ErrorHandler;
@@ -631,7 +631,7 @@ class Controller extends Extendable
             throw new ApplicationException('Missing a hint name.');
         }
 
-        $preferences = UserPreferences::forUser();
+        $preferences = UserPreference::forUser();
         $hiddenHints = $preferences->get('backend::hints.hidden', []);
         $hiddenHints[$name] = 1;
 
@@ -645,7 +645,7 @@ class Controller extends Extendable
      */
     public function isBackendHintHidden($name)
     {
-        $hiddenHints = UserPreferences::forUser()->get('backend::hints.hidden', []);
+        $hiddenHints = UserPreference::forUser()->get('backend::hints.hidden', []);
         return array_key_exists($name, $hiddenHints);
     }
 
diff --git a/modules/backend/models/UserPreferences.php b/modules/backend/models/UserPreference.php
similarity index 95%
rename from modules/backend/models/UserPreferences.php
rename to modules/backend/models/UserPreference.php
index 703d0ed71..97a26e159 100644
--- a/modules/backend/models/UserPreferences.php
+++ b/modules/backend/models/UserPreference.php
@@ -12,7 +12,7 @@ use October\Rain\Auth\Models\Preferences as PreferencesBase;
  * @package october\backend
  * @author Alexey Bobkov, Samuel Georges
  */
-class UserPreferences extends PreferencesBase
+class UserPreference extends PreferencesBase
 {
     /**
      * @var string The database table used by the model.
diff --git a/modules/backend/widgets/ReportContainer.php b/modules/backend/widgets/ReportContainer.php
index 6a85c66c4..a671f4571 100644
--- a/modules/backend/widgets/ReportContainer.php
+++ b/modules/backend/widgets/ReportContainer.php
@@ -5,7 +5,7 @@ use Lang;
 use Request;
 use Backend\Classes\WidgetBase;
 use Backend\Classes\WidgetManager;
-use Backend\Models\UserPreferences;
+use Backend\Models\UserPreference;
 use ApplicationException;
 
 /**
@@ -317,7 +317,7 @@ class ReportContainer extends WidgetBase
 
     protected function getWidgetsFromUserPreferences()
     {
-        $widgets = UserPreferences::forUser()
+        $widgets = UserPreference::forUser()
             ->get($this->getUserPreferencesKey(), $this->defaultWidgets);
 
         if (!is_array($widgets)) {
@@ -328,7 +328,7 @@ class ReportContainer extends WidgetBase
 
     protected function setWidgetsToUserPreferences($widgets)
     {
-        UserPreferences::forUser()->set($this->getUserPreferencesKey(), $widgets);
+        UserPreference::forUser()->set($this->getUserPreferencesKey(), $widgets);
     }
 
     protected function saveWidgetProperties($alias, $properties)
diff --git a/modules/cms/classes/MediaLibraryItem.php b/modules/cms/classes/MediaLibraryItem.php
index a540e7c44..1f3f02239 100644
--- a/modules/cms/classes/MediaLibraryItem.php
+++ b/modules/cms/classes/MediaLibraryItem.php
@@ -2,7 +2,6 @@
 
 use File;
 use Config;
-use Backend\Models\UserPreferences;
 use October\Rain\Filesystem\Definitions as FileDefinitions;
 use Carbon\Carbon;