diff --git a/en/02_Developer_Guides/00_Model/07_Permissions.md b/en/02_Developer_Guides/00_Model/07_Permissions.md
index 728333a19..aa6ef354d 100644
--- a/en/02_Developer_Guides/00_Model/07_Permissions.md
+++ b/en/02_Developer_Guides/00_Model/07_Permissions.md
@@ -128,7 +128,7 @@ class PermissionsExtension extends Extension
 }
 ```
 
-See [Extensions and DataExtensions](/developer_guides/extending/extensions/) for more information about extensions.
+See [Extensions](/developer_guides/extending/extensions/) for more information about extensions.
 
 ## API documentation
 
diff --git a/en/02_Developer_Guides/00_Model/10_Versioning.md b/en/02_Developer_Guides/00_Model/10_Versioning.md
index e7b2d448f..933968991 100644
--- a/en/02_Developer_Guides/00_Model/10_Versioning.md
+++ b/en/02_Developer_Guides/00_Model/10_Versioning.md
@@ -8,7 +8,7 @@ summary: Add versioning to your database content through the Versioned extension
 Database content in Silverstripe CMS can be "staged" before its publication, as well as track all changes through the
 lifetime of a database record.
 
-Versioning in Silverstripe CMS is handled through the [`Versioned`](api:SilverStripe\Versioned\Versioned) extension class. As an [`DataExtension`](api:SilverStripe/ORM/DataExtension) it is possible to be applied to any [`DataObject`](api:SilverStripe\ORM\DataObject) subclass. The extension class will automatically update read and write operations performed via the ORM because it implements the [`augmentSQL()`](api:SilverStripe/ORM/DataExtension::augmentSql()) extension hook method.
+Versioning in Silverstripe CMS is handled through the [`Versioned`](api:SilverStripe\Versioned\Versioned) extension class. As an [`Extension`](api:SilverStripe\Core\Extension) it is possible to be applied to any [`DataObject`](api:SilverStripe\ORM\DataObject) subclass.
 
 The `Versioned` extension is applied to pages in the CMS (the [`SiteTree`](api:SilverStripe\CMS\Model\SiteTree) class) - along with some other core `DataObject` models such as files - by default. Draft content edited in the CMS can be different
 from published content shown to your website visitors.
@@ -327,10 +327,10 @@ E.g.
 ```php
 namespace App\Extension;
 
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 use SilverStripe\Security\Permission;
 
