diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
index 4d9222fa45..8ef43df47b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
@@ -255,7 +255,8 @@ Use this directive to construct a header inside the main editor window.
                 description: "=",
                 hideDescription: "@",
                 descriptionLocked: "@",
-                navigation: "="
+                navigation: "=",
+                key: "="
             },
             link: link
         };
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
index f55b587c04..fdc1ddf0f5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html
@@ -17,6 +17,7 @@
 
                    <ng-form name="headerNameForm">
                        <input
+                        title="{{key}}"
                         type="text"
                         class="umb-panel-header-name-input"
                         localize="placeholder"
@@ -30,7 +31,7 @@
                         required />
                    </ng-form>
 
-                  <div class="umb-panel-header-name" ng-if="nameLocked">{{ name }}</div>
+                  <div class="umb-panel-header-name" ng-if="nameLocked" title="{{key}}">{{ name }}</div>
 
                   <umb-generate-alias class="umb-panel-header-alias"
                                       ng-if="!hideAlias"
@@ -38,16 +39,18 @@
                                       alias-from="$parent.name"
                                       enable-lock="true"
                                       server-validation-field="Alias"></umb-generate-alias>
+                
 
-                  <input
-                    type="text"
-                    class="umb-panel-header-description"
-                    localize="placeholder"
-                    placeholder="@placeholders_enterDescription"
-                    ng-if="!hideDescription && !descriptionLocked"
-                    ng-model="$parent.description" />
+                        <input
+                            type="text"
+                            class="umb-panel-header-description"
+                            localize="placeholder"
+                            placeholder="@placeholders_enterDescription"
+                            ng-if="!hideDescription && !descriptionLocked"
+                            ng-model="$parent.description" />
+
+                        <div class="umb-panel-header-locked-description" ng-show="descriptionLocked">{{ description }}</div>
 
-                    <div class="umb-panel-header-locked-description" ng-show="descriptionLocked">{{ description }}</div>
 
                </div>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
index fc53982b90..9f52357c31 100644
--- a/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
@@ -12,6 +12,7 @@
          <umb-editor-header
             menu="page.menu"
             name="content.name"
+            key="content.key"
             name-locked="page.nameLocked"
             hide-icon="true"
             hide-description="true"
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
index 39efb9d1c6..1c480b9766 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
@@ -9,6 +9,7 @@
             <umb-editor-header
                 name="vm.contentType.name"
                 alias="vm.contentType.alias"
+                key="vm.contentType.key"
                 description="vm.contentType.description"
                 navigation="vm.page.navigation"
                 icon="vm.contentType.icon">
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
index 5bde09f8e0..f0d3a8fbf6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
@@ -9,6 +9,7 @@
             <umb-editor-header
                 name="vm.contentType.name"
                 alias="vm.contentType.alias"
+                key="vm.contentType.key"
                 description="vm.contentType.description"
                 navigation="vm.page.navigation"
                 icon="vm.contentType.icon">
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
index ec8ca3e9b4..2d59b644d0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
@@ -13,6 +13,7 @@
             <umb-editor-header
                 name="vm.template.name"
                 alias="vm.template.alias"
+                key="vm.template.key"
                 hideDescription="true"
                 description="vm.template.virtualPath"
                 description-locked="true"
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx b/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx
index ee0dfe02bd..05bfab1115 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx
@@ -58,6 +58,9 @@
         <cc1:PropertyPanel runat="server" Text="Alias">
             <asp:TextBox ID="macroAlias" runat="server" CssClass="guiInputText"></asp:TextBox>
         </cc1:PropertyPanel>
+        <cc1:PropertyPanel runat="server" Text="Key">
+            <asp:Label ID="macroKey" runat="server" CssClass="guiLabel"></asp:Label>
+        </cc1:PropertyPanel>
     </cc1:Pane>
 
 
diff --git a/src/Umbraco.Web/Models/ContentEditing/TemplateDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/TemplateDisplay.cs
index 91c1aefdb0..ffa4e4e100 100644
--- a/src/Umbraco.Web/Models/ContentEditing/TemplateDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/TemplateDisplay.cs
@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
 using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Core.Models.Validation;
 
 namespace Umbraco.Web.Models.ContentEditing
 {
@@ -24,6 +20,9 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "alias")]
         public string Alias { get; set; }
 
+        [DataMember(Name = "key")]
+        public Guid Key { get; set; }
+
         [DataMember(Name = "content")]
         public string Content { get; set; }
 
diff --git a/src/Umbraco.Web/Models/Mapping/TemplateModelMapper.cs b/src/Umbraco.Web/Models/Mapping/TemplateModelMapper.cs
index 19677fccc8..6111941084 100644
--- a/src/Umbraco.Web/Models/Mapping/TemplateModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/TemplateModelMapper.cs
@@ -15,7 +15,6 @@ namespace Umbraco.Web.Models.Mapping
 
             config.CreateMap<TemplateDisplay, Template>()
                 .ForMember(x => x.DeletedDate, exp => exp.Ignore())
-                .ForMember(x => x.Key, exp => exp.Ignore())
                 .ForMember(x => x.Path, exp => exp.Ignore())
                 .ForMember(x => x.CreateDate, exp => exp.Ignore())
                 .ForMember(x => x.UpdateDate, exp => exp.Ignore())
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs
index b40515578b..73800ca117 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/editMacro.aspx.cs
@@ -88,6 +88,7 @@ namespace umbraco.cms.presentation.developer
 		{
 			macroName.Text = macro.Name;
 			macroAlias.Text = macro.Alias;
+		    macroKey.Text = macro.Key.ToString();
 			macroXslt.Text = macro.XsltPath;
 			macroPython.Text = macro.ScriptPath;
 		    cachePeriod.Text = macro.CacheDuration.ToInvariantString();
@@ -209,7 +210,7 @@ namespace umbraco.cms.presentation.developer
         }
 
         protected IEnumerable<IParameterEditor> GetMacroParameterEditors()
-        {
+        {
             // we need to show the depracated ones for backwards compatibility
             return ParameterEditorResolver.Current.GetParameterEditors(true);
         }
@@ -433,14 +434,23 @@ namespace umbraco.cms.presentation.developer
 		/// </remarks>
 		protected global::System.Web.UI.WebControls.TextBox macroAlias;
 
-		/// <summary>
-		/// Pane1_2 control.
-		/// </summary>
-		/// <remarks>
-		/// Auto-generated field.
-		/// To modify move field declaration from designer file to code-behind file.
-		/// </remarks>
-		protected global::umbraco.uicontrols.Pane Pane1_2;
+	    /// <summary>
+	    /// macroAlias control.
+	    /// </summary>
+	    /// <remarks>
+	    /// Auto-generated field.
+	    /// To modify move field declaration from designer file to code-behind file.
+	    /// </remarks>
+	    protected global::System.Web.UI.WebControls.Label macroKey;
+
+        /// <summary>
+        /// Pane1_2 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::umbraco.uicontrols.Pane Pane1_2;
 
 		/// <summary>
 		/// macroXslt control.