diff --git a/src/Umbraco.Core/Constants-Applications.cs b/src/Umbraco.Core/Constants-Applications.cs
index d884debfc4..17178cd430 100644
--- a/src/Umbraco.Core/Constants-Applications.cs
+++ b/src/Umbraco.Core/Constants-Applications.cs
@@ -61,7 +61,7 @@
             /// <summary>
             /// alias for the media tree.
             /// </summary>
-            public const string Members = "member";
+            public const string Members = "members";
 
             /// <summary>
             /// alias for the media tree.
@@ -71,7 +71,7 @@
             /// <summary>
             /// alias for the datatype tree.
             /// </summary>
-			public const string DataTypes = "datatype";
+			public const string DataTypes = "dataTypes";
 
 			/// <summary>
 			/// alias for the dictionary tree.
@@ -83,18 +83,18 @@
             /// <summary>
             /// alias for the document type tree.
             /// </summary>
-            public const string DocumentTypes = "documenttype";
+            public const string DocumentTypes = "documentTypes";
 
             /// <summary>
             /// alias for the media type tree.
             /// </summary>
-            public const string MediaTypes = "mediatype";
+            public const string MediaTypes = "mediaTypes";
 
 
             /// <summary>
             /// alias for the member type tree.
             /// </summary>
-            public const string MemberTypes = "membertype";
+            public const string MemberTypes = "memberTypes";
 
             /// <summary>
             /// alias for the template tree.
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
index d4116e0be9..dfb19a647d 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
@@ -899,7 +899,7 @@
     <key alias="cacheBrowser">Prohlížeč mezipaměti</key>
     <key alias="contentRecycleBin">Koš</key>
     <key alias="createdPackages">Vytvořené balíčky</key>
-    <key alias="datatype">Datové typy</key>
+    <key alias="dataTypes">Datové typy</key>
     <key alias="dictionary">Slovník</key>
     <key alias="installedPackages">Instalované balíčky</key>
     <key alias="installSkin">Instalovat téma</key>
@@ -908,11 +908,11 @@
     <key alias="localPackage">Instalovat místní balíček</key>
     <key alias="macros">Makra</key>
     <key alias="mediaTypes">Typy medií</key>
-    <key alias="member">Členové</key>
-    <key alias="memberGroup">Skupiny členů</key>
+    <key alias="members">Členové</key>
+    <key alias="memberGroups">Skupiny členů</key>
     <key alias="memberRoles">Role</key>
-    <key alias="memberType">Typy členů</key>
-    <key alias="nodeTypes">Typy dokumentů</key>
+    <key alias="memberTypes">Typy členů</key>
+    <key alias="documentTypes">Typy dokumentů</key>
     <key alias="packager">Balíčky</key>
     <key alias="packages">Balíčky</key>
     <key alias="python">Soubory python</key>
diff --git a/src/Umbraco.Web.UI/config/trees.Release.config b/src/Umbraco.Web.UI/config/trees.Release.config
index bb60356cd4..413ebe2b78 100644
--- a/src/Umbraco.Web.UI/config/trees.Release.config
+++ b/src/Umbraco.Web.UI/config/trees.Release.config
@@ -3,39 +3,48 @@
   <!--Content-->
   <add initialize="true" sortOrder="0" alias="content" application="content" title="Content" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.ContentTreeController, umbraco" />
   <add initialize="false" sortOrder="0" alias="contentRecycleBin" application="content" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.ContentRecycleBin, umbraco" />
+  
   <!--Media-->
   <add initialize="true" sortOrder="0" alias="media" application="media" title="Media" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.MediaTreeController, umbraco" />
   <add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, umbraco" />
+  
   <!--Settings-->
   <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
   <add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" />
-  <add application="settings" alias="templates" title="Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.TemplatesTreeController, umbraco" initialize="true" sortOrder="1"/>
+  <add application="settings" alias="templates" title="Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.TemplatesTreeController, umbraco" initialize="true" sortOrder="1" />
   <add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" />
   <add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
   <add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
   <add application="settings" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" sortOrder="5" />
-  <add application="settings" alias="mediaTypes" title="Media Types" type="umbraco.loadMediaTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" />
-  <add application="settings" alias="nodeTypes" title="Document Types" type="umbraco.loadNodeTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="7" />
+  
+  <add initialize="true" sortOrder="5" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" />
+  <add initialize="true" sortOrder="6" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, umbraco" />
+  
   <!--Developer-->
-  <add initialize="true" sortOrder="0" alias="datatype" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" />
+  <add initialize="true" sortOrder="0" alias="dataTypes" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" />
   <add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
   <add application="developer" alias="packager" title="Packages" type="umbraco.loadPackager, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
   <add application="developer" alias="packagerPackages" title="Packager Packages" type="umbraco.loadPackages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" initialize="false" sortOrder="3" />
   <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
   <add application="developer" alias="xslt" title="XSLT Files" type="umbraco.loadXslt, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" />
   <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
