diff --git a/src/ArchiveAdmin.php b/src/ArchiveAdmin.php
index 167def03..5fc8f018 100644
--- a/src/ArchiveAdmin.php
+++ b/src/ArchiveAdmin.php
@@ -20,8 +20,8 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\Versioned\GridFieldRestoreAction;
-use SilverStripe\Versioned\Versioned;
-use SilverStripe\Versioned\VersionedGridFieldState\VersionedGridFieldState;
+use SilverStripe\Versioned\Mode\Versioned;
+use SilverStripe\Versioned\Mode\VersionedGridFieldState\VersionedGridFieldState;
 use SilverStripe\VersionedAdmin\Interfaces\ArchiveViewProvider;
 use SilverStripe\Model\ArrayData;
 
diff --git a/src/Controllers/HistoryViewerController.php b/src/Controllers/HistoryViewerController.php
index 5ba9ffcf..6186d9ef 100644
--- a/src/Controllers/HistoryViewerController.php
+++ b/src/Controllers/HistoryViewerController.php
@@ -12,7 +12,7 @@
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBDatetime;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\VersionedAdmin\Forms\DataObjectVersionFormFactory;
 use SilverStripe\VersionedAdmin\Forms\DiffTransformation;
 use SilverStripe\VersionedAdmin\Forms\HistoryViewerField;
diff --git a/src/Extensions/ArchiveRestoreAction.php b/src/Extensions/ArchiveRestoreAction.php
index d74ac342..2bf031a4 100644
--- a/src/Extensions/ArchiveRestoreAction.php
+++ b/src/Extensions/ArchiveRestoreAction.php
@@ -11,7 +11,7 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Versioned\RestoreAction;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\Versioned\VersionedGridFieldItemRequest;
 use SilverStripe\VersionedAdmin\ArchiveAdmin;
 
diff --git a/src/Extensions/UsedOnTableExtension.php b/src/Extensions/UsedOnTableExtension.php
index fbab16c1..f8ba87f1 100644
--- a/src/Extensions/UsedOnTableExtension.php
+++ b/src/Extensions/UsedOnTableExtension.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Admin\Forms\UsedOnTable;
 use SilverStripe\Core\Extension;
