diff --git a/src/ArchiveAdmin.php b/src/ArchiveAdmin.php
index b1db5795..167def03 100644
--- a/src/ArchiveAdmin.php
+++ b/src/ArchiveAdmin.php
@@ -16,14 +16,14 @@
 use SilverStripe\Forms\GridField\GridFieldDetailForm;
 use SilverStripe\Forms\GridField\GridFieldFilterHeader;
 use SilverStripe\Forms\GridField\GridFieldViewButton;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\Versioned\GridFieldRestoreAction;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\Versioned\VersionedGridFieldState\VersionedGridFieldState;
 use SilverStripe\VersionedAdmin\Interfaces\ArchiveViewProvider;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\ArrayData;
 
 /**
  * Archive admin is a section of the CMS that displays archived records
diff --git a/src/Extensions/ArchiveRestoreAction.php b/src/Extensions/ArchiveRestoreAction.php
index 6e4e7a7e..d74ac342 100644
--- a/src/Extensions/ArchiveRestoreAction.php
+++ b/src/Extensions/ArchiveRestoreAction.php
@@ -9,7 +9,7 @@
 use SilverStripe\Forms\FormAction;
 use SilverStripe\Core\Extension;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\ORM\ValidationResult;
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Versioned\RestoreAction;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\Versioned\VersionedGridFieldItemRequest;
diff --git a/tests/Extensions/ArchiveRestoreActionTest.php b/tests/Extensions/ArchiveRestoreActionTest.php
index c0b24b42..1dad2166 100644
--- a/tests/Extensions/ArchiveRestoreActionTest.php
+++ b/tests/Extensions/ArchiveRestoreActionTest.php
@@ -13,8 +13,8 @@
 use SilverStripe\Forms\GridField\GridField;
 use SilverStripe\Forms\GridField\GridFieldConfig_Base;
 use SilverStripe\Forms\GridField\GridFieldDetailForm;
-use SilverStripe\ORM\ArrayList;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\List\ArrayList;
+use SilverStripe\Model\ArrayData;
 use SilverStripe\Versioned\VersionedGridFieldItemRequest;
 use SilverStripe\VersionedAdmin\ArchiveAdmin;
 use SilverStripe\VersionedAdmin\Tests\Controllers\HistoryViewerControllerTest\ViewableVersionedObject;
diff --git a/tests/Forms/DiffTransformationTest.php b/tests/Forms/DiffTransformationTest.php
index e624a270..c2c094c1 100644
--- a/tests/Forms/DiffTransformationTest.php
+++ b/tests/Forms/DiffTransformationTest.php
@@ -12,7 +12,7 @@
 use SilverStripe\Forms\TextField;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\VersionedAdmin\Forms\DiffTransformation;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\ArrayData;
 
 class DiffTransformationTest extends SapphireTest
 {
diff --git a/tests/Forms/GridField/GridFieldFileRestoreActionTest.php b/tests/Forms/GridField/GridFieldFileRestoreActionTest.php
index bc2f3586..6078d822 100644
--- a/tests/Forms/GridField/GridFieldFileRestoreActionTest.php
+++ b/tests/Forms/GridField/GridFieldFileRestoreActionTest.php
@@ -7,7 +7,7 @@
 use SilverStripe\Forms\GridField\GridField;
 use SilverStripe\Forms\GridField\GridField_FormAction;
 use SilverStripe\Forms\GridField\GridFieldConfig;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\VersionedAdmin\Forms\GridField\GridFieldFileRestoreAction;
 use SilverStripe\VersionedAdmin\Tests\ArchiveAdminTest\VersionedObject;