diff --git a/src/AssetControlExtension.php b/src/AssetControlExtension.php
index 32e77890..265a37fc 100644
--- a/src/AssetControlExtension.php
+++ b/src/AssetControlExtension.php
@@ -7,7 +7,7 @@
 use SilverStripe\Core\Convert;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\Security\Member;
 use SilverStripe\Core\Extension;
 
diff --git a/src/File.php b/src/File.php
index b2a19c88..cbe6e494 100644
--- a/src/File.php
+++ b/src/File.php
@@ -34,8 +34,8 @@
 use SilverStripe\Security\PermissionChecker;
 use SilverStripe\Security\PermissionProvider;
 use SilverStripe\Security\Security;
-use SilverStripe\Versioned\RecursivePublishable;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\View\HTML;
 
 /**
diff --git a/src/FilenameParsing/FileIDHelperResolutionStrategy.php b/src/FilenameParsing/FileIDHelperResolutionStrategy.php
index 59321802..e5762605 100644
--- a/src/FilenameParsing/FileIDHelperResolutionStrategy.php
+++ b/src/FilenameParsing/FileIDHelperResolutionStrategy.php
@@ -9,7 +9,7 @@
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\Assets\File;
 use SilverStripe\ORM\DB;
 
diff --git a/src/Flysystem/FlysystemAssetStore.php b/src/Flysystem/FlysystemAssetStore.php
index ee67b7f2..ae66ccb1 100644
--- a/src/Flysystem/FlysystemAssetStore.php
+++ b/src/Flysystem/FlysystemAssetStore.php
@@ -25,7 +25,7 @@
 use SilverStripe\Core\Flushable;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Security\Security;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * Asset store based on flysystem Filesystem as a backend
diff --git a/src/Folder.php b/src/Folder.php
index 1ccf8364..2c847370 100644
--- a/src/Folder.php
+++ b/src/Folder.php
@@ -11,7 +11,7 @@
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Core\Validation\ValidationResult;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * Represents a logical folder, which may be used to organise assets
diff --git a/src/Shortcodes/FileLinkTracking.php b/src/Shortcodes/FileLinkTracking.php
index 76323831..4875cdf4 100644
--- a/src/Shortcodes/FileLinkTracking.php
+++ b/src/Shortcodes/FileLinkTracking.php
@@ -9,7 +9,7 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBHTMLText;
 use SilverStripe\ORM\ManyManyThroughList;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\View\Parsers\HTMLValue;
 use SilverStripe\Core\Extension;
 
diff --git a/tests/php/AssetControlExtensionTest.php b/tests/php/AssetControlExtensionTest.php
index 82bb607f..acbaacb2 100644
--- a/tests/php/AssetControlExtensionTest.php
+++ b/tests/php/AssetControlExtensionTest.php
@@ -11,7 +11,7 @@
 use SilverStripe\Assets\Tests\AssetControlExtensionTest\VersionedObject;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * Tests {@see AssetControlExtension}
diff --git a/tests/php/AssetControlExtensionTest/TestObject.php b/tests/php/AssetControlExtensionTest/TestObject.php
index 264f70ba..c7aefb69 100644
--- a/tests/php/AssetControlExtensionTest/TestObject.php
+++ b/tests/php/AssetControlExtensionTest/TestObject.php
@@ -6,7 +6,7 @@
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Security\Member;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * A basic unversioned object
diff --git a/tests/php/AssetControlExtensionTest/VersionedObject.php b/tests/php/AssetControlExtensionTest/VersionedObject.php
index 82922266..b90efd3b 100644
--- a/tests/php/AssetControlExtensionTest/VersionedObject.php
+++ b/tests/php/AssetControlExtensionTest/VersionedObject.php
@@ -6,7 +6,7 @@
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Security\Security;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\Security\Member;
 
 /**
diff --git a/tests/php/FileTest.php b/tests/php/FileTest.php
index b2e2b1c8..3424c7fa 100644
--- a/tests/php/FileTest.php
+++ b/tests/php/FileTest.php
@@ -23,7 +23,7 @@
 use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\PermissionChecker;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
diff --git a/tests/php/FilenameParsing/FileIDHelperResolutionStrategyTest.php b/tests/php/FilenameParsing/FileIDHelperResolutionStrategyTest.php
index 9fd9b6e9..0c16e61c 100644
--- a/tests/php/FilenameParsing/FileIDHelperResolutionStrategyTest.php
+++ b/tests/php/FilenameParsing/FileIDHelperResolutionStrategyTest.php
@@ -17,7 +17,7 @@
 use SilverStripe\Assets\Storage\Sha1FileHashingService;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use PHPUnit\Framework\Attributes\DataProvider;
 
 class FileIDHelperResolutionStrategyTest extends SapphireTest
diff --git a/tests/php/FolderTest.php b/tests/php/FolderTest.php
index abbb7f41..cd604ed4 100644
--- a/tests/php/FolderTest.php
+++ b/tests/php/FolderTest.php
@@ -13,7 +13,7 @@
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\Security\InheritedPermissions;
 use SilverStripe\Security\Member;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * @author Ingo Schommer (ingo at silverstripe dot com)
diff --git a/tests/php/ProtectedFileControllerTest.php b/tests/php/ProtectedFileControllerTest.php
index 46d8f12a..7dd4dc58 100644
--- a/tests/php/ProtectedFileControllerTest.php
+++ b/tests/php/ProtectedFileControllerTest.php
@@ -11,7 +11,7 @@
 use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Dev\FunctionalTest;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use PHPUnit\Framework\Attributes\DataProvider;
 
 class ProtectedFileControllerTest extends FunctionalTest
diff --git a/tests/php/RedirectFileControllerTest.php b/tests/php/RedirectFileControllerTest.php
index f3366581..95dd1b91 100644
--- a/tests/php/RedirectFileControllerTest.php
+++ b/tests/php/RedirectFileControllerTest.php
@@ -14,7 +14,7 @@
 use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Assets\Dev\TestAssetStore;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use PHPUnit\Framework\Attributes\DataProvider;
 
 class RedirectFileControllerTest extends FunctionalTest
diff --git a/tests/php/Shortcodes/FileBrokenLinksTest.php b/tests/php/Shortcodes/FileBrokenLinksTest.php
index 5fefe562..6de0acc7 100644
--- a/tests/php/Shortcodes/FileBrokenLinksTest.php
+++ b/tests/php/Shortcodes/FileBrokenLinksTest.php
@@ -6,7 +6,7 @@
 use SilverStripe\Assets\File;
 use SilverStripe\Assets\Tests\Shortcodes\FileBrokenLinksTest\EditableObject;
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * Tests broken links in html areas
diff --git a/tests/php/Shortcodes/FileBrokenLinksTest/EditableObject.php b/tests/php/Shortcodes/FileBrokenLinksTest/EditableObject.php
index 29c44e9b..42b61123 100644
--- a/tests/php/Shortcodes/FileBrokenLinksTest/EditableObject.php
+++ b/tests/php/Shortcodes/FileBrokenLinksTest/EditableObject.php
@@ -5,8 +5,8 @@
 use SilverStripe\Assets\Shortcodes\FileLinkTracking;
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\RecursivePublishable;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * @mixin RecursivePublishable
diff --git a/tests/php/Shortcodes/FileLinkTrackingTest.php b/tests/php/Shortcodes/FileLinkTrackingTest.php
index ff23d644..3bd43365 100644
--- a/tests/php/Shortcodes/FileLinkTrackingTest.php
+++ b/tests/php/Shortcodes/FileLinkTrackingTest.php
@@ -9,7 +9,7 @@
 use SilverStripe\Assets\Tests\Shortcodes\FileBrokenLinksTest\EditableObject;
 use SilverStripe\Core\Convert;
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class FileLinkTrackingTest extends SapphireTest
 {
diff --git a/tests/php/Shortcodes/FileShortcodeProviderTest.php b/tests/php/Shortcodes/FileShortcodeProviderTest.php
index 9c079ffc..39613409 100644
--- a/tests/php/Shortcodes/FileShortcodeProviderTest.php
+++ b/tests/php/Shortcodes/FileShortcodeProviderTest.php
@@ -13,7 +13,7 @@
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\ErrorPage\ErrorPage;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\View\Parsers\ShortcodeParser;
 
 class FileShortcodeProviderTest extends SapphireTest
diff --git a/tests/php/UploadTest.php b/tests/php/UploadTest.php
index 4a587ca5..07e9a0df 100644
--- a/tests/php/UploadTest.php
+++ b/tests/php/UploadTest.php
@@ -15,7 +15,7 @@
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Security\Member;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class UploadTest extends SapphireTest
 {