diff --git a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
index 512ae0caf5..e9b41c9fc5 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js
@@ -5,7 +5,7 @@ angular.module('umbraco.services')
         member.menuUrl = umbRequestHelper.getApiUrl("memberTreeBaseUrl", "GetMenu", [{ id: member.id }, { application: 'member' }]);
         member.editorPath = "member/member/edit/" + (member.key ? member.key : member.id);
         member.metaData = { treeAlias: "member" };
-        member.subTitle = member.additionalData.Email;
+        member.subTitle = member.metaData.Email;
     }
     
     function configureMediaResult(media)
@@ -19,7 +19,7 @@ angular.module('umbraco.services')
         content.menuUrl = umbRequestHelper.getApiUrl("contentTreeBaseUrl", "GetMenu", [{ id: content.id }, { application: 'content' }]);
         content.editorPath = "content/content/edit/" + content.id;
         content.metaData = { treeAlias: "content" };
-        content.subTitle = content.additionalData.Url;        
+        content.subTitle = content.metaData.Url;        
     }
 
     return {
diff --git a/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs b/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
index f5f779611f..428bb4ba3d 100644
--- a/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
@@ -53,7 +53,7 @@ namespace Umbraco.Web.Models.ContentEditing
         /// <summary>
         /// A collection of extra data that is available for this specific entity/entity type
         /// </summary>
-        [DataMember(Name = "additionalData")]
+        [DataMember(Name = "metaData")]
         public IDictionary<string, object> AdditionalData { get; private set; } 
     }
 }
diff --git a/src/Umbraco.Web/Models/Trees/SectionRootNode.cs b/src/Umbraco.Web/Models/Trees/SectionRootNode.cs
index 4d5b34db5e..59b50a7792 100644
--- a/src/Umbraco.Web/Models/Trees/SectionRootNode.cs
+++ b/src/Umbraco.Web/Models/Trees/SectionRootNode.cs
@@ -28,7 +28,7 @@ namespace Umbraco.Web.Models.Trees
             return new SectionRootNode(nodeId, getChildNodesUrl, menuUrl)
             {
                 Children = children,
-                Title = title
+                Name = title
             };
         }
 
diff --git a/src/Umbraco.Web/Models/Trees/TreeNode.cs b/src/Umbraco.Web/Models/Trees/TreeNode.cs
index 03fa955426..c13fae94d9 100644
--- a/src/Umbraco.Web/Models/Trees/TreeNode.cs
+++ b/src/Umbraco.Web/Models/Trees/TreeNode.cs
@@ -2,6 +2,7 @@
 using Umbraco.Core.IO;
 using System.Collections.Generic;
 using Umbraco.Core;