+  
   <!--Users-->
   <add application="users" alias="users" title="Users" type="umbraco.loadUsers, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
   <add application="users" alias="userTypes" title="User Types" type="umbraco.cms.presentation.Trees.UserTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" />
   <add application="users" alias="userPermissions" title="User Permissions" type="umbraco.cms.presentation.Trees.UserPermissions, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
+  
   <!--Members-->
-  <add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, umbraco" />
-  <add application="member" alias="memberGroup" title="Member Groups" type="umbraco.loadMemberGroups, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" />
-  <add application="member" alias="memberType" title="Member Types" type="umbraco.loadMemberTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
+  <add initialize="true" sortOrder="0" alias="members" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, umbraco" />
+  <add application="member" alias="memberGroups" title="Member Groups" type="umbraco.loadMemberGroups, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" />
+  <add initialize="true" sortOrder="0" alias="memberTypes" application="member" title="Member Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTypeTreeController, umbraco" />
+  
   <!--Translation-->
   <add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadOpenTasks, umbraco" />
   <add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, umbraco" />
+  
   <!-- Custom -->
   <!--<add application="myApplication" alias="myTree" title="Me Tree" type="MyNamespace.myTree, MyAssembly"
        iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="10" />-->
+  
 </trees>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/config/trees.config b/src/Umbraco.Web.UI/config/trees.config
index cf18abfa59..413ebe2b78 100644
--- a/src/Umbraco.Web.UI/config/trees.config
+++ b/src/Umbraco.Web.UI/config/trees.config
@@ -3,9 +3,11 @@
   <!--Content-->
   <add initialize="true" sortOrder="0" alias="content" application="content" title="Content" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.ContentTreeController, umbraco" />
   <add initialize="false" sortOrder="0" alias="contentRecycleBin" application="content" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.ContentRecycleBin, umbraco" />
+  
   <!--Media-->
   <add initialize="true" sortOrder="0" alias="media" application="media" title="Media" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.MediaTreeController, umbraco" />
   <add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, umbraco" />
+  
   <!--Settings-->
   <add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
   <add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" />
@@ -14,31 +16,35 @@
   <add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
   <add application="settings" alias="dictionary" title="Dictionary" type="umbraco.loadDictionary, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
   <add application="settings" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" sortOrder="5" />
-  <add application="settings" alias="mediaTypes" title="Media Types" type="umbraco.loadMediaTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" />
-  <add application="settings" alias="nodeTypes" title="Document Types" type="umbraco.loadNodeTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="7" />
+  
+  <add initialize="true" sortOrder="5" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" />
+  <add initialize="true" sortOrder="6" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, umbraco" />
+  
   <!--Developer-->
-  <add initialize="true" sortOrder="0" alias="datatype" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" />
+  <add initialize="true" sortOrder="0" alias="dataTypes" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" />
   <add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
   <add application="developer" alias="packager" title="Packages" type="umbraco.loadPackager, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
   <add application="developer" alias="packagerPackages" title="Packager Packages" type="umbraco.loadPackages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" initialize="false" sortOrder="3" />
   <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
   <add application="developer" alias="xslt" title="XSLT Files" type="umbraco.loadXslt, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" />
   <add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
+  
   <!--Users-->
   <add application="users" alias="users" title="Users" type="umbraco.loadUsers, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
   <add application="users" alias="userTypes" title="User Types" type="umbraco.cms.presentation.Trees.UserTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" />
   <add application="users" alias="userPermissions" title="User Permissions" type="umbraco.cms.presentation.Trees.UserPermissions, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
+  
   <!--Members-->
-  <add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, umbraco" />
-  <add application="member" alias="memberGroup" title="Member Groups" type="umbraco.loadMemberGroups, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" />
-  <add application="member" alias="memberType" title="Member Types" type="umbraco.loadMemberTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
+  <add initialize="true" sortOrder="0" alias="members" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, umbraco" />
+  <add application="member" alias="memberGroups" title="Member Groups" type="umbraco.loadMemberGroups, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" />
+  <add initialize="true" sortOrder="0" alias="memberTypes" application="member" title="Member Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTypeTreeController, umbraco" />
+  
   <!--Translation-->
   <add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadOpenTasks, umbraco" />
   <add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, umbraco" />
+  
   <!-- Custom -->
   <!--<add application="myApplication" alias="myTree" title="Me Tree" type="MyNamespace.myTree, MyAssembly"
        iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="10" />-->
-  <add initialize="true" sortOrder="0" alias="documenttype" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.DocumentTypeTreeController, umbraco" />
-  <add initialize="true" sortOrder="0" alias="membertype" application="member" title="Member Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTypeTreeController, umbraco" />
-  <add initialize="true" sortOrder="0" alias="documenttype" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, umbraco" />
+  
 </trees>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index cfcfca042a..db0424ff31 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -851,7 +851,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="cacheBrowser">Cacheviser</key>
     <key alias="contentRecycleBin">Papirkurv</key>
     <key alias="createdPackages">Oprettede pakker</key>