-use SilverStripe\Versioned\ChangeSetItem;
+use SilverStripe\Versioned\Staged\ChangeSetItem;
 
 /**
  * @extends Extension<UsedOnTable>
diff --git a/src/Forms/DiffField.php b/src/Forms/DiffField.php
index e3f6a61b..fc5fd498 100644
--- a/src/Forms/DiffField.php
+++ b/src/Forms/DiffField.php
@@ -15,7 +15,7 @@
  * e.g. a TextField with the value "Old data" can be transformed with {@see DiffTransformation}
  * and then having setValue called again to load in "New data" - this field will then render
  * the value "<ins>New</ins> <del>Old</del> data". Most useful in historic version comparisons
- * {@see SilverStripe\Versioned\Versioned}
+ * {@see SilverStripe\Versioned\Mode\Versioned}
  */
 class DiffField extends HTMLReadonlyField
 {
diff --git a/src/Navigator/SilverStripeNavigatorItem_ArchiveLink.php b/src/Navigator/SilverStripeNavigatorItem_ArchiveLink.php
index 5cc1c2d5..8b323892 100644
--- a/src/Navigator/SilverStripeNavigatorItem_ArchiveLink.php
+++ b/src/Navigator/SilverStripeNavigatorItem_ArchiveLink.php
@@ -9,7 +9,7 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\ORM\FieldType\DBField;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class SilverStripeNavigatorItem_ArchiveLink extends SilverStripeNavigatorItem
 {
diff --git a/src/Navigator/SilverStripeNavigatorItem_LiveLink.php b/src/Navigator/SilverStripeNavigatorItem_LiveLink.php
index e54d8436..f4ca0a50 100644
--- a/src/Navigator/SilverStripeNavigatorItem_LiveLink.php
+++ b/src/Navigator/SilverStripeNavigatorItem_LiveLink.php
@@ -7,7 +7,7 @@
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Convert;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class SilverStripeNavigatorItem_LiveLink extends SilverStripeNavigatorItem
 {
diff --git a/src/Navigator/SilverStripeNavigatorItem_StageLink.php b/src/Navigator/SilverStripeNavigatorItem_StageLink.php
index cc88dd2c..f1d004d8 100644
--- a/src/Navigator/SilverStripeNavigatorItem_StageLink.php
+++ b/src/Navigator/SilverStripeNavigatorItem_StageLink.php
@@ -7,7 +7,7 @@
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Convert;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class SilverStripeNavigatorItem_StageLink extends SilverStripeNavigatorItem
 {
diff --git a/tests/ArchiveAdminTest/SingleStageObject.php b/tests/ArchiveAdminTest/SingleStageObject.php
index 2eeb55a8..6bc24609 100644
--- a/tests/ArchiveAdminTest/SingleStageObject.php
+++ b/tests/ArchiveAdminTest/SingleStageObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class SingleStageObject extends DataObject implements TestOnly
 {
diff --git a/tests/ArchiveAdminTest/VersionedObject.php b/tests/ArchiveAdminTest/VersionedObject.php
index f432ad3a..34d7607e 100644
--- a/tests/ArchiveAdminTest/VersionedObject.php
+++ b/tests/ArchiveAdminTest/VersionedObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class VersionedObject extends DataObject implements TestOnly
 {
diff --git a/tests/ArchiveAdminTest/ViewProviderChildObject.php b/tests/ArchiveAdminTest/ViewProviderChildObject.php
index 3287e297..c95b4377 100644
--- a/tests/ArchiveAdminTest/ViewProviderChildObject.php
+++ b/tests/ArchiveAdminTest/ViewProviderChildObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\VersionedAdmin\Tests\ArchiveAdminTest\ViewProviderVersionedObject;
 
 class ViewProviderChildObject extends ViewProviderVersionedObject implements TestOnly
diff --git a/tests/ArchiveAdminTest/ViewProviderVersionedObject.php b/tests/ArchiveAdminTest/ViewProviderVersionedObject.php
index 71f95679..aa9907fe 100644
--- a/tests/ArchiveAdminTest/ViewProviderVersionedObject.php
+++ b/tests/ArchiveAdminTest/ViewProviderVersionedObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\VersionedAdmin\Interfaces\ArchiveViewProvider;
 
 class ViewProviderVersionedObject extends DataObject implements ArchiveViewProvider, TestOnly
diff --git a/tests/Controllers/HistoryViewerControllerTest.php b/tests/Controllers/HistoryViewerControllerTest.php
index 8d315971..023a8029 100644
--- a/tests/Controllers/HistoryViewerControllerTest.php
+++ b/tests/Controllers/HistoryViewerControllerTest.php
@@ -14,7 +14,7 @@
 use SilverStripe\VersionedAdmin\Tests\Controllers\HistoryViewerControllerTest\TestVersionedObject;
 use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\Security\SecurityToken;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\VersionedAdmin\Forms\HistoryViewerField;
 use PHPUnit\Framework\Attributes\DataProvider;
 
diff --git a/tests/Controllers/HistoryViewerControllerTest/TestVersionedObject.php b/tests/Controllers/HistoryViewerControllerTest/TestVersionedObject.php
index ee0797f3..59be6df8 100644
--- a/tests/Controllers/HistoryViewerControllerTest/TestVersionedObject.php
+++ b/tests/Controllers/HistoryViewerControllerTest/TestVersionedObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class TestVersionedObject extends DataObject implements TestOnly
 {
diff --git a/tests/Controllers/HistoryViewerControllerTest/ViewableVersionedObject.php b/tests/Controllers/HistoryViewerControllerTest/ViewableVersionedObject.php
index 2c00abcc..aa7e71a6 100644
--- a/tests/Controllers/HistoryViewerControllerTest/ViewableVersionedObject.php
+++ b/tests/Controllers/HistoryViewerControllerTest/ViewableVersionedObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class ViewableVersionedObject extends DataObject implements TestOnly
 {
diff --git a/tests/Forms/DataObjectVersionFormFactoryTest/ObjectWithFields.php b/tests/Forms/DataObjectVersionFormFactoryTest/ObjectWithFields.php
index 8074f9ab..a85ff2aa 100644
--- a/tests/Forms/DataObjectVersionFormFactoryTest/ObjectWithFields.php
+++ b/tests/Forms/DataObjectVersionFormFactoryTest/ObjectWithFields.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\VersionedAdmin\Forms\HistoryViewerField;
 
 class ObjectWithFields extends DataObject implements TestOnly
diff --git a/tests/Navigator/UnstagedRecord.php b/tests/Navigator/UnstagedRecord.php
index 7b08b4eb..2b370751 100644
--- a/tests/Navigator/UnstagedRecord.php
+++ b/tests/Navigator/UnstagedRecord.php
@@ -5,7 +5,7 @@
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\CMSPreviewable;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * Versioned but not staged
diff --git a/tests/Navigator/VersionedRecord.php b/tests/Navigator/VersionedRecord.php
index 3218a63f..5a859edd 100644
--- a/tests/Navigator/VersionedRecord.php
+++ b/tests/Navigator/VersionedRecord.php
@@ -5,7 +5,7 @@
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\CMSPreviewable;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class VersionedRecord extends DataObject implements TestOnly, CMSPreviewable
 {