diff --git a/src/B8Framework/Controller.php b/src/B8Framework/Controller.php
index 325271b8..e199f5ad 100644
--- a/src/B8Framework/Controller.php
+++ b/src/B8Framework/Controller.php
@@ -4,6 +4,7 @@ namespace b8;
 
 use b8\Http\Request;
 use b8\Http\Response;
+use PHPCensor\View;
 
 abstract class Controller
 {
diff --git a/src/B8Framework/Database.php b/src/PHPCensor/Database.php
similarity index 98%
rename from src/B8Framework/Database.php
rename to src/PHPCensor/Database.php
index 996076ba..3decd58b 100644
--- a/src/B8Framework/Database.php
+++ b/src/PHPCensor/Database.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace b8;
+namespace PHPCensor;
+
+use b8\Config;
 
 class Database extends \PDO
 {
@@ -76,7 +78,7 @@ class Database extends \PDO
     /**
      * @param string $type
      *
-     * @return \b8\Database
+     * @return Database
      *
      * @throws \Exception
      */
diff --git a/src/PHPCensor/Plugin/Mysql.php b/src/PHPCensor/Plugin/Mysql.php
index d80b2c78..02f36cef 100644
--- a/src/PHPCensor/Plugin/Mysql.php
+++ b/src/PHPCensor/Plugin/Mysql.php
@@ -6,7 +6,7 @@ use PDO;
 use PHPCensor\Builder;
 use PHPCensor\Model\Build;
 use PHPCensor\Plugin;
-use b8\Database;
+use PHPCensor\Database;
 
 /**
  * MySQL Plugin - Provides access to a MySQL database.
diff --git a/src/PHPCensor/Store.php b/src/PHPCensor/Store.php
index b4dd9abd..53604050 100644
--- a/src/PHPCensor/Store.php
+++ b/src/PHPCensor/Store.php
@@ -2,8 +2,6 @@
 
 namespace PHPCensor;
 
-use b8\Database;
-
 abstract class Store
 {
     /**
diff --git a/src/PHPCensor/Store/BuildErrorStore.php b/src/PHPCensor/Store/BuildErrorStore.php
index b13ede4a..134661c3 100644
--- a/src/PHPCensor/Store/BuildErrorStore.php
+++ b/src/PHPCensor/Store/BuildErrorStore.php
@@ -2,7 +2,7 @@
 
 namespace PHPCensor\Store;
 
-use b8\Database;
+use PHPCensor\Database;
 use PHPCensor\Model\BuildError;
 use b8\Exception\HttpException;
 use PHPCensor\Store;
diff --git a/src/PHPCensor/Store/BuildErrorWriter.php b/src/PHPCensor/Store/BuildErrorWriter.php
index df03a369..3fe2d5ed 100644
--- a/src/PHPCensor/Store/BuildErrorWriter.php
+++ b/src/PHPCensor/Store/BuildErrorWriter.php
@@ -3,7 +3,7 @@
 namespace PHPCensor\Store;
 
 use b8\Config;
-use b8\Database;
+use PHPCensor\Database;
 use PHPCensor\Model\BuildError;
 
 /**
diff --git a/src/PHPCensor/Store/BuildMetaStore.php b/src/PHPCensor/Store/BuildMetaStore.php
index 08529889..8aabf59e 100644
--- a/src/PHPCensor/Store/BuildMetaStore.php
+++ b/src/PHPCensor/Store/BuildMetaStore.php
@@ -3,7 +3,7 @@
 namespace PHPCensor\Store;
 
 use PHPCensor\Store;
-use b8\Database;
+use PHPCensor\Database;
 use PHPCensor\Model\BuildMeta;
 use b8\Exception\HttpException;
 
diff --git a/src/PHPCensor/Store/BuildStore.php b/src/PHPCensor/Store/BuildStore.php
index 5edb0ae7..de2c3f1f 100644
--- a/src/PHPCensor/Store/BuildStore.php
+++ b/src/PHPCensor/Store/BuildStore.php
@@ -2,7 +2,7 @@
 
 namespace PHPCensor\Store;
 
-use b8\Database;
+use PHPCensor\Database;
 use PHPCensor\Model\Build;
 use b8\Exception\HttpException;
 use PHPCensor\Model\BuildMeta;
diff --git a/src/PHPCensor/Store/EnvironmentStore.php b/src/PHPCensor/Store/EnvironmentStore.php
index 8bee7f08..0fa60cb4 100644
--- a/src/PHPCensor/Store/EnvironmentStore.php
+++ b/src/PHPCensor/Store/EnvironmentStore.php
@@ -2,7 +2,7 @@
 
 namespace PHPCensor\Store;
 
-use b8\Database;
+use PHPCensor\Database;
 use PHPCensor\Model\Environment;
 use PHPCensor\Store;
 use b8\Exception\HttpException;
diff --git a/src/PHPCensor/Store/ProjectGroupStore.php b/src/PHPCensor/Store/ProjectGroupStore.php
index c53c8e17..5d004569 100644
--- a/src/PHPCensor/Store/ProjectGroupStore.php
+++ b/src/PHPCensor/Store/ProjectGroupStore.php
@@ -2,7 +2,7 @@
 
 namespace PHPCensor\Store;
 
-use b8\Database;
+use PHPCensor\Database;
 use b8\Exception\HttpException;
 use PHPCensor\Store;
 use PHPCensor\Model\ProjectGroup;
diff --git a/src/PHPCensor/Store/ProjectStore.php b/src/PHPCensor/Store/ProjectStore.php
index b0473208..7c35da61 100644
--- a/src/PHPCensor/Store/ProjectStore.php
+++ b/src/PHPCensor/Store/ProjectStore.php
@@ -2,7 +2,7 @@
 
 namespace PHPCensor\Store;
 
-use b8\Database;
+use PHPCensor\Database;
 use PHPCensor\Model\Project;
 use PHPCensor\Store;
 use b8\Exception\HttpException;
diff --git a/src/PHPCensor/Store/UserStore.php b/src/PHPCensor/Store/UserStore.php
index 8bb75a7b..7d8aa55b 100644
--- a/src/PHPCensor/Store/UserStore.php
+++ b/src/PHPCensor/Store/UserStore.php
@@ -3,7 +3,7 @@
 namespace PHPCensor\Store;
 
 use PHPCensor\Store;
-use b8\Database;
+use PHPCensor\Database;
 use b8\Exception\HttpException;
 use PHPCensor\Model\User;
 
diff --git a/tests/B8Framework/DatabaseMysqlTest.php b/tests/PHPCensor/DatabaseMysqlTest.php
similarity index 95%
rename from tests/B8Framework/DatabaseMysqlTest.php
rename to tests/PHPCensor/DatabaseMysqlTest.php
index 5810bdcf..6a52b2f2 100755
--- a/tests/B8Framework/DatabaseMysqlTest.php
+++ b/tests/PHPCensor/DatabaseMysqlTest.php
@@ -3,7 +3,7 @@
 namespace Tests\b8;
 
 use b8\Config;
-use b8\Database;
+use PHPCensor\Database;
 
 class DatabaseMysqlTest extends \PHPUnit_Extensions_Database_TestCase
 {
@@ -117,8 +117,8 @@ class DatabaseMysqlTest extends \PHPUnit_Extensions_Database_TestCase
         $writeConnection = Database::getConnection('write');
         $readConnection  = Database::getConnection('read');
 
-        self::assertInstanceOf('\b8\Database', $writeConnection);
-        self::assertInstanceOf('\b8\Database', $readConnection);
+        self::assertInstanceOf('\PHPCensor\Database', $writeConnection);
+        self::assertInstanceOf('\PHPCensor\Database', $readConnection);
 
         $writeDetails = $writeConnection->getDetails();
 
@@ -168,8 +168,8 @@ class DatabaseMysqlTest extends \PHPUnit_Extensions_Database_TestCase
         $writeConnection = Database::getConnection('write');
         $readConnection  = Database::getConnection('read');
 
-        self::assertInstanceOf('\b8\Database', $writeConnection);
-        self::assertInstanceOf('\b8\Database', $readConnection);
+        self::assertInstanceOf('\PHPCensor\Database', $writeConnection);
+        self::assertInstanceOf('\PHPCensor\Database', $readConnection);
 
         self::assertEquals('mysql:host=localhost;port=3306;dbname=b8_test', $readConnection->getDsn());
     }
diff --git a/tests/B8Framework/DatabasePostgresqlTest.php b/tests/PHPCensor/DatabasePostgresqlTest.php
similarity index 95%
rename from tests/B8Framework/DatabasePostgresqlTest.php
rename to tests/PHPCensor/DatabasePostgresqlTest.php
index 6ccee80f..721af120 100755
--- a/tests/B8Framework/DatabasePostgresqlTest.php
+++ b/tests/PHPCensor/DatabasePostgresqlTest.php
@@ -3,7 +3,7 @@
 namespace Tests\b8;
 
 use b8\Config;
-use b8\Database;
+use PHPCensor\Database;
 
 class DatabasePostgresqlTest extends \PHPUnit_Extensions_Database_TestCase
 {
@@ -117,8 +117,8 @@ class DatabasePostgresqlTest extends \PHPUnit_Extensions_Database_TestCase
         $writeConnection = Database::getConnection('write');
         $readConnection  = Database::getConnection('read');
 
-        self::assertInstanceOf('\b8\Database', $writeConnection);
-        self::assertInstanceOf('\b8\Database', $readConnection);
+        self::assertInstanceOf('\PHPCensor\Database', $writeConnection);
+        self::assertInstanceOf('\PHPCensor\Database', $readConnection);
 
         $writeDetails = $writeConnection->getDetails();
 
@@ -168,8 +168,8 @@ class DatabasePostgresqlTest extends \PHPUnit_Extensions_Database_TestCase
         $writeConnection = Database::getConnection('write');
         $readConnection  = Database::getConnection('read');
 
-        self::assertInstanceOf('\b8\Database', $writeConnection);
-        self::assertInstanceOf('\b8\Database', $readConnection);
+        self::assertInstanceOf('\PHPCensor\Database', $writeConnection);
+        self::assertInstanceOf('\PHPCensor\Database', $readConnection);
 
         self::assertEquals('pgsql:host=localhost;port=5432;dbname=b8_test', $readConnection->getDsn());
     }
diff --git a/tests/PHPCensor/StoreMysqlTest.php b/tests/PHPCensor/StoreMysqlTest.php
index 26235ed5..18f7e3b2 100755
--- a/tests/PHPCensor/StoreMysqlTest.php
+++ b/tests/PHPCensor/StoreMysqlTest.php
@@ -3,7 +3,7 @@
 namespace Tests\PHPCensor;
 
 use b8\Config;
-use b8\Database;
+use PHPCensor\Database;
 use PHPCensor\Store\Factory;
 use PHPCensor\Model\Project;
 use PHPCensor\Model\ProjectGroup;
diff --git a/tests/PHPCensor/StorePostgresqlTest.php b/tests/PHPCensor/StorePostgresqlTest.php
index 1bfb7973..fd2f26f7 100755
--- a/tests/PHPCensor/StorePostgresqlTest.php
+++ b/tests/PHPCensor/StorePostgresqlTest.php
@@ -3,7 +3,7 @@
 namespace Tests\PHPCensor;
 
 use b8\Config;
-use b8\Database;
+use PHPCensor\Database;
 use PHPCensor\Store\Factory;
 use PHPCensor\Model\Project;
 use PHPCensor\Model\ProjectGroup;