-    <key alias="datatype">Datatyper</key>
+    <key alias="dataTypes">Datatyper</key>
     <key alias="dictionary">Ordbog</key>
     <key alias="installedPackages">Installerede pakker</key>
     <key alias="installSkin">Installér et skin'</key>
@@ -860,11 +860,13 @@ Mange hilsner fra Umbraco robotten
     <key alias="localPackage">Installer lokal pakke</key>
     <key alias="macros">Makroer</key>
     <key alias="mediaTypes">Medietyper</key>
-    <key alias="member">Medlemmer</key>
-    <key alias="memberGroup">Medlemsgruppe</key>
+    <key alias="members">Medlemmer</key>
+    <key alias="memberGroups">Medlemsgruppe</key>
     <key alias="memberRoles">Roller</key>
-    <key alias="memberType">Medlemstype</key>
-    <key alias="nodeTypes">Dokumenttyper</key>
+    <key alias="memberTypes">Medlemstype</key>
+    <key alias="documentTypes">Dokumenttyper</key>
+    <key alias="relationTypes">Dokumenttyper</key>
+    
     <key alias="packager">Pakker</key>
     <key alias="packages">Pakker</key>
     <key alias="python">Python</key>
@@ -872,7 +874,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="runway">Installer Runway</key>
     <key alias="runwayModules">Runway-moduler</key>
     <key alias="scripting">Scripting filer</key>
-    <key alias="scripts">Script</key>
+    <key alias="scripts">Scripts</key>
     <key alias="stylesheets">Stylesheets</key>
     <key alias="templates">Skabeloner</key>
     <key alias="xslt">XSLT-filer</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
index c6f87964e7..b7a6ccb7fc 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
@@ -928,7 +928,7 @@ Ihr freundlicher Umbraco-Robot
     <key alias="cacheBrowser">Zwischenspeicher</key>
     <key alias="contentRecycleBin">Papierkorb</key>
     <key alias="createdPackages">Erstellte Pakete</key>
-    <key alias="datatype">Datentypen</key>
+    <key alias="dataTypes">Datentypen</key>
     <key alias="dictionary">Wörterbuch</key>
     <key alias="installedPackages">Installierte Pakete</key>
     <key alias="installSkin">Design-Skin installieren</key>
@@ -937,11 +937,11 @@ Ihr freundlicher Umbraco-Robot
     <key alias="localPackage">Lokales Paket hochladen und installieren</key>
     <key alias="macros">Makros</key>
     <key alias="mediaTypes">Medientypen</key>
-    <key alias="member">Mitglieder</key>
-    <key alias="memberGroup">Mitgliedergruppen</key>
+    <key alias="members">Mitglieder</key>
+    <key alias="memberGroups">Mitgliedergruppen</key>
     <key alias="memberRoles">Mitgliederrollen</key>
-    <key alias="memberType">Mitglieder-Typen</key>
-    <key alias="nodeTypes">Dokumententypen</key>
+    <key alias="memberTypes">Mitglieder-Typen</key>
+    <key alias="documentTypes">Dokumententypen</key>
     <key alias="packager">Pakete</key>
     <key alias="packages">Pakete</key>
     <key alias="python">Python-Dateien</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 79fad32639..ae9832b724 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -985,7 +985,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="cacheBrowser">Cache Browser</key>
     <key alias="contentRecycleBin">Recycle Bin</key>
     <key alias="createdPackages">Created packages</key>
-    <key alias="datatype">Data Types</key>
+    <key alias="dataTypes">Data Types</key>
     <key alias="dictionary">Dictionary</key>
     <key alias="installedPackages">Installed packages</key>
     <key alias="installSkin">Install skin</key>
@@ -994,11 +994,12 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="localPackage">Install local package</key>
     <key alias="macros">Macros</key>
     <key alias="mediaTypes">Media Types</key>
-    <key alias="member">Members</key>
-    <key alias="memberGroup">Member Groups</key>
+    <key alias="members">Members</key>
+    <key alias="memberGroups">Member Groups</key>
     <key alias="memberRoles">Roles</key>
-    <key alias="memberType">Member Types</key>
-    <key alias="nodeTypes">Document Types</key>
+    <key alias="memberTypes">Member Types</key>
+    <key alias="documentTypes">Document Types</key>
+    <key alias="relationTypes">Relation Types</key>
     <key alias="packager">Packages</key>
     <key alias="packages">Packages</key>
     <key alias="python">Python Files</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 4da1607c4b..ce8b61142b 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -983,7 +983,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="cacheBrowser">Cache Browser</key>
     <key alias="contentRecycleBin">Recycle Bin</key>
     <key alias="createdPackages">Created packages</key>