-class MyObjectExtension extends DataExtension
+class MyObjectExtension extends Extension
 {
     public function canViewNonLive($member = null)
     {
diff --git a/en/02_Developer_Guides/01_Templates/10_Unique_Keys.md b/en/02_Developer_Guides/01_Templates/10_Unique_Keys.md
index 376a7c08f..cb25246f3 100644
--- a/en/02_Developer_Guides/01_Templates/10_Unique_Keys.md
+++ b/en/02_Developer_Guides/01_Templates/10_Unique_Keys.md
@@ -39,7 +39,7 @@ Some cases where this is used in supported modules already are:
 - versions - an object in different version stages needs to have different unique keys for each stage
 - locales - an object in different locales needs to have different unique keys for each locale
 
-See [Extensions and DataExtensions](/developer_guides/extending/extensions) for more information about implementing and applying extensions.
+See [Extensions](/developer_guides/extending/extensions) for more information about implementing and applying extensions.
 
 ### Custom service
 
diff --git a/en/02_Developer_Guides/05_Extending/01_Extensions.md b/en/02_Developer_Guides/05_Extending/01_Extensions.md
index 3bd80d6af..fef9dcd52 100644
--- a/en/02_Developer_Guides/05_Extending/01_Extensions.md
+++ b/en/02_Developer_Guides/05_Extending/01_Extensions.md
@@ -1,17 +1,16 @@
 ---
 title: Extensions
-summary: Extensions and DataExtensions let you modify and augment objects transparently.
+summary: Extensions let you modify and augment objects transparently.
 icon: code
 ---
 
-# `Extension` and `DataExtension`
-
+# `Extension`
 An [Extension](api:SilverStripe\Core\Extension) allows for adding additional functionality to a class or modifying existing functionality
 without the hassle of creating a subclass. Developers can add Extensions to any PHP class that has the [Extensible](api:SilverStripe\Core\Extensible)
 trait applied within core, modules or even their own code to make it more reusable.
 
 Extensions are defined as subclasses of the [`Extension`](api:SilverStripe\Core\Extension) class.
-Typically, subclasses of the [`DataExtension`](api:SilverStripe\ORM\DataExtension) class are used for extending a [`DataObject`](api:SilverStripe\ORM\DataObject) subclass.
+Typically, subclasses of the [`Extension`](api:SilverStripe\Core\Extension) class are used for extending a [`DataObject`](api:SilverStripe\ORM\DataObject) subclass.
 
 > [!NOTE]
 > For performance reasons a few classes are excluded from receiving extensions, including `ViewableData`
@@ -21,9 +20,9 @@ Typically, subclasses of the [`DataExtension`](api:SilverStripe\ORM\DataExtensio
 // app/src/Extension/MyMemberExtension.php
 namespace App\Extension;
 
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 
-class MyMemberExtension extends DataExtension
+class MyMemberExtension extends Extension
 {
     private static $db = [
         'DateOfBirth' => 'DBDatetime',
@@ -78,9 +77,9 @@ In your [`Extension`](api:SilverStripe\Core\Extension) class you can only refer
 // app/src/Extension/MyMemberExtension.php
 namespace App\Extension;
 
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 
-class MyMemberExtension extends DataExtension
+class MyMemberExtension extends Extension
 {
     public function updateFoo($foo)
     {
@@ -174,9 +173,9 @@ Because `$db`, `$has_one`, etc are ultimately just configuration properties, the
 namespace App\Extension;
 
 use SilverStripe\Assets\Image;
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 
-class MyMemberExtension extends DataExtension
+class MyMemberExtension extends Extension
 {
     private static $db = [
         'Position' => 'Varchar',
@@ -252,9 +251,9 @@ validator by defining the `updateValidator` method.
 // app/src/Extension/MyMemberExtension.php
 namespace App\Extension;
 
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 
-class MyMemberExtension extends DataExtension
+class MyMemberExtension extends Extension
 {
     protected function updateValidator($validator)
     {
@@ -276,9 +275,9 @@ namespace App\Extension;
 use SilverStripe\AssetAdmin\Forms\UploadField;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\TextField;
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 
-class MyMemberExtension extends DataExtension
+class MyMemberExtension extends Extension
 {
     private static $db = [
         'Position' => 'Varchar',
@@ -455,4 +454,3 @@ class CustomisedSomeExtension extends SomeExtension
 ## API documentation
 
 - [Extension](api:SilverStripe\Core\Extension)
-- [DataExtension](api:SilverStripe\ORM\DataExtension)
diff --git a/en/02_Developer_Guides/05_Extending/How_Tos/03_Track_member_logins.md b/en/02_Developer_Guides/05_Extending/How_Tos/03_Track_member_logins.md
index b36e5c9f5..1f09ab652 100644
--- a/en/02_Developer_Guides/05_Extending/How_Tos/03_Track_member_logins.md
+++ b/en/02_Developer_Guides/05_Extending/How_Tos/03_Track_member_logins.md
@@ -20,12 +20,12 @@ namespace App\Extension;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\ReadonlyField;
 use SilverStripe\ORM\DB;
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\Security;
 
-class MyMemberExtension extends DataExtension
+class MyMemberExtension extends Extension
 {
     private static $db = [
         'LastVisited' => 'Datetime',
diff --git a/en/02_Developer_Guides/09_Security/00_Member.md b/en/02_Developer_Guides/09_Security/00_Member.md
index b609908f3..e4a2e8d1a 100644
--- a/en/02_Developer_Guides/09_Security/00_Member.md
+++ b/en/02_Developer_Guides/09_Security/00_Member.md
@@ -30,7 +30,7 @@ if ($member) {
 ## Subclassing
 
 > [!WARNING]
-> This is the least desirable way of extending the [Member](api:SilverStripe\Security\Member) class. It's better to use [DataExtension](api:SilverStripe\ORM\DataExtension)
+> This is the least desirable way of extending the [Member](api:SilverStripe\Security\Member) class. It's better to use [Extension](api:SilverStripe\Core\Extension)
 > (see below).
 
 You can define subclasses of [Member](api:SilverStripe\Security\Member) to add extra fields or functionality to the built-in membership system.
@@ -109,7 +109,7 @@ SilverStripe\Security\Member:
     - App\Extension\MyMemberExtension
 ```
 
-A role extension is simply a subclass of [`DataExtension`](api:SilverStripe\ORM\DataExtension) that is designed to be used to add behaviour to [`Member`](api:SilverStripe\Security\Member).
+A role extension is simply a subclass of [`Extension`](api:SilverStripe\Core\Extension) that is designed to be used to add behaviour to [`Member`](api:SilverStripe\Security\Member).
 The roles affect the entire class - all members will get the additional behaviour.  However, if you want to restrict
 things, you should add appropriate [`Permission::checkMember()`](api:SilverStripe\Security\Permission::checkMember()) calls to the role's methods.
 
@@ -117,10 +117,10 @@ things, you should add appropriate [`Permission::checkMember()`](api:SilverStrip
 namespace App\Extension;
 
 use SilverStripe\Form\FieldList;
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 use SilverStripe\Security\Permission;
 
-class MyMemberExtension extends DataExtension
+class MyMemberExtension extends Extension
 {
     // define additional properties
     private static $db = [
diff --git a/en/02_Developer_Guides/14_Files/01_File_Management.md b/en/02_Developer_Guides/14_Files/01_File_Management.md
index c29302ff2..bbf52967a 100644
--- a/en/02_Developer_Guides/14_Files/01_File_Management.md
+++ b/en/02_Developer_Guides/14_Files/01_File_Management.md
@@ -159,9 +159,9 @@ SilverStripe\AssetAdmin\Forms\FileFormFactory:
 // app/src/Extension/MyFileExtension.php
 namespace App\Extension;
 
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 
-class MyFileExtension extends DataExtension
+class MyFileExtension extends Extension
 {
     private static $db = [
         'Description' => 'Text',
diff --git a/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md b/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
index a9d9a7242..902780421 100644
--- a/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
+++ b/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
@@ -73,16 +73,16 @@ On top of your administration windows, the menu can also have external links
 (e.g. to external reference). In this example, we're going to add a link to
 Google to the menu.
 
-First, we need to define a [LeftAndMainExtension](api:SilverStripe\Admin\LeftAndMainExtension) which will contain our
+First, we need to define an [Extension](api:SilverStripe\Core\Extension) which will contain our
 button configuration.
 
 ```php
 namespace App\Admin;
 
 use SilverStripe\Admin\CMSMenu;
-use SilverStripe\Admin\LeftAndMainExtension;
+use SilverStripe\Core\Extension;
 
-class CustomLeftAndMain extends LeftAndMainExtension
+class CustomLeftAndMain extends Extension
 {
     // ...
 
diff --git a/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md b/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
index d2d67733c..474f4f9ae 100644
--- a/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
+++ b/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
@@ -56,7 +56,7 @@ Each flag has a unique identifier, which is also used as a CSS class for easier
 
 Developers can easily add a new flag, delete or alter an existing flag on how it is looked
 or changing the flag label. The customization of these lozenges could be done either through
-inherited subclass or [DataExtension](api:SilverStripe\ORM\DataExtension). It is just really about how we change the return
+inherited subclass or [Extension](api:SilverStripe\Core\Extension). It is just really about how we change the return
 value of function `SiteTree->getTreeTitle()` by two easily extendable methods
 `SiteTree->getStatusClass()` and `SiteTree->getStatusFlags()`.
 
diff --git a/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md b/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
index 9704e2a32..02a0b498f 100644
--- a/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
+++ b/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
@@ -88,16 +88,16 @@ Then run `composer vendor-expose`. This command will publish all the `css` files
 ## Create a "bookmark" flag on pages
 
 Now we'll define which pages are actually bookmarked, a flag that is stored in
-the database. For this we need to decorate the page record with a
-`DataExtension`. Create a new file called `app/src/BookmarkedPageExtension.php`
+the database. For this we need to decorate the page record with an
+`Extension`. Create a new file called `app/src/BookmarkedPageExtension.php`
 and insert the following code.
 
 ```php
 namespace App\Extension;
 
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 
-class BookmarkedPageExtension extends DataExtension
+class BookmarkedPageExtension extends Extension
 {
     private static array $db = [
         'IsBookmarked' => 'Boolean',
@@ -117,9 +117,9 @@ If you need to update those form fields, you can implement the `updateCMSFields(
 namespace App\Extension;
 
 use SilverStripe\Forms\FieldList;
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 
-class BookmarkedPageExtension extends DataExtension
+class BookmarkedPageExtension extends Extension
 {
     // ...
 
@@ -153,9 +153,9 @@ Add the following code to a new file `app/src/BookmarkedLeftAndMainExtension.php
 ```php
 namespace App\Extension;
 
-use SilverStripe\Admin\LeftAndMainExtension;
+use SilverStripe\Core\Extension;
 
-class BookmarkedPagesLeftAndMainExtension extends LeftAndMainExtension
+class BookmarkedPagesLeftAndMainExtension extends Extension
 {
     public function getBookmarkedPages()
     {
@@ -264,9 +264,9 @@ applicable controller actions to it:
 ```php
 namespace App\Extension;
 
-use SilverStripe\Admin\LeftAndMainExtension;
+use SilverStripe\Core\Extension;
 
-class CustomActionsExtension extends LeftAndMainExtension
+class CustomActionsExtension extends Extension
 {
     private static $allowed_actions = [
         'sampleAction',
diff --git a/en/02_Developer_Guides/18_Cookies_And_Sessions/03_Managing_Sessions.md b/en/02_Developer_Guides/18_Cookies_And_Sessions/03_Managing_Sessions.md
index a4e3bc5c2..7388c16bb 100644
--- a/en/02_Developer_Guides/18_Cookies_And_Sessions/03_Managing_Sessions.md
+++ b/en/02_Developer_Guides/18_Cookies_And_Sessions/03_Managing_Sessions.md
@@ -77,16 +77,16 @@ will need to log back in to perform further actions.
 
 #### Creating an extension for `LoginSession`
 
-The first step is to create a [`DataExtension`](api:SilverStripe\ORM\DataExtension) that grant some users the ability to hooks into [`LoginSession`](api:SilverStripe\SessionManager\Models\LoginSession)'s `canView()` and `canDelete()` methods. This example aligns the permissions on the [`LoginSession`](api:SilverStripe\SessionManager\Models\LoginSession) to the permission on the Member who owns the [`LoginSession`](api:SilverStripe\SessionManager\Models\LoginSession).
+The first step is to create an [`Extension`](api:SilverStripe\Core\Extension) that grant some users the ability to hooks into [`LoginSession`](api:SilverStripe\SessionManager\Models\LoginSession)'s `canView()` and `canDelete()` methods. This example aligns the permissions on the [`LoginSession`](api:SilverStripe\SessionManager\Models\LoginSession) to the permission on the Member who owns the [`LoginSession`](api:SilverStripe\SessionManager\Models\LoginSession).
 
 Alternatively, you could call [`Permission::check()`](api:SilverStripe\Security\Permission::check()) to validate if the member has a predefined CMS permission. If you need even more granular permissions, you can implement a [`PermissionProvider`](/developer_guides/security/permissions/#permissionprovider) to define your own custom permissions.
 
 ```php
 namespace My\App;
 
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 
-class LoginSessionExtension extends DataExtension
+class LoginSessionExtension extends Extension
 {
     /**
      * @param Member $member
diff --git a/en/02_Developer_Guides/19_GraphQL/05_plugins/03_writing_a_complex_plugin.md b/en/02_Developer_Guides/19_GraphQL/05_plugins/03_writing_a_complex_plugin.md
index f81f38992..750d76fcc 100644
--- a/en/02_Developer_Guides/19_GraphQL/05_plugins/03_writing_a_complex_plugin.md
+++ b/en/02_Developer_Guides/19_GraphQL/05_plugins/03_writing_a_complex_plugin.md
@@ -10,7 +10,7 @@ summary: In this tutorial, we'll create a plugin that affects models, queries, a
 ## Writing a complex plugin
 
 For this example, we'll imagine that a lot of our DataObjects are geocoded, and this is ostensibly some kind of
-`DataExtension` that adds lat/lon information to the `DataObject`, and maybe allows you to ask how close it is to
+`Extension` that adds lat/lon information to the `DataObject`, and maybe allows you to ask how close it is to
 a given lat/lon pair.
 
 We want any queries using these DataObjects to be able to search within a radius of a given lat/lon.
diff --git a/en/10_Contributing/05_Coding_Conventions/01_PHP_Coding_Conventions.md b/en/10_Contributing/05_Coding_Conventions/01_PHP_Coding_Conventions.md
index c513985d0..4be4d808b 100644
--- a/en/10_Contributing/05_Coding_Conventions/01_PHP_Coding_Conventions.md
+++ b/en/10_Contributing/05_Coding_Conventions/01_PHP_Coding_Conventions.md
@@ -101,7 +101,6 @@ Use an appropriate suffix or prefix for classnames when making a subclass or imp
 ## Extensions and traits
 
 - Use the [`Extension`](api:SilverStripe\Core\Extension) class for extending classes, including `DataObject` subclasses.
-- Do not use the `DataExtension` class, it will be deprecated in a future release.
 
 Use a trait instead of an [`Extension`](api:SilverStripe\Core\Extension) when the composable functionality: