diff --git a/src/B8Framework/Exception/HttpException/ServerErrorException.php b/src/B8Framework/Exception/HttpException/ServerErrorException.php
deleted file mode 100644
index 34ec1e84..00000000
--- a/src/B8Framework/Exception/HttpException/ServerErrorException.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace b8\Exception\HttpException;
-
-use b8\Exception\HttpException;
-
-class ServerErrorException extends HttpException
-{
-}
diff --git a/src/PHPCensor/Application.php b/src/PHPCensor/Application.php
index fe2adca6..e652edb2 100644
--- a/src/PHPCensor/Application.php
+++ b/src/PHPCensor/Application.php
@@ -2,11 +2,11 @@
 
 namespace PHPCensor;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 use b8\Http\Response;
 use b8\Http\Response\RedirectResponse;
 use PHPCensor\Store\Factory;
-use b8\Exception\HttpException\NotFoundException;
+use PHPCensor\Exception\HttpException\NotFoundException;
 use b8\Http\Request;
 use b8\Http\Router;
 
diff --git a/src/PHPCensor/Controller.php b/src/PHPCensor/Controller.php
index c2905ba9..fc8b4ea4 100644
--- a/src/PHPCensor/Controller.php
+++ b/src/PHPCensor/Controller.php
@@ -2,7 +2,7 @@
 
 namespace PHPCensor;
 
-use b8\Exception\HttpException\ForbiddenException;
+use PHPCensor\Exception\HttpException\ForbiddenException;
 use b8\Http\Request;
 use b8\Http\Response;
 use PHPCensor\Store\Factory;
diff --git a/src/PHPCensor/Controller/BuildController.php b/src/PHPCensor/Controller/BuildController.php
index 28b97d07..8d28224c 100644
--- a/src/PHPCensor/Controller/BuildController.php
+++ b/src/PHPCensor/Controller/BuildController.php
@@ -2,8 +2,7 @@
 
 namespace PHPCensor\Controller;
 
-use b8;
-use b8\Exception\HttpException\NotFoundException;
+use PHPCensor\Exception\HttpException\NotFoundException;
 use b8\Http\Response\JsonResponse;
 use JasonGrimes\Paginator;
 use PHPCensor\BuildFactory;
diff --git a/src/PHPCensor/Controller/BuildStatusController.php b/src/PHPCensor/Controller/BuildStatusController.php
index a8d42004..36ab3a73 100644
--- a/src/PHPCensor/Controller/BuildStatusController.php
+++ b/src/PHPCensor/Controller/BuildStatusController.php
@@ -2,8 +2,9 @@
 
 namespace PHPCensor\Controller;
 
-use b8;
-use b8\Exception\HttpException\NotFoundException;
+use b8\Http\Response;
+use b8\Http\Response\RedirectResponse;
+use PHPCensor\Exception\HttpException\NotFoundException;
 use PHPCensor\Store\Factory;
 use PHPCensor\BuildFactory;
 use PHPCensor\Model\Project;
@@ -76,7 +77,6 @@ class BuildStatusController extends Controller
      * @return bool
      *
      * @throws \Exception
