diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
index 093afd3c73..f47a1958ae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
@@ -6,9 +6,14 @@
       <p><localize key="grid_addRowConfigurationDetail" /></p>
 
       <div class="alert alert-warn ng-scope" ng-show="nameChanged">
-          Modifying a row configuration name will result in loss of
-          data for any existing content that is based on this configuration.
+          <p>Modifying a row configuration name will result in loss of
+          data for any existing content that is based on this configuration.</p>
+          <p><strong>Modifying only the label will not result in data loss.</strong></p>
       </div>
+       
+       <umb-control-group label="@general_label">
+           <input type="text" ng-model="currentRow.label" placeholder="Overrides name" />
+       </umb-control-group>
 
       <umb-control-group label="@general_name">
           <input type="text" ng-model="currentRow.name" />
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
index feaed67ed9..4ddca47489 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -80,7 +80,7 @@
                             <div class="umb-row-title-bar">
 
                                 <div class=".umb-grid-right">
-                                    <div class="umb-row-title">{{row.name}}</div>
+                                    <div class="umb-row-title">{{row.label || row.name}}</div>
 
                                     <div class="umb-grid-has-config" ng-if="row.hasConfig && !sortMode">
                                             <localize key="grid_settingsApplied" />
@@ -282,7 +282,7 @@
                             <div class="preview-overlay">
                             </div>
 
-                            <small>{{layout.name}}</small>
+                            <small>{{layout.label || layout.name}}</small>
 
                         </div> <!-- .templates-preview-rows -->
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
index 810623320c..5403ce4aad 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js
@@ -48,6 +48,7 @@ angular.module("umbraco")
 
             layouts:[
                 {
+                    label: "Headline",
                     name: "Headline",
                     areas: [
                         {
@@ -57,6 +58,7 @@ angular.module("umbraco")
                     ]
                 },
                 {
+                    label: "Article",
                     name: "Article",
                     areas: [
                         {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
index 9d9626694a..eaffa56d14 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
@@ -72,7 +72,7 @@
                         </div>
 
                         <div>
-                            {{layout.name}}<br />
+                            {{layout.label || layout.name}}<br />
                             <i class="icon-delete red"></i>
                             <a class="btn btn-small btn-link" href ng-click="deleteLayout($index)">
                                 <localize key="general_delete" />
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 aeeb441281..b050e71ea4 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -460,6 +460,7 @@
     <key alias="install">Install</key>
     <key alias="invalid">Invalid</key>
     <key alias="justify">Justify</key>
+    <key alias="label">Label</key>
     <key alias="language">Language</key>
     <key alias="layout">Layout</key>
     <key alias="loading">Loading</key>