diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index 3410281e2..450d19d35 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -14,7 +14,7 @@ use Exception;
 use BackendAuth;
 use Backend\Models\UserPreference;
 use Backend\Models\Preference as BackendPreference;
-use Cms\Widgets\MediaManager;
+use Backend\Widgets\MediaManager;
 use October\Rain\Exception\AjaxException;
 use October\Rain\Exception\SystemException;
 use October\Rain\Exception\ValidationException;
@@ -152,11 +152,7 @@ class Controller extends Extendable
         /*
          * Media Manager widget is available on all back-end pages
          */
-        if (
-            class_exists('Cms\Widgets\MediaManager') &&
-            $this->user &&
-            $this->user->hasAccess('media.*')
-        ) {
+        if ($this->user && $this->user->hasAccess('media.*')) {
             $manager = new MediaManager($this, 'ocmediamanager');
             $manager->bindToController();
         }
diff --git a/modules/backend/widgets/mediamanager/partials/_crop-toolbar.htm b/modules/backend/widgets/mediamanager/partials/_crop-toolbar.htm
index e98a8da1c..02c7a28f2 100644
--- a/modules/backend/widgets/mediamanager/partials/_crop-toolbar.htm
+++ b/modules/backend/widgets/mediamanager/partials/_crop-toolbar.htm
@@ -1,12 +1,12 @@
 <?php
 
     $selectionModes = [
-        Cms\Widgets\MediaManager::SELECTION_MODE_NORMAL => trans('cms::lang.media.selection_mode_normal'),
-        Cms\Widgets\MediaManager::SELECTION_MODE_FIXED_RATIO => trans('cms::lang.media.selection_mode_fixed_ratio'),
-        Cms\Widgets\MediaManager::SELECTION_MODE_FIXED_SIZE => trans('cms::lang.media.selection_mode_fixed_size')
+        Backend\Widgets\MediaManager::SELECTION_MODE_NORMAL => trans('cms::lang.media.selection_mode_normal'),
+        Backend\Widgets\MediaManager::SELECTION_MODE_FIXED_RATIO => trans('cms::lang.media.selection_mode_fixed_ratio'),
+        Backend\Widgets\MediaManager::SELECTION_MODE_FIXED_SIZE => trans('cms::lang.media.selection_mode_fixed_size')
     ];
 
-    $sizeDisabledAttr = $currentSelectionMode == Cms\Widgets\MediaManager::SELECTION_MODE_NORMAL ? 'disabled="disabled"' : null;
+    $sizeDisabledAttr = $currentSelectionMode == Backend\Widgets\MediaManager::SELECTION_MODE_NORMAL ? 'disabled="disabled"' : null;
 ?>
 
 <div class="control-toolbar toolbar-padded">
diff --git a/modules/backend/widgets/mediamanager/partials/_filters.htm b/modules/backend/widgets/mediamanager/partials/_filters.htm
index 230206617..cf90cb94b 100644
--- a/modules/backend/widgets/mediamanager/partials/_filters.htm
+++ b/modules/backend/widgets/mediamanager/partials/_filters.htm
@@ -2,7 +2,7 @@
 
 <ul class="nav nav-stacked selector-group">
     <li role="presentation" <?php if ($currentFilter == Cms\Widgets\MediaManager::FILTER_EVERYTHING): ?>class="active"<?php endif ?>>
-        <a href="#" data-command="set-filter" data-filter="<?= Cms\Widgets\MediaManager::FILTER_EVERYTHING ?>">
+        <a href="#" data-command="set-filter" data-filter="<?= Backend\Widgets\MediaManager::FILTER_EVERYTHING ?>">
             <i class="icon-recycle"></i>
 
             <?= e(trans('cms::lang.media.filter_everything')) ?>
diff --git a/modules/backend/widgets/mediamanager/partials/_item-list.htm b/modules/backend/widgets/mediamanager/partials/_item-list.htm
index 5eb055b7c..47f783588 100644
--- a/modules/backend/widgets/mediamanager/partials/_item-list.htm
+++ b/modules/backend/widgets/mediamanager/partials/_item-list.htm
@@ -6,9 +6,9 @@
             <div class="empty-library"><?= e(trans('cms::lang.media.empty_library')) ?></div>
         <?php endif ?>
 
-        <?php if ($viewMode == Cms\Widgets\MediaManager::VIEW_MODE_GRID): ?>
+        <?php if ($viewMode == Backend\Widgets\MediaManager::VIEW_MODE_GRID): ?>
             <?= $this->makePartial('list-grid') ?>
-        <?php elseif ($viewMode == Cms\Widgets\MediaManager::VIEW_MODE_LIST): ?>
+        <?php elseif ($viewMode == Backend\Widgets\MediaManager::VIEW_MODE_LIST): ?>
             <?= $this->makePartial('list-list') ?>
         <?php else: ?>
             <?= $this->makePartial('list-tiles') ?>
diff --git a/modules/backend/widgets/mediamanager/partials/_view-mode-buttons.htm b/modules/backend/widgets/mediamanager/partials/_view-mode-buttons.htm
index fc7c31537..2826b33c8 100644
--- a/modules/backend/widgets/mediamanager/partials/_view-mode-buttons.htm
+++ b/modules/backend/widgets/mediamanager/partials/_view-mode-buttons.htm
@@ -1,18 +1,18 @@
-<button 
-    type="button" 
-    class="btn btn-default oc-icon-align-justify empty <?= $viewMode == Cms\Widgets\MediaManager::VIEW_MODE_GRID ? 'on' : '' ?>" 
-    data-command="change-view" 
-    data-view="<?= Cms\Widgets\MediaManager::VIEW_MODE_GRID ?>">
-</button>
-<button 
+<button
     type="button"
-    class="btn btn-default oc-icon-th empty <?= $viewMode == Cms\Widgets\MediaManager::VIEW_MODE_LIST ? 'on' : '' ?>"
+    class="btn btn-default oc-icon-align-justify empty <?= $viewMode == Backend\Widgets\MediaManager::VIEW_MODE_GRID ? 'on' : '' ?>"
     data-command="change-view"
-    data-view="<?= Cms\Widgets\MediaManager::VIEW_MODE_LIST ?>">
+    data-view="<?= Backend\Widgets\MediaManager::VIEW_MODE_GRID ?>">
 </button>
 <button
     type="button"
-    class="btn btn-default oc-icon-th-large empty <?= $viewMode == Cms\Widgets\MediaManager::VIEW_MODE_TILES ? 'on' : '' ?>"
+    class="btn btn-default oc-icon-th empty <?= $viewMode == Backend\Widgets\MediaManager::VIEW_MODE_LIST ? 'on' : '' ?>"
     data-command="change-view"
-    data-view="<?= Cms\Widgets\MediaManager::VIEW_MODE_TILES ?>">
+    data-view="<?= Backend\Widgets\MediaManager::VIEW_MODE_LIST ?>">
+</button>
+<button
+    type="button"
+    class="btn btn-default oc-icon-th-large empty <?= $viewMode == Backend\Widgets\MediaManager::VIEW_MODE_TILES ? 'on' : '' ?>"
+    data-command="change-view"
+    data-view="<?= Backend\Widgets\MediaManager::VIEW_MODE_TILES ?>">
 </button>
\ No newline at end of file
diff --git a/modules/cms/controllers/Media.php b/modules/cms/controllers/Media.php
index 70622005e..cc6dbfa70 100644
--- a/modules/cms/controllers/Media.php
+++ b/modules/cms/controllers/Media.php
@@ -1,6 +1,6 @@
 <?php namespace Cms\Controllers;
 
-use Backend\Controllers\Media;
+use Backend\Controllers\Media as MediaController;
 
 /**
  * CMS Media Manager
@@ -16,6 +16,7 @@ class Media extends MediaController
      */
     public function __construct()
     {
+        traceLog('Controller Cms\Controllers\Media has been deprecated, use Backend\Controller\Media instead.');
         parent::__construct();
     }
 }