-     * @throws b8\Exception\HttpException
      */
     public function ccxml($projectId)
     {
@@ -131,7 +131,7 @@ class BuildStatusController extends Controller
      *
      * @param $projectId
      *
-     * @return b8\Http\Response|b8\Http\Response\RedirectResponse
+     * @return Response
      */
     public function image($projectId)
     {
@@ -149,7 +149,7 @@ class BuildStatusController extends Controller
         $status = $this->getStatus($projectId);
 
         if (is_null($status)) {
-            $response = new b8\Http\Response\RedirectResponse();
+            $response = new RedirectResponse();
             $response->setHeader('Location', '/');
 
             return $response;
@@ -182,6 +182,7 @@ class BuildStatusController extends Controller
         $this->response->disableLayout();
         $this->response->setHeader('Content-Type', 'image/svg+xml');
         $this->response->setContent($image);
+
         return $this->response;
     }
 
@@ -192,7 +193,7 @@ class BuildStatusController extends Controller
      *
      * @return string
      *
-     * @throws \b8\Exception\HttpException\NotFoundException
+     * @throws NotFoundException
      */
     public function view($projectId)
     {
diff --git a/src/PHPCensor/Controller/ProjectController.php b/src/PHPCensor/Controller/ProjectController.php
index c222c43f..5db12a36 100644
--- a/src/PHPCensor/Controller/ProjectController.php
+++ b/src/PHPCensor/Controller/ProjectController.php
@@ -2,8 +2,7 @@
 
 namespace PHPCensor\Controller;
 
-use b8;
-use b8\Exception\HttpException\NotFoundException;
+use PHPCensor\Exception\HttpException\NotFoundException;
 use b8\Form;
 use JasonGrimes\Paginator;
 use PHPCensor;
diff --git a/src/PHPCensor/Controller/UserController.php b/src/PHPCensor/Controller/UserController.php
index 2395754f..c7df2325 100644
--- a/src/PHPCensor/Controller/UserController.php
+++ b/src/PHPCensor/Controller/UserController.php
@@ -3,7 +3,7 @@
 namespace PHPCensor\Controller;
 
 use PHPCensor\Config;
-use b8\Exception\HttpException\NotFoundException;
+use PHPCensor\Exception\HttpException\NotFoundException;
 use b8\Form;
 use PHPCensor\Controller;
 use PHPCensor\Helper\Lang;
diff --git a/src/PHPCensor/Controller/WebhookController.php b/src/PHPCensor/Controller/WebhookController.php
index abaae725..c43e0635 100644
--- a/src/PHPCensor/Controller/WebhookController.php
+++ b/src/PHPCensor/Controller/WebhookController.php
@@ -2,7 +2,6 @@
 
 namespace PHPCensor\Controller;
 
-use b8;
 use Exception;
 use GuzzleHttp\Client;
 use PHPCensor\Helper\Lang;
@@ -13,7 +12,7 @@ use PHPCensor\Store\BuildStore;
 use PHPCensor\Store\ProjectStore;
 use PHPCensor\Controller;
 use PHPCensor\Config;
-use b8\Exception\HttpException\NotFoundException;
+use PHPCensor\Exception\HttpException\NotFoundException;
 use PHPCensor\Store\Factory;
 use b8\Http\Request;
 use b8\Http\Response;
@@ -75,7 +74,7 @@ class WebhookController extends Controller
      */
     public function handleAction($action, $actionParams)
     {
-        $response = new b8\Http\Response\JsonResponse();
+        $response = new Response\JsonResponse();
         try {
             $data = call_user_func_array([$this, $action], $actionParams);
             if (isset($data['responseCode'])) {
diff --git a/src/B8Framework/Exception/HttpException.php b/src/PHPCensor/Exception/HttpException.php
similarity index 95%
rename from src/B8Framework/Exception/HttpException.php
rename to src/PHPCensor/Exception/HttpException.php
index 4c266213..ba2637d7 100644
--- a/src/B8Framework/Exception/HttpException.php
+++ b/src/PHPCensor/Exception/HttpException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace b8\Exception;
+namespace PHPCensor\Exception;
 
 class HttpException extends \Exception
 {
diff --git a/src/B8Framework/Exception/HttpException/BadRequestException.php b/src/PHPCensor/Exception/HttpException/BadRequestException.php
similarity index 71%
rename from src/B8Framework/Exception/HttpException/BadRequestException.php
rename to src/PHPCensor/Exception/HttpException/BadRequestException.php
index ec30b8e5..5e3afec7 100644
--- a/src/B8Framework/Exception/HttpException/BadRequestException.php
+++ b/src/PHPCensor/Exception/HttpException/BadRequestException.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace b8\Exception\HttpException;
+namespace PHPCensor\Exception\HttpException;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class BadRequestException extends HttpException
 {
diff --git a/src/B8Framework/Exception/HttpException/ForbiddenException.php b/src/PHPCensor/Exception/HttpException/ForbiddenException.php
similarity index 71%
rename from src/B8Framework/Exception/HttpException/ForbiddenException.php
rename to src/PHPCensor/Exception/HttpException/ForbiddenException.php
index 1fe357da..83bdb5c3 100644
--- a/src/B8Framework/Exception/HttpException/ForbiddenException.php
+++ b/src/PHPCensor/Exception/HttpException/ForbiddenException.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace b8\Exception\HttpException;
+namespace PHPCensor\Exception\HttpException;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class ForbiddenException extends HttpException
 {
diff --git a/src/B8Framework/Exception/HttpException/NotAuthorizedException.php b/src/PHPCensor/Exception/HttpException/NotAuthorizedException.php
similarity index 72%
rename from src/B8Framework/Exception/HttpException/NotAuthorizedException.php
rename to src/PHPCensor/Exception/HttpException/NotAuthorizedException.php
index f1e44586..462fdc68 100644
--- a/src/B8Framework/Exception/HttpException/NotAuthorizedException.php
+++ b/src/PHPCensor/Exception/HttpException/NotAuthorizedException.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace b8\Exception\HttpException;
+namespace PHPCensor\Exception\HttpException;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class NotAuthorizedException extends HttpException
 {
diff --git a/src/B8Framework/Exception/HttpException/NotFoundException.php b/src/PHPCensor/Exception/HttpException/NotFoundException.php
similarity index 71%
rename from src/B8Framework/Exception/HttpException/NotFoundException.php
rename to src/PHPCensor/Exception/HttpException/NotFoundException.php
index 883d74a7..135116c9 100644
--- a/src/B8Framework/Exception/HttpException/NotFoundException.php
+++ b/src/PHPCensor/Exception/HttpException/NotFoundException.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace b8\Exception\HttpException;
+namespace PHPCensor\Exception\HttpException;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class NotFoundException extends HttpException
 {
diff --git a/src/PHPCensor/Exception/HttpException/ServerErrorException.php b/src/PHPCensor/Exception/HttpException/ServerErrorException.php
new file mode 100644
index 00000000..7568b4b7
--- /dev/null
+++ b/src/PHPCensor/Exception/HttpException/ServerErrorException.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPCensor\Exception\HttpException;
+
+use PHPCensor\Exception\HttpException;
+
+class ServerErrorException extends HttpException
+{
+}
diff --git a/src/B8Framework/Exception/HttpException/ValidationException.php b/src/PHPCensor/Exception/HttpException/ValidationException.php
similarity index 71%
rename from src/B8Framework/Exception/HttpException/ValidationException.php
rename to src/PHPCensor/Exception/HttpException/ValidationException.php
index 4714e5c0..3bdda75c 100644
--- a/src/B8Framework/Exception/HttpException/ValidationException.php
+++ b/src/PHPCensor/Exception/HttpException/ValidationException.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace b8\Exception\HttpException;
+namespace PHPCensor\Exception\HttpException;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class ValidationException extends HttpException
 {
diff --git a/src/PHPCensor/Model.php b/src/PHPCensor/Model.php
index ba72d19d..ac51dbb2 100644
--- a/src/PHPCensor/Model.php
+++ b/src/PHPCensor/Model.php
@@ -2,7 +2,7 @@
 
 namespace PHPCensor;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException\ValidationException;
 
 class Model
 {
@@ -87,12 +87,12 @@ class Model
      * @param string $name
      * @param mixed  $value
      *
-     * @throws HttpException\ValidationException
+     * @throws ValidationException
      */
     protected function validateString($name, $value)
     {
         if (!is_string($value) && !is_null($value)) {
-            throw new HttpException\ValidationException('Column "' . $name . '" must be a string.');
+            throw new ValidationException('Column "' . $name . '" must be a string.');
         }
     }
 
@@ -100,12 +100,12 @@ class Model
      * @param string $name
      * @param mixed  $value
      *
-     * @throws HttpException\ValidationException
+     * @throws ValidationException
      */
     protected function validateInt($name, $value)
     {
         if (!is_integer($value) && !is_null($value)) {
-            throw new HttpException\ValidationException('Column "' . $name . '" must be an integer.');
+            throw new ValidationException('Column "' . $name . '" must be an integer.');
         }
     }
 
@@ -113,12 +113,12 @@ class Model
      * @param string $name
      * @param mixed  $value
      *
-     * @throws HttpException\ValidationException
+     * @throws ValidationException
      */
     protected function validateNotNull($name, $value)
     {
         if (is_null($value)) {
-            throw new HttpException\ValidationException('Column "' . $name . '" must not be null.');
+            throw new ValidationException('Column "' . $name . '" must not be null.');
         }
     }
 }
diff --git a/src/PHPCensor/Store/BuildErrorStore.php b/src/PHPCensor/Store/BuildErrorStore.php
index 134661c3..c5bda60e 100644
--- a/src/PHPCensor/Store/BuildErrorStore.php
+++ b/src/PHPCensor/Store/BuildErrorStore.php
@@ -4,7 +4,7 @@ namespace PHPCensor\Store;
 
 use PHPCensor\Database;
 use PHPCensor\Model\BuildError;
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 use PHPCensor\Store;
 
 class BuildErrorStore extends Store
diff --git a/src/PHPCensor/Store/BuildMetaStore.php b/src/PHPCensor/Store/BuildMetaStore.php
index 8aabf59e..abf75cb9 100644
--- a/src/PHPCensor/Store/BuildMetaStore.php
+++ b/src/PHPCensor/Store/BuildMetaStore.php
@@ -5,7 +5,7 @@ namespace PHPCensor\Store;
 use PHPCensor\Store;
 use PHPCensor\Database;
 use PHPCensor\Model\BuildMeta;
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class BuildMetaStore extends Store
 {
diff --git a/src/PHPCensor/Store/BuildStore.php b/src/PHPCensor/Store/BuildStore.php
index de2c3f1f..9e15613d 100644
--- a/src/PHPCensor/Store/BuildStore.php
+++ b/src/PHPCensor/Store/BuildStore.php
@@ -4,7 +4,7 @@ namespace PHPCensor\Store;
 
 use PHPCensor\Database;
 use PHPCensor\Model\Build;
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 use PHPCensor\Model\BuildMeta;
 use PHPCensor\Store;
 
diff --git a/src/PHPCensor/Store/EnvironmentStore.php b/src/PHPCensor/Store/EnvironmentStore.php
index 0fa60cb4..ec206b5b 100644
--- a/src/PHPCensor/Store/EnvironmentStore.php
+++ b/src/PHPCensor/Store/EnvironmentStore.php
@@ -5,7 +5,7 @@ namespace PHPCensor\Store;
 use PHPCensor\Database;
 use PHPCensor\Model\Environment;
 use PHPCensor\Store;
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class EnvironmentStore extends Store
 {
diff --git a/src/PHPCensor/Store/ProjectGroupStore.php b/src/PHPCensor/Store/ProjectGroupStore.php
index 5d004569..2e1d4a05 100644
--- a/src/PHPCensor/Store/ProjectGroupStore.php
+++ b/src/PHPCensor/Store/ProjectGroupStore.php
@@ -3,7 +3,7 @@
 namespace PHPCensor\Store;
 
 use PHPCensor\Database;
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 use PHPCensor\Store;
 use PHPCensor\Model\ProjectGroup;
 
diff --git a/src/PHPCensor/Store/ProjectStore.php b/src/PHPCensor/Store/ProjectStore.php
index 7c35da61..e2127fed 100644
--- a/src/PHPCensor/Store/ProjectStore.php
+++ b/src/PHPCensor/Store/ProjectStore.php
@@ -5,7 +5,7 @@ namespace PHPCensor\Store;
 use PHPCensor\Database;
 use PHPCensor\Model\Project;
 use PHPCensor\Store;
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 /**
  * @author Dan Cryer <dan@block8.co.uk>
diff --git a/src/PHPCensor/Store/UserStore.php b/src/PHPCensor/Store/UserStore.php
index 7d8aa55b..b397f090 100644
--- a/src/PHPCensor/Store/UserStore.php
+++ b/src/PHPCensor/Store/UserStore.php
@@ -4,7 +4,7 @@ namespace PHPCensor\Store;
 
 use PHPCensor\Store;
 use PHPCensor\Database;
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 use PHPCensor\Model\User;
 
 /**
diff --git a/tests/PHPCensor/DatabaseMysqlTest.php b/tests/PHPCensor/DatabaseMysqlTest.php
index 6e4d7613..b5662cf8 100755
--- a/tests/PHPCensor/DatabaseMysqlTest.php
+++ b/tests/PHPCensor/DatabaseMysqlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\b8;
+namespace Tests\PHPCensor;
 
 use PHPCensor\Config;
 use PHPCensor\Database;
diff --git a/tests/PHPCensor/DatabasePostgresqlTest.php b/tests/PHPCensor/DatabasePostgresqlTest.php
index e89b0c18..b6e4df52 100755
--- a/tests/PHPCensor/DatabasePostgresqlTest.php
+++ b/tests/PHPCensor/DatabasePostgresqlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\b8;
+namespace Tests\PHPCensor;
 
 use PHPCensor\Config;
 use PHPCensor\Database;
diff --git a/tests/B8Framework/HttpExceptionTest.php b/tests/PHPCensor/HttpExceptionTest.php
similarity index 97%
rename from tests/B8Framework/HttpExceptionTest.php
rename to tests/PHPCensor/HttpExceptionTest.php
index 98fd2319..b328870a 100755
--- a/tests/B8Framework/HttpExceptionTest.php
+++ b/tests/PHPCensor/HttpExceptionTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\b8;
+namespace Tests\PHPCensor;
 
-use b8\Exception\HttpException;
+use PHPCensor\Exception\HttpException;
 
 class HttpExceptionTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/tests/PHPCensor/Model/BuildTest.php b/tests/PHPCensor/Model/BuildTest.php
index 57817e45..02ae078f 100644
--- a/tests/PHPCensor/Model/BuildTest.php
+++ b/tests/PHPCensor/Model/BuildTest.php
@@ -2,9 +2,8 @@
 
 namespace Tests\PHPCensor\Model;
 
-use b8\Exception\HttpException\ValidationException;
+use PHPCensor\Exception\HttpException\ValidationException;
 use PHPCensor\Model\Build;
-use PHPCensor\Model;
 
 /**
  * Unit tests for the Build model class.