diff --git a/code/Model/EditableCustomRule.php b/code/Model/EditableCustomRule.php
index 08fa1b40..f4880232 100644
--- a/code/Model/EditableCustomRule.php
+++ b/code/Model/EditableCustomRule.php
@@ -119,7 +119,7 @@ protected function getCanCreateContext($args)
         }
         // Hack in currently edited page if context is missing
         if (Controller::has_curr() && Controller::curr() instanceof CMSMain) {
-            return Controller::curr()->currentPage();
+            return Controller::curr()->currentRecord();
         }
 
         // No page being edited
diff --git a/code/Model/EditableFormField.php b/code/Model/EditableFormField.php
index 231cd0fe..986787e6 100755
--- a/code/Model/EditableFormField.php
+++ b/code/Model/EditableFormField.php
@@ -509,7 +509,7 @@ public function canEdit($member = null)
             // This is to restore User Forms 2.x backwards compatibility.
             $controller = Controller::curr();
             if ($controller && $controller instanceof CMSPageEditController) {
-                $parent = $controller->getRecord($controller->currentPageID());
+                $parent = $controller->getRecord($controller->currentRecordID());
                 // Only allow this behaviour on pages using UserFormFieldEditorExtension, such
                 // as UserDefinedForm page type.
                 if ($parent && $parent->hasExtension(UserFormFieldEditorExtension::class)) {
@@ -572,7 +572,7 @@ protected function getCanCreateContext($args)
         }
         // Hack in currently edited page if context is missing
         if (Controller::has_curr() && Controller::curr() instanceof CMSMain) {
-            return Controller::curr()->currentPage();
+            return Controller::curr()->currentRecord();
         }
 
         // No page being edited
diff --git a/code/Model/Recipient/EmailRecipient.php b/code/Model/Recipient/EmailRecipient.php
index c3daf7cd..fad9c0d7 100644
--- a/code/Model/Recipient/EmailRecipient.php
+++ b/code/Model/Recipient/EmailRecipient.php
@@ -234,7 +234,7 @@ protected function getFormParent()
         // LeftAndMain::sessionNamespace is protected.
         $sessionNamespace = $this->config()->get('session_namespace') ?: CMSMain::class;
 
-        $formID = Controller::curr()->getRequest()->getSession()->get($sessionNamespace . '.currentPage');
+        $formID = Controller::curr()->getRequest()->getSession()->get($sessionNamespace . '.currentRecord');
         if ($formID) {
             return UserDefinedForm::get()->byID($formID);
         }
@@ -466,7 +466,7 @@ protected function getCanCreateContext($args)
         }
         // Hack in currently edited page if context is missing
         if (Controller::has_curr() && Controller::curr() instanceof CMSMain) {
-            return Controller::curr()->currentPage();
+            return Controller::curr()->currentRecord();
         }
 
         // No page being edited
diff --git a/code/Model/Recipient/EmailRecipientCondition.php b/code/Model/Recipient/EmailRecipientCondition.php
index 760baf45..48b882cb 100644
--- a/code/Model/Recipient/EmailRecipientCondition.php
+++ b/code/Model/Recipient/EmailRecipientCondition.php
@@ -143,7 +143,7 @@ protected function getCanCreateContext($args)
         }
         // Hack in currently edited page if context is missing
         if (Controller::has_curr() && Controller::curr() instanceof CMSMain) {
-            return Controller::curr()->currentPage();
+            return Controller::curr()->currentRecord();
         }
 
         // No page being edited
diff --git a/code/Model/UserDefinedForm.php b/code/Model/UserDefinedForm.php
index 3dac41ea..be236ce6 100755
--- a/code/Model/UserDefinedForm.php
+++ b/code/Model/UserDefinedForm.php
@@ -19,7 +19,7 @@ class UserDefinedForm extends Page
     /**
      * @var string
      */
-    private static $icon_class = 'font-icon-p-list';
+    private static $cms_icon_class = 'font-icon-p-list';
 
     private static $class_description = 'Adds a customizable form.';
 
diff --git a/tests/php/Form/GridFieldAddClassesButtonTest.php b/tests/php/Form/GridFieldAddClassesButtonTest.php
index df96672b..bed6d7b8 100644
--- a/tests/php/Form/GridFieldAddClassesButtonTest.php
+++ b/tests/php/Form/GridFieldAddClassesButtonTest.php
@@ -31,7 +31,7 @@ public function testHandleAddUpdatesModifiedFormData()
         $request = new HTTPRequest('GET', '/');
         $request->setSession(new Session([]));
         $controller->setRequest($request);
-        $controller->setCurrentPageID($udf->ID);
+        $controller->setCurrentRecordID($udf->ID);
         $controller->pushCurrent();
         $list = new DataList(EditableFormField::class);
         $field = EditableTextField::create([