-    <key alias="datatype">Data Types</key>
+    <key alias="dataTypes">Data Types</key>
     <key alias="dictionary">Dictionary</key>
     <key alias="installedPackages">Installed packages</key>
     <key alias="installSkin">Install skin</key>
@@ -992,11 +992,12 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="localPackage">Install local package</key>
     <key alias="macros">Macros</key>
     <key alias="mediaTypes">Media Types</key>
-    <key alias="member">Members</key>
-    <key alias="memberGroup">Member Groups</key>
-    <key alias="memberRoles">Roles</key>
-    <key alias="memberType">Member Types</key>
-    <key alias="nodeTypes">Document Types</key>
+    <key alias="members">Members</key>
+    <key alias="memberGroups">Member Groups</key>
+    <key alias="memberRoles">Member Roles</key>
+    <key alias="memberTypes">Member Types</key>
+    <key alias="documentTypes">Document Types</key>
+    <key alias="relationTypes">Relation Types</key>
     <key alias="packager">Packages</key>
     <key alias="packages">Packages</key>
     <key alias="python">Python Files</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
index fab7d30f03..1016c81d77 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
@@ -814,7 +814,7 @@
     <key alias="cacheBrowser">Caché del navegador</key>
     <key alias="contentRecycleBin">Papelera de reciclaje</key>
     <key alias="createdPackages">Paquetes creados</key>
-    <key alias="datatype">Tipos de datos</key>
+    <key alias="dataTypes">Tipos de datos</key>
     <key alias="dictionary">Diccionario</key>
     <key alias="installedPackages">Paquetes instalados</key>
     <key alias="installSkin">Instalar skin</key>
@@ -823,11 +823,11 @@
     <key alias="localPackage">Instalar paquete local</key>
     <key alias="macros">Macros</key>
     <key alias="mediaTypes">Tipos de medios</key>
-    <key alias="member">Miembros</key>
-    <key alias="memberGroup">Grupos de miembros</key>
+    <key alias="members">Miembros</key>
+    <key alias="memberGroups">Grupos de miembros</key>
     <key alias="memberRoles">Roles</key>
-    <key alias="memberType">Tipos de miembros</key>
-    <key alias="nodeTypes">Tipos de documento</key>
+    <key alias="memberTypes">Tipos de miembros</key>
+    <key alias="documentTypes">Tipos de documento</key>
     <key alias="packager">Paquetes</key>
     <key alias="packages">Paquetes</key>
     <key alias="python">Ficheros Python</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
index af1c39345b..745dfe8292 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
@@ -915,7 +915,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="cacheBrowser">Navigateur de cache</key>
     <key alias="contentRecycleBin">Corbeille</key>
     <key alias="createdPackages">Packages créés</key>
-    <key alias="datatype">Typesde données</key>
+    <key alias="dataTypes">Typesde données</key>
     <key alias="dictionary">Dictionnaire</key>
     <key alias="installedPackages">Packages installés</key>
     <key alias="installSkin">Installer un skin</key>
@@ -924,11 +924,11 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="localPackage">Installer un package local</key>
     <key alias="macros">Macros</key>
     <key alias="mediaTypes">Types de médias</key>
-    <key alias="member">Membres</key>
-    <key alias="memberGroup">Groupes de membres</key>
+    <key alias="members">Membres</key>
+    <key alias="memberGroups">Groupes de membres</key>
     <key alias="memberRoles">Rôles</key>
-    <key alias="memberType">Types de membres</key>
-    <key alias="nodeTypes">Types de documents</key>
+    <key alias="memberTypes">Types de membres</key>
+    <key alias="documentTypes">Types de documents</key>
     <key alias="packager">Packages</key>
     <key alias="packages">Packages</key>
     <key alias="python">Fichiers Python</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
index 81cf4b2ff5..64567d5934 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
@@ -800,7 +800,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="cacheBrowser">זיכרון מטמון בדפדפן</key>
     <key alias="contentRecycleBin">סל מיחזור</key>
     <key alias="createdPackages">יצירת חבילות</key>
-    <key alias="datatype">סוגי מידע</key>
+    <key alias="dataTypes">סוגי מידע</key>
     <key alias="dictionary">מילון</key>
     <key alias="installedPackages">חבילות מותקנות</key>
     <key alias="installSkin">התקן עיצוב</key>
@@ -809,11 +809,11 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="localPackage">התקן חבילה מקומית</key>
     <key alias="macros">מקרו</key>
     <key alias="mediaTypes">סוגי מדיה</key>
-    <key alias="member">משתמשים</key>
-    <key alias="memberGroup">קבוצות משתמשים</key>
+    <key alias="members">משתמשים</key>
+    <key alias="memberGroups">קבוצות משתמשים</key>
     <key alias="memberRoles">כללים</key>
-    <key alias="memberType">סוגי משתמשים</key>
-    <key alias="nodeTypes">סוגי מסמכים</key>
+    <key alias="memberTypes">סוגי משתמשים</key>
+    <key alias="documentTypes">סוגי מסמכים</key>
     <key alias="packager">חבילות</key>
     <key alias="packages">חבילות</key>
     <key alias="python">קבצי פייתון</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
