diff --git a/code/PostgreSQLDatabase.php b/code/PostgreSQLDatabase.php
index 447e2db..dee99f9 100644
--- a/code/PostgreSQLDatabase.php
+++ b/code/PostgreSQLDatabase.php
@@ -7,7 +7,7 @@ use SilverStripe\Core\Injector\Injector;
 use SilverStripe\ORM\DB;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\ArrayList;
-use SilverStripe\ORM\Connect\SS_Database;
+use SilverStripe\ORM\Connect\Database;
 use SilverStripe\ORM\PaginatedList;
 use ErrorException;
 use Exception;
@@ -18,7 +18,7 @@ use Exception;
  * @package sapphire
  * @subpackage model
  */
-class PostgreSQLDatabase extends SS_Database
+class PostgreSQLDatabase extends Database
 {
     use Configurable;
 
diff --git a/code/PostgreSQLQuery.php b/code/PostgreSQLQuery.php
index 811c610..a6f7061 100644
--- a/code/PostgreSQLQuery.php
+++ b/code/PostgreSQLQuery.php
@@ -2,7 +2,7 @@
 
 namespace SilverStripe\PostgreSQL;
 
-use SilverStripe\ORM\Connect\SS_Query;
+use SilverStripe\ORM\Connect\Query;
 
 /**
  * A result-set from a PostgreSQL database.
@@ -10,7 +10,7 @@ use SilverStripe\ORM\Connect\SS_Query;
  * @package sapphire
  * @subpackage model
  */
-class PostgreSQLQuery extends SS_Query
+class PostgreSQLQuery extends Query
 {
     /**
      * The internal Postgres handle that points to the result set.