diff --git a/src/Umbraco.Core/Models/EntityBase/IUmbracoEntity.cs b/src/Umbraco.Core/Models/EntityBase/IUmbracoEntity.cs
index 7ae9422a25..62130fdab9 100644
--- a/src/Umbraco.Core/Models/EntityBase/IUmbracoEntity.cs
+++ b/src/Umbraco.Core/Models/EntityBase/IUmbracoEntity.cs
@@ -3,29 +3,34 @@
     public interface IUmbracoEntity : IAggregateRoot
     {
         /// <summary>
-        /// Gets or sets the Id of the Parent entity
+        /// Profile of the user who created this Entity
         /// </summary>
-        int ParentId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the sort order of the Entity
-        /// </summary>
-        int SortOrder { get; set; }
+        int CreatorId { get; set; }
 
         /// <summary>
         /// Gets or sets the level of the Entity
         /// </summary>
         int Level { get; set; }
 
+        /// <summary>
+        /// Gets or Sets the Name of the Entity
+        /// </summary>
+        string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Id of the Parent Entity
+        /// </summary>
+        int ParentId { get; set; }
+
         /// <summary>
         /// Gets or sets the path to the Entity
         /// </summary>
         string Path { get; set; }
 
         /// <summary>
-        /// Profile of the user who created this Entity
+        /// Gets or sets the sort order of the Entity
         /// </summary>
-        int CreatorId { get; set; }
+        int SortOrder { get; set; }
 
         /// <summary>
         /// Boolean indicating whether this Entity is Trashed or not.
diff --git a/src/Umbraco.Core/Models/IContentBase.cs b/src/Umbraco.Core/Models/IContentBase.cs
index 42174ee757..269f6b8572 100644
--- a/src/Umbraco.Core/Models/IContentBase.cs
+++ b/src/Umbraco.Core/Models/IContentBase.cs
@@ -10,11 +10,6 @@ namespace Umbraco.Core.Models
     /// </summary>
     public interface IContentBase : IUmbracoEntity
     {
-        /// <summary>
-        /// Gets or Sets the Name of the Content
-        /// </summary>
-        string Name { get; set; }
-       
         /// <summary>
         /// Integer Id of the default ContentType
         /// </summary>
diff --git a/src/Umbraco.Core/Models/IContentTypeBase.cs b/src/Umbraco.Core/Models/IContentTypeBase.cs
index 2b19dd216c..35abf1e241 100644
--- a/src/Umbraco.Core/Models/IContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/IContentTypeBase.cs
@@ -15,11 +15,6 @@ namespace Umbraco.Core.Models
         /// </summary>
         string Alias { get; set; }
 
-        /// <summary>
-        /// Gets or Sets the Name of the ContentType
-        /// </summary>
-        string Name { get; set; }
-
         /// <summary>
         /// Gets or Sets the Description for the ContentType
         /// </summary>
diff --git a/src/Umbraco.Core/Models/IDataTypeDefinition.cs b/src/Umbraco.Core/Models/IDataTypeDefinition.cs
index 3b1391ae8d..e2ed1ef52e 100644
--- a/src/Umbraco.Core/Models/IDataTypeDefinition.cs
+++ b/src/Umbraco.Core/Models/IDataTypeDefinition.cs
@@ -5,11 +5,6 @@ namespace Umbraco.Core.Models
 {
     public interface IDataTypeDefinition : IUmbracoEntity
     {
-        /// <summary>
-        /// Gets or sets the name of the current entity
-        /// </summary>
-        string Name { get; set; }
-
         /// <summary>
         /// Id of the DataType control
         /// </summary>
diff --git a/src/umbraco.cms/businesslogic/CMSNode.cs b/src/umbraco.cms/businesslogic/CMSNode.cs
index 4838cdc355..9d4091555b 100644
--- a/src/umbraco.cms/businesslogic/CMSNode.cs
+++ b/src/umbraco.cms/businesslogic/CMSNode.cs
@@ -48,6 +48,7 @@ namespace umbraco.cms.businesslogic
         private bool _hasChildrenInitialized;
         private string m_image = "default.png";
         private bool? _isTrashed = null;
+        private IUmbracoEntity _entity;
 
         #endregion
 
@@ -55,6 +56,7 @@ namespace umbraco.cms.businesslogic
 
         private static readonly string m_DefaultIconCssFile = IOHelper.MapPath(SystemDirectories.Umbraco_client + "/Tree/treeIcons.css");
         private static List<string> m_DefaultIconClasses = new List<string>();
+
         private static void initializeIconClasses()
         {
             StreamReader re = File.OpenText(m_DefaultIconCssFile);
@@ -394,9 +396,10 @@ namespace umbraco.cms.businesslogic
             PopulateCMSNodeFromReader(reader);
         }
 
-        protected internal CMSNode(IEntity entity)
+        protected internal CMSNode(IUmbracoEntity entity)
         {
             _id = entity.Id;
+            _entity = entity;
         }
 
         #endregion
@@ -576,6 +579,7 @@ order by level,sortOrder";
         /// Moves the CMSNode from the current position in the hierarchy to the target
         /// </summary>
         /// <param name="NewParentId">Target CMSNode id</param>
+        [Obsolete("Obsolete, Use Umbraco.Core.Services.ContentService.Move() or Umbraco.Core.Services.MediaService.Move()", false)]
         public virtual void Move(int newParentId)
         {
             CMSNode parent = new CMSNode(newParentId);
@@ -705,6 +709,9 @@ order by level,sortOrder";
             {
                 _sortOrder = value;
                 SqlHelper.ExecuteNonQuery("update umbracoNode set sortOrder = '" + value + "' where id = " + this.Id.ToString());
+
+                if (_entity != null)
+                    _entity.SortOrder = value;
             }
         }
 
@@ -766,6 +773,9 @@ order by level,sortOrder";
             {
                 _parentid = value.Id;
                 SqlHelper.ExecuteNonQuery("update umbracoNode set parentId = " + value.Id.ToString() + " where id = " + this.Id.ToString());
+
+                if (_entity != null)
+                    _entity.ParentId = value.Id;
             }
         }
 
@@ -781,6 +791,9 @@ order by level,sortOrder";
             {
                 _path = value;
                 SqlHelper.ExecuteNonQuery("update umbracoNode set path = '" + _path + "' where id = " + this.Id.ToString());
+
+                if (_entity != null)
+                    _entity.Path = value;
             }
         }
 
@@ -796,6 +809,9 @@ order by level,sortOrder";
             {
                 _level = value;
                 SqlHelper.ExecuteNonQuery("update umbracoNode set level = " + _level.ToString() + " where id = " + this.Id.ToString());
+
+                if (_entity != null)
+                    _entity.Level = value;
             }
         }
 
@@ -915,6 +931,8 @@ order by level,sortOrder";
                                           SqlHelper.CreateParameter("@text", value.Trim()),
                                           SqlHelper.CreateParameter("@id", this.Id));
 
+                if (_entity != null)
+                    _entity.Name = value;
             }
         }
 
@@ -966,6 +984,9 @@ order by level,sortOrder";
         protected void SetText(string txt)
         {
             _text = txt;
+
+            if (_entity != null)
+                _entity.Name = txt;
         }
 
         /// <summary>
@@ -1086,6 +1107,7 @@ order by level,sortOrder";
             _userId = content.CreatorId;
             _createDate = content.CreateDate;
             _isTrashed = content.Trashed;
+            _entity = content;
         }
 
         internal protected void PopulateCMSNodeFromContentTypeBase(IContentTypeBase contentType, Guid objectType)
@@ -1100,6 +1122,7 @@ order by level,sortOrder";
             _userId = contentType.CreatorId;
             _createDate = contentType.CreateDate;
             _isTrashed = false;
+            _entity = contentType;
         }
 
         #endregion