index 975ce0bb6a..43b3cd877a 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
@@ -773,7 +773,7 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
     <key alias="cacheBrowser">Cache Browser</key>
     <key alias="contentRecycleBin">Cestino</key>
     <key alias="createdPackages">Pacchetti creati</key>
-    <key alias="datatype">Tipi di dato</key>
+    <key alias="dataTypes">Tipi di dato</key>
     <key alias="dictionary">Dizionario</key>
     <key alias="installedPackages">Pacchetti installati</key>
     <key alias="installSkin">Installare skin</key>
@@ -782,11 +782,11 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
     <key alias="localPackage">Installa un pacchetto locale</key>
     <key alias="macros">Macros</key>
     <key alias="mediaTypes">Tipi di media</key>
-    <key alias="member">Membri</key>
-    <key alias="memberGroup">Gruppi di Membri</key>
+    <key alias="members">Membri</key>
+    <key alias="memberGroups">Gruppi di Membri</key>
     <key alias="memberRoles">Ruoli</key>
-    <key alias="memberType">Tipologia Membri</key>
-    <key alias="nodeTypes">Tipi di documento</key>
+    <key alias="memberTypes">Tipologia Membri</key>
+    <key alias="documentTypes">Tipi di documento</key>
     <key alias="packager">Pacchetti</key>
 	  <key alias="packages">Pacchetti</key>
     <key alias="python">Files Python</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
index db3fb72574..dc3605cd40 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
@@ -981,7 +981,7 @@ Runwayをインストールして作られた新しいウェブサイトがど
     <key alias="cacheBrowser">キャッシュの参照</key>
     <key alias="contentRecycleBin">ごみ箱</key>
     <key alias="createdPackages">パッケージの作成</key>
-    <key alias="datatype">データ型</key>
+    <key alias="dataTypes">データ型</key>
     <key alias="dictionary">ディクショナリ</key>
     <key alias="installedPackages">インストール済のパッケージ</key>
     <key alias="installSkin">スキンのインストール</key>
@@ -990,11 +990,11 @@ Runwayをインストールして作られた新しいウェブサイトがど
     <key alias="localPackage">ローカルパッケージのインストール</key>
     <key alias="macros">マクロ</key>
     <key alias="mediaTypes">メディアタイプ</key>
-    <key alias="member">メンバー</key>
-    <key alias="memberGroup">メンバーのグループ</key>
+    <key alias="members">メンバー</key>
+    <key alias="memberGroups">メンバーのグループ</key>
     <key alias="memberRoles">役割</key>
-    <key alias="memberType">メンバーの種類</key>
-    <key alias="nodeTypes">ドキュメントタイプ</key>
+    <key alias="memberTypes">メンバーの種類</key>
+    <key alias="documentTypes">ドキュメントタイプ</key>
     <key alias="packager">パッケージ</key>
     <key alias="packages">パッケージ</key>
     <key alias="python">Python ファイル</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
index b3f6a3a384..f2d58d51e0 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
@@ -777,7 +777,7 @@
     <key alias="cacheBrowser">캐시 브라우저</key>
     <key alias="contentRecycleBin">휴지통</key>
     <key alias="createdPackages">생성된 패키지</key>
-    <key alias="datatype">데이터 타입</key>
+    <key alias="dataTypes">데이터 타입</key>
     <key alias="dictionary">사전</key>
     <key alias="installedPackages">설치된 패키지</key>
     <key alias="installSkin">TRANSLATE ME: 'Install skin'</key>
@@ -786,11 +786,11 @@
     <key alias="localPackage">로컬 패키지 설치</key>
     <key alias="macros">매크로</key>
     <key alias="mediaTypes">미디어 타입</key>
-    <key alias="member">구성원</key>
-    <key alias="memberGroup">구성원 그룹</key>
+    <key alias="members">구성원</key>
+    <key alias="memberGroups">구성원 그룹</key>
     <key alias="memberRoles">역할</key>
-    <key alias="memberType">구성원 유형</key>
-    <key alias="nodeTypes">문서 타입</key>
+    <key alias="memberTypes">구성원 유형</key>
+    <key alias="docuemntTypes">문서 타입</key>
     <key alias="packager">패키지</key>
     <key alias="packages">패키지</key>
     <key alias="python">Python 파일</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
index 0320df479e..7b29d33977 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
@@ -915,7 +915,7 @@ Om een vertalingstaak te sluiten, ga aub naar het detailoverzicht en klik op de
     <key alias="cacheBrowser">Cachebrowser</key>
     <key alias="contentRecycleBin">Prullenbak</key>
     <key alias="createdPackages">Gemaakte packages</key>
-    <key alias="datatype">Datatypes</key>
+    <key alias="dataTypes">Datatypes</key>
     <key alias="dictionary">Woordenboek</key>
     <key alias="installedPackages">Geïnstalleerde packages</key>
     <key alias="installSkin">Installeer skin</key>
