diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypegroup.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypegroup.component.js
index c1b8c39579..db70cb572d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypegroup.component.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypegroup.component.js
@@ -63,7 +63,7 @@
       allowRemove: '<',
       onRemove: '&',
       sorting: '<',
-      nameValServerField: '@',
+      valServerFieldName: '@',
       onNameFocus: '&',
       onFocus: '&'
     },
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypeproperty.component.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypeproperty.component.js
index 2264a75544..eb95632a22 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypeproperty.component.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/contenttype/umbcontenttypeproperty.component.js
@@ -46,8 +46,8 @@
       sortable: '<',
       onEdit: '&',
       onRemove: '&',
-      aliasValServerField: '@',
-      labelValServerField: '@'
+      valServerFieldAlias: '@',
+      valServerFieldLabel: '@'
     },
     controllerAs: 'vm',
     controller: umbContentTypePropertyController
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-group.html b/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-group.html
index 2ca0be0821..0533ce66a9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-group.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-group.html
@@ -19,7 +19,7 @@
                             umb-auto-resize
                             ng-focus="vm.whenNameFocus()"
                             required
-                            val-server-field="{{vm.nameValServerField}}"
+                            val-server-field="{{vm.valServerFieldName}}"
                             data-lpignore="true" />
 
                     <div ng-messages="groupNameForm.groupName.$error" show-validation-on-submit>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-property.html b/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-property.html
index 13fe58bc9e..80776d9c13 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-property.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/contenttype/umb-content-type-property.html
@@ -12,7 +12,7 @@
                   locked="locked"
                   ng-model="vm.property.alias"
                   placeholder-text="'Alias...'"
-                  server-validation-field="{{ vm.aliasValServerField }}">
+                  server-validation-field="{{ vm.valServerFieldAlias }}">
               </umb-locked-field>
 
               <div class="umb-group-builder__property-meta-label">
@@ -23,7 +23,7 @@
                             name="groupName"
                             umb-auto-resize
                             required
-                            val-server-field="{{ vm.labelValServerField }}">
+                            val-server-field="{{ vm.valServerFieldLabel }}">
                   </textarea>
 
                   <div ng-messages="propertyTypeForm.groupName.$error" show-validation-on-submit>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
index 71b7d5f7f0..647d768e7c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
@@ -76,7 +76,7 @@
                     allow-remove="canRemoveGroup(group) && !sortingMode"
                     on-remove="removeGroup(groupIndex)"
                     sorting="sortingMode"
-                    name-val-server-field="{{'Groups[' + $index + '].Name'}}">
+                    val-server-field-name="{{'Groups[' + $index + '].Name'}}">
                     
                     <ul class="umb-group-builder__properties" ui-sortable="sortableOptionsProperty" ng-model="group.properties">
                         <li ng-repeat="(propertyIndex, property) in group.properties track by property.alias" data-element="property-{{property.alias}}" ng-class="{'umb-group-builder__property-sortable': sortingMode && !property.inherited}">
@@ -86,8 +86,8 @@
                                 sortable="sortingMode"
                                 on-edit="editPropertyTypeSettings(property)"
                                 on-remove="deleteProperty(group.properties, property)"
-                                alias-val-server-field="{{'Groups[' + groupIndex + '].Properties[' + propertyIndex + '].Alias'}}"
-                                label-val-server-field="{{'Groups[' + groupIndex + '].Properties[' + propertyIndex + '].Label'}}">
+                                val-server-field-alias="{{'Groups[' + groupIndex + '].Properties[' + propertyIndex + '].Alias'}}"
+                                val-server-field-label="{{'Groups[' + groupIndex + '].Properties[' + propertyIndex + '].Label'}}">
                             </umb-content-type-property>
                         </li>
                     </ul>