diff --git a/code/Extension/UpgradePolymorphicExtension.php b/code/Extension/UpgradePolymorphicExtension.php
index 81dac23..778d18e 100644
--- a/code/Extension/UpgradePolymorphicExtension.php
+++ b/code/Extension/UpgradePolymorphicExtension.php
@@ -4,7 +4,7 @@ namespace SilverStripe\UserForms\Extension;
 
 use SilverStripe\Control\Director;
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\ValidationException;
@@ -24,9 +24,9 @@ use SilverStripe\UserForms\UserForm;
  *
  * @internal This API is likely to be removed in later major versions of silverstripe/userforms
  *
- * @extends DataExtension<UserDefinedForm>
+ * @extends Extension<UserDefinedForm>
  */
-class UpgradePolymorphicExtension extends DataExtension
+class UpgradePolymorphicExtension extends Extension
 {
     /**
      * A list of userforms classes that have had polymorphic relationships added in SilverStripe 4, and the fields
diff --git a/code/Extension/UserFormFieldEditorExtension.php b/code/Extension/UserFormFieldEditorExtension.php
index 8da76a7..47b079f 100644
--- a/code/Extension/UserFormFieldEditorExtension.php
+++ b/code/Extension/UserFormFieldEditorExtension.php
@@ -13,7 +13,7 @@ use SilverStripe\Forms\GridField\GridFieldEditButton;
 use SilverStripe\Forms\GridField\GridFieldDeleteAction;
 use SilverStripe\Forms\GridField\GridFieldDetailForm;
 use SilverStripe\Forms\GridField\GridFieldToolbarHeader;
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\HasManyList;
@@ -32,7 +32,7 @@ use Symbiote\GridFieldExtensions\GridFieldOrderableRows;
 /**
  * @method HasManyList<EditableFormField> Fields()
  */
-class UserFormFieldEditorExtension extends DataExtension
+class UserFormFieldEditorExtension extends Extension
 {
     /**
      * @var array
diff --git a/code/Extension/UserFormFileExtension.php b/code/Extension/UserFormFileExtension.php
index cb5c76c..9199e33 100644
--- a/code/Extension/UserFormFileExtension.php
+++ b/code/Extension/UserFormFileExtension.php
@@ -5,7 +5,7 @@ namespace SilverStripe\UserForms\Extension;
 use SilverStripe\Assets\File;
 use SilverStripe\Assets\Folder;
 use SilverStripe\Core\Convert;
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\Queries\SQLUpdate;
 use SilverStripe\UserForms\Control\UserDefinedFormController;
@@ -15,9 +15,9 @@ use SilverStripe\UserForms\Model\Submission\SubmittedFileField;
  * @property string $UserFormUpload
  * @method SubmittedFileField SubmittedFileField()
  *
- * @extends DataExtension<File&static>
+ * @extends Extension<File&static>
  */
-class UserFormFileExtension extends DataExtension
+class UserFormFileExtension extends Extension
 {
 
     public const USER_FORM_UPLOAD_UNKNOWN = null;
diff --git a/code/UserForm.php b/code/UserForm.php
index 66b44fc..70a54f4 100644
--- a/code/UserForm.php
+++ b/code/UserForm.php
@@ -329,7 +329,7 @@ SQL;
     }
 
     /**
-     * Allow overriding the EmailRecipients on a {@link DataExtension}
+     * Allow overriding the EmailRecipients on a {@link Extension}
      * so you can customise who receives an email.
      * Converts the RelationList to an ArrayList so that manipulation
      * of the original source data isn't possible.