diff --git a/code/TestSessionController.php b/code/TestSessionController.php
index 4191482..46fa667 100644
--- a/code/TestSessionController.php
+++ b/code/TestSessionController.php
@@ -3,7 +3,7 @@
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\Director;
 use SilverStripe\Control\Session;
-use SilverStripe\Control\SS_HTTPRequest;
+use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Dev\Deprecation;
 use SilverStripe\Dev\SapphireTest;
@@ -163,7 +163,7 @@ class TestSessionController extends Controller
     /**
      * Set $_SESSION state for the current browser session.
      *
-     * @param SS_HTTPRequest $request
+     * @param HTTPRequest $request
      */
     public function browsersessionstate($request)
     {
diff --git a/code/TestSessionRequestFilter.php b/code/TestSessionRequestFilter.php
index 88fd748..70ea3d3 100644
--- a/code/TestSessionRequestFilter.php
+++ b/code/TestSessionRequestFilter.php
@@ -4,12 +4,13 @@ use SilverStripe\ORM\DataModel;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\ORM\DB;
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\Control\SS_HTTPRequest;
 use SilverStripe\Control\Session;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Control\Director;
-use SilverStripe\Control\SS_HTTPResponse;
 use SilverStripe\Control\RequestFilter;
+use SilverStripe\Control\HTTPRequest;
+use SilverStripe\Control\HTTPResponse;
+
 
 
 /**
@@ -28,7 +29,7 @@ class TestSessionRequestFilter implements RequestFilter
         $this->testSessionEnvironment = Injector::inst()->get('TestSessionEnvironment');
     }
 
-    public function preRequest(SS_HTTPRequest $request, Session $session, DataModel $model)
+    public function preRequest(HTTPRequest $request, Session $session, DataModel $model)
     {
         if (!$this->testSessionEnvironment->isRunningTests()) {
             return;
@@ -66,7 +67,7 @@ class TestSessionRequestFilter implements RequestFilter
         }
     }
 
-    public function postRequest(SS_HTTPRequest $request, SS_HTTPResponse $response, DataModel $model)
+    public function postRequest(HTTPRequest $request, HTTPResponse $response, DataModel $model)
     {
         if (!$this->testSessionEnvironment->isRunningTests()) {
             return;