+using Umbraco.Web.Models.ContentEditing;
 
 namespace Umbraco.Web.Models.Trees
 {
@@ -12,7 +13,7 @@ namespace Umbraco.Web.Models.Trees
     /// TreeNode is sealed to prevent developers from adding additional json data to the response
     /// </remarks>
     [DataContract(Name = "node", Namespace = "")]
-    public class TreeNode 
+    public class TreeNode : EntityBasic
     {
         /// <summary>
         /// Internal constructor, to create a tree node use the CreateTreeNode methods of the TreeApiController.
@@ -22,35 +23,20 @@ namespace Umbraco.Web.Models.Trees
         /// <param name="menuUrl"></param>
         internal TreeNode(string nodeId, string getChildNodesUrl, string menuUrl)
         {
-            //_menuItems = menuItems;
-            //Style = new NodeStyle();
-            NodeId = nodeId;
-            AdditionalData = new Dictionary<string, object>();
+            Id = nodeId;
             ChildNodesUrl = getChildNodesUrl;
             MenuUrl = menuUrl;
             CssClasses = new List<string>();
              //default
             Icon = "icon-folder-close";
         }
-
-        /// <summary>
-        /// The unique identifier for the node
-        /// </summary>
-        [DataMember(Name = "id")]
-        public string NodeId { get; private set; }
-
+        
         /// <summary>
         /// A flag to set whether or not this node has children
         /// </summary>
         [DataMember(Name = "hasChildren")]
         public bool HasChildren { get; set; }
-
-        /// <summary>
-        /// The text title of the node that is displayed in the tree
-        /// </summary>
-        [DataMember(Name = "name")]
-        public string Title { get; set; }
-
+        
         /// <summary>
         /// The tree nodetype which refers to the type of node rendered in the tree
         /// </summary>
@@ -77,14 +63,7 @@ namespace Umbraco.Web.Models.Trees
         /// </summary>
         [DataMember(Name = "menuUrl")]
         public string MenuUrl { get; set; }
-
-        /// <summary>
-        /// A dictionary to support any additional meta data that should be rendered for the node which is 
-        /// useful for custom action commands such as 'create', 'copy', etc...
-        /// </summary>
-        [DataMember(Name = "metaData")]
-        public Dictionary<string, object> AdditionalData { get; private set; }
-
+        
         /// <summary>
         /// The icon to use for the node, this can be either a path to an image or a Css class. 
         /// If a '/' is found in the string then it will be considered a path to an image.
diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
index 3e96dee554..b16ee8bd00 100644
--- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs
+++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs
@@ -80,7 +80,7 @@ namespace Umbraco.Web.Trees
             }
 
             var multiTree = SectionRootNode.CreateMultiTreeSectionRoot(rootId, collection);
-            multiTree.Title = ui.Text("sections", application);
+            multiTree.Name = ui.Text("sections", application);
             return multiTree;
         }
 
@@ -133,7 +133,7 @@ namespace Umbraco.Web.Trees
                     rootId, 
                     rootNode.Result.ChildNodesUrl, 
                     rootNode.Result.MenuUrl, 
-                    rootNode.Result.Title,
+                    rootNode.Result.Name,
                     byControllerAttempt.Result);
 
                 foreach (var d in rootNode.Result.AdditionalData)
diff --git a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
index 98100c771a..5aacb96f40 100644
--- a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
+++ b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
@@ -352,7 +352,7 @@ namespace Umbraco.Web.Trees
             {
                 HasChildren = xmlTreeNode.HasChildren,
                 Icon = xmlTreeNode.Icon,
-                Title = xmlTreeNode.Text,
+                Name = xmlTreeNode.Text,
                 NodeType = xmlTreeNode.NodeType
             };
             if (isRoot)
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
index 496418cdfd..35c8d75de5 100644
--- a/src/Umbraco.Web/Trees/TreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -160,7 +160,7 @@ namespace Umbraco.Web.Trees
                 {
                     HasChildren = true,
                     RoutePath = currApp,
-                    Title = RootNodeDisplayName
+                    Name = RootNodeDisplayName
                 };
 
             return node;
@@ -179,7 +179,7 @@ namespace Umbraco.Web.Trees
         {
             var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
             var menuUrl = Url.GetMenuUrl(GetType(), id, queryStrings);
-            var node = new TreeNode(id, jsonUrl, menuUrl) { Title = title };
+            var node = new TreeNode(id, jsonUrl, menuUrl) { Name = title };
             return node;
         }
 
@@ -195,7 +195,7 @@ namespace Umbraco.Web.Trees
         {
             var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
             var menuUrl = Url.GetMenuUrl(GetType(), id, queryStrings);
-            var node = new TreeNode(id, jsonUrl, menuUrl) { Title = title, Icon = icon };
+            var node = new TreeNode(id, jsonUrl, menuUrl) { Name = title, Icon = icon };
             return node;
         }
 
@@ -212,7 +212,7 @@ namespace Umbraco.Web.Trees
         {
             var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
             var menuUrl = Url.GetMenuUrl(GetType(), id, queryStrings);
-            var node = new TreeNode(id, jsonUrl, menuUrl) { Title = title, RoutePath = routePath, Icon = icon };
+            var node = new TreeNode(id, jsonUrl, menuUrl) { Name = title, RoutePath = routePath, Icon = icon };
             return node;
         }