diff --git a/code/Control/UserDefinedFormAdmin.php b/code/Control/UserDefinedFormAdmin.php
index b61a0035d..83ee33bad 100644
--- a/code/Control/UserDefinedFormAdmin.php
+++ b/code/Control/UserDefinedFormAdmin.php
@@ -18,7 +18,7 @@
 use SilverStripe\Forms\Schema\FormSchema;
 use SilverStripe\Forms\TextField;
 use SilverStripe\Forms\TreeDropdownField;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\Security\Group;
 use SilverStripe\Security\InheritedPermissions;
 use SilverStripe\Security\Permission;
diff --git a/code/Control/UserDefinedFormController.php b/code/Control/UserDefinedFormController.php
index be8df3575..951c9a90f 100644
--- a/code/Control/UserDefinedFormController.php
+++ b/code/Control/UserDefinedFormController.php
@@ -16,10 +16,10 @@
 use SilverStripe\Core\Manifest\ModuleLoader;
 use SilverStripe\Forms\Form;
 use SilverStripe\i18n\i18n;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\FieldType\DBField;
-use SilverStripe\ORM\ValidationException;
-use SilverStripe\ORM\ValidationResult;
+use SilverStripe\Core\Validation\ValidationException;
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Security\Security;
 use SilverStripe\UserForms\Extension\UserFormFileExtension;
 use SilverStripe\UserForms\Form\UserForm;
@@ -29,10 +29,10 @@
 use SilverStripe\UserForms\Model\Submission\SubmittedFileField;
 use SilverStripe\UserForms\Model\UserDefinedForm;
 use SilverStripe\Versioned\Versioned;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\ArrayData;
 use SilverStripe\View\Requirements;
 use SilverStripe\View\SSViewer;
