diff --git a/src/Checks/CacheHeadersCheck.php b/src/Checks/CacheHeadersCheck.php
index 73ce49c..28ccae2 100644
--- a/src/Checks/CacheHeadersCheck.php
+++ b/src/Checks/CacheHeadersCheck.php
@@ -4,7 +4,7 @@
 
 use SilverStripe\Control\Director;
 use SilverStripe\Control\Controller;
-use SilverStripe\ORM\ValidationResult;
+use SilverStripe\Core\Validation\ValidationResult;
 use Psr\Http\Message\ResponseInterface;
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\EnvironmentCheck\Traits\Fetcher;
diff --git a/src/EnvironmentCheckSuiteResult.php b/src/EnvironmentCheckSuiteResult.php
index aa61dcc..ae9e167 100644
--- a/src/EnvironmentCheckSuiteResult.php
+++ b/src/EnvironmentCheckSuiteResult.php
@@ -3,16 +3,16 @@
 namespace SilverStripe\EnvironmentCheck;
 
 use InvalidArgumentException;
-use SilverStripe\ORM\ArrayList;
-use SilverStripe\View\ArrayData;
-use SilverStripe\View\ViewableData;
+use SilverStripe\Model\List\ArrayList;
+use SilverStripe\Model\ArrayData;
+use SilverStripe\Model\ModelData;
 
 /**
  * A single set of results from running an EnvironmentCheckSuite
  *
  * @package environmentcheck
  */
-class EnvironmentCheckSuiteResult extends ViewableData
+class EnvironmentCheckSuiteResult extends ModelData
 {
     /**
      * @var ArrayList