diff --git a/code/AuditHook.php b/code/AuditHook.php
index 36228a9..d79fb38 100644
--- a/code/AuditHook.php
+++ b/code/AuditHook.php
@@ -6,7 +6,6 @@
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\Email\Email;
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\ORM\DataExtension;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DataObjectSchema;
 use SilverStripe\ORM\DB;
@@ -15,13 +14,14 @@
 use SilverStripe\Security\PermissionRole;
 use SilverStripe\Security\PermissionRoleCode;
 use SilverStripe\Security\Security;
+use SilverStripe\Core\Extension;
 
 /**
  * Provides logging hooks that are inserted into Framework objects.
  *
- * @extends DataExtension<Member|SiteTree|Controller>
+ * @extends Extension<Member|SiteTree|Controller>
  */
-class AuditHook extends DataExtension
+class AuditHook extends Extension
 {
     protected function getAuditLogger()
     {
diff --git a/code/AuditHookMFA.php b/code/AuditHookMFA.php
index 7e41f7a..209ca19 100644
--- a/code/AuditHookMFA.php
+++ b/code/AuditHookMFA.php
@@ -7,15 +7,15 @@
 use SilverStripe\MFA\Authenticator\LoginHandler;
 use SilverStripe\MFA\Method\MethodInterface;
 use SilverStripe\MFA\Service\RegisteredMethodManager;
-use SilverStripe\ORM\DataExtension;
 use SilverStripe\Security\Member;
+use SilverStripe\Core\Extension;
 
 /**
  * Provides logging actions on extension hooks from certain silverstripe/mfa actions.
  *
- * @extends DataExtension<LoginHandler|RegisteredMethodManager>
+ * @extends Extension<LoginHandler|RegisteredMethodManager>
  */
-class AuditHookMFA extends DataExtension
+class AuditHookMFA extends Extension
 {
     /**
      * A successful login using an MFA method
diff --git a/code/AuditHookSessionManager.php b/code/AuditHookSessionManager.php
index 9993134..cbc9288 100644
--- a/code/AuditHookSessionManager.php
+++ b/code/AuditHookSessionManager.php
@@ -4,17 +4,17 @@
 
 use Psr\Log\LoggerInterface;
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\ORM\DataExtension;
 use SilverStripe\Security\Security;
 use SilverStripe\SessionManager\Controllers\LoginSessionController;
 use SilverStripe\SessionManager\Models\LoginSession;
+use SilverStripe\Core\Extension;
 
 /**
  * Provides logging actions on extension hooks from certain silverstripe/session-manager actions.
  *
- * @extends DataExtension<LoginSessionController>
+ * @extends Extension<LoginSessionController>
  */
-class AuditHookSessionManager extends DataExtension
+class AuditHookSessionManager extends Extension
 {
     /**
      * Login session for a member is being removed