diff --git a/code/Forms/UsedOnTable.php b/code/Forms/UsedOnTable.php
index 5897e0012..167c0c091 100644
--- a/code/Forms/UsedOnTable.php
+++ b/code/Forms/UsedOnTable.php
@@ -185,7 +185,7 @@ public function setRecord($record)
     public function getAttributes()
     {
         $attributes = [
-            'class' => $this->extraClass(),
+            'class' => $this->getExtraClass(),
             'id' => $this->ID(),
             'data-schema' => json_encode($this->getSchemaData()),
             'data-state' => json_encode($this->getSchemaState()),
diff --git a/templates/SilverStripe/Admin/Includes/CMSProfileController_EditForm.ss b/templates/SilverStripe/Admin/Includes/CMSProfileController_EditForm.ss
index 927dd9aa5..3990632b2 100644
--- a/templates/SilverStripe/Admin/Includes/CMSProfileController_EditForm.ss
+++ b/templates/SilverStripe/Admin/Includes/CMSProfileController_EditForm.ss
@@ -10,7 +10,7 @@
 		<fieldset>
 			<% if $Legend %><legend>$Legend</legend><% end_if %>
 			<% loop $Fields %>
-				$FieldHolder
+				$Holder
 			<% end_loop %>
 			<div class="clear"><!-- --></div>
 		</fieldset>
@@ -20,7 +20,7 @@
 		<% if $Actions %>
 		<div class="btn-toolbar">
 			<% loop $Actions %>
-				$Field
+				$
 			<% end_loop %>
 		</div>
 		<% end_if %>
diff --git a/templates/SilverStripe/Admin/Includes/LeftAndMain_EditForm.ss b/templates/SilverStripe/Admin/Includes/LeftAndMain_EditForm.ss
index 86d4bd6c0..b0fab7a3f 100644
--- a/templates/SilverStripe/Admin/Includes/LeftAndMain_EditForm.ss
+++ b/templates/SilverStripe/Admin/Includes/LeftAndMain_EditForm.ss
@@ -37,7 +37,7 @@
 		<fieldset>
 			<% if $Legend %><legend>$Legend</legend><% end_if %>
 			<% loop $Fields %>
-				$FieldHolder
+				$Holder
 			<% end_loop %>
 			<div class="clear"><!-- --></div>
 		</fieldset>
@@ -47,7 +47,7 @@
 		<% if $Actions %>
 		<div class="btn-toolbar">
 			<% loop $Actions %>
-				$FieldHolder
+				$Holder
 			<% end_loop %>
 			<% if $Controller.LinkPreview %>
 			<a href="$Controller.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
diff --git a/tests/php/ModelAdminTest.php b/tests/php/ModelAdminTest.php
index 817d5bc9f..b1e66855c 100644
--- a/tests/php/ModelAdminTest.php
+++ b/tests/php/ModelAdminTest.php
@@ -136,7 +136,7 @@ public function testGetGridField()
 
         $this->assertStringContainsString(
             'OverridenModelAdmin',
-            $field->extraClass(),
+            $field->getExtraClass(),
             'OverridenModelAdmin has added an extra class to the grid field'
         );
         $this->assertStringContainsString(
diff --git a/themes/cms-forms/templates/RightLabelledFieldHolder.ss b/themes/cms-forms/templates/RightLabelledFieldHolder.ss
index 06cb8e0a6..418d09e01 100644
--- a/themes/cms-forms/templates/RightLabelledFieldHolder.ss
+++ b/themes/cms-forms/templates/RightLabelledFieldHolder.ss
@@ -1,5 +1,5 @@
 <p id="$Name" class="field $Type">
-	$Field
+	$
 	<label class="right" for="$id">$Title</label>
 	<% if $Message %><span class="alert $AlertType">$Message</span><% end_if %>
 </p>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/CMSTabSet.ss b/themes/cms-forms/templates/SilverStripe/Forms/CMSTabSet.ss
index c63450e54..bb2495f3e 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/CMSTabSet.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/CMSTabSet.ss
@@ -8,11 +8,11 @@
 	<div class="tab-content">
         <% loop $Tabs %>
             <% if $Tabs %>
-                $FieldHolder
+                $Holder
             <% else %>
                 <div $getAttributesHTML("class") class="tab-pane $extraClass">
                     <% loop $Fields %>
-                        $FieldHolder
+                        $Holder
                     <% end_loop %>
                 </div>
             <% end_if %>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/CheckboxField_holder.ss b/themes/cms-forms/templates/SilverStripe/Forms/CheckboxField_holder.ss
index 887769249..06df81366 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/CheckboxField_holder.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/CheckboxField_holder.ss
@@ -1,7 +1,7 @@
 <div id="$HolderID" class="form-group field<% if $extraClass %> $extraClass<% end_if %>">
     <div class="form__field-holder form-check">
         <label class="form-check-label">
-            $Field
+            $
             $Title
         </label>
         <% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/CheckboxField_holder_small.ss b/themes/cms-forms/templates/SilverStripe/Forms/CheckboxField_holder_small.ss
index e98e33ebc..20b80ac52 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/CheckboxField_holder_small.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/CheckboxField_holder_small.ss
@@ -1,6 +1,6 @@
 <div id="$HolderID" class="form__fieldgroup-item checkboxfield-small form-check field field--small<% if $extraClass %> $extraClass<% end_if %>">
 	<label class="form-check-label">
-		$Field
+		$
 		$Title
         $RightTitle
 	</label>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/CompositeField.ss b/themes/cms-forms/templates/SilverStripe/Forms/CompositeField.ss
index 702c7b286..703c6b5f5 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/CompositeField.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/CompositeField.ss
@@ -2,5 +2,5 @@
 	<legend>$Legend</legend>
 <% end_if %>
 <% loop $FieldList %>
-	$FieldHolder
+	$Holder
 <% end_loop %>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/CompositeField_holder.ss b/themes/cms-forms/templates/SilverStripe/Forms/CompositeField_holder.ss
index e3c6df17e..6d5c5fd08 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/CompositeField_holder.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/CompositeField_holder.ss
@@ -7,7 +7,7 @@
 			<% if not $Title %> form__field-holder--no-label<% end_if %>
 			<% if $Zebra %> form__fieldgroup-zebra<% end_if %>"
 	>
-		$Field
+		$
 		<% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
         <% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
 	</$Tag>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/CompositeField_holder_buttongroup.ss b/themes/cms-forms/templates/SilverStripe/Forms/CompositeField_holder_buttongroup.ss
index 550e027e7..74d62d33b 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/CompositeField_holder_buttongroup.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/CompositeField_holder_buttongroup.ss
@@ -1,3 +1,3 @@
 <div role="group" id="$HolderID" class="btn-group<% if $extraClass %> $extraClass<% end_if %>">
-	$Field
+	$
 </div>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/CompositeField_holder_small.ss b/themes/cms-forms/templates/SilverStripe/Forms/CompositeField_holder_small.ss
index 70f086cd0..f693ada88 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/CompositeField_holder_small.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/CompositeField_holder_small.ss
@@ -9,9 +9,9 @@
 			<% if $Zebra %> form__fieldgroup-zebra<% end_if %>
 			<% if $extraClass %> $extraClass<% end_if %>"
 	>
-		<%-- Note: _holder_small.ss overrides CompositeField.ss to force nested $SmallFieldHolder --%>
+		<%-- Note: _holder_small.ss overrides CompositeField.ss to force nested $Holder --%>
 		<% loop $FieldList %>
-			$SmallFieldHolder
+			$Holder
 		<% end_loop %>
 	</$Tag>
 </div>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/DatetimeField_holder.ss b/themes/cms-forms/templates/SilverStripe/Forms/DatetimeField_holder.ss
index 5d634ce95..cd6d603e7 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/DatetimeField_holder.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/DatetimeField_holder.ss
@@ -7,7 +7,7 @@
 			<% if not $Title %> form__field-holder--no-label<% end_if %>
 			<% if $extraClass %> $extraClass<% end_if %>"
 	>
-		$Field
+		$
 		<% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
         <% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
 	</div>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/FieldGroup.ss b/themes/cms-forms/templates/SilverStripe/Forms/FieldGroup.ss
index c0dc9971a..187367722 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/FieldGroup.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/FieldGroup.ss
@@ -1,3 +1,3 @@
 <% loop $FieldList %>
-	$SmallFieldHolder
+	$Holder
 <% end_loop %>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/FieldGroup_DefaultFieldHolder.ss b/themes/cms-forms/templates/SilverStripe/Forms/FieldGroup_DefaultFieldHolder.ss
index d280a0c55..71c09327a 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/FieldGroup_DefaultFieldHolder.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/FieldGroup_DefaultFieldHolder.ss
@@ -1,5 +1,5 @@
 <% loop $FieldList %>
 	<div class="form__fieldgroup-item">
-		$FieldHolder
+		$Holder
 	</div>
 <% end_loop %>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/FieldGroup_holder.ss b/themes/cms-forms/templates/SilverStripe/Forms/FieldGroup_holder.ss
index d7a0fbcca..92695b56b 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/FieldGroup_holder.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/FieldGroup_holder.ss
@@ -8,7 +8,7 @@
 			<% if $Zebra %> form__fieldgroup-zebra<% end_if %>
 			<% if $extraClass %> $extraClass<% end_if %>"
 	>
-		$Field
+		$
 		<% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
         <% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
 	</div>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/FormAction_holder_small.ss b/themes/cms-forms/templates/SilverStripe/Forms/FormAction_holder_small.ss
index 433fcfaec..d368c2c31 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/FormAction_holder_small.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/FormAction_holder_small.ss
@@ -1,3 +1,3 @@
 <div id="$HolderID" class="form__fieldgroup-item field field--small action">
-	$Field
+	$
 </div>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/FormField_holder.ss b/themes/cms-forms/templates/SilverStripe/Forms/FormField_holder.ss
index 73b908d87..a6cb8fa49 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/FormField_holder.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/FormField_holder.ss
@@ -3,7 +3,7 @@
         <label for="$ID" id="title-$ID" class="form__field-label">$Title</label>
     <% end_if %>
     <div class="form__field-holder<% if not $Title %> form__field-holder--no-label<% end_if %>">
-        $Field
+        $
         <% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
         <% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
     </div>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/FormField_holder_small.ss b/themes/cms-forms/templates/SilverStripe/Forms/FormField_holder_small.ss
index 6d05f86fd..b35c73c6d 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/FormField_holder_small.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/FormField_holder_small.ss
@@ -2,5 +2,5 @@
 	<% if $Title %>
 		<label for="$ID" id="title-$ID" class="form__fieldgroup-label">$Title</label>
 	<% end_if %>
-	$Field
+	$
 </div>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/Includes/Form.ss b/themes/cms-forms/templates/SilverStripe/Forms/Includes/Form.ss
index 24a0dcfb2..326764b19 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/Includes/Form.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/Includes/Form.ss
@@ -10,7 +10,7 @@
 	<fieldset>
 		<% if $Legend %><legend>$Legend</legend><% end_if %>
 		<% loop $Fields %>
-			$FieldHolder
+			$Holder
 		<% end_loop %>
 		<div class="clear"><!-- --></div>
 	</fieldset>
@@ -18,7 +18,7 @@
 	<% if $Actions %>
 	<div class="btn-toolbar">
 		<% loop $Actions %>
-			$Field
+			$
 		<% end_loop %>
 	</div>
 	<% end_if %>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/MoneyField.ss b/themes/cms-forms/templates/SilverStripe/Forms/MoneyField.ss
index 564cb795b..44d19e618 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/MoneyField.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/MoneyField.ss
@@ -1,4 +1,4 @@
 <div class="form__fieldgroup <% if $extraClass %>$extraClass<% end_if %>" id="$ID" <% include SilverStripe/Forms/AriaAttributes %>>
-	$CurrencyField.SmallFieldHolder
-	$AmountField.SmallFieldHolder
+	$CurrencyField.Holder
+	$AmountField.Holder
 </div>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/OptionsetField_holder.ss b/themes/cms-forms/templates/SilverStripe/Forms/OptionsetField_holder.ss
index 73b908d87..a6cb8fa49 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/OptionsetField_holder.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/OptionsetField_holder.ss
@@ -3,7 +3,7 @@
         <label for="$ID" id="title-$ID" class="form__field-label">$Title</label>
     <% end_if %>
     <div class="form__field-holder<% if not $Title %> form__field-holder--no-label<% end_if %>">
-        $Field
+        $
         <% if $Message %><p class="alert $AlertType" role="alert" id="message-$ID">$Message</p><% end_if %>
         <% if $Description %><p class="form__field-description form-text" id="describes-$ID">$Description</p><% end_if %>
     </div>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/SelectionGroup.ss b/themes/cms-forms/templates/SilverStripe/Forms/SelectionGroup.ss
index 203a65f61..1e8743c46 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/SelectionGroup.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/SelectionGroup.ss
@@ -8,7 +8,7 @@
 					<% if $FieldList %>
 						<div class="selection-group selection-group__item__fieldlist" id="$ID">
 							<% loop $FieldList %>
-								$Fieldholder
+								$holder
 							<% end_loop %>
 						</div>
 					<% end_if %>
@@ -23,7 +23,7 @@
 				<% if $FieldList %>
 					<div class="selection-group selection-group__item__fieldlist" id="$ID">
 						<% loop $FieldList %>
-							$FieldHolder
+							$Holder
 						<% end_loop %>
 					</div>
 				<% end_if %>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/TabSet.ss b/themes/cms-forms/templates/SilverStripe/Forms/TabSet.ss
index 83803a5da..f3b05ef5a 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/TabSet.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/TabSet.ss
@@ -10,11 +10,11 @@
 	<div class="tab-content">
 	  <% loop $Tabs %>
 		  <% if $Tabs %>
-			$FieldHolder
+			$Holder
 		  <% else %>
 			<div $getAttributesHTML("class") class="tab-pane $extraClass">
 				<% loop $Fields %>
-					$FieldHolder
+					$Holder
 				<% end_loop %>
 			</div>
 		  <% end_if %>