diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatype/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js
similarity index 81%
rename from src/Umbraco.Web.UI.Client/src/views/mediatype/create.controller.js
rename to src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js
index 4012cdae1f..56451510e8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatype/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.controller.js
@@ -25,13 +25,13 @@ function mediaTypeCreateController($scope, $location, navigationService, mediaTy
 
                 navigationService.hideMenu();
                 var currPath = node.path ? node.path : "-1";
-                navigationService.syncTree({ tree: "mediatype", path: currPath + "," + folderId, forceReload: true, activate: true });
+                navigationService.syncTree({ tree: "mediatypes", path: currPath + "," + folderId, forceReload: true, activate: true });
 
                 formHelper.resetForm({ scope: $scope });
 
                 var section = appState.getSectionState("currentSection");
 
-                $location.path("/" + section + "/mediatype/list/" + folderId);
+                $location.path("/" + section + "/mediatypes/list/" + folderId);
 
             }, function(err) {
 
@@ -42,7 +42,7 @@ function mediaTypeCreateController($scope, $location, navigationService, mediaTy
 
     $scope.createMediaType = function() {
         $location.search('create', null);
-        $location.path("/settings/mediatype/edit/" + node.id).search("create", true);
+        $location.path("/settings/mediatypes/edit/" + node.id).search("create", true);
         navigationService.hideMenu();
     }
 }
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatype/create.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/mediatype/create.html
rename to src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatype/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.controller.js
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/mediatype/delete.controller.js
rename to src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.controller.js
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatype/delete.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/mediatype/delete.html
rename to src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.html
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatype/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
similarity index 93%
rename from src/Umbraco.Web.UI.Client/src/views/mediatype/edit.controller.js
rename to src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
index 2523756b51..b44eeacb84 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatype/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
@@ -232,7 +232,7 @@
 		/** Syncs the content type  to it's tree node - this occurs on first load and after saving */
 		function syncTreeNode(dt, path, initialLoad) {
 
-			navigationService.syncTree({ tree: "mediatype", path: path.split(","), forceReload: initialLoad !== true }).then(function (syncArgs) {
+			navigationService.syncTree({ tree: "mediatypes", path: path.split(","), forceReload: initialLoad !== true }).then(function (syncArgs) {
 				vm.currentNode = syncArgs.node;
 			});
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatype/edit.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/mediatype/edit.html
rename to src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatype/views/design/design.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/design/design.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/mediatype/views/design/design.html
rename to src/Umbraco.Web.UI.Client/src/views/mediatypes/views/design/design.html
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatype/views/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/listview/listview.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/mediatype/views/listview/listview.html
rename to src/Umbraco.Web.UI.Client/src/views/mediatypes/views/listview/listview.html
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatype/views/permissions/permissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/mediatype/views/permissions/permissions.controller.js
rename to src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.controller.js
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatype/views/permissions/permissions.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html
similarity index 100%
rename from src/Umbraco.Web.UI.Client/src/views/mediatype/views/permissions/permissions.html
rename to src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html