diff --git a/_register_database.php b/_register_database.php
index a90d1ba..938f179 100644
--- a/_register_database.php
+++ b/_register_database.php
@@ -1,5 +1,7 @@
 <?php
 
+use SilverStripe\Dev\Install\DatabaseAdapterRegistry;
+
 // PDO Postgre database
 DatabaseAdapterRegistry::register(array(
     /** @skipUpgrade */
diff --git a/code/PostgreSQLDatabase.php b/code/PostgreSQLDatabase.php
index 146360d..447e2db 100644
--- a/code/PostgreSQLDatabase.php
+++ b/code/PostgreSQLDatabase.php
@@ -2,15 +2,15 @@
 
 namespace SilverStripe\PostgreSQL;
 
-use Injector;
-use SilverStripe\Framework\Core\Configurable;
+use SilverStripe\Core\Config\Configurable;
+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\PaginatedList;
 use ErrorException;
 use Exception;
-use PaginatedList;
 
 /**
  * PostgreSQL connector class.
@@ -396,7 +396,7 @@ class PostgreSQLDatabase extends SS_Database
 
         // Make column selection lists
         $pageClass = 'SilverStripe\\CMS\\Model\\SiteTree';
-        $fileClass = 'File';
+        $fileClass = 'SilverStripe\\Assets\\File';
         $select = array(
             $pageClass => array(
                 '"ClassName"',
diff --git a/code/PostgreSQLDatabaseConfigurationHelper.php b/code/PostgreSQLDatabaseConfigurationHelper.php
index 828ffb6..9edce3b 100644
--- a/code/PostgreSQLDatabaseConfigurationHelper.php
+++ b/code/PostgreSQLDatabaseConfigurationHelper.php
@@ -2,10 +2,10 @@
 
 namespace SilverStripe\PostgreSQL;
 
-use DatabaseConfigurationHelper;
-use PDO;
+use SilverStripe\Dev\Install\DatabaseAdapterRegistry;
+use SilverStripe\Dev\Install\DatabaseConfigurationHelper;
 use Exception;
-use DatabaseAdapterRegistry;
+use PDO;
 
 /**
  * This is a helper class for the SS installer.
diff --git a/code/PostgreSQLSchemaManager.php b/code/PostgreSQLSchemaManager.php
index a45c729..eb251ee 100644
--- a/code/PostgreSQLSchemaManager.php
+++ b/code/PostgreSQLSchemaManager.php
@@ -2,9 +2,9 @@
 
 namespace SilverStripe\PostgreSQL;
 
+use SilverStripe\Dev\Deprecation;
 use SilverStripe\ORM\Connect\DBSchemaManager;
 use SilverStripe\ORM\DB;
-use Deprecation;
 
 /**
  * PostgreSQL schema manager
diff --git a/tests/PostgreSQLConnectorTest.php b/tests/PostgreSQLConnectorTest.php
index 82653e5..dd97262 100644
--- a/tests/PostgreSQLConnectorTest.php
+++ b/tests/PostgreSQLConnectorTest.php
@@ -1,12 +1,8 @@
 <?php
 
+use SilverStripe\Dev\SapphireTest;
 use SilverStripe\PostgreSQL\PostgreSQLConnector;
 
-/**
- * Description of PostgreSQLConnectorTest
- *
- * @author Damian
- */
 class PostgreSQLConnectorTest extends SapphireTest
 {
     public function testSubstitutesPlaceholders()
diff --git a/tests/PostgreSQLDatabaseTest.php b/tests/PostgreSQLDatabaseTest.php
index 0331ad0..947c99e 100644
--- a/tests/PostgreSQLDatabaseTest.php
+++ b/tests/PostgreSQLDatabaseTest.php
@@ -1,7 +1,8 @@
 <?php
 
-use SilverStripe\ORM\DB;
+use SilverStripe\Dev\SapphireTest;
 use SilverStripe\ORM\DataObject;
+use SilverStripe\ORM\DB;
 use SilverStripe\PostgreSQL\PostgreSQLDatabase;
 
 /**