@@ -924,11 +924,11 @@ Om een vertalingstaak te sluiten, ga aub naar het detailoverzicht en klik op de
     <key alias="localPackage">Installeer een lokale package</key>
     <key alias="macros">Macro's</key>
     <key alias="mediaTypes">Mediatypes</key>
-    <key alias="member">Leden</key>
-    <key alias="memberGroup">Ledengroepen</key>
+    <key alias="members">Leden</key>
+    <key alias="memberGroups">Ledengroepen</key>
     <key alias="memberRoles">Rollen</key>
-    <key alias="memberType">Ledentypes</key>
-    <key alias="nodeTypes">Documenttypes</key>
+    <key alias="memberTypes">Ledentypes</key>
+    <key alias="documentTypes">Documenttypes</key>
     <key alias="packager">Packages</key>
     <key alias="packages">Packages</key>
     <key alias="python">Python-bestanden</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml
index f5d5fe9773..3ce52128c7 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml
@@ -746,7 +746,7 @@ Vennlig hilsen Umbraco roboten
     <key alias="cacheBrowser">Hurtigbufferleser</key>
     <key alias="contentRecycleBin">Papirkurv</key>
     <key alias="createdPackages">Opprettede pakker</key>
-    <key alias="datatype">Datatyper</key>
+    <key alias="dataTypes">Datatyper</key>
     <key alias="dictionary">Ordbok</key>
     <key alias="installedPackages">Installerte pakker</key>
     <key alias="installSkin">Installer utseende</key>
@@ -755,11 +755,11 @@ Vennlig hilsen Umbraco roboten
     <key alias="localPackage">Installer lokal pakke</key>
     <key alias="macros">Makroer</key>
     <key alias="mediaTypes">Mediatyper</key>
-    <key alias="member">Medlemmer</key>
-    <key alias="memberGroup">Medlemsgrupper</key>
+    <key alias="members">Medlemmer</key>
+    <key alias="memberGroups">Medlemsgrupper</key>
     <key alias="memberRoles">Roller</key>
-    <key alias="memberType">Medlemstyper</key>
-    <key alias="nodeTypes">Dokumenttyper</key>
+    <key alias="memberTypes">Medlemstyper</key>
+    <key alias="documentTypes">Dokumenttyper</key>
     <key alias="packager">Pakker</key>
     <key alias="packages">Pakker</key>
     <key alias="python">Python Filer</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
index 1b59676ae7..716b13ca1d 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
@@ -673,7 +673,7 @@ Miłego dnia!]]></key>
     <key alias="cacheBrowser">Cache przeglądarki</key>
     <key alias="contentRecycleBin">Kosz</key>
     <key alias="createdPackages">Utworzone pakiety</key>
-    <key alias="datatype">Typy danych</key>
+    <key alias="dataTypes">Typy danych</key>
     <key alias="dictionary">Słownik</key>
     <key alias="installedPackages">Zainstalowane pakiety</key>
     <key alias="installSkin">TRANSLATE ME: 'Install skin'</key>
@@ -682,11 +682,11 @@ Miłego dnia!]]></key>
     <key alias="localPackage">Zainstaluj pakiet lokalny</key>
     <key alias="macros">Makra</key>
     <key alias="mediaTypes">Typy mediów</key>
-    <key alias="member">Członkowie</key>
-    <key alias="memberGroup">Grupy członków</key>
+    <key alias="members">Członkowie</key>
+    <key alias="memberGroups">Grupy członków</key>
     <key alias="memberRoles">Role</key>
-    <key alias="memberType">Typ członka</key>
-    <key alias="nodeTypes">Typy dokumentów</key>
+    <key alias="memberTypes">Typ członka</key>
+    <key alias="documentTypes">Typy dokumentów</key>
     <key alias="packager">Pakiety</key>
     <key alias="packages">Pakiety</key>
     <key alias="python">Pliki Python</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
index a713ba8d5b..bdfb0573d5 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
@@ -761,7 +761,7 @@ Para fechar a tarefa de tradução vá até os detalhes e clique no botão "Fech
     <key alias="cacheBrowser">Navegador de Cache</key>
     <key alias="contentRecycleBin">Lixeira</key>
     <key alias="createdPackages">Pacotes criados</key>
-    <key alias="datatype">Tipo de Dado</key>
+    <key alias="dataTypes">Tipo de Dado</key>
     <key alias="dictionary">Dicionário</key>
     <key alias="installedPackages">Pacotes instalados</key>
     <key alias="installSkin">Instalar tema</key>
@@ -770,11 +770,11 @@ Para fechar a tarefa de tradução vá até os detalhes e clique no botão "Fech
     <key alias="localPackage">Instalar pacote local</key>
     <key alias="macros">Macros</key>
     <key alias="mediaTypes">Tipos de Mídia</key>
