diff --git a/code/Extension/UserFormFieldEditorExtension.php b/code/Extension/UserFormFieldEditorExtension.php
index 05f1a591..a5dbadf7 100644
--- a/code/Extension/UserFormFieldEditorExtension.php
+++ b/code/Extension/UserFormFieldEditorExtension.php
@@ -60,7 +60,7 @@ public function updateCMSFields(FieldList $fields)
     {
         $fieldEditor = $this->getFieldEditorGrid();
 
-        $fields->insertAfter('Main', new Tab('FormFields', _t(__CLASS__.'.FORMFIELDS', 'Form Fields')));
+        $fields->insertAfter('Main', Tab::create('FormFields', _t(__CLASS__.'.FORMFIELDS', 'Form Fields')));
         $fields->addFieldToTab('Root.FormFields', $fieldEditor);
 
         return $fields;
@@ -81,7 +81,7 @@ public function getFieldEditorGrid()
 
         $this->createInitialFormStep(true);
 
-        $editableColumns = new GridFieldEditableColumns();
+        $editableColumns = GridFieldEditableColumns::create();
         $fieldClasses = singleton(EditableFormField::class)->getEditableFieldClasses();
         $editableColumns->setDisplayFields([
             'ClassName' => function ($record, $column, $grid) use ($fieldClasses) {
@@ -103,7 +103,7 @@ public function getFieldEditorGrid()
         $config = GridFieldConfig::create()
             ->addComponents(
                 $editableColumns,
-                new GridFieldButtonRow(),
+                GridFieldButtonRow::create(),
                 (new GridFieldAddClassesButton(EditableTextField::class))
                     ->setButtonName(_t(__CLASS__.'.ADD_FIELD', 'Add Field'))
                     ->setButtonClass('btn-primary'),
@@ -113,13 +113,13 @@ public function getFieldEditorGrid()
                 (new GridFieldAddClassesButton([EditableFieldGroup::class, EditableFieldGroupEnd::class]))
                     ->setButtonName(_t(__CLASS__.'.ADD_FIELD_GROUP', 'Add Field Group'))
                     ->setButtonClass('btn-secondary'),
-                $editButton = new GridFieldEditButton(),
-                new GridFieldDeleteAction(),
-                new GridFieldToolbarHeader(),
-                new GridFieldOrderableRows('Sort'),
-                new GridFieldDetailForm(),
+                $editButton = GridFieldEditButton::create(),
+                GridFieldDeleteAction::create(),
+                GridFieldToolbarHeader::create(),
+                GridFieldOrderableRows::create('Sort'),
+                GridFieldDetailForm::create(),
                 // Betterbuttons prev and next is enabled by adding a GridFieldPaginator component
-                new GridFieldPaginator(999)
+                GridFieldPaginator::create(999)
             );
 
         $editButton->removeExtraClass('grid-field__icon-action--hidden-on-hover');