-use SilverStripe\View\ViewableData;
+use SilverStripe\Model\ModelData;
 use Swift_RfcComplianceException;
 
 /**
@@ -578,7 +578,7 @@ protected function getMergeFieldsMap($fields = [])
      * This action handles rendering the "finished" message, which is
      * customizable by editing the ReceivedFormSubmission template.
      *
-     * @return ViewableData
+     * @return ModelData
      */
     public function finished()
     {
diff --git a/code/Extension/UpgradePolymorphicExtension.php b/code/Extension/UpgradePolymorphicExtension.php
index 778d18e55..b77b1145c 100644
--- a/code/Extension/UpgradePolymorphicExtension.php
+++ b/code/Extension/UpgradePolymorphicExtension.php
@@ -7,7 +7,7 @@
 use SilverStripe\Core\Extension;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\UserForms\Model\EditableFormField;
 use SilverStripe\UserForms\Model\Recipient\EmailRecipient;
 use SilverStripe\UserForms\Model\Submission\SubmittedForm;
diff --git a/code/Form/UserForm.php b/code/Form/UserForm.php
index 106452fed..a9b73e083 100644
--- a/code/Form/UserForm.php
+++ b/code/Form/UserForm.php
@@ -98,7 +98,7 @@ public function getDisplayErrorMessagesAtTop()
     /**
      * Return the fieldlist, filtered to only contain steps
      *
-     * @return \SilverStripe\ORM\ArrayList
+     * @return \SilverStripe\Model\List\ArrayList
      */
     public function getSteps()
     {
diff --git a/code/Form/UserFormsGridFieldFilterHeader.php b/code/Form/UserFormsGridFieldFilterHeader.php
index 44f3525bb..6b996a7a5 100644
--- a/code/Form/UserFormsGridFieldFilterHeader.php
+++ b/code/Form/UserFormsGridFieldFilterHeader.php
@@ -12,10 +12,10 @@
 use SilverStripe\Forms\GridField\GridFieldDataColumns;
 use SilverStripe\Forms\GridField\GridFieldFilterHeader;
 use SilverStripe\Forms\TextField;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\FieldType\DBDate;
-use SilverStripe\ORM\SS_List;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\List\SS_List;
+use SilverStripe\Model\ArrayData;
 
 /**
  * Extension to the build in SilverStripe {@link GridField} to allow for
diff --git a/code/Form/UserFormsRequiredFields.php b/code/Form/UserFormsRequiredFields.php
index 0d7c4b38f..268a1d273 100644
--- a/code/Form/UserFormsRequiredFields.php
+++ b/code/Form/UserFormsRequiredFields.php
@@ -7,7 +7,7 @@
 use SilverStripe\Forms\FileField;
 use SilverStripe\Forms\FormField;
 use SilverStripe\Forms\RequiredFields;
-use SilverStripe\ORM\ArrayLib;
+use SilverStripe\Core\ArrayLib;
 use SilverStripe\UserForms\Model\EditableFormField;
 
 /**
diff --git a/code/Model/EditableFormField.php b/code/Model/EditableFormField.php
index 660bfb9fd..231cd0fea 100755
--- a/code/Model/EditableFormField.php
+++ b/code/Model/EditableFormField.php
@@ -27,7 +27,7 @@
 use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\ORM\FieldType\DBVarchar;
 use SilverStripe\ORM\HasManyList;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\UserForms\Extension\UserFormFieldEditorExtension;
 use SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroup;
 use SilverStripe\UserForms\Model\EditableFormField\EditableFieldGroupEnd;
diff --git a/code/Model/EditableFormField/EditableFileField.php b/code/Model/EditableFormField/EditableFileField.php
index a4145004a..711529888 100755
--- a/code/Model/EditableFormField/EditableFileField.php
+++ b/code/Model/EditableFormField/EditableFileField.php
@@ -13,7 +13,7 @@
 use SilverStripe\Forms\LiteralField;
 use SilverStripe\Forms\NumericField;
 use SilverStripe\Forms\TreeDropdownField;
-use SilverStripe\ORM\ValidationResult;
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\InheritedPermissions;
 use SilverStripe\UserForms\Control\UserDefinedFormAdmin;
diff --git a/code/Model/EditableFormField/EditableMultipleOptionField.php b/code/Model/EditableFormField/EditableMultipleOptionField.php
index a8f76fb21..3a34b878f 100644
--- a/code/Model/EditableFormField/EditableMultipleOptionField.php
+++ b/code/Model/EditableFormField/EditableMultipleOptionField.php
@@ -12,8 +12,8 @@
 use SilverStripe\Forms\Tab;
 use SilverStripe\Forms\TextField;
 use SilverStripe\ORM\HasManyList;
-use SilverStripe\ORM\Map;
-use SilverStripe\ORM\SS_List;
+use SilverStripe\Model\List\Map;
+use SilverStripe\Model\List\SS_List;
 use SilverStripe\UserForms\Model\EditableFormField;
 use Symbiote\GridFieldExtensions\GridFieldAddNewInlineButton;
 use Symbiote\GridFieldExtensions\GridFieldEditableColumns;
diff --git a/code/Model/EditableFormField/EditableTextField.php b/code/Model/EditableFormField/EditableTextField.php
index 2d54bc271..09d33a846 100644
--- a/code/Model/EditableFormField/EditableTextField.php
+++ b/code/Model/EditableFormField/EditableTextField.php
@@ -10,7 +10,7 @@
 use SilverStripe\Forms\NumericField;
 use SilverStripe\Forms\TextareaField;
 use SilverStripe\Forms\TextField;
-use SilverStripe\ORM\ValidationResult;
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\UserForms\Model\EditableFormField;
 
 /**
diff --git a/code/Model/Recipient/EmailRecipient.php b/code/Model/Recipient/EmailRecipient.php
index 91ce21036..aa53bbf36 100644
--- a/code/Model/Recipient/EmailRecipient.php
+++ b/code/Model/Recipient/EmailRecipient.php
@@ -29,13 +29,13 @@
 use SilverStripe\Forms\TabSet;
 use SilverStripe\Forms\TextareaField;
 use SilverStripe\Forms\TextField;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DB;
 use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\ORM\HasManyList;
-use SilverStripe\ORM\ValidationResult;
+use SilverStripe\Core\Validation\ValidationResult;
 use SilverStripe\Security\Member;
 use SilverStripe\UserForms\Model\EditableFormField;
 use SilverStripe\UserForms\Model\EditableFormField\EditableEmailField;
diff --git a/code/Model/Recipient/UserFormRecipientItemRequest.php b/code/Model/Recipient/UserFormRecipientItemRequest.php
index f836180cc..5f1f33f0d 100644
--- a/code/Model/Recipient/UserFormRecipientItemRequest.php
+++ b/code/Model/Recipient/UserFormRecipientItemRequest.php
@@ -4,11 +4,11 @@
 
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\FieldType\DBField;
 use SilverStripe\UserForms\Model\EditableFormField\EditableFormHeading;
 use SilverStripe\UserForms\Model\EditableFormField\EditableLiteralField;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\ArrayData;
 use SilverStripe\View\Requirements;
 use SilverStripe\View\SSViewer;
 
diff --git a/code/UserForm.php b/code/UserForm.php
index 70a54f44d..060b0f643 100644
--- a/code/UserForm.php
+++ b/code/UserForm.php
@@ -23,7 +23,7 @@
 use SilverStripe\Forms\LabelField;
 use SilverStripe\Forms\LiteralField;
 use SilverStripe\Forms\TextField;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\DB;
 use SilverStripe\UserForms\Extension\UserFormFieldEditorExtension;
 use SilverStripe\UserForms\Extension\UserFormValidator;
diff --git a/tests/php/Control/UserDefinedFormAdminTest.php b/tests/php/Control/UserDefinedFormAdminTest.php
index 80dadf7f2..c5b8c3ca4 100644
--- a/tests/php/Control/UserDefinedFormAdminTest.php
+++ b/tests/php/Control/UserDefinedFormAdminTest.php
@@ -28,7 +28,7 @@
 use SilverStripe\UserForms\Model\Recipient\EmailRecipient;
 use SilverStripe\UserForms\Model\Submission\SubmittedFormField;
 use SilverStripe\UserForms\Model\UserDefinedForm;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\ArrayData;
 use SilverStripe\View\SSViewer;
 
 /**
diff --git a/tests/php/Control/UserDefinedFormControllerTest.php b/tests/php/Control/UserDefinedFormControllerTest.php
index 2cb09db4c..49600acb4 100644
--- a/tests/php/Control/UserDefinedFormControllerTest.php
+++ b/tests/php/Control/UserDefinedFormControllerTest.php
@@ -27,7 +27,7 @@
 use SilverStripe\UserForms\Model\UserDefinedForm;
 use SilverStripe\UserForms\Tests\Control\fixtures\SizeStringTestableController;
 use SilverStripe\Versioned\Versioned;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\ArrayData;
 use SilverStripe\View\SSViewer;
 use function filesize;
 use PHPUnit\Framework\Attributes\DataProvider;
diff --git a/tests/php/Model/EditableFormField/EditableFileFieldTest.php b/tests/php/Model/EditableFormField/EditableFileFieldTest.php
index 1b659ac0e..d0595f684 100644
--- a/tests/php/Model/EditableFormField/EditableFileFieldTest.php
+++ b/tests/php/Model/EditableFormField/EditableFileFieldTest.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Assets\Folder;
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\ORM\ValidationException;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\UserForms\Model\EditableFormField\EditableFileField;
 
 /**
diff --git a/tests/php/Model/Recipient/EmailRecipientTest.php b/tests/php/Model/Recipient/EmailRecipientTest.php
index 3e8b77cbc..2eec468d1 100644
--- a/tests/php/Model/Recipient/EmailRecipientTest.php
+++ b/tests/php/Model/Recipient/EmailRecipientTest.php
@@ -31,7 +31,7 @@ public function testShortcodesAreRenderedInEmailPreviewContent()
 
     public function testEmptyRecipientFailsValidation()
     {
-        $this->expectException(\SilverStripe\ORM\ValidationException::class);
+        $this->expectException(\SilverStripe\Core\Validation\ValidationException::class);
         $this->expectExceptionMessage('"Send email to" address or field is required');
         $recipient = new EmailRecipient();
         $recipient->EmailFrom = 'test@example.com';