-    <key alias="member">Membros</key>
-    <key alias="memberGroup">Grupos de Membros</key>
+    <key alias="members">Membros</key>
+    <key alias="memberGroups">Grupos de Membros</key>
     <key alias="memberRoles">Funções</key>
-    <key alias="memberType">Tipo de Membro</key>
-    <key alias="nodeTypes">Tipos de Documentos</key>
+    <key alias="memberTypes">Tipo de Membro</key>
+    <key alias="documentTypes">Tipos de Documentos</key>
     <key alias="packager">Pacotes</key>
     <key alias="packages">Pacotes</key>
     <key alias="python">Arquivos Python</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
index d5bfbaffb1..d1bd885a42 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
@@ -965,7 +965,7 @@
     <key alias="cacheBrowser">Обзор кэша</key>
     <key alias="contentRecycleBin">Корзина</key>
     <key alias="createdPackages">Созданные пакеты</key>
-    <key alias="datatype">Типы данных</key>
+    <key alias="dataTypes">Типы данных</key>
     <key alias="dictionary">Словарь</key>
     <key alias="installedPackages">Установленные пакеты</key>
     <key alias="installSkin">Установить тему</key>
@@ -974,11 +974,11 @@
     <key alias="localPackage">Установить локальный пакет</key>
     <key alias="macros">Макросы</key>
     <key alias="mediaTypes">Типы медиа-материалов</key>
-    <key alias="member">Участники</key>
-    <key alias="memberGroup">Группы участников</key>
+    <key alias="members">Участники</key>
+    <key alias="memberGroups">Группы участников</key>
     <key alias="memberRoles">Роли участников</key>
-    <key alias="memberType">Типы участников</key>
-    <key alias="nodeTypes">Типы документов</key>
+    <key alias="memberTypes">Типы участников</key>
+    <key alias="documentTypes">Типы документов</key>
     <key alias="packager">Пакеты дополнений</key>
     <key alias="packages">Пакеты дополнений</key>
     <key alias="python">Скрипты Python</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
index 84b885a931..01497fefe3 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
@@ -816,7 +816,7 @@
     <key alias="cacheBrowser">Cacha webbläsare</key>
     <key alias="contentRecycleBin">Papperskorg</key>
     <key alias="createdPackages">Skapade paket</key>
-    <key alias="datatype">Datatyper</key>
+    <key alias="dataTypes">Datatyper</key>
     <key alias="dictionary">Ordbok</key>
     <key alias="installedPackages">Installerade paket</key>
     <key alias="installSkin">Installera skin</key>
@@ -825,11 +825,11 @@
     <key alias="localPackage">Installera lokalt paket</key>
     <key alias="macros">Makron</key>
     <key alias="mediaTypes">Mediatyper</key>
-    <key alias="member">Medlem</key>
-    <key alias="memberGroup">Medlemsgrupper</key>
+    <key alias="members">Medlem</key>
+    <key alias="memberGroups">Medlemsgrupper</key>
     <key alias="memberRoles">Roller</key>
-    <key alias="memberType">Medlemstyper</key>
-    <key alias="nodeTypes">Dokumenttyper</key>
+    <key alias="memberTypes">Medlemstyper</key>
+    <key alias="documentTypes">Dokumenttyper</key>
     <key alias="packager">Paket</key>
     <key alias="packages">Paket</key>
     <key alias="python">Python-filer</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
index a45a626366..e025551ab2 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
@@ -851,7 +851,7 @@
     <key alias="cacheBrowser">缓存浏览</key>
     <key alias="contentRecycleBin">回收站</key>
     <key alias="createdPackages">创建扩展包</key>
-    <key alias="datatype">数据类型</key>
+    <key alias="dataTypes">数据类型</key>
     <key alias="dictionary">字典</key>
     <key alias="installedPackages">已安装的扩展包</key>
     <key alias="installSkin">安装皮肤</key>
@@ -860,11 +860,11 @@
     <key alias="localPackage">安装本地扩展包</key>
     <key alias="macros">宏</key>
     <key alias="mediaTypes">媒体类型</key>
-    <key alias="member">会员</key>
-    <key alias="memberGroup">会员组</key>
+    <key alias="members">会员</key>
+    <key alias="memberGroups">会员组</key>
     <key alias="memberRoles">角色</key>
-    <key alias="memberType">会员类型</key>
-    <key alias="nodeTypes">文档类型</key>
+    <key alias="memberTypes">会员类型</key>
+    <key alias="documentTypes">文档类型</key>
     <key alias="packager">扩展包</key>
     <key alias="packages">扩展包</key>
     <key alias="python">Python文件</key>
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index 50267f1d05..9f33a44ea9 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Web.Trees
         Constants.Applications.Developer,
         Constants.Applications.Members)]
     [LegacyBaseTree(typeof(loadContent))]
