diff --git a/code/Controller/AssetAdmin.php b/code/Controller/AssetAdmin.php
index 86ac05769..6b52f2053 100644
--- a/code/Controller/AssetAdmin.php
+++ b/code/Controller/AssetAdmin.php
@@ -38,7 +38,7 @@
 use SilverStripe\Security\PermissionProvider;
 use SilverStripe\Security\Security;
 use SilverStripe\Security\SecurityToken;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\View\Requirements;
 use SilverStripe\View\SSViewer;
 use SilverStripe\VersionedAdmin\Extensions\FileArchiveExtension;
diff --git a/code/Controller/AssetAdminFile.php b/code/Controller/AssetAdminFile.php
index 1c944e5f7..a71651c41 100644
--- a/code/Controller/AssetAdminFile.php
+++ b/code/Controller/AssetAdminFile.php
@@ -8,7 +8,7 @@
 use SilverStripe\Control\Director;
 use SilverStripe\Model\List\ArrayList;
 use SilverStripe\Model\List\SS_List;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\Versioned\DataDifferencer;
 use SilverStripe\Core\Extension;
 
diff --git a/code/Controller/AssetAdminOpen.php b/code/Controller/AssetAdminOpen.php
index 54522e29f..8791e6786 100644
--- a/code/Controller/AssetAdminOpen.php
+++ b/code/Controller/AssetAdminOpen.php
@@ -11,7 +11,7 @@
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Model\List\ArrayList;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\AssetAdmin\Controller\AssetAdminFile;
 use stdClass;
 use SilverStripe\ORM\DataList;
diff --git a/code/Forms/FileFormFactory.php b/code/Forms/FileFormFactory.php
index 1eb0e5658..2d4981e42 100644
--- a/code/Forms/FileFormFactory.php
+++ b/code/Forms/FileFormFactory.php
@@ -17,8 +17,8 @@
 use SilverStripe\Forms\Tab;
 use SilverStripe\Forms\TabSet;
 use SilverStripe\Forms\TextField;
-use SilverStripe\Versioned\RecursivePublishable;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Staged\RecursivePublishable;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class FileFormFactory extends AssetFormFactory
 {
diff --git a/code/Forms/HistoryListField.php b/code/Forms/HistoryListField.php
index c661c3392..4264d7548 100644
--- a/code/Forms/HistoryListField.php
+++ b/code/Forms/HistoryListField.php
@@ -5,7 +5,7 @@
 
 use SilverStripe\Forms\FormField;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 /**
  * History view for file editor form
diff --git a/tests/php/Controller/AssetAdminOpenTest.php b/tests/php/Controller/AssetAdminOpenTest.php
index e369bc6fd..5fd5b772f 100644
--- a/tests/php/Controller/AssetAdminOpenTest.php
+++ b/tests/php/Controller/AssetAdminOpenTest.php
@@ -8,7 +8,7 @@
 use SilverStripe\Assets\Dev\TestAssetStore;
 use SilverStripe\Assets\Folder;
 use SilverStripe\Assets\File;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use PHPUnit\Framework\Attributes\DataProvider;
 
 class AssetAdminOpenTest extends FunctionalTest
diff --git a/tests/php/Controller/AssetAdminTest.php b/tests/php/Controller/AssetAdminTest.php
index 00458aee5..8b5b547eb 100644
--- a/tests/php/Controller/AssetAdminTest.php
+++ b/tests/php/Controller/AssetAdminTest.php
@@ -16,7 +16,7 @@
 use SilverStripe\Control\Session;
 use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\Subsites\Extensions\FolderFormFactoryExtension;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\Security\SecurityToken;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\AssetAdmin\Tests\Controller\AssetAdminTest\FilesInUseFileExtension;
diff --git a/tests/php/Controller/AssetAdminTest/TestObject.php b/tests/php/Controller/AssetAdminTest/TestObject.php
index 1e1e6c442..96fd4f384 100644
--- a/tests/php/Controller/AssetAdminTest/TestObject.php
+++ b/tests/php/Controller/AssetAdminTest/TestObject.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Assets\File;
 use SilverStripe\Dev\TestOnly;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 use SilverStripe\AssetAdmin\Tests\Controller\AssetAdminTest\TestFile;
 
 class TestObject extends File implements TestOnly
diff --git a/tests/php/Forms/FileFormBuilderTest/FileOwner.php b/tests/php/Forms/FileFormBuilderTest/FileOwner.php
index 639307097..2ca407a77 100644
--- a/tests/php/Forms/FileFormBuilderTest/FileOwner.php
+++ b/tests/php/Forms/FileFormBuilderTest/FileOwner.php
@@ -5,8 +5,8 @@
 use SilverStripe\Assets\File;
 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 Versioned|RecursivePublishable
diff --git a/tests/php/Forms/UsedOnTableTest.php b/tests/php/Forms/UsedOnTableTest.php
index a1d36c46e..867f65f51 100644
--- a/tests/php/Forms/UsedOnTableTest.php
+++ b/tests/php/Forms/UsedOnTableTest.php
@@ -9,7 +9,7 @@
 use SilverStripe\Control\Director;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\Versioned\Versioned;
+use SilverStripe\Versioned\Mode\Versioned;
 
 class UsedOnTableTest extends SapphireTest
 {