-    [Tree(Constants.Applications.Content, Constants.Trees.Content, "Content")]
+    [Tree(Constants.Applications.Content, Constants.Trees.Content)]
     [PluginController("UmbracoTrees")]
     [CoreTree]
     public class ContentTreeController : ContentTreeControllerBase
diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
index 333eceb40f..adca78df99 100644
--- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
@@ -16,7 +16,7 @@ using Umbraco.Core.Services;
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.DataTypes)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.DocumentTypes, "Document Types", sortOrder: 6)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.DocumentTypes, null, sortOrder: 6)]
     [Umbraco.Web.Mvc.PluginController("UmbracoTrees")]
     [CoreTree]
     public class ContentTypeTreeController : TreeController
diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
index fdc8b4c949..7da38328b4 100644
--- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
@@ -17,7 +17,7 @@ using Constants = Umbraco.Core.Constants;
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.DataTypes)]
-    [Tree(Constants.Applications.Developer, Constants.Trees.DataTypes, "Data Types")]
+    [Tree(Constants.Applications.Developer, Constants.Trees.DataTypes)]
     [PluginController("UmbracoTrees")]
     [CoreTree]
     public class DataTypeTreeController : TreeController
diff --git a/src/Umbraco.Web/Trees/LanguageTreeController.cs b/src/Umbraco.Web/Trees/LanguageTreeController.cs
index fefbf82307..5900697d27 100644
--- a/src/Umbraco.Web/Trees/LanguageTreeController.cs
+++ b/src/Umbraco.Web/Trees/LanguageTreeController.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.Languages)]
     [LegacyBaseTree(typeof(loadLanguages))]
-    [Tree(Constants.Applications.Settings, Constants.Trees.Languages, "Languages", sortOrder: 4)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.Languages, null, sortOrder: 4)]
     [PluginController("UmbracoTrees")]
     [CoreTree]
     public class LanguageTreeController : TreeController
diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs
index 86d7bc44c9..b08db4cacd 100644
--- a/src/Umbraco.Web/Trees/MediaTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTreeController.cs
@@ -26,7 +26,7 @@ namespace Umbraco.Web.Trees
         Constants.Applications.Developer,
         Constants.Applications.Members)]
     [LegacyBaseTree(typeof(loadMedia))]
-    [Tree(Constants.Applications.Media, Constants.Trees.Media, "Media")]
+    [Tree(Constants.Applications.Media, Constants.Trees.Media)]
     [PluginController("UmbracoTrees")]
     [CoreTree]
     public class MediaTreeController : ContentTreeControllerBase
diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
index 0623fc6426..75c31767eb 100644
--- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
@@ -16,7 +16,7 @@ using Umbraco.Core.Services;
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.DataTypes)]
-    [Tree(Constants.Applications.Settings, Constants.Trees.MediaTypes, "Media Types", sortOrder:5)]
+    [Tree(Constants.Applications.Settings, Constants.Trees.MediaTypes, null, sortOrder:5)]
     [Umbraco.Web.Mvc.PluginController("UmbracoTrees")]
     [CoreTree]
     public class MediaTypeTreeController : TreeController
diff --git a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
index 1c814f4dea..24f3722c15 100644
--- a/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTypeTreeController.cs
@@ -13,7 +13,7 @@ using Umbraco.Web.WebApi.Filters;
 namespace Umbraco.Web.Trees
 {
     [UmbracoTreeAuthorize(Constants.Trees.DataTypes)]
-    [Tree(Constants.Applications.Members, Constants.Trees.MemberTypes, "Member Types", sortOrder:2  )]
+    [Tree(Constants.Applications.Members, Constants.Trees.MemberTypes, null, sortOrder:2  )]
     [Umbraco.Web.Mvc.PluginController("UmbracoTrees")]
     [CoreTree]
     public class MemberTypeTreeController : TreeController
diff --git a/src/Umbraco.Web/Trees/TemplatesTreeController.cs b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
index 7ca1464333..9e4b6f71d8 100644
--- a/src/Umbraco.Web/Trees/TemplatesTreeController.cs
+++ b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
@@ -52,7 +52,8 @@ namespace Umbraco.Web.Trees
                 queryStrings,
                 template.Name,
                 template.IsMasterTemplate ? "icon-newspaper" : "icon-newspaper-alt",
-                template.IsMasterTemplate)));
+                template.IsMasterTemplate,
+                GetEditorPath(template, queryStrings))));
 
             return nodes;
         }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs
index 6121d2f69b..1af276caed 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs
@@ -31,7 +31,7 @@ namespace umbraco
 	/// <summary>
 	/// Handles loading of the member groups into the application tree
 	/// </summary>
-    [Tree(Constants.Applications.Members, "memberGroup", "Member Groups", sortOrder: 1)]
+    [Tree(Constants.Applications.Members, "memberGroups", "Member Groups", sortOrder: 1)]
     public class loadMemberGroups : BaseTree
 	{
         public loadMemberGroups(string application) : base(application) { }