diff --git a/.gitignore b/.gitignore
index 39844871..321de2a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@
 /app/loggerconfig.php
 /app/pluginconfig.php
 /app/config.yml
-/tests/PHPCI/config.yml
diff --git a/app/phinx.php b/app/phinx.php
index 687b9249..6b901faa 100644
--- a/app/phinx.php
+++ b/app/phinx.php
@@ -18,7 +18,7 @@ if (!is_array($writeServers)) {
 
 $conf = [
     'paths' => [
-        'migrations' => 'src/PHPCI/Migrations',
+        'migrations' => 'src/PHPCensor/Migrations',
     ],
     'environments'                => [
         'default_migration_table' => 'migration',
diff --git a/app/pluginconfig.example.php b/app/pluginconfig.example.php
index ac5f7724..538d30ff 100644
--- a/app/pluginconfig.example.php
+++ b/app/pluginconfig.example.php
@@ -1,6 +1,6 @@
 <?php
 
-return function (PHPCI\Plugin\Util\Factory $factory) {
+return function (PHPCensor\Plugin\Util\Factory $factory) {
     $factory->registerResource(
         // This function will be called when the resource is needed.
         function() {
@@ -18,6 +18,6 @@ return function (PHPCI\Plugin\Util\Factory $factory) {
         "ResourceArray",
 
         // The resource will only be given when the type hint is:
-        PHPCI\Plugin\Util\Factory::TYPE_ARRAY
+        PHPCensor\Plugin\Util\Factory::TYPE_ARRAY
     );
 };
diff --git a/bin/console b/bin/console
index c6de3a00..b0826611 100755
--- a/bin/console
+++ b/bin/console
@@ -9,17 +9,17 @@
 * @link         http://www.phptesting.org/
 */
 
-use PHPCI\Command\RunCommand;
-use PHPCI\Command\RebuildCommand;
-use PHPCI\Command\UpdateCommand;
-use PHPCI\Command\InstallCommand;
-use PHPCI\Command\DaemonCommand;
-use PHPCI\Command\PollCommand;
-use PHPCI\Command\CreateAdminCommand;
-use PHPCI\Command\CreateBuildCommand;
-use PHPCI\Command\WorkerCommand;
-use PHPCI\Command\RebuildQueueCommand;
-use PHPCI\Service\BuildService;
+use PHPCensor\Command\RunCommand;
+use PHPCensor\Command\RebuildCommand;
+use PHPCensor\Command\UpdateCommand;
+use PHPCensor\Command\InstallCommand;
+use PHPCensor\Command\DaemonCommand;
+use PHPCensor\Command\PollCommand;
+use PHPCensor\Command\CreateAdminCommand;
+use PHPCensor\Command\CreateBuildCommand;
+use PHPCensor\Command\WorkerCommand;
+use PHPCensor\Command\RebuildQueueCommand;
+use PHPCensor\Service\BuildService;
 use Symfony\Component\Console\Application;
 use b8\Store\Factory;
 
diff --git a/bin/daemonise b/bin/daemonise
index 29314c5f..25271525 100755
--- a/bin/daemonise
+++ b/bin/daemonise
@@ -9,7 +9,7 @@
 * @link         http://www.phptesting.org/
 */
 
-use PHPCI\Command\DaemoniseCommand;
+use PHPCensor\Command\DaemoniseCommand;
 use Symfony\Component\Console\Application;
 
 define('PHPCI_IS_CONSOLE', true);
diff --git a/bootstrap.php b/bootstrap.php
index 25968cd3..6d9f5912 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -7,14 +7,14 @@
 * @link         http://www.phptesting.org/
 */
 
-use PHPCI\Logging\LoggerConfig;
+use PHPCensor\Logging\LoggerConfig;
 
 if (!defined('ROOT_DIR')) {
     define('ROOT_DIR', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
 if (!defined('PHPCI_DIR')) {
-    define('PHPCI_DIR', ROOT_DIR . 'src' . DIRECTORY_SEPARATOR . 'PHPCI' . DIRECTORY_SEPARATOR);
+    define('PHPCI_DIR', ROOT_DIR . 'src' . DIRECTORY_SEPARATOR . 'PHPCensor' . DIRECTORY_SEPARATOR);
 }
 
 if (!defined('PHPCI_PUBLIC_DIR')) {
@@ -43,7 +43,7 @@ if (!defined('IS_WIN')) {
 
 require_once(ROOT_DIR . 'vendor/autoload.php');
 
-\PHPCI\ErrorHandler::register();
+\PHPCensor\ErrorHandler::register();
 
 if (defined('PHPCI_IS_CONSOLE') && PHPCI_IS_CONSOLE) {
     $loggerConfig = LoggerConfig::newFromFile(PHPCI_APP_DIR . "loggerconfig.php");
@@ -51,7 +51,7 @@ if (defined('PHPCI_IS_CONSOLE') && PHPCI_IS_CONSOLE) {
 
 // Load configuration if present:
 $conf = [];
-$conf['b8']['app']['namespace']          = 'PHPCI';
+$conf['b8']['app']['namespace']          = 'PHPCensor';
 $conf['b8']['app']['default_controller'] = 'Home';
 $conf['b8']['view']['path']              = PHPCI_DIR . 'View' . DIRECTORY_SEPARATOR;
 
@@ -70,4 +70,4 @@ if (!defined('PHPCI_IS_CONSOLE')) {
     define('PHPCI_IS_CONSOLE', false);
 }
 
-\PHPCI\Helper\Lang::init($config);
+\PHPCensor\Helper\Lang::init($config);
diff --git a/composer.json b/composer.json
index e27fd0bc..c6f81f78 100644
--- a/composer.json
+++ b/composer.json
@@ -26,14 +26,14 @@
   },
   "autoload": {
     "psr-4": {
-      "PHPCI\\": "src/PHPCI/",
-      "b8\\":    "src/B8Framework/"
+      "PHPCensor\\": "src/PHPCensor/",
+      "b8\\":        "src/B8Framework/"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Tests\\PHPCI\\": "tests/PHPCI/",
-      "Tests\\b8\\":    "tests/B8Framework/"
+      "Tests\\PHPCensor\\": "tests/PHPCensor/",
+      "Tests\\b8\\":        "tests/B8Framework/"
     }
   },
   "require": {
diff --git a/composer.lock b/composer.lock
index bc775fde..b4384b69 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "1a7e6ffa53784a02d845d40fc34455f1",
-    "content-hash": "aea45980fd51944fe67aeb4a0677ec88",
+    "hash": "051fd6b7588f4f8e7d0a838f6a98b892",
+    "content-hash": "aadffadc413d506fc161c5486c8bd885",
     "packages": [
         {
             "name": "ircmaxell/password-compat",
@@ -262,16 +262,16 @@
         },
         {
             "name": "robmorgan/phinx",
-            "version": "v0.5.3",
+            "version": "v0.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/robmorgan/phinx.git",
-                "reference": "4e7fee7792f4bf3dbf55ee29001850ba26c86a88"
+                "reference": "da9950a5e5b9314ebf72ddc6317ed587ce9ba8dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/robmorgan/phinx/zipball/4e7fee7792f4bf3dbf55ee29001850ba26c86a88",
-                "reference": "4e7fee7792f4bf3dbf55ee29001850ba26c86a88",
+                "url": "https://api.github.com/repos/robmorgan/phinx/zipball/da9950a5e5b9314ebf72ddc6317ed587ce9ba8dc",
+                "reference": "da9950a5e5b9314ebf72ddc6317ed587ce9ba8dc",
                 "shasum": ""
             },
             "require": {
@@ -297,17 +297,17 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Rob Morgan",
-                    "email": "robbym@gmail.com",
-                    "homepage": "http://robmorgan.id.au",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Woody Gilk",
                     "email": "woody.gilk@gmail.com",
                     "homepage": "http://shadowhand.me",
                     "role": "Developer"
+                },
+                {
+                    "name": "Rob Morgan",
+                    "email": "robbym@gmail.com",
+                    "homepage": "https://robmorgan.id.au",
+                    "role": "Lead Developer"
                 }
             ],
             "description": "Phinx makes it ridiculously easy to manage the database migrations for your PHP app.",
@@ -319,7 +319,7 @@
                 "migrations",
                 "phinx"
             ],
-            "time": "2016-03-07 14:09:22"
+            "time": "2016-06-17 15:29:02"
         },
         {
             "name": "sensiolabs/ansi-to-html",
@@ -367,23 +367,23 @@
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "v5.4.1",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421"
+                "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/0697e6aa65c83edf97bb0f23d8763f94e3f11421",
-                "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
+                "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "mockery/mockery": "~0.9.1,<0.9.4"
+                "mockery/mockery": "~0.9.1"
             },
             "type": "library",
             "extra": {
@@ -416,20 +416,20 @@
                 "mail",
                 "mailer"
             ],
-            "time": "2015-06-06 14:19:39"
+            "time": "2016-07-08 11:51:25"
         },
         {
             "name": "symfony/config",
-            "version": "v3.0.4",
+            "version": "v3.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "980ee40c28f00acff8906c11b778aab5f0db74c2"
+                "reference": "bcf5aebabc95b56e370e13d78565f74c7d8726dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/980ee40c28f00acff8906c11b778aab5f0db74c2",
-                "reference": "980ee40c28f00acff8906c11b778aab5f0db74c2",
+                "url": "https://api.github.com/repos/symfony/config/zipball/bcf5aebabc95b56e370e13d78565f74c7d8726dc",
+                "reference": "bcf5aebabc95b56e370e13d78565f74c7d8726dc",
                 "shasum": ""
             },
             "require": {
@@ -442,7 +442,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -469,20 +469,20 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2016-03-04 07:55:57"
+            "time": "2016-06-29 05:41:56"
         },
         {
             "name": "symfony/console",
-            "version": "v2.8.4",
+            "version": "v2.8.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "9a5aef5fc0d4eff86853d44202b02be8d5a20154"
+                "reference": "c392a6ec72f2122748032c2ad6870420561ffcfa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/9a5aef5fc0d4eff86853d44202b02be8d5a20154",
-                "reference": "9a5aef5fc0d4eff86853d44202b02be8d5a20154",
+                "url": "https://api.github.com/repos/symfony/console/zipball/c392a6ec72f2122748032c2ad6870420561ffcfa",
+                "reference": "c392a6ec72f2122748032c2ad6870420561ffcfa",
                 "shasum": ""
             },
             "require": {
@@ -529,20 +529,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2016-03-17 09:19:04"
+            "time": "2016-06-29 07:02:14"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.0.4",
+            "version": "v3.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "f82499a459dcade2ea56df94cc58b19c8bde3d20"
+                "reference": "322da5f0910d8aa0b25fa65ffccaba68dbddb890"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/f82499a459dcade2ea56df94cc58b19c8bde3d20",
-                "reference": "f82499a459dcade2ea56df94cc58b19c8bde3d20",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/322da5f0910d8aa0b25fa65ffccaba68dbddb890",
+                "reference": "322da5f0910d8aa0b25fa65ffccaba68dbddb890",
                 "shasum": ""
             },
             "require": {
@@ -551,7 +551,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -578,20 +578,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2016-03-27 10:24:39"
+            "time": "2016-06-29 05:41:56"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.1.1",
+            "version": "v1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "1289d16209491b584839022f29257ad859b8532d"
+                "reference": "dff51f72b0706335131b00a7f49606168c582594"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
-                "reference": "1289d16209491b584839022f29257ad859b8532d",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594",
+                "reference": "dff51f72b0706335131b00a7f49606168c582594",
                 "shasum": ""
             },
             "require": {
@@ -603,7 +603,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -637,20 +637,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-01-20 09:13:37"
+            "time": "2016-05-18 14:26:46"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.8.4",
+            "version": "v2.8.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "584e52cb8f788a887553ba82db6caacb1d6260bb"
+                "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/584e52cb8f788a887553ba82db6caacb1d6260bb",
-                "reference": "584e52cb8f788a887553ba82db6caacb1d6260bb",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/dba4bb5846798cd12f32e2d8f3f35d77045773c8",
+                "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8",
                 "shasum": ""
             },
             "require": {
@@ -686,7 +686,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2016-03-04 07:54:35"
+            "time": "2016-06-29 05:29:29"
         }
     ],
     "packages-dev": [
@@ -885,38 +885,87 @@
             "time": "2016-03-10 15:15:04"
         },
         {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "2.0.4",
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.5"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "dflydev/markdown": "~1.0",
-                "erusev/parsedown": "~1.0"
+                "phpunit/phpunit": "^4.6"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "phpDocumentor": [
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2015-12-27 11:43:31"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "9270140b940ff02e58ec577c237274e92cd40cdd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd",
+                "reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0@dev",
+                "phpdocumentor/type-resolver": "^0.2.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
                         "src/"
                     ]
                 }
@@ -928,30 +977,78 @@
             "authors": [
                 {
                     "name": "Mike van Riel",
-                    "email": "mike.vanriel@naenius.com"
+                    "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2015-02-03 12:10:50"
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2016-06-10 09:48:41"
         },
         {
-            "name": "phploc/phploc",
-            "version": "3.0.0",
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/phploc.git",
-                "reference": "2917d010fbfd503d9e836cefff249cb3c1b3f17a"
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phploc/zipball/2917d010fbfd503d9e836cefff249cb3c1b3f17a",
-                "reference": "2917d010fbfd503d9e836cefff249cb3c1b3f17a",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443",
+                "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "time": "2016-06-10 07:14:17"
+        },
+        {
+            "name": "phploc/phploc",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phploc.git",
+                "reference": "74f917e6f80f291856989960d31afa44a4196859"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phploc/zipball/74f917e6f80f291856989960d31afa44a4196859",
+                "reference": "74f917e6f80f291856989960d31afa44a4196859",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.6",
                 "sebastian/finder-facade": "~1.1",
-                "sebastian/git": "~2.0",
-                "sebastian/version": "~1.0.3",
+                "sebastian/git": "~2.1",
+                "sebastian/version": "~1.0.3|~2.0",
                 "symfony/console": "~2.5|~3.0"
             },
             "require-dev": {
@@ -984,24 +1081,24 @@
             ],
             "description": "A tool for quickly measuring the size of a PHP project.",
             "homepage": "https://github.com/sebastianbergmann/phploc",
-            "time": "2016-01-13 10:20:53"
+            "time": "2016-04-25 08:11:21"
         },
         {
             "name": "phpmd/phpmd",
-            "version": "2.4.2",
+            "version": "2.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "fccbdb6b222f6d7a6d35af1c396ba5435cec76a9"
+                "reference": "2b9c2417a18696dfb578b38c116cd0ddc19b256e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/fccbdb6b222f6d7a6d35af1c396ba5435cec76a9",
-                "reference": "fccbdb6b222f6d7a6d35af1c396ba5435cec76a9",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/2b9c2417a18696dfb578b38c116cd0ddc19b256e",
+                "reference": "2b9c2417a18696dfb578b38c116cd0ddc19b256e",
                 "shasum": ""
             },
             "require": {
-                "pdepend/pdepend": "~2.0",
+                "pdepend/pdepend": "^2.0.4",
                 "php": ">=5.3.0"
             },
             "require-dev": {
@@ -1049,36 +1146,36 @@
                 "phpmd",
                 "pmd"
             ],
-            "time": "2016-03-10 17:17:44"
+            "time": "2016-04-04 11:52:04"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.6.0",
+            "version": "v1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972"
+                "reference": "58a8137754bc24b25740d4281399a4a3596058e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3c91bdf81797d725b14cb62906f9a4ce44235972",
-                "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0",
+                "reference": "58a8137754bc24b25740d4281399a4a3596058e0",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "~2.0",
-                "sebastian/comparator": "~1.1",
-                "sebastian/recursion-context": "~1.0"
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "sebastian/comparator": "^1.1",
+                "sebastian/recursion-context": "^1.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "~2.0"
+                "phpspec/phpspec": "^2.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.5.x-dev"
+                    "dev-master": "1.6.x-dev"
                 }
             },
             "autoload": {
@@ -1111,7 +1208,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2016-02-15 07:46:21"
+            "time": "2016-06-07 08:13:47"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -1265,21 +1362,24 @@
         },
         {
             "name": "phpunit/php-timer",
-            "version": "1.0.7",
+            "version": "1.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
+                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
-                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
+            "require-dev": {
+                "phpunit/phpunit": "~4|~5"
+            },
             "type": "library",
             "autoload": {
                 "classmap": [
@@ -1302,7 +1402,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2015-06-21 08:01:12"
+            "time": "2016-05-12 18:03:57"
         },
         {
             "name": "phpunit/php-token-stream",
@@ -1355,16 +1455,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.8.24",
+            "version": "4.8.26",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "a1066c562c52900a142a0e2bbf0582994671385e"
+                "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1066c562c52900a142a0e2bbf0582994671385e",
-                "reference": "a1066c562c52900a142a0e2bbf0582994671385e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74",
+                "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74",
                 "shasum": ""
             },
             "require": {
@@ -1378,7 +1478,7 @@
                 "phpunit/php-code-coverage": "~2.1",
                 "phpunit/php-file-iterator": "~1.4",
                 "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": ">=1.0.6",
+                "phpunit/php-timer": "^1.0.6",
                 "phpunit/phpunit-mock-objects": "~2.3",
                 "sebastian/comparator": "~1.1",
                 "sebastian/diff": "~1.2",
@@ -1423,7 +1523,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-03-14 06:16:08"
+            "time": "2016-05-17 03:09:28"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -1599,16 +1699,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "1.3.5",
+            "version": "1.3.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf"
+                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf",
-                "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
+                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
                 "shasum": ""
             },
             "require": {
@@ -1645,20 +1745,20 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2016-02-26 18:40:46"
+            "time": "2016-05-17 03:18:57"
         },
         {
             "name": "sebastian/exporter",
-            "version": "1.2.1",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "7ae5513327cb536431847bcc0c10edba2701064e"
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e",
-                "reference": "7ae5513327cb536431847bcc0c10edba2701064e",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
                 "shasum": ""
             },
             "require": {
@@ -1666,12 +1766,13 @@
                 "sebastian/recursion-context": "~1.0"
             },
             "require-dev": {
+                "ext-mbstring": "*",
                 "phpunit/phpunit": "~4.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2.x-dev"
+                    "dev-master": "1.3.x-dev"
                 }
             },
             "autoload": {
@@ -1711,7 +1812,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2015-06-21 07:55:53"
+            "time": "2016-06-17 09:04:28"
         },
         {
             "name": "sebastian/finder-facade",
@@ -1754,16 +1855,16 @@
         },
         {
             "name": "sebastian/git",
-            "version": "2.1.1",
+            "version": "2.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/git.git",
-                "reference": "38638de3e94830a5cd7a5956135589b967609cd5"
+                "reference": "5100bc50cd9e70f424c643618e142214225024f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/git/zipball/38638de3e94830a5cd7a5956135589b967609cd5",
-                "reference": "38638de3e94830a5cd7a5956135589b967609cd5",
+                "url": "https://api.github.com/repos/sebastianbergmann/git/zipball/5100bc50cd9e70f424c643618e142214225024f3",
+                "reference": "5100bc50cd9e70f424c643618e142214225024f3",
                 "shasum": ""
             },
             "require": {
@@ -1795,7 +1896,7 @@
             "keywords": [
                 "git"
             ],
-            "time": "2016-02-21 15:02:23"
+            "time": "2016-06-15 09:30:19"
         },
         {
             "name": "sebastian/global-state",
@@ -1850,23 +1951,23 @@
         },
         {
             "name": "sebastian/phpcpd",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpcpd.git",
-                "reference": "6f868833a18de143d5733eafb5078b9801f8052b"
+                "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/6f868833a18de143d5733eafb5078b9801f8052b",
-                "reference": "6f868833a18de143d5733eafb5078b9801f8052b",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/24d9a880deadb0b8c9680e9cfe78e30b704225db",
+                "reference": "24d9a880deadb0b8c9680e9cfe78e30b704225db",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
                 "phpunit/php-timer": ">=1.0.6",
                 "sebastian/finder-facade": "~1.1",
-                "sebastian/version": "~1.0",
+                "sebastian/version": "~1.0|~2.0",
                 "symfony/console": "~2.7|^3.0",
                 "theseer/fdomdocument": "~1.4"
             },
@@ -1897,7 +1998,7 @@
             ],
             "description": "Copy/Paste Detector (CPD) for PHP code.",
             "homepage": "https://github.com/sebastianbergmann/phpcpd",
-            "time": "2016-04-17 13:55:09"
+            "time": "2016-04-17 19:32:49"
         },
         {
             "name": "sebastian/recursion-context",
@@ -1989,16 +2090,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "2.6.0",
+            "version": "2.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "1bcdf03b068a530ac1962ce671dead356eeba43b"
+                "reference": "4edb770cb853def6e60c93abb088ad5ac2010c83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1bcdf03b068a530ac1962ce671dead356eeba43b",
-                "reference": "1bcdf03b068a530ac1962ce671dead356eeba43b",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/4edb770cb853def6e60c93abb088ad5ac2010c83",
+                "reference": "4edb770cb853def6e60c93abb088ad5ac2010c83",
                 "shasum": ""
             },
             "require": {
@@ -2063,20 +2164,20 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2016-04-03 22:58:34"
+            "time": "2016-07-13 23:29:13"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v3.0.4",
+            "version": "v3.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "6a9058101b591edced21ca3c83c80a3978f5c6b0"
+                "reference": "b7272b65f2f46cbe77def7d33916f2613669c508"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6a9058101b591edced21ca3c83c80a3978f5c6b0",
-                "reference": "6a9058101b591edced21ca3c83c80a3978f5c6b0",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/b7272b65f2f46cbe77def7d33916f2613669c508",
+                "reference": "b7272b65f2f46cbe77def7d33916f2613669c508",
                 "shasum": ""
             },
             "require": {
@@ -2089,13 +2190,14 @@
             },
             "suggest": {
                 "symfony/config": "",
+                "symfony/expression-language": "For using expressions in service container configuration",
                 "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
                 "symfony/yaml": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -2122,20 +2224,20 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2016-03-30 10:41:14"
+            "time": "2016-06-29 05:42:25"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.0.4",
+            "version": "v3.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "c54e407b35bc098916704e9fd090da21da4c4f52"
+                "reference": "8201978de88a9fa0923e18601bb17f1df9c721e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/c54e407b35bc098916704e9fd090da21da4c4f52",
-                "reference": "c54e407b35bc098916704e9fd090da21da4c4f52",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/8201978de88a9fa0923e18601bb17f1df9c721e7",
+                "reference": "8201978de88a9fa0923e18601bb17f1df9c721e7",
                 "shasum": ""
             },
             "require": {
@@ -2144,7 +2246,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -2171,7 +2273,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2016-03-10 11:13:05"
+            "time": "2016-06-29 05:41:56"
         },
         {
             "name": "theseer/fdomdocument",
@@ -2212,6 +2314,55 @@
             "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
             "homepage": "https://github.com/theseer/fDOMDocument",
             "time": "2015-05-27 22:58:02"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
+                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2015-08-24 13:29:44"
         }
     ],
     "aliases": [],
diff --git a/phpcs.xml b/phpcs.xml
index 82a65c73..9aa40933 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -10,9 +10,9 @@
     <arg name="encoding" value="UTF-8"/>
     <arg name="extensions" value="php"/>
 
-    <exclude-pattern>src/PHPCI/Migrations/*</exclude-pattern>
-    <exclude-pattern>src/PHPCI/Model/Base/*</exclude-pattern>
-    <exclude-pattern>src/PHPCI/Languages/*</exclude-pattern>
+    <exclude-pattern>src/PHPCensor/Migrations/*</exclude-pattern>
+    <exclude-pattern>src/PHPCensor/Model/Base/*</exclude-pattern>
+    <exclude-pattern>src/PHPCensor/Languages/*</exclude-pattern>
     <exclude-pattern>tests/*</exclude-pattern>
     <exclude-pattern>vendor/*</exclude-pattern>
 
diff --git a/phpunit.xml b/phpunit.xml
index 51d85c42..166bea97 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -13,28 +13,28 @@
 >
     <testsuites>
         <!--<testsuite name="PHP Censor Command Test Suite">
-            <directory suffix="Test.php">./tests/PHPCI/Command</directory>
+            <directory suffix="Test.php">./tests/PHPCensor/Command</directory>
         </testsuite>-->
         <testsuite name="PHP Censor Controller Test Suite">
-            <directory suffix="Test.php">./tests/PHPCI/Controller</directory>
+            <directory suffix="Test.php">./tests/PHPCensor/Controller</directory>
         </testsuite>
         <testsuite name="PHP Censor Helper Test Suite">
-            <directory suffix="Test.php">./tests/PHPCI/Helper</directory>
+            <directory suffix="Test.php">./tests/PHPCensor/Helper</directory>
         </testsuite>
         <testsuite name="PHP Censor Logging Test Suite">
-            <directory suffix="Test.php">./tests/PHPCI/Logging</directory>
+            <directory suffix="Test.php">./tests/PHPCensor/Logging</directory>
         </testsuite>
         <testsuite name="PHP Censor Model Test Suite">
-            <directory suffix="Test.php">./tests/PHPCI/Model</directory>
+            <directory suffix="Test.php">./tests/PHPCensor/Model</directory>
         </testsuite>
         <testsuite name="PHP Censor Plugin Test Suite">
-            <directory suffix="Test.php">./tests/PHPCI/Plugin</directory>
+            <directory suffix="Test.php">./tests/PHPCensor/Plugin</directory>
         </testsuite>
         <!--<testsuite name="PHP Censor ProcessControl Test Suite">
-            <directory suffix="Test.php">./tests/PHPCI/ProcessControl</directory>
+            <directory suffix="Test.php">./tests/PHPCensor/ProcessControl</directory>
         </testsuite>-->
         <testsuite name="PHP Censor Service Test Suite">
-            <directory suffix="Test.php">./tests/PHPCI/Service</directory>
+            <directory suffix="Test.php">./tests/PHPCensor/Service</directory>
         </testsuite>
         <!--<testsuite name="B8Framework Test Suite">
             <directory suffix="Test.php">./tests/B8Framework</directory>
diff --git a/public/assets/js/build.js b/public/assets/js/build.js
index bc7369ed..66dd8bb8 100644
--- a/public/assets/js/build.js
+++ b/public/assets/js/build.js
@@ -66,7 +66,7 @@ var Build = Class.extend({
                 }
             }
 
-            PHPCI.uiUpdated();
+            PHPCensor.uiUpdated();
         });
     },
 
diff --git a/public/assets/js/init.js b/public/assets/js/init.js
index 0ef49c4f..45e978ab 100644
--- a/public/assets/js/init.js
+++ b/public/assets/js/init.js
@@ -7,7 +7,7 @@
  * @time 3:44 AM
  * @license LICENSE.md
  *
- * @package PHPCI
+ * @package PHPCensor
  */
 
 $(function () {
diff --git a/public/assets/js/phpci.js b/public/assets/js/phpci.js
index 4a55b459..f7d8f59d 100644
--- a/public/assets/js/phpci.js
+++ b/public/assets/js/phpci.js
@@ -1,5 +1,5 @@
 
-var PHPCI = {
+var PHPCensor = {
     intervals: {},
 
     init: function () {
@@ -15,19 +15,19 @@ var PHPCI = {
             });
 
             // Update latest builds every 5 seconds:
-            PHPCI.getBuilds();
-            PHPCI.intervals.getBuilds = setInterval(PHPCI.getBuilds, 5000);
+            PHPCensor.getBuilds();
+            PHPCensor.intervals.getBuilds = setInterval(PHPCensor.getBuilds, 5000);
 
             // Update latest project builds every 10 seconds:
             if (typeof PHPCI_PROJECT_ID != 'undefined') {
-                PHPCI.intervals.getProjectBuilds = setInterval(PHPCI.getProjectBuilds, 10000);
+                PHPCensor.intervals.getProjectBuilds = setInterval(PHPCensor.getProjectBuilds, 10000);
             }
 
-            PHPCI.uiUpdated();
+            PHPCensor.uiUpdated();
         });
 
         $(window).on('builds-updated', function (e, data) {
-            PHPCI.updateHeaderBuilds(data);
+            PHPCensor.updateHeaderBuilds(data);
         });
     },
 
@@ -39,7 +39,7 @@ var PHPCI = {
                 $(window).trigger('builds-updated', [data]);
             },
 
-            error: PHPCI.handleFailedAjax
+            error: PHPCensor.handleFailedAjax
         });
     },
 
@@ -51,7 +51,7 @@ var PHPCI = {
                 $('#latest-builds').html(data);
             },
 
-            error: PHPCI.handleFailedAjax
+            error: PHPCensor.handleFailedAjax
         });
     },
 
@@ -90,10 +90,10 @@ var PHPCI = {
 
             success: function (data) {
                 success();
-                PHPCI.uiUpdated();
+                PHPCensor.uiUpdated();
             },
 
-            error: PHPCI.handleFailedAjax
+            error: PHPCensor.handleFailedAjax
         });
     },
 
@@ -126,10 +126,10 @@ var PHPCI = {
     }
 };
 
-PHPCI.init();
+PHPCensor.init();
 
 function handleFailedAjax(xhr) {
-    PHPCI.handleFailedAjax(xhr);
+    PHPCensor.handleFailedAjax(xhr);
 }
 
 /**
@@ -166,7 +166,7 @@ if (!Function.prototype.bind) {
  */
 function confirmDelete(url, subject, reloadAfter) {
 
-    var dialog = new PHPCIConfirmDialog({
+    var dialog = new PHPCensorConfirmDialog({
         message: subject + ' will be permanently deleted. Are you sure?',
         confirmBtnCaption: 'Delete',
         /*
@@ -206,10 +206,10 @@ function confirmDelete(url, subject, reloadAfter) {
 }
 
 /**
- * PHPCIConfirmDialog constructor options object
+ * PHPCensorConfirmDialog constructor options object
  * @type {{message: string, title: string, confirmBtnCaption: string, cancelBtnCaption: string, confirmed: Function}}
  */
-var PHPCIConfirmDialogOptions = {
+var PHPCensorConfirmDialogOptions = {
     message: 'The action will be performed and cannot be undone. Are you sure?',
     title: 'Confirmation Dialog',
     confirmBtnCaption: 'Ok',
@@ -219,7 +219,7 @@ var PHPCIConfirmDialogOptions = {
     }
 };
 
-var PHPCIConfirmDialog = Class.extend({
+var PHPCensorConfirmDialog = Class.extend({
     /**
      * @private
      * @var {bool} Determines whether the dialog has been confirmed
@@ -227,11 +227,11 @@ var PHPCIConfirmDialog = Class.extend({
     confirmed: false,
 
     /**
-     * @param {PHPCIConfirmDialogOptions} options
+     * @param {PHPCensorConfirmDialogOptions} options
      */
     init: function (options) {
 
-        options = options ? $.extend(PHPCIConfirmDialogOptions, options) : PHPCIConfirmDialogOptions;
+        options = options ? $.extend(PHPCensorConfirmDialogOptions, options) : PHPCensorConfirmDialogOptions;
 
         if (!$('#confirm-dialog').length) {
             /*
@@ -270,14 +270,14 @@ var PHPCIConfirmDialog = Class.extend({
         /*
          Initialize its values
          */
-        this.$title.html(options.title ? options.title : PHPCIConfirmDialogOptions.title);
-        this.$body.html(options.message ? options.message : PHPCIConfirmDialogOptions.message);
+        this.$title.html(options.title ? options.title : PHPCensorConfirmDialogOptions.title);
+        this.$body.html(options.message ? options.message : PHPCensorConfirmDialogOptions.message);
         this.$confirmBtn.html(
-            options.confirmBtnCaption ? options.confirmBtnCaption : PHPCIConfirmDialogOptions.confirmBtnCaption
+            options.confirmBtnCaption ? options.confirmBtnCaption : PHPCensorConfirmDialogOptions.confirmBtnCaption
         );
 
         this.$cancelBtn.html(
-            options.cancelBtnCaption ? options.cancelBtnCaption : PHPCIConfirmDialogOptions.cancelBtnCaption
+            options.cancelBtnCaption ? options.cancelBtnCaption : PHPCensorConfirmDialogOptions.cancelBtnCaption
         );
 
         /*
diff --git a/public/index.php b/public/index.php
index b43e1fbb..7847f5cf 100644
--- a/public/index.php
+++ b/public/index.php
@@ -13,5 +13,5 @@ session_start();
 
 require_once(dirname(__DIR__) . '/bootstrap.php');
 
-$fc = new PHPCI\Application($config, new b8\Http\Request());
+$fc = new PHPCensor\Application($config, new b8\Http\Request());
 print $fc->handleRequest();
diff --git a/src/PHPCI/Application.php b/src/PHPCensor/Application.php
similarity index 99%
rename from src/PHPCI/Application.php
rename to src/PHPCensor/Application.php
index 04421c2f..363bd021 100644
--- a/src/PHPCI/Application.php
+++ b/src/PHPCensor/Application.php
@@ -7,7 +7,7 @@
 * @link         https://www.phptesting.org/
 */
 
-namespace PHPCI;
+namespace PHPCensor;
 
 use b8;
 use b8\Exception\HttpException;
diff --git a/src/PHPCI/BuildFactory.php b/src/PHPCensor/BuildFactory.php
similarity index 94%
rename from src/PHPCI/BuildFactory.php
rename to src/PHPCensor/BuildFactory.php
index 91e618a8..c7e8428a 100644
--- a/src/PHPCI/BuildFactory.php
+++ b/src/PHPCensor/BuildFactory.php
@@ -7,10 +7,10 @@
 * @link         https://www.phptesting.org/
 */
 
-namespace PHPCI;
+namespace PHPCensor;
 
 use b8\Store\Factory;
-use PHPCI\Model\Build;
+use PHPCensor\Model\Build;
 
 /**
 * PHPCI Build Factory - Takes in a generic "Build" and returns a type-specific build model.
@@ -70,7 +70,7 @@ class BuildFactory
                     return $build;
             }
 
-            $class = '\\PHPCI\\Model\\Build\\' . $type;
+            $class = '\\PHPCensor\\Model\\Build\\' . $type;
             $build = new $class($build->getDataArray());
         }
 
diff --git a/src/PHPCI/Builder.php b/src/PHPCensor/Builder.php
similarity index 96%
rename from src/PHPCI/Builder.php
rename to src/PHPCensor/Builder.php
index 11a9e36a..cba0fff3 100644
--- a/src/PHPCI/Builder.php
+++ b/src/PHPCensor/Builder.php
@@ -7,19 +7,19 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI;
+namespace PHPCensor;
 
-use PHPCI\Helper\BuildInterpolator;
-use PHPCI\Helper\Lang;
-use PHPCI\Helper\MailerFactory;
-use PHPCI\Logging\BuildLogger;
-use PHPCI\Model\Build;
+use PHPCensor\Helper\BuildInterpolator;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Helper\MailerFactory;
+use PHPCensor\Logging\BuildLogger;
+use PHPCensor\Model\Build;
 use b8\Config;
 use b8\Store\Factory;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
-use PHPCI\Plugin\Util\Factory as PluginFactory;
+use PHPCensor\Plugin\Util\Factory as PluginFactory;
 
 /**
  * PHPCI Build Runner
@@ -113,9 +113,9 @@ class Builder implements LoggerAwareInterface
         $pluginFactory->addConfigFromFile(PHPCI_APP_DIR . "pluginconfig.php");
         $this->pluginExecutor = new Plugin\Util\Executor($pluginFactory, $this->buildLogger);
 
-        $executorClass = 'PHPCI\Helper\UnixCommandExecutor';
+        $executorClass = 'PHPCensor\Helper\UnixCommandExecutor';
         if (IS_WIN) {
-            $executorClass = 'PHPCI\Helper\WindowsCommandExecutor';
+            $executorClass = 'PHPCensor\Helper\WindowsCommandExecutor';
         }
 
         $this->commandExecutor = new $executorClass(
@@ -407,7 +407,7 @@ class Builder implements LoggerAwareInterface
                 return $self;
             },
             null,
-            'PHPCI\Builder'
+            'PHPCensor\Builder'
         );
 
         $pluginFactory->registerResource(
@@ -415,7 +415,7 @@ class Builder implements LoggerAwareInterface
                 return $build;
             },
             null,
-            'PHPCI\Model\Build'
+            'PHPCensor\Model\Build'
         );
 
         $logger = $this->logger;
diff --git a/src/PHPCI/Command/CreateAdminCommand.php b/src/PHPCensor/Command/CreateAdminCommand.php
similarity index 95%
rename from src/PHPCI/Command/CreateAdminCommand.php
rename to src/PHPCensor/Command/CreateAdminCommand.php
index f9542fe3..208f9b68 100644
--- a/src/PHPCI/Command/CreateAdminCommand.php
+++ b/src/PHPCensor/Command/CreateAdminCommand.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Command;
+namespace PHPCensor\Command;
 
-use PHPCI\Service\UserService;
-use PHPCI\Helper\Lang;
-use PHPCI\Store\UserStore;
+use PHPCensor\Service\UserService;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Store\UserStore;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/src/PHPCI/Command/CreateBuildCommand.php b/src/PHPCensor/Command/CreateBuildCommand.php
similarity index 95%
rename from src/PHPCI/Command/CreateBuildCommand.php
rename to src/PHPCensor/Command/CreateBuildCommand.php
index 01260080..1ee1adb7 100644
--- a/src/PHPCI/Command/CreateBuildCommand.php
+++ b/src/PHPCensor/Command/CreateBuildCommand.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Command;
+namespace PHPCensor\Command;
 
-use PHPCI\Helper\Lang;
-use PHPCI\Service\BuildService;
-use PHPCI\Store\ProjectStore;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Service\BuildService;
+use PHPCensor\Store\ProjectStore;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/src/PHPCI/Command/DaemonCommand.php b/src/PHPCensor/Command/DaemonCommand.php
similarity index 97%
rename from src/PHPCI/Command/DaemonCommand.php
rename to src/PHPCensor/Command/DaemonCommand.php
index 6318430c..f2a3c59e 100644
--- a/src/PHPCI/Command/DaemonCommand.php
+++ b/src/PHPCensor/Command/DaemonCommand.php
@@ -8,11 +8,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Command;
+namespace PHPCensor\Command;
 
 use Monolog\Logger;
-use PHPCI\ProcessControl\Factory;
-use PHPCI\ProcessControl\ProcessControlInterface;
+use PHPCensor\ProcessControl\Factory;
+use PHPCensor\ProcessControl\ProcessControlInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/src/PHPCI/Command/DaemoniseCommand.php b/src/PHPCensor/Command/DaemoniseCommand.php
similarity index 98%
rename from src/PHPCI/Command/DaemoniseCommand.php
rename to src/PHPCensor/Command/DaemoniseCommand.php
index c683ce47..b4e3b0f6 100644
--- a/src/PHPCI/Command/DaemoniseCommand.php
+++ b/src/PHPCensor/Command/DaemoniseCommand.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Command;
+namespace PHPCensor\Command;
 
 use Monolog\Logger;
 use Symfony\Component\Console\Command\Command;
diff --git a/src/PHPCI/Command/InstallCommand.php b/src/PHPCensor/Command/InstallCommand.php
similarity index 99%
rename from src/PHPCI/Command/InstallCommand.php
rename to src/PHPCensor/Command/InstallCommand.php
index 05939f5b..cb6c7e54 100644
--- a/src/PHPCI/Command/InstallCommand.php
+++ b/src/PHPCensor/Command/InstallCommand.php
@@ -7,20 +7,20 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Command;
+namespace PHPCensor\Command;
 
 use Exception;
 use PDO;
 
 use b8\Config;
 use b8\Store\Factory;
-use PHPCI\Helper\Lang;
+use PHPCensor\Helper\Lang;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use PHPCI\Service\UserService;
+use PHPCensor\Service\UserService;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Yaml\Dumper;
diff --git a/src/PHPCI/Command/PollCommand.php b/src/PHPCensor/Command/PollCommand.php
similarity index 97%
rename from src/PHPCI/Command/PollCommand.php
rename to src/PHPCensor/Command/PollCommand.php
index d3894c5a..9a7ffa7a 100644
--- a/src/PHPCI/Command/PollCommand.php
+++ b/src/PHPCensor/Command/PollCommand.php
@@ -7,17 +7,17 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Command;
+namespace PHPCensor\Command;
 
 use b8\Store\Factory;
 use b8\HttpClient;
 use Monolog\Logger;
-use PHPCI\Helper\Lang;
+use PHPCensor\Helper\Lang;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Yaml\Parser;
-use PHPCI\Model\Build;
+use PHPCensor\Model\Build;
 
 /**
  * Run console command - Poll github for latest commit id
diff --git a/src/PHPCI/Command/RebuildCommand.php b/src/PHPCensor/Command/RebuildCommand.php
similarity index 96%
rename from src/PHPCI/Command/RebuildCommand.php
rename to src/PHPCensor/Command/RebuildCommand.php
index 6b333d9c..548fe267 100644
--- a/src/PHPCI/Command/RebuildCommand.php
+++ b/src/PHPCensor/Command/RebuildCommand.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Command;
+namespace PHPCensor\Command;
 
 use b8\Store\Factory;
 use Monolog\Logger;
-use PHPCI\Service\BuildService;
+use PHPCensor\Service\BuildService;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/src/PHPCI/Command/RebuildQueueCommand.php b/src/PHPCensor/Command/RebuildQueueCommand.php
similarity index 92%
rename from src/PHPCI/Command/RebuildQueueCommand.php
rename to src/PHPCensor/Command/RebuildQueueCommand.php
index 8e1d9f0b..4cd3628d 100644
--- a/src/PHPCI/Command/RebuildQueueCommand.php
+++ b/src/PHPCensor/Command/RebuildQueueCommand.php
@@ -7,14 +7,14 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Command;
+namespace PHPCensor\Command;
 
 use b8\Store\Factory;
 use Monolog\Logger;
-use PHPCI\BuildFactory;
-use PHPCI\Helper\Lang;
-use PHPCI\Logging\OutputLogHandler;
-use PHPCI\Service\BuildService;
+use PHPCensor\BuildFactory;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Logging\OutputLogHandler;
+use PHPCensor\Service\BuildService;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/src/PHPCI/Command/RunCommand.php b/src/PHPCensor/Command/RunCommand.php
similarity index 95%
rename from src/PHPCI/Command/RunCommand.php
rename to src/PHPCensor/Command/RunCommand.php
index 47e97602..6c0a1883 100644
--- a/src/PHPCI/Command/RunCommand.php
+++ b/src/PHPCensor/Command/RunCommand.php
@@ -7,21 +7,21 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Command;
+namespace PHPCensor\Command;
 
 use b8\Config;
 use Monolog\Logger;
-use PHPCI\Helper\Lang;
-use PHPCI\Logging\BuildDBLogHandler;
-use PHPCI\Logging\LoggedBuildContextTidier;
-use PHPCI\Logging\OutputLogHandler;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Logging\BuildDBLogHandler;
+use PHPCensor\Logging\LoggedBuildContextTidier;
+use PHPCensor\Logging\OutputLogHandler;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use b8\Store\Factory;
-use PHPCI\Builder;
-use PHPCI\BuildFactory;
-use PHPCI\Model\Build;
+use PHPCensor\Builder;
+use PHPCensor\BuildFactory;
+use PHPCensor\Model\Build;
 
 /**
 * Run console command - Runs any pending builds.
diff --git a/src/PHPCI/Command/UpdateCommand.php b/src/PHPCensor/Command/UpdateCommand.php
similarity index 96%
rename from src/PHPCI/Command/UpdateCommand.php
rename to src/PHPCensor/Command/UpdateCommand.php
index 98f5d37e..295ab5df 100644
--- a/src/PHPCI/Command/UpdateCommand.php
+++ b/src/PHPCensor/Command/UpdateCommand.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Command;
+namespace PHPCensor\Command;
 
 use b8\Config;
 use Monolog\Logger;
-use PHPCI\Helper\Lang;
+use PHPCensor\Helper\Lang;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/src/PHPCI/Command/WorkerCommand.php b/src/PHPCensor/Command/WorkerCommand.php
similarity index 95%
rename from src/PHPCI/Command/WorkerCommand.php
rename to src/PHPCensor/Command/WorkerCommand.php
index 26756aa2..6cf0cc20 100644
--- a/src/PHPCI/Command/WorkerCommand.php
+++ b/src/PHPCensor/Command/WorkerCommand.php
@@ -7,12 +7,12 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Command;
+namespace PHPCensor\Command;
 
 use b8\Config;
 use Monolog\Logger;
-use PHPCI\Logging\OutputLogHandler;
-use PHPCI\Worker\BuildWorker;
+use PHPCensor\Logging\OutputLogHandler;
+use PHPCensor\Worker\BuildWorker;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/src/PHPCI/Controller.php b/src/PHPCensor/Controller.php
similarity index 99%
rename from src/PHPCI/Controller.php
rename to src/PHPCensor/Controller.php
index 003265c1..4de5105e 100644
--- a/src/PHPCI/Controller.php
+++ b/src/PHPCensor/Controller.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI;
+namespace PHPCensor;
 
 use b8\Config;
 use b8\Exception\HttpException\ForbiddenException;
diff --git a/src/PHPCI/Controller/BuildController.php b/src/PHPCensor/Controller/BuildController.php
similarity index 96%
rename from src/PHPCI/Controller/BuildController.php
rename to src/PHPCensor/Controller/BuildController.php
index a2536141..a44cd410 100644
--- a/src/PHPCI/Controller/BuildController.php
+++ b/src/PHPCensor/Controller/BuildController.php
@@ -7,18 +7,18 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Controller;
+namespace PHPCensor\Controller;
 
 use b8;
 use b8\Exception\HttpException\NotFoundException;
 use b8\Http\Response\JsonResponse;
-use PHPCI\BuildFactory;
-use PHPCI\Helper\AnsiConverter;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
-use PHPCI\Model\Project;
-use PHPCI\Service\BuildService;
-use PHPCI\Controller;
+use PHPCensor\BuildFactory;
+use PHPCensor\Helper\AnsiConverter;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
+use PHPCensor\Model\Project;
+use PHPCensor\Service\BuildService;
+use PHPCensor\Controller;
 
 /**
 * Build Controller - Allows users to run and view builds.
diff --git a/src/PHPCI/Controller/BuildStatusController.php b/src/PHPCensor/Controller/BuildStatusController.php
similarity index 96%
rename from src/PHPCI/Controller/BuildStatusController.php
rename to src/PHPCensor/Controller/BuildStatusController.php
index 25d4cc01..17dad790 100644
--- a/src/PHPCI/Controller/BuildStatusController.php
+++ b/src/PHPCensor/Controller/BuildStatusController.php
@@ -7,16 +7,16 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Controller;
+namespace PHPCensor\Controller;
 
 use b8;
 use b8\Exception\HttpException\NotFoundException;
 use b8\Store;
-use PHPCI\BuildFactory;
-use PHPCI\Model\Project;
-use PHPCI\Model\Build;
-use PHPCI\Service\BuildStatusService;
-use PHPCI\Controller;
+use PHPCensor\BuildFactory;
+use PHPCensor\Model\Project;
+use PHPCensor\Model\Build;
+use PHPCensor\Service\BuildStatusService;
+use PHPCensor\Controller;
 
 /**
 * Build Status Controller - Allows external access to build status information / images.
diff --git a/src/PHPCI/Controller/GroupController.php b/src/PHPCensor/Controller/GroupController.php
similarity index 96%
rename from src/PHPCI/Controller/GroupController.php
rename to src/PHPCensor/Controller/GroupController.php
index aeec8389..f8771c43 100644
--- a/src/PHPCI/Controller/GroupController.php
+++ b/src/PHPCensor/Controller/GroupController.php
@@ -7,14 +7,14 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Controller;
+namespace PHPCensor\Controller;
 
 use b8;
 use b8\Form;
 use b8\Store;
-use PHPCI\Controller;
-use PHPCI\Model\ProjectGroup;
-use PHPCI\Helper\Lang;
+use PHPCensor\Controller;
+use PHPCensor\Model\ProjectGroup;
+use PHPCensor\Helper\Lang;
 
 /**
  * Project Controller - Allows users to create, edit and view projects.
diff --git a/src/PHPCI/Controller/HomeController.php b/src/PHPCensor/Controller/HomeController.php
similarity index 97%
rename from src/PHPCI/Controller/HomeController.php
rename to src/PHPCensor/Controller/HomeController.php
index 233171ee..3d325f76 100644
--- a/src/PHPCI/Controller/HomeController.php
+++ b/src/PHPCensor/Controller/HomeController.php
@@ -7,13 +7,13 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Controller;
+namespace PHPCensor\Controller;
 
 use b8;
-use PHPCI\BuildFactory;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
-use PHPCI\Controller;
+use PHPCensor\BuildFactory;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
+use PHPCensor\Controller;
 
 /**
 * Home Controller - Displays the PHPCI Dashboard.
diff --git a/src/PHPCI/Controller/PluginController.php b/src/PHPCensor/Controller/PluginController.php
similarity index 86%
rename from src/PHPCI/Controller/PluginController.php
rename to src/PHPCensor/Controller/PluginController.php
index ad0953b9..e0f0c82a 100644
--- a/src/PHPCI/Controller/PluginController.php
+++ b/src/PHPCensor/Controller/PluginController.php
@@ -7,14 +7,14 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Controller;
+namespace PHPCensor\Controller;
 
 use b8;
-use PHPCI\Helper\Lang;
-use PHPCI\Plugin\Util\ComposerPluginInformation;
-use PHPCI\Plugin\Util\FilesPluginInformation;
-use PHPCI\Plugin\Util\PluginInformationCollection;
-use PHPCI\Controller;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Plugin\Util\ComposerPluginInformation;
+use PHPCensor\Plugin\Util\FilesPluginInformation;
+use PHPCensor\Plugin\Util\PluginInformationCollection;
+use PHPCensor\Controller;
 
 /**
  * Plugin Controller - Provides support for installing Composer packages.
diff --git a/src/PHPCI/Controller/ProjectController.php b/src/PHPCensor/Controller/ProjectController.php
similarity index 98%
rename from src/PHPCI/Controller/ProjectController.php
rename to src/PHPCensor/Controller/ProjectController.php
index a5a4358b..56e19891 100644
--- a/src/PHPCI/Controller/ProjectController.php
+++ b/src/PHPCensor/Controller/ProjectController.php
@@ -7,19 +7,19 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Controller;
+namespace PHPCensor\Controller;
 
 use b8;
 use b8\Form;
 use b8\Exception\HttpException\NotFoundException;
 use b8\Store;
-use PHPCI;
-use PHPCI\BuildFactory;
-use PHPCI\Helper\Github;
-use PHPCI\Helper\Lang;
-use PHPCI\Helper\SshKey;
-use PHPCI\Service\BuildService;
-use PHPCI\Service\ProjectService;
+use PHPCensor;
+use PHPCensor\BuildFactory;
+use PHPCensor\Helper\Github;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Helper\SshKey;
+use PHPCensor\Service\BuildService;
+use PHPCensor\Service\ProjectService;
 
 /**
 * Project Controller - Allows users to create, edit and view projects.
@@ -27,7 +27,7 @@ use PHPCI\Service\ProjectService;
 * @package      PHPCI
 * @subpackage   Web
 */
-class ProjectController extends PHPCI\Controller
+class ProjectController extends PHPCensor\Controller
 {
     /**
      * @var \PHPCI\Store\ProjectStore
diff --git a/src/PHPCI/Controller/SessionController.php b/src/PHPCensor/Controller/SessionController.php
similarity index 98%
rename from src/PHPCI/Controller/SessionController.php
rename to src/PHPCensor/Controller/SessionController.php
index 9973c57d..e7f3f46f 100644
--- a/src/PHPCI/Controller/SessionController.php
+++ b/src/PHPCensor/Controller/SessionController.php
@@ -7,12 +7,12 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Controller;
+namespace PHPCensor\Controller;
 
 use b8;
-use PHPCI\Helper\Email;
-use PHPCI\Helper\Lang;
-use PHPCI\Controller;
+use PHPCensor\Helper\Email;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Controller;
 
 /**
 * Session Controller - Handles user login / logout.
diff --git a/src/PHPCI/Controller/SettingsController.php b/src/PHPCensor/Controller/SettingsController.php
similarity index 99%
rename from src/PHPCI/Controller/SettingsController.php
rename to src/PHPCensor/Controller/SettingsController.php
index f0bbd2c7..a45413c5 100644
--- a/src/PHPCI/Controller/SettingsController.php
+++ b/src/PHPCensor/Controller/SettingsController.php
@@ -7,13 +7,13 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Controller;
+namespace PHPCensor\Controller;
 
 use b8;
 use b8\Form;
 use b8\HttpClient;
-use PHPCI\Controller;
-use PHPCI\Helper\Lang;
+use PHPCensor\Controller;
+use PHPCensor\Helper\Lang;
 use Symfony\Component\Yaml\Dumper;
 use Symfony\Component\Yaml\Parser;
 
diff --git a/src/PHPCI/Controller/UserController.php b/src/PHPCensor/Controller/UserController.php
similarity index 98%
rename from src/PHPCI/Controller/UserController.php
rename to src/PHPCensor/Controller/UserController.php
index fa6007d2..1ba3a799 100644
--- a/src/PHPCI/Controller/UserController.php
+++ b/src/PHPCensor/Controller/UserController.php
@@ -7,14 +7,14 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Controller;
+namespace PHPCensor\Controller;
 
 use b8;
 use b8\Exception\HttpException\NotFoundException;
 use b8\Form;
-use PHPCI\Controller;
-use PHPCI\Helper\Lang;
-use PHPCI\Service\UserService;
+use PHPCensor\Controller;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Service\UserService;
 
 /**
 * User Controller - Allows an administrator to view, add, edit and delete users.
diff --git a/src/PHPCI/Controller/WebhookController.php b/src/PHPCensor/Controller/WebhookController.php
similarity index 98%
rename from src/PHPCI/Controller/WebhookController.php
rename to src/PHPCensor/Controller/WebhookController.php
index 9df92000..fa1b80b7 100644
--- a/src/PHPCI/Controller/WebhookController.php
+++ b/src/PHPCensor/Controller/WebhookController.php
@@ -7,15 +7,15 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Controller;
+namespace PHPCensor\Controller;
 
 use b8;
 use b8\Store;
 use Exception;
-use PHPCI\Model\Project;
-use PHPCI\Service\BuildService;
-use PHPCI\Store\BuildStore;
-use PHPCI\Store\ProjectStore;
+use PHPCensor\Model\Project;
+use PHPCensor\Service\BuildService;
+use PHPCensor\Store\BuildStore;
+use PHPCensor\Store\ProjectStore;
 use b8\Controller;
 use b8\Config;
 use b8\HttpClient;
diff --git a/src/PHPCI/ErrorHandler.php b/src/PHPCensor/ErrorHandler.php
similarity index 98%
rename from src/PHPCI/ErrorHandler.php
rename to src/PHPCensor/ErrorHandler.php
index 13af5fd3..403569f4 100644
--- a/src/PHPCI/ErrorHandler.php
+++ b/src/PHPCensor/ErrorHandler.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI;
+namespace PHPCensor;
 
 /**
  * Error Handler
diff --git a/src/PHPCI/Helper/AnsiConverter.php b/src/PHPCensor/Helper/AnsiConverter.php
similarity index 97%
rename from src/PHPCI/Helper/AnsiConverter.php
rename to src/PHPCensor/Helper/AnsiConverter.php
index 7df6663c..594bc1fe 100644
--- a/src/PHPCI/Helper/AnsiConverter.php
+++ b/src/PHPCensor/Helper/AnsiConverter.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Helper;
+namespace PHPCensor\Helper;
 
 use SensioLabs\AnsiConverter\AnsiToHtmlConverter;
 
diff --git a/src/PHPCI/Helper/BaseCommandExecutor.php b/src/PHPCensor/Helper/BaseCommandExecutor.php
similarity index 98%
rename from src/PHPCI/Helper/BaseCommandExecutor.php
rename to src/PHPCensor/Helper/BaseCommandExecutor.php
index 5a994a09..15fb7805 100644
--- a/src/PHPCI/Helper/BaseCommandExecutor.php
+++ b/src/PHPCensor/Helper/BaseCommandExecutor.php
@@ -7,10 +7,10 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Helper;
+namespace PHPCensor\Helper;
 
 use Exception;
-use PHPCI\Logging\BuildLogger;
+use PHPCensor\Logging\BuildLogger;
 use Psr\Log\LogLevel;
 
 /**
diff --git a/src/PHPCI/Helper/Build.php b/src/PHPCensor/Helper/Build.php
similarity index 96%
rename from src/PHPCI/Helper/Build.php
rename to src/PHPCensor/Helper/Build.php
index 65231b4a..7aae24a7 100644
--- a/src/PHPCI/Helper/Build.php
+++ b/src/PHPCensor/Helper/Build.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Helper;
+namespace PHPCensor\Helper;
 
 /**
  * User Helper - Provides access to logged in user information in views.
diff --git a/src/PHPCI/Helper/BuildInterpolator.php b/src/PHPCensor/Helper/BuildInterpolator.php
similarity index 98%
rename from src/PHPCI/Helper/BuildInterpolator.php
rename to src/PHPCensor/Helper/BuildInterpolator.php
index 2b791d3f..3ab9e09a 100644
--- a/src/PHPCI/Helper/BuildInterpolator.php
+++ b/src/PHPCensor/Helper/BuildInterpolator.php
@@ -7,9 +7,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Helper;
+namespace PHPCensor\Helper;
 
-use PHPCI\Model\Build;
+use PHPCensor\Model\Build;
 
 /**
  * The BuildInterpolator class replaces variables in a string with build-specific information.
diff --git a/src/PHPCI/Helper/CommandExecutor.php b/src/PHPCensor/Helper/CommandExecutor.php
similarity index 97%
rename from src/PHPCI/Helper/CommandExecutor.php
rename to src/PHPCensor/Helper/CommandExecutor.php
index ccce9009..e6d1b435 100644
--- a/src/PHPCI/Helper/CommandExecutor.php
+++ b/src/PHPCensor/Helper/CommandExecutor.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Helper;
+namespace PHPCensor\Helper;
 
 interface CommandExecutor
 {
diff --git a/src/PHPCI/Helper/Diff.php b/src/PHPCensor/Helper/Diff.php
similarity index 97%
rename from src/PHPCI/Helper/Diff.php
rename to src/PHPCensor/Helper/Diff.php
index 38afacc0..deb7e6a0 100644
--- a/src/PHPCI/Helper/Diff.php
+++ b/src/PHPCensor/Helper/Diff.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Helper;
+namespace PHPCensor\Helper;
 
 /**
  * Provides some basic diff processing functionality.
diff --git a/src/PHPCI/Helper/Email.php b/src/PHPCensor/Helper/Email.php
similarity index 98%
rename from src/PHPCI/Helper/Email.php
rename to src/PHPCensor/Helper/Email.php
index 8e3f21ae..3014863c 100644
--- a/src/PHPCI/Helper/Email.php
+++ b/src/PHPCensor/Helper/Email.php
@@ -7,10 +7,10 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Helper;
+namespace PHPCensor\Helper;
 
 use b8\Config;
-use PHPCI\Builder;
+use PHPCensor\Builder;
 
 /**
  * Helper class for sending emails using PHPCI's email configuration.
diff --git a/src/PHPCI/Helper/Github.php b/src/PHPCensor/Helper/Github.php
similarity index 99%
rename from src/PHPCI/Helper/Github.php
rename to src/PHPCensor/Helper/Github.php
index c0fb2c7a..99d21171 100644
--- a/src/PHPCI/Helper/Github.php
+++ b/src/PHPCensor/Helper/Github.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Helper;
+namespace PHPCensor\Helper;
 
 use b8\Cache;
 use b8\Config;
diff --git a/src/PHPCI/Helper/Lang.php b/src/PHPCensor/Helper/Lang.php
similarity index 98%
rename from src/PHPCI/Helper/Lang.php
rename to src/PHPCensor/Helper/Lang.php
index bff0f458..ef63a2fb 100644
--- a/src/PHPCI/Helper/Lang.php
+++ b/src/PHPCensor/Helper/Lang.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Helper;
+namespace PHPCensor\Helper;
 
 use b8\Config;
 
@@ -64,7 +64,7 @@ class Lang
      */
     public static function out()
     {
-        print call_user_func_array(['PHPCI\Helper\Lang', 'get'], func_get_args());
+        print call_user_func_array(['PHPCensor\Helper\Lang', 'get'], func_get_args());
     }
 
     /**
diff --git a/src/PHPCI/Helper/LoginIsDisabled.php b/src/PHPCensor/Helper/LoginIsDisabled.php
similarity index 96%
rename from src/PHPCI/Helper/LoginIsDisabled.php
rename to src/PHPCensor/Helper/LoginIsDisabled.php
index 746b8d40..18fd81ac 100644
--- a/src/PHPCI/Helper/LoginIsDisabled.php
+++ b/src/PHPCensor/Helper/LoginIsDisabled.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Helper;
+namespace PHPCensor\Helper;
 
 use b8\Config;
 
diff --git a/src/PHPCI/Helper/MailerFactory.php b/src/PHPCensor/Helper/MailerFactory.php
similarity index 98%
rename from src/PHPCI/Helper/MailerFactory.php
rename to src/PHPCensor/Helper/MailerFactory.php
index 570b7550..f352ce2a 100644
--- a/src/PHPCI/Helper/MailerFactory.php
+++ b/src/PHPCensor/Helper/MailerFactory.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Helper;
+namespace PHPCensor\Helper;
 
 /**
  * Class MailerFactory helps to set up and configure a SwiftMailer object.
diff --git a/src/PHPCI/Helper/SshKey.php b/src/PHPCensor/Helper/SshKey.php
similarity index 98%
rename from src/PHPCI/Helper/SshKey.php
rename to src/PHPCensor/Helper/SshKey.php
index e34bf230..fd13624d 100644
--- a/src/PHPCI/Helper/SshKey.php
+++ b/src/PHPCensor/Helper/SshKey.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Helper;
+namespace PHPCensor\Helper;
 
 /**
  * Helper class for dealing with SSH keys.
diff --git a/src/PHPCI/Helper/UnixCommandExecutor.php b/src/PHPCensor/Helper/UnixCommandExecutor.php
similarity index 95%
rename from src/PHPCI/Helper/UnixCommandExecutor.php
rename to src/PHPCensor/Helper/UnixCommandExecutor.php
index b922caff..eb250c34 100644
--- a/src/PHPCI/Helper/UnixCommandExecutor.php
+++ b/src/PHPCensor/Helper/UnixCommandExecutor.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Helper;
+namespace PHPCensor\Helper;
 
 /**
  * Unix/Linux specific extension of the CommandExecutor class.
diff --git a/src/PHPCI/Helper/User.php b/src/PHPCensor/Helper/User.php
similarity index 96%
rename from src/PHPCI/Helper/User.php
rename to src/PHPCensor/Helper/User.php
index 39248060..90affa7f 100644
--- a/src/PHPCI/Helper/User.php
+++ b/src/PHPCensor/Helper/User.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Helper;
+namespace PHPCensor\Helper;
 
 /**
 * User Helper - Provides access to logged in user information in views.
diff --git a/src/PHPCI/Helper/WindowsCommandExecutor.php b/src/PHPCensor/Helper/WindowsCommandExecutor.php
similarity index 96%
rename from src/PHPCI/Helper/WindowsCommandExecutor.php
rename to src/PHPCensor/Helper/WindowsCommandExecutor.php
index a1d0889f..7c499d72 100644
--- a/src/PHPCI/Helper/WindowsCommandExecutor.php
+++ b/src/PHPCensor/Helper/WindowsCommandExecutor.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Helper;
+namespace PHPCensor\Helper;
 
 /**
  * Windows-specific extension of the CommandExecutor class.
diff --git a/src/PHPCI/Languages/lang.da.php b/src/PHPCensor/Languages/lang.da.php
similarity index 100%
rename from src/PHPCI/Languages/lang.da.php
rename to src/PHPCensor/Languages/lang.da.php
diff --git a/src/PHPCI/Languages/lang.de.php b/src/PHPCensor/Languages/lang.de.php
similarity index 100%
rename from src/PHPCI/Languages/lang.de.php
rename to src/PHPCensor/Languages/lang.de.php
diff --git a/src/PHPCI/Languages/lang.el.php b/src/PHPCensor/Languages/lang.el.php
similarity index 100%
rename from src/PHPCI/Languages/lang.el.php
rename to src/PHPCensor/Languages/lang.el.php
diff --git a/src/PHPCI/Languages/lang.en.php b/src/PHPCensor/Languages/lang.en.php
similarity index 100%
rename from src/PHPCI/Languages/lang.en.php
rename to src/PHPCensor/Languages/lang.en.php
diff --git a/src/PHPCI/Languages/lang.es.php b/src/PHPCensor/Languages/lang.es.php
similarity index 100%
rename from src/PHPCI/Languages/lang.es.php
rename to src/PHPCensor/Languages/lang.es.php
diff --git a/src/PHPCI/Languages/lang.fr.php b/src/PHPCensor/Languages/lang.fr.php
similarity index 100%
rename from src/PHPCI/Languages/lang.fr.php
rename to src/PHPCensor/Languages/lang.fr.php
diff --git a/src/PHPCI/Languages/lang.it.php b/src/PHPCensor/Languages/lang.it.php
similarity index 100%
rename from src/PHPCI/Languages/lang.it.php
rename to src/PHPCensor/Languages/lang.it.php
diff --git a/src/PHPCI/Languages/lang.nl.php b/src/PHPCensor/Languages/lang.nl.php
similarity index 100%
rename from src/PHPCI/Languages/lang.nl.php
rename to src/PHPCensor/Languages/lang.nl.php
diff --git a/src/PHPCI/Languages/lang.pl.php b/src/PHPCensor/Languages/lang.pl.php
similarity index 100%
rename from src/PHPCI/Languages/lang.pl.php
rename to src/PHPCensor/Languages/lang.pl.php
diff --git a/src/PHPCI/Languages/lang.ru.php b/src/PHPCensor/Languages/lang.ru.php
similarity index 100%
rename from src/PHPCI/Languages/lang.ru.php
rename to src/PHPCensor/Languages/lang.ru.php
diff --git a/src/PHPCI/Languages/lang.uk.php b/src/PHPCensor/Languages/lang.uk.php
similarity index 100%
rename from src/PHPCI/Languages/lang.uk.php
rename to src/PHPCensor/Languages/lang.uk.php
diff --git a/src/PHPCI/Logging/BuildDBLogHandler.php b/src/PHPCensor/Logging/BuildDBLogHandler.php
similarity index 96%
rename from src/PHPCI/Logging/BuildDBLogHandler.php
rename to src/PHPCensor/Logging/BuildDBLogHandler.php
index 91664b25..31e23452 100644
--- a/src/PHPCI/Logging/BuildDBLogHandler.php
+++ b/src/PHPCensor/Logging/BuildDBLogHandler.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Logging;
+namespace PHPCensor\Logging;
 
 use b8\Store\Factory;
 use Monolog\Handler\AbstractProcessingHandler;
-use PHPCI\Model\Build;
+use PHPCensor\Model\Build;
 use Psr\Log\LogLevel;
 
 /**
diff --git a/src/PHPCI/Logging/BuildLogger.php b/src/PHPCensor/Logging/BuildLogger.php
similarity index 98%
rename from src/PHPCI/Logging/BuildLogger.php
rename to src/PHPCensor/Logging/BuildLogger.php
index ddaeb61b..16e43780 100644
--- a/src/PHPCI/Logging/BuildLogger.php
+++ b/src/PHPCensor/Logging/BuildLogger.php
@@ -7,9 +7,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Logging;
+namespace PHPCensor\Logging;
 
-use PHPCI\Model\Build;
+use PHPCensor\Model\Build;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
diff --git a/src/PHPCI/Logging/Handler.php b/src/PHPCensor/Logging/Handler.php
similarity index 99%
rename from src/PHPCI/Logging/Handler.php
rename to src/PHPCensor/Logging/Handler.php
index 45289d4c..c353d57f 100644
--- a/src/PHPCI/Logging/Handler.php
+++ b/src/PHPCensor/Logging/Handler.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Logging;
+namespace PHPCensor\Logging;
 
 use Psr\Log\LoggerInterface;
 
diff --git a/src/PHPCI/Logging/LoggedBuildContextTidier.php b/src/PHPCensor/Logging/LoggedBuildContextTidier.php
similarity index 95%
rename from src/PHPCI/Logging/LoggedBuildContextTidier.php
rename to src/PHPCensor/Logging/LoggedBuildContextTidier.php
index cfcfb8b8..6356f92f 100644
--- a/src/PHPCI/Logging/LoggedBuildContextTidier.php
+++ b/src/PHPCensor/Logging/LoggedBuildContextTidier.php
@@ -7,9 +7,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Logging;
+namespace PHPCensor\Logging;
 
-use PHPCI\Model\Build;
+use PHPCensor\Model\Build;
 
 /**
  * Class LoggedBuildContextTidier cleans up build log entries.
diff --git a/src/PHPCI/Logging/LoggerConfig.php b/src/PHPCensor/Logging/LoggerConfig.php
similarity index 98%
rename from src/PHPCI/Logging/LoggerConfig.php
rename to src/PHPCensor/Logging/LoggerConfig.php
index 665e9b53..724090e7 100644
--- a/src/PHPCI/Logging/LoggerConfig.php
+++ b/src/PHPCensor/Logging/LoggerConfig.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Logging;
+namespace PHPCensor\Logging;
 
 use Monolog\ErrorHandler;
 use Monolog\Logger;
diff --git a/src/PHPCI/Logging/OutputLogHandler.php b/src/PHPCensor/Logging/OutputLogHandler.php
similarity index 97%
rename from src/PHPCI/Logging/OutputLogHandler.php
rename to src/PHPCensor/Logging/OutputLogHandler.php
index 4b4c81a4..ef104ed7 100644
--- a/src/PHPCI/Logging/OutputLogHandler.php
+++ b/src/PHPCensor/Logging/OutputLogHandler.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Logging;
+namespace PHPCensor\Logging;
 
 use Monolog\Handler\AbstractProcessingHandler;
 use Psr\Log\LogLevel;
diff --git a/src/PHPCI/Migrations/20140513143726_initial_migration.php b/src/PHPCensor/Migrations/20140513143726_initial_migration.php
similarity index 100%
rename from src/PHPCI/Migrations/20140513143726_initial_migration.php
rename to src/PHPCensor/Migrations/20140513143726_initial_migration.php
diff --git a/src/PHPCI/Migrations/20140513153133_change_build_keys_migration.php b/src/PHPCensor/Migrations/20140513153133_change_build_keys_migration.php
similarity index 100%
rename from src/PHPCI/Migrations/20140513153133_change_build_keys_migration.php
rename to src/PHPCensor/Migrations/20140513153133_change_build_keys_migration.php
diff --git a/src/PHPCI/Migrations/20140611170618_choose_branch.php b/src/PHPCensor/Migrations/20140611170618_choose_branch.php
similarity index 100%
rename from src/PHPCI/Migrations/20140611170618_choose_branch.php
rename to src/PHPCensor/Migrations/20140611170618_choose_branch.php
diff --git a/src/PHPCI/Migrations/20140730143702_fix_database_columns.php b/src/PHPCensor/Migrations/20140730143702_fix_database_columns.php
similarity index 100%
rename from src/PHPCI/Migrations/20140730143702_fix_database_columns.php
rename to src/PHPCensor/Migrations/20140730143702_fix_database_columns.php
diff --git a/src/PHPCI/Migrations/20150131075425_archive_project.php b/src/PHPCensor/Migrations/20150131075425_archive_project.php
similarity index 100%
rename from src/PHPCI/Migrations/20150131075425_archive_project.php
rename to src/PHPCensor/Migrations/20150131075425_archive_project.php
diff --git a/src/PHPCI/Migrations/20150203105015_fix_column_types.php b/src/PHPCensor/Migrations/20150203105015_fix_column_types.php
similarity index 100%
rename from src/PHPCI/Migrations/20150203105015_fix_column_types.php
rename to src/PHPCensor/Migrations/20150203105015_fix_column_types.php
diff --git a/src/PHPCI/Migrations/20150324174958_unique_email_and_name_user_fields.php b/src/PHPCensor/Migrations/20150324174958_unique_email_and_name_user_fields.php
similarity index 100%
rename from src/PHPCI/Migrations/20150324174958_unique_email_and_name_user_fields.php
rename to src/PHPCensor/Migrations/20150324174958_unique_email_and_name_user_fields.php
diff --git a/src/PHPCI/Migrations/20151008140800_add_project_groups.php b/src/PHPCensor/Migrations/20151008140800_add_project_groups.php
similarity index 95%
rename from src/PHPCI/Migrations/20151008140800_add_project_groups.php
rename to src/PHPCensor/Migrations/20151008140800_add_project_groups.php
index 329b6cc9..1751202b 100644
--- a/src/PHPCI/Migrations/20151008140800_add_project_groups.php
+++ b/src/PHPCensor/Migrations/20151008140800_add_project_groups.php
@@ -15,7 +15,7 @@ class AddProjectGroups extends AbstractMigration
         if (!$table->hasColumn('title')) {
             $table->addColumn('title', 'string', ['limit' => 100, 'null' => false])->save();
 
-            $group = new \PHPCI\Model\ProjectGroup();
+            $group = new \PHPCensor\Model\ProjectGroup();
             $group->setTitle('Projects');
 
             \b8\Store\Factory::getStore('ProjectGroup')->save($group);
diff --git a/src/PHPCI/Migrations/20151009100610_remove_unique_name_index.php b/src/PHPCensor/Migrations/20151009100610_remove_unique_name_index.php
similarity index 100%
rename from src/PHPCI/Migrations/20151009100610_remove_unique_name_index.php
rename to src/PHPCensor/Migrations/20151009100610_remove_unique_name_index.php
diff --git a/src/PHPCI/Migrations/20151014091859_errors_table.php b/src/PHPCensor/Migrations/20151014091859_errors_table.php
similarity index 100%
rename from src/PHPCI/Migrations/20151014091859_errors_table.php
rename to src/PHPCensor/Migrations/20151014091859_errors_table.php
diff --git a/src/PHPCI/Migrations/20151015124825_convert_errors.php b/src/PHPCensor/Migrations/20151015124825_convert_errors.php
similarity index 99%
rename from src/PHPCI/Migrations/20151015124825_convert_errors.php
rename to src/PHPCensor/Migrations/20151015124825_convert_errors.php
index c326fc0b..4954ad46 100644
--- a/src/PHPCI/Migrations/20151015124825_convert_errors.php
+++ b/src/PHPCensor/Migrations/20151015124825_convert_errors.php
@@ -1,8 +1,8 @@
 <?php
 
 use Phinx\Migration\AbstractMigration;
-use PHPCI\Model\BuildMeta;
-use PHPCI\Model\BuildError;
+use PHPCensor\Model\BuildMeta;
+use PHPCensor\Model\BuildError;
 
 class ConvertErrors extends AbstractMigration
 {
diff --git a/src/PHPCI/Migrations/20160425162114_branch_column_length.php b/src/PHPCensor/Migrations/20160425162114_branch_column_length.php
similarity index 100%
rename from src/PHPCI/Migrations/20160425162114_branch_column_length.php
rename to src/PHPCensor/Migrations/20160425162114_branch_column_length.php
diff --git a/src/PHPCI/Migrations/20160623100223_project_table_defaults.php b/src/PHPCensor/Migrations/20160623100223_project_table_defaults.php
similarity index 100%
rename from src/PHPCI/Migrations/20160623100223_project_table_defaults.php
rename to src/PHPCensor/Migrations/20160623100223_project_table_defaults.php
diff --git a/src/PHPCI/Model.php b/src/PHPCensor/Model.php
similarity index 93%
rename from src/PHPCI/Model.php
rename to src/PHPCensor/Model.php
index 5d911533..ddf1f091 100644
--- a/src/PHPCI/Model.php
+++ b/src/PHPCensor/Model.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI;
+namespace PHPCensor;
 
 /**
  * PHPCI Base Model.
diff --git a/src/PHPCI/Model/Base/BuildBase.php b/src/PHPCensor/Model/Base/BuildBase.php
similarity index 95%
rename from src/PHPCI/Model/Base/BuildBase.php
rename to src/PHPCensor/Model/Base/BuildBase.php
index 02c804dd..190024df 100644
--- a/src/PHPCI/Model/Base/BuildBase.php
+++ b/src/PHPCensor/Model/Base/BuildBase.php
@@ -4,11 +4,11 @@
  * Build base model for table: build
  */
 
-namespace PHPCI\Model\Base;
+namespace PHPCensor\Model\Base;
 
-use PHPCI\Model;
+use PHPCensor\Model;
 use b8\Store\Factory;
-use PHPCI\Model\Project;
+use PHPCensor\Model\Project;
 
 /**
  * Build Base Model
@@ -584,7 +584,7 @@ class BuildBase extends Model
         $rtn      = $this->cache->get($cacheKey, null);
 
         if (empty($rtn)) {
-            $rtn = Factory::getStore('Project', 'PHPCI')->getById($key);
+            $rtn = Factory::getStore('Project', 'PHPCensor')->getById($key);
             $this->cache->set($cacheKey, $rtn);
         }
 
@@ -625,24 +625,24 @@ class BuildBase extends Model
     /**
      * Get BuildError models by BuildId for this Build.
      *
-     * @uses \PHPCI\Store\BuildErrorStore::getByBuildId()
-     * @uses \PHPCI\Model\BuildError
-     * @return \PHPCI\Model\BuildError[]
+     * @uses \PHPCensor\Store\BuildErrorStore::getByBuildId()
+     * @uses \PHPCensor\Model\BuildError
+     * @return \PHPCensor\Model\BuildError[]
      */
     public function getBuildBuildErrors()
     {
-        return Factory::getStore('BuildError', 'PHPCI')->getByBuildId($this->getId());
+        return Factory::getStore('BuildError', 'PHPCensor')->getByBuildId($this->getId());
     }
 
     /**
      * Get BuildMeta models by BuildId for this Build.
      *
-     * @uses \PHPCI\Store\BuildMetaStore::getByBuildId()
-     * @uses \PHPCI\Model\BuildMeta
-     * @return \PHPCI\Model\BuildMeta[]
+     * @uses \PHPCensor\Store\BuildMetaStore::getByBuildId()
+     * @uses \PHPCensor\Model\BuildMeta
+     * @return \PHPCensor\Model\BuildMeta[]
      */
     public function getBuildBuildMetas()
     {
-        return Factory::getStore('BuildMeta', 'PHPCI')->getByBuildId($this->getId());
+        return Factory::getStore('BuildMeta', 'PHPCensor')->getByBuildId($this->getId());
     }
 }
diff --git a/src/PHPCI/Model/Base/BuildErrorBase.php b/src/PHPCensor/Model/Base/BuildErrorBase.php
similarity index 98%
rename from src/PHPCI/Model/Base/BuildErrorBase.php
rename to src/PHPCensor/Model/Base/BuildErrorBase.php
index be79c662..74ec1432 100644
--- a/src/PHPCI/Model/Base/BuildErrorBase.php
+++ b/src/PHPCensor/Model/Base/BuildErrorBase.php
@@ -4,11 +4,11 @@
  * BuildError base model for table: build_error
  */
 
-namespace PHPCI\Model\Base;
+namespace PHPCensor\Model\Base;
 
-use PHPCI\Model;
+use PHPCensor\Model;
 use b8\Store\Factory;
-use PHPCI\Model\Build;
+use PHPCensor\Model\Build;
 
 /**
  * BuildError Base Model
@@ -464,7 +464,7 @@ class BuildErrorBase extends Model
         $rtn        = $this->cache->get($cacheKey, null);
 
         if (empty($rtn)) {
-            $rtn    = Factory::getStore('Build', 'PHPCI')->getById($key);
+            $rtn    = Factory::getStore('Build', 'PHPCensor')->getById($key);
             $this->cache->set($cacheKey, $rtn);
         }
 
diff --git a/src/PHPCI/Model/Base/BuildMetaBase.php b/src/PHPCensor/Model/Base/BuildMetaBase.php
similarity index 97%
rename from src/PHPCI/Model/Base/BuildMetaBase.php
rename to src/PHPCensor/Model/Base/BuildMetaBase.php
index 4c080e7f..94f393f0 100644
--- a/src/PHPCI/Model/Base/BuildMetaBase.php
+++ b/src/PHPCensor/Model/Base/BuildMetaBase.php
@@ -4,12 +4,12 @@
  * BuildMeta base model for table: build_meta
  */
 
-namespace PHPCI\Model\Base;
+namespace PHPCensor\Model\Base;
 
-use PHPCI\Model;
+use PHPCensor\Model;
 use b8\Store\Factory;
-use PHPCI\Model\Project;
-use PHPCI\Model\Build;
+use PHPCensor\Model\Project;
+use PHPCensor\Model\Build;
 
 /**
  * BuildMeta Base Model
@@ -312,7 +312,7 @@ class BuildMetaBase extends Model
         $rtn        = $this->cache->get($cacheKey, null);
 
         if (empty($rtn)) {
-            $rtn    = Factory::getStore('Project', 'PHPCI')->getById($key);
+            $rtn    = Factory::getStore('Project', 'PHPCensor')->getById($key);
             $this->cache->set($cacheKey, $rtn);
         }
 
@@ -369,7 +369,7 @@ class BuildMetaBase extends Model
         $rtn        = $this->cache->get($cacheKey, null);
 
         if (empty($rtn)) {
-            $rtn    = Factory::getStore('Build', 'PHPCI')->getById($key);
+            $rtn    = Factory::getStore('Build', 'PHPCensor')->getById($key);
             $this->cache->set($cacheKey, $rtn);
         }
 
diff --git a/src/PHPCI/Model/Base/ProjectBase.php b/src/PHPCensor/Model/Base/ProjectBase.php
similarity index 96%
rename from src/PHPCI/Model/Base/ProjectBase.php
rename to src/PHPCensor/Model/Base/ProjectBase.php
index c7876508..9f57c18a 100644
--- a/src/PHPCI/Model/Base/ProjectBase.php
+++ b/src/PHPCensor/Model/Base/ProjectBase.php
@@ -4,11 +4,11 @@
  * Project base model for table: project
  */
 
-namespace PHPCI\Model\Base;
+namespace PHPCensor\Model\Base;
 
-use PHPCI\Model;
+use PHPCensor\Model;
 use b8\Store\Factory;
-use PHPCI\Model\ProjectGroup;
+use PHPCensor\Model\ProjectGroup;
 
 /**
  * Project Base Model
@@ -614,7 +614,7 @@ class ProjectBase extends Model
         $rtn        = $this->cache->get($cacheKey, null);
 
         if (empty($rtn)) {
-            $rtn    = Factory::getStore('ProjectGroup', 'PHPCI')->getById($key);
+            $rtn    = Factory::getStore('ProjectGroup', 'PHPCensor')->getById($key);
             $this->cache->set($cacheKey, $rtn);
         }
 
@@ -655,24 +655,24 @@ class ProjectBase extends Model
     /**
      * Get Build models by ProjectId for this Project.
      *
-     * @uses \PHPCI\Store\BuildStore::getByProjectId()
-     * @uses \PHPCI\Model\Build
-     * @return \PHPCI\Model\Build[]
+     * @uses \PHPCensor\Store\BuildStore::getByProjectId()
+     * @uses \PHPCensor\Model\Build
+     * @return \PHPCensor\Model\Build[]
      */
     public function getProjectBuilds()
     {
-        return Factory::getStore('Build', 'PHPCI')->getByProjectId($this->getId());
+        return Factory::getStore('Build', 'PHPCensor')->getByProjectId($this->getId());
     }
 
     /**
      * Get BuildMeta models by ProjectId for this Project.
      *
-     * @uses \PHPCI\Store\BuildMetaStore::getByProjectId()
-     * @uses \PHPCI\Model\BuildMeta
-     * @return \PHPCI\Model\BuildMeta[]
+     * @uses \PHPCensor\Store\BuildMetaStore::getByProjectId()
+     * @uses \PHPCensor\Model\BuildMeta
+     * @return \PHPCensor\Model\BuildMeta[]
      */
     public function getProjectBuildMetas()
     {
-        return Factory::getStore('BuildMeta', 'PHPCI')->getByProjectId($this->getId());
+        return Factory::getStore('BuildMeta', 'PHPCensor')->getByProjectId($this->getId());
     }
 }
diff --git a/src/PHPCI/Model/Base/ProjectGroupBase.php b/src/PHPCensor/Model/Base/ProjectGroupBase.php
similarity index 90%
rename from src/PHPCI/Model/Base/ProjectGroupBase.php
rename to src/PHPCensor/Model/Base/ProjectGroupBase.php
index 83c80afb..35d4d719 100644
--- a/src/PHPCI/Model/Base/ProjectGroupBase.php
+++ b/src/PHPCensor/Model/Base/ProjectGroupBase.php
@@ -4,9 +4,9 @@
  * ProjectGroup base model for table: project_group
  */
 
-namespace PHPCI\Model\Base;
+namespace PHPCensor\Model\Base;
 
-use PHPCI\Model;
+use PHPCensor\Model;
 use b8\Store\Factory;
 
 /**
@@ -154,12 +154,12 @@ class ProjectGroupBase extends Model
     /**
      * Get Project models by GroupId for this ProjectGroup.
      *
-     * @uses \PHPCI\Store\ProjectStore::getByGroupId()
-     * @uses \PHPCI\Model\Project
-     * @return \PHPCI\Model\Project[]
+     * @uses \PHPCensor\Store\ProjectStore::getByGroupId()
+     * @uses \PHPCensor\Model\Project
+     * @return \PHPCensor\Model\Project[]
      */
     public function getGroupProjects()
     {
-        return Factory::getStore('Project', 'PHPCI')->getByGroupId($this->getId());
+        return Factory::getStore('Project', 'PHPCensor')->getByGroupId($this->getId());
     }
 }
diff --git a/src/PHPCI/Model/Base/UserBase.php b/src/PHPCensor/Model/Base/UserBase.php
similarity index 98%
rename from src/PHPCI/Model/Base/UserBase.php
rename to src/PHPCensor/Model/Base/UserBase.php
index 8e91b425..1b97883d 100644
--- a/src/PHPCI/Model/Base/UserBase.php
+++ b/src/PHPCensor/Model/Base/UserBase.php
@@ -4,9 +4,9 @@
  * User base model for table: user
  */
 
-namespace PHPCI\Model\Base;
+namespace PHPCensor\Model\Base;
 
-use PHPCI\Model;
+use PHPCensor\Model;
 
 /**
  * User Base Model
diff --git a/src/PHPCI/Model/Build.php b/src/PHPCensor/Model/Build.php
similarity index 96%
rename from src/PHPCI/Model/Build.php
rename to src/PHPCensor/Model/Build.php
index 499926a0..74183b07 100644
--- a/src/PHPCI/Model/Build.php
+++ b/src/PHPCensor/Model/Build.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Model;
+namespace PHPCensor\Model;
 
 use b8\Store\Factory;
-use PHPCI\Model\Base\BuildBase;
-use PHPCI\Builder;
+use PHPCensor\Model\Base\BuildBase;
+use PHPCensor\Builder;
 use Symfony\Component\Yaml\Parser as YamlParser;
 
 /**
@@ -159,11 +159,11 @@ class Build extends BuildBase
                 continue;
             }
 
-            $className = '\PHPCI\Plugin\\'.$item->getBasename('.php');
+            $className = '\PHPCensor\Plugin\\'.$item->getBasename('.php');
 
             $reflectedPlugin = new \ReflectionClass($className);
 
-            if (!$reflectedPlugin->implementsInterface('\PHPCI\ZeroConfigPlugin')) {
+            if (!$reflectedPlugin->implementsInterface('\PHPCensor\ZeroConfigPlugin')) {
                 continue;
             }
 
diff --git a/src/PHPCI/Model/Build/BitbucketBuild.php b/src/PHPCensor/Model/Build/BitbucketBuild.php
similarity index 95%
rename from src/PHPCI/Model/Build/BitbucketBuild.php
rename to src/PHPCensor/Model/Build/BitbucketBuild.php
index 53db0dcb..bc8e4bf1 100644
--- a/src/PHPCI/Model/Build/BitbucketBuild.php
+++ b/src/PHPCensor/Model/Build/BitbucketBuild.php
@@ -7,9 +7,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Model\Build;
+namespace PHPCensor\Model\Build;
 
-use PHPCI\Model\Build;
+use PHPCensor\Model\Build;
 
 /**
 * BitBucket Build Model
diff --git a/src/PHPCI/Model/Build/GithubBuild.php b/src/PHPCensor/Model/Build/GithubBuild.php
similarity index 98%
rename from src/PHPCI/Model/Build/GithubBuild.php
rename to src/PHPCensor/Model/Build/GithubBuild.php
index 06b1ab00..93d0e2d0 100644
--- a/src/PHPCI/Model/Build/GithubBuild.php
+++ b/src/PHPCensor/Model/Build/GithubBuild.php
@@ -7,14 +7,14 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Model\Build;
+namespace PHPCensor\Model\Build;
 
-use PHPCI\Builder;
-use PHPCI\Helper\Diff;
-use PHPCI\Helper\Github;
+use PHPCensor\Builder;
+use PHPCensor\Helper\Diff;
+use PHPCensor\Helper\Github;
 use b8\Config;
 use b8\HttpClient;
-use PHPCI\Model\BuildError;
+use PHPCensor\Model\BuildError;
 
 /**
 * Github Build Model
diff --git a/src/PHPCI/Model/Build/GitlabBuild.php b/src/PHPCensor/Model/Build/GitlabBuild.php
similarity index 98%
rename from src/PHPCI/Model/Build/GitlabBuild.php
rename to src/PHPCensor/Model/Build/GitlabBuild.php
index e3a1a26b..aa5570e8 100644
--- a/src/PHPCI/Model/Build/GitlabBuild.php
+++ b/src/PHPCensor/Model/Build/GitlabBuild.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Model\Build;
+namespace PHPCensor\Model\Build;
 
 /**
 * Gitlab Build Model
diff --git a/src/PHPCI/Model/Build/LocalBuild.php b/src/PHPCensor/Model/Build/LocalBuild.php
similarity index 97%
rename from src/PHPCI/Model/Build/LocalBuild.php
rename to src/PHPCensor/Model/Build/LocalBuild.php
index 5131abe1..f531e6d9 100644
--- a/src/PHPCI/Model/Build/LocalBuild.php
+++ b/src/PHPCensor/Model/Build/LocalBuild.php
@@ -7,10 +7,10 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Model\Build;
+namespace PHPCensor\Model\Build;
 
-use PHPCI\Model\Build;
-use PHPCI\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Builder;
 
 /**
 * Local Build Model
diff --git a/src/PHPCI/Model/Build/MercurialBuild.php b/src/PHPCensor/Model/Build/MercurialBuild.php
similarity index 96%
rename from src/PHPCI/Model/Build/MercurialBuild.php
rename to src/PHPCensor/Model/Build/MercurialBuild.php
index 0f38940b..d47946b7 100644
--- a/src/PHPCI/Model/Build/MercurialBuild.php
+++ b/src/PHPCensor/Model/Build/MercurialBuild.php
@@ -7,10 +7,10 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Model\Build;
+namespace PHPCensor\Model\Build;
 
-use PHPCI\Model\Build;
-use PHPCI\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Builder;
 
 /**
  * Mercurial Build Model
diff --git a/src/PHPCI/Model/Build/RemoteGitBuild.php b/src/PHPCensor/Model/Build/RemoteGitBuild.php
similarity index 98%
rename from src/PHPCI/Model/Build/RemoteGitBuild.php
rename to src/PHPCensor/Model/Build/RemoteGitBuild.php
index faaccfb5..3ce2391b 100644
--- a/src/PHPCI/Model/Build/RemoteGitBuild.php
+++ b/src/PHPCensor/Model/Build/RemoteGitBuild.php
@@ -7,10 +7,10 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Model\Build;
+namespace PHPCensor\Model\Build;
 
-use PHPCI\Model\Build;
-use PHPCI\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Builder;
 
 /**
 * Remote Git Build Model
diff --git a/src/PHPCI/Model/Build/SubversionBuild.php b/src/PHPCensor/Model/Build/SubversionBuild.php
similarity index 98%
rename from src/PHPCI/Model/Build/SubversionBuild.php
rename to src/PHPCensor/Model/Build/SubversionBuild.php
index af884933..b74570c7 100644
--- a/src/PHPCI/Model/Build/SubversionBuild.php
+++ b/src/PHPCensor/Model/Build/SubversionBuild.php
@@ -7,10 +7,10 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Model\Build;
+namespace PHPCensor\Model\Build;
 
-use PHPCI\Model\Build;
-use PHPCI\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Builder;
 
 /**
  * Remote Subversion Build Model
diff --git a/src/PHPCI/Model/BuildError.php b/src/PHPCensor/Model/BuildError.php
similarity index 95%
rename from src/PHPCI/Model/BuildError.php
rename to src/PHPCensor/Model/BuildError.php
index 8d005e26..e3115729 100644
--- a/src/PHPCI/Model/BuildError.php
+++ b/src/PHPCensor/Model/BuildError.php
@@ -4,9 +4,9 @@
  * BuildError model for table: build_error
  */
 
-namespace PHPCI\Model;
+namespace PHPCensor\Model;
 
-use PHPCI\Model\Base\BuildErrorBase;
+use PHPCensor\Model\Base\BuildErrorBase;
 
 /**
  * BuildError Model
diff --git a/src/PHPCI/Model/BuildMeta.php b/src/PHPCensor/Model/BuildMeta.php
similarity index 86%
rename from src/PHPCI/Model/BuildMeta.php
rename to src/PHPCensor/Model/BuildMeta.php
index fc2af129..cbb6ce1e 100644
--- a/src/PHPCI/Model/BuildMeta.php
+++ b/src/PHPCensor/Model/BuildMeta.php
@@ -7,12 +7,13 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Model;
+namespace PHPCensor\Model;
 
-use PHPCI\Model\Base\BuildMetaBase;
+use PHPCensor\Model\Base\BuildMetaBase;
 
 /**
  * BuildMeta Model
+ * 
  * @uses PHPCI\Model\Base\BuildMetaBase
  */
 class BuildMeta extends BuildMetaBase
diff --git a/src/PHPCI/Model/Project.php b/src/PHPCensor/Model/Project.php
similarity index 97%
rename from src/PHPCI/Model/Project.php
rename to src/PHPCensor/Model/Project.php
index 2ef7685d..a068cd74 100644
--- a/src/PHPCI/Model/Project.php
+++ b/src/PHPCensor/Model/Project.php
@@ -7,10 +7,10 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Model;
+namespace PHPCensor\Model;
 
-use PHPCI\Model\Base\ProjectBase;
-use PHPCI\Model\Build;
+use PHPCensor\Model\Base\ProjectBase;
+use PHPCensor\Model\Build;
 use b8\Store;
 
 /**
diff --git a/src/PHPCI/Model/ProjectGroup.php b/src/PHPCensor/Model/ProjectGroup.php
similarity index 80%
rename from src/PHPCI/Model/ProjectGroup.php
rename to src/PHPCensor/Model/ProjectGroup.php
index f85e6339..9834fb32 100644
--- a/src/PHPCI/Model/ProjectGroup.php
+++ b/src/PHPCensor/Model/ProjectGroup.php
@@ -4,9 +4,9 @@
  * ProjectGroup model for table: project_group
  */
 
-namespace PHPCI\Model;
+namespace PHPCensor\Model;
 
-use PHPCI\Model\Base\ProjectGroupBase;
+use PHPCensor\Model\Base\ProjectGroupBase;
 
 /**
  * ProjectGroup Model
diff --git a/src/PHPCI/Model/User.php b/src/PHPCensor/Model/User.php
similarity index 89%
rename from src/PHPCI/Model/User.php
rename to src/PHPCensor/Model/User.php
index 61c6902c..55b26958 100644
--- a/src/PHPCI/Model/User.php
+++ b/src/PHPCensor/Model/User.php
@@ -7,9 +7,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Model;
+namespace PHPCensor\Model;
 
-use PHPCI\Model\Base\UserBase;
+use PHPCensor\Model\Base\UserBase;
 
 /**
 * User Model
diff --git a/src/PHPCI/Plugin.php b/src/PHPCensor/Plugin.php
similarity index 94%
rename from src/PHPCI/Plugin.php
rename to src/PHPCensor/Plugin.php
index ac2960cd..d360545f 100644
--- a/src/PHPCI/Plugin.php
+++ b/src/PHPCensor/Plugin.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI;
+namespace PHPCensor;
 
 /**
 * PHPCI Plugin Interface - Used by all build plugins.
diff --git a/src/PHPCI/Plugin/Atoum.php b/src/PHPCensor/Plugin/Atoum.php
similarity index 94%
rename from src/PHPCI/Plugin/Atoum.php
rename to src/PHPCensor/Plugin/Atoum.php
index c7b04a66..a2af33ca 100644
--- a/src/PHPCI/Plugin/Atoum.php
+++ b/src/PHPCensor/Plugin/Atoum.php
@@ -7,12 +7,12 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
  * Atoum plugin, runs Atoum tests within a project.
diff --git a/src/PHPCI/Plugin/Behat.php b/src/PHPCensor/Plugin/Behat.php
similarity index 95%
rename from src/PHPCI/Plugin/Behat.php
rename to src/PHPCensor/Plugin/Behat.php
index 5bf4d372..bee4f22b 100644
--- a/src/PHPCI/Plugin/Behat.php
+++ b/src/PHPCensor/Plugin/Behat.php
@@ -7,13 +7,13 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
-use PHPCI\Model\BuildError;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
+use PHPCensor\Model\BuildError;
+use PHPCensor\Plugin;
 
 /**
  * Behat BDD Plugin
diff --git a/src/PHPCI/Plugin/Campfire.php b/src/PHPCensor/Plugin/Campfire.php
similarity index 97%
rename from src/PHPCI/Plugin/Campfire.php
rename to src/PHPCensor/Plugin/Campfire.php
index ada1eaf6..a1073294 100644
--- a/src/PHPCI/Plugin/Campfire.php
+++ b/src/PHPCensor/Plugin/Campfire.php
@@ -7,12 +7,12 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
  * Campfire Plugin - Allows Campfire API actions.
diff --git a/src/PHPCI/Plugin/CleanBuild.php b/src/PHPCensor/Plugin/CleanBuild.php
similarity index 95%
rename from src/PHPCI/Plugin/CleanBuild.php
rename to src/PHPCensor/Plugin/CleanBuild.php
index e537af39..a9273b12 100644
--- a/src/PHPCI/Plugin/CleanBuild.php
+++ b/src/PHPCensor/Plugin/CleanBuild.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
 * Clean build removes Composer related files and allows PHPCI users to clean up their build directory.
diff --git a/src/PHPCI/Plugin/Codeception.php b/src/PHPCensor/Plugin/Codeception.php
similarity index 95%
rename from src/PHPCI/Plugin/Codeception.php
rename to src/PHPCensor/Plugin/Codeception.php
index c7f160ac..9892c8da 100644
--- a/src/PHPCI/Plugin/Codeception.php
+++ b/src/PHPCensor/Plugin/Codeception.php
@@ -7,15 +7,15 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
-use PHPCI\Plugin\Util\TestResultParsers\Codeception as Parser;
+use PHPCensor\Builder;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin\Util\TestResultParsers\Codeception as Parser;
 use Psr\Log\LogLevel;
-use PHPCI\Plugin;
-use PHPCI\ZeroConfigPlugin;
+use PHPCensor\Plugin;
+use PHPCensor\ZeroConfigPlugin;
 
 /**
  * Codeception Plugin - Enables full acceptance, unit, and functional testing.
diff --git a/src/PHPCI/Plugin/Composer.php b/src/PHPCensor/Plugin/Composer.php
similarity index 95%
rename from src/PHPCI/Plugin/Composer.php
rename to src/PHPCensor/Plugin/Composer.php
index 46ef1ec9..553d07f3 100644
--- a/src/PHPCI/Plugin/Composer.php
+++ b/src/PHPCensor/Plugin/Composer.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI;
-use PHPCI\Builder;
-use PHPCI\Model\Build;
+use PHPCensor;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
 
 /**
 * Composer Plugin - Provides access to Composer functionality.
@@ -19,7 +19,7 @@ use PHPCI\Model\Build;
 * @package      PHPCI
 * @subpackage   Plugins
 */
-class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
+class Composer implements PHPCensor\Plugin, PHPCensor\ZeroConfigPlugin
 {
     protected $directory;
     protected $action;
diff --git a/src/PHPCI/Plugin/CopyBuild.php b/src/PHPCensor/Plugin/CopyBuild.php
similarity index 95%
rename from src/PHPCI/Plugin/CopyBuild.php
rename to src/PHPCensor/Plugin/CopyBuild.php
index c1ffb216..f87b41c3 100644
--- a/src/PHPCI/Plugin/CopyBuild.php
+++ b/src/PHPCensor/Plugin/CopyBuild.php
@@ -7,12 +7,12 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Helper\Lang;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Plugin;
 
 /**
 * Copy Build Plugin - Copies the entire build to another directory.
diff --git a/src/PHPCI/Plugin/Deployer.php b/src/PHPCensor/Plugin/Deployer.php
similarity index 95%
rename from src/PHPCI/Plugin/Deployer.php
rename to src/PHPCensor/Plugin/Deployer.php
index cebb4f68..a11482bf 100644
--- a/src/PHPCI/Plugin/Deployer.php
+++ b/src/PHPCensor/Plugin/Deployer.php
@@ -7,12 +7,12 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
 use b8\HttpClient;
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
 * Integrates PHPCI with Deployer: https://github.com/rebelinblue/deployer
diff --git a/src/PHPCI/Plugin/Email.php b/src/PHPCensor/Plugin/Email.php
similarity index 97%
rename from src/PHPCI/Plugin/Email.php
rename to src/PHPCensor/Plugin/Email.php
index e2928526..b741b876 100644
--- a/src/PHPCI/Plugin/Email.php
+++ b/src/PHPCensor/Plugin/Email.php
@@ -7,16 +7,16 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
 use Exception;
 use b8\View;
-use PHPCI\Builder;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
-use PHPCI\Helper\Email as EmailHelper;
+use PHPCensor\Builder;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
+use PHPCensor\Helper\Email as EmailHelper;
 use Psr\Log\LogLevel;
-use PHPCI\Plugin;
+use PHPCensor\Plugin;
 
 /**
 * Email Plugin - Provides simple email capability to PHPCI.
diff --git a/src/PHPCI/Plugin/Env.php b/src/PHPCensor/Plugin/Env.php
similarity index 93%
rename from src/PHPCI/Plugin/Env.php
rename to src/PHPCensor/Plugin/Env.php
index 7813ff72..1b8771ad 100644
--- a/src/PHPCI/Plugin/Env.php
+++ b/src/PHPCensor/Plugin/Env.php
@@ -7,12 +7,12 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
 * Environment variable plugin
diff --git a/src/PHPCI/Plugin/FlowdockNotify.php b/src/PHPCensor/Plugin/FlowdockNotify.php
similarity index 94%
rename from src/PHPCI/Plugin/FlowdockNotify.php
rename to src/PHPCensor/Plugin/FlowdockNotify.php
index 59e5cce9..44faca51 100644
--- a/src/PHPCI/Plugin/FlowdockNotify.php
+++ b/src/PHPCensor/Plugin/FlowdockNotify.php
@@ -6,13 +6,13 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Model\Build;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
 use Mremi\Flowdock\Api\Push\Push;
 use Mremi\Flowdock\Api\Push\TeamInboxMessage;
-use PHPCI\Plugin;
+use PHPCensor\Plugin;
 
 /**
  * Flowdock Plugin
@@ -58,7 +58,7 @@ class FlowdockNotify implements Plugin
         $successfulBuild = $this->build->isSuccessful() ? 'Success' : 'Failed';
         $push = new Push($this->api_key);
         $flowMessage = TeamInboxMessage::create()
-            ->setSource("PHPCI")
+            ->setSource("PHPCensor")
             ->setFromAddress($this->email)
             ->setFromName($this->build->getProject()->getTitle())
             ->setSubject($successfulBuild)
diff --git a/src/PHPCI/Plugin/Git.php b/src/PHPCensor/Plugin/Git.php
similarity index 97%
rename from src/PHPCI/Plugin/Git.php
rename to src/PHPCensor/Plugin/Git.php
index 53835844..552a7d5e 100644
--- a/src/PHPCI/Plugin/Git.php
+++ b/src/PHPCensor/Plugin/Git.php
@@ -7,12 +7,12 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
  * Git plugin.
diff --git a/src/PHPCI/Plugin/Grunt.php b/src/PHPCensor/Plugin/Grunt.php
similarity index 96%
rename from src/PHPCI/Plugin/Grunt.php
rename to src/PHPCensor/Plugin/Grunt.php
index 79e43b43..3a4f9762 100644
--- a/src/PHPCI/Plugin/Grunt.php
+++ b/src/PHPCensor/Plugin/Grunt.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
 * Grunt Plugin - Provides access to grunt functionality.
diff --git a/src/PHPCI/Plugin/Gulp.php b/src/PHPCensor/Plugin/Gulp.php
similarity index 96%
rename from src/PHPCI/Plugin/Gulp.php
rename to src/PHPCensor/Plugin/Gulp.php
index 8291c514..17e2319e 100644
--- a/src/PHPCI/Plugin/Gulp.php
+++ b/src/PHPCensor/Plugin/Gulp.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
 * Gulp Plugin - Provides access to gulp functionality.
diff --git a/src/PHPCI/Plugin/HipchatNotify.php b/src/PHPCensor/Plugin/HipchatNotify.php
similarity index 95%
rename from src/PHPCI/Plugin/HipchatNotify.php
rename to src/PHPCensor/Plugin/HipchatNotify.php
index 4c03ae6d..bb0e1fc8 100644
--- a/src/PHPCI/Plugin/HipchatNotify.php
+++ b/src/PHPCensor/Plugin/HipchatNotify.php
@@ -7,12 +7,12 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 use HipChat\HipChat;
 
 /**
diff --git a/src/PHPCI/Plugin/Irc.php b/src/PHPCensor/Plugin/Irc.php
similarity index 96%
rename from src/PHPCI/Plugin/Irc.php
rename to src/PHPCensor/Plugin/Irc.php
index 0f907a45..561864ac 100644
--- a/src/PHPCI/Plugin/Irc.php
+++ b/src/PHPCensor/Plugin/Irc.php
@@ -7,12 +7,12 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
  * IRC Plugin - Sends a notification to an IRC channel
diff --git a/src/PHPCI/Plugin/Lint.php b/src/PHPCensor/Plugin/Lint.php
similarity index 96%
rename from src/PHPCI/Plugin/Lint.php
rename to src/PHPCensor/Plugin/Lint.php
index e481e61a..6f497bef 100644
--- a/src/PHPCI/Plugin/Lint.php
+++ b/src/PHPCensor/Plugin/Lint.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI;
-use PHPCI\Builder;
-use PHPCI\Model\Build;
+use PHPCensor;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
 
 /**
  * PHP Lint Plugin - Provides access to PHP lint functionality.
@@ -19,7 +19,7 @@ use PHPCI\Model\Build;
  * @package      PHPCI
  * @subpackage   Plugins
  */
-class Lint implements PHPCI\Plugin
+class Lint implements PHPCensor\Plugin
 {
     protected $directories;
     protected $recursive = true;
diff --git a/src/PHPCI/Plugin/Mysql.php b/src/PHPCensor/Plugin/Mysql.php
similarity index 97%
rename from src/PHPCI/Plugin/Mysql.php
rename to src/PHPCensor/Plugin/Mysql.php
index e504a9cd..49fe1314 100644
--- a/src/PHPCI/Plugin/Mysql.php
+++ b/src/PHPCensor/Plugin/Mysql.php
@@ -7,13 +7,13 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
 use PDO;
-use PHPCI\Builder;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 use b8\Database;
 
 /**
diff --git a/src/PHPCI/Plugin/PackageBuild.php b/src/PHPCensor/Plugin/PackageBuild.php
similarity index 96%
rename from src/PHPCI/Plugin/PackageBuild.php
rename to src/PHPCensor/Plugin/PackageBuild.php
index e311d0c5..65a1e333 100644
--- a/src/PHPCI/Plugin/PackageBuild.php
+++ b/src/PHPCensor/Plugin/PackageBuild.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
 * Create a ZIP or TAR.GZ archive of the entire build.
diff --git a/src/PHPCI/Plugin/Pdepend.php b/src/PHPCensor/Plugin/Pdepend.php
similarity index 97%
rename from src/PHPCI/Plugin/Pdepend.php
rename to src/PHPCensor/Plugin/Pdepend.php
index 71c3f6b6..7e21a54d 100644
--- a/src/PHPCI/Plugin/Pdepend.php
+++ b/src/PHPCensor/Plugin/Pdepend.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
  * Pdepend Plugin - Allows Pdepend report
diff --git a/src/PHPCI/Plugin/Pgsql.php b/src/PHPCensor/Plugin/Pgsql.php
similarity index 95%
rename from src/PHPCI/Plugin/Pgsql.php
rename to src/PHPCensor/Plugin/Pgsql.php
index 9b55221a..81748691 100644
--- a/src/PHPCI/Plugin/Pgsql.php
+++ b/src/PHPCensor/Plugin/Pgsql.php
@@ -7,12 +7,12 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
 use PDO;
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
 * PgSQL Plugin - Provides access to a PgSQL database.
diff --git a/src/PHPCI/Plugin/Phar.php b/src/PHPCensor/Plugin/Phar.php
similarity index 97%
rename from src/PHPCI/Plugin/Phar.php
rename to src/PHPCensor/Plugin/Phar.php
index 3a999e04..1c1e4df6 100644
--- a/src/PHPCI/Plugin/Phar.php
+++ b/src/PHPCensor/Plugin/Phar.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
 use Exception;
-use PHPCI\Builder;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
+use PHPCensor\Builder;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
 use Phar as PHPPhar;
-use PHPCI\Plugin;
+use PHPCensor\Plugin;
 
 /**
  * Phar Plugin
diff --git a/src/PHPCI/Plugin/Phing.php b/src/PHPCensor/Plugin/Phing.php
similarity index 97%
rename from src/PHPCI/Plugin/Phing.php
rename to src/PHPCensor/Plugin/Phing.php
index 0e1d949b..f0baccf9 100644
--- a/src/PHPCI/Plugin/Phing.php
+++ b/src/PHPCensor/Plugin/Phing.php
@@ -7,12 +7,12 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
  * Phing Plugin - Provides access to Phing functionality.
diff --git a/src/PHPCI/Plugin/PhpCodeSniffer.php b/src/PHPCensor/Plugin/PhpCodeSniffer.php
similarity index 95%
rename from src/PHPCI/Plugin/PhpCodeSniffer.php
rename to src/PHPCensor/Plugin/PhpCodeSniffer.php
index 962a4e25..5c8768f6 100644
--- a/src/PHPCI/Plugin/PhpCodeSniffer.php
+++ b/src/PHPCensor/Plugin/PhpCodeSniffer.php
@@ -7,12 +7,12 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI;
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Model\BuildError;
+use PHPCensor;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Model\BuildError;
 
 /**
 * PHP Code Sniffer Plugin - Allows PHP Code Sniffer testing.
@@ -20,7 +20,7 @@ use PHPCI\Model\BuildError;
 * @package      PHPCI
 * @subpackage   Plugins
 */
-class PhpCodeSniffer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
+class PhpCodeSniffer implements PHPCensor\Plugin, PHPCensor\ZeroConfigPlugin
 {
     /**
      * @var \PHPCI\Builder
@@ -222,7 +222,7 @@ class PhpCodeSniffer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
 
         if (!is_array($data)) {
             $this->phpci->log($output);
-            throw new \Exception(PHPCI\Helper\Lang::get('could_not_process_report'));
+            throw new \Exception(PHPCensor\Helper\Lang::get('could_not_process_report'));
         }
 
         $errors = $data['totals']['errors'];
diff --git a/src/PHPCI/Plugin/PhpCpd.php b/src/PHPCensor/Plugin/PhpCpd.php
similarity index 96%
rename from src/PHPCI/Plugin/PhpCpd.php
rename to src/PHPCensor/Plugin/PhpCpd.php
index d49a7525..c0ae1956 100644
--- a/src/PHPCI/Plugin/PhpCpd.php
+++ b/src/PHPCensor/Plugin/PhpCpd.php
@@ -7,13 +7,13 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
-use PHPCI\Model\BuildError;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
+use PHPCensor\Model\BuildError;
+use PHPCensor\Plugin;
 
 /**
 * PHP Copy / Paste Detector - Allows PHP Copy / Paste Detector testing.
diff --git a/src/PHPCI/Plugin/PhpCsFixer.php b/src/PHPCensor/Plugin/PhpCsFixer.php
similarity index 96%
rename from src/PHPCI/Plugin/PhpCsFixer.php
rename to src/PHPCensor/Plugin/PhpCsFixer.php
index 8f88d5c1..381709ff 100644
--- a/src/PHPCI/Plugin/PhpCsFixer.php
+++ b/src/PHPCensor/Plugin/PhpCsFixer.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
 * PHP CS Fixer - Works with the PHP Coding Standards Fixer for testing coding standards.
diff --git a/src/PHPCI/Plugin/PhpDocblockChecker.php b/src/PHPCensor/Plugin/PhpDocblockChecker.php
similarity index 93%
rename from src/PHPCI/Plugin/PhpDocblockChecker.php
rename to src/PHPCensor/Plugin/PhpDocblockChecker.php
index e90db2ff..f6e8f9ce 100644
--- a/src/PHPCI/Plugin/PhpDocblockChecker.php
+++ b/src/PHPCensor/Plugin/PhpDocblockChecker.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI;
-use PHPCI\Builder;
-use PHPCI\Model\Build;
+use PHPCensor;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
 
 /**
 * PHP Docblock Checker Plugin - Checks your PHP files for appropriate uses of Docblocks
@@ -19,7 +19,7 @@ use PHPCI\Model\Build;
 * @package      PHPCI
 * @subpackage   Plugins
 */
-class PhpDocblockChecker implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
+class PhpDocblockChecker implements PHPCensor\Plugin, PHPCensor\ZeroConfigPlugin
 {
     /**
      * @var \PHPCI\Builder
@@ -162,11 +162,11 @@ class PhpDocblockChecker implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
     {
         foreach ($output as $error) {
             $message = 'Class ' . $error['class'] . ' is missing a docblock.';
-            $severity = PHPCI\Model\BuildError::SEVERITY_LOW;
+            $severity = PHPCensor\Model\BuildError::SEVERITY_LOW;
 
             if ($error['type'] == 'method') {
                 $message = $error['class'] . '::' . $error['method'] . ' is missing a docblock.';
-                $severity = PHPCI\Model\BuildError::SEVERITY_NORMAL;
+                $severity = PHPCensor\Model\BuildError::SEVERITY_NORMAL;
             }
 
             $this->build->reportError(
diff --git a/src/PHPCI/Plugin/PhpLoc.php b/src/PHPCensor/Plugin/PhpLoc.php
similarity index 93%
rename from src/PHPCI/Plugin/PhpLoc.php
rename to src/PHPCensor/Plugin/PhpLoc.php
index a3d92e5d..ed2220c3 100644
--- a/src/PHPCI/Plugin/PhpLoc.php
+++ b/src/PHPCensor/Plugin/PhpLoc.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI;
-use PHPCI\Builder;
-use PHPCI\Model\Build;
+use PHPCensor;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
 
 /**
  * PHP Loc - Allows PHP Copy / Lines of Code testing.
@@ -19,7 +19,7 @@ use PHPCI\Model\Build;
  * @package      PHPCI
  * @subpackage   Plugins
  */
-class PhpLoc implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
+class PhpLoc implements PHPCensor\Plugin, PHPCensor\ZeroConfigPlugin
 {
     /**
      * @var string
diff --git a/src/PHPCI/Plugin/PhpMessDetector.php b/src/PHPCensor/Plugin/PhpMessDetector.php
similarity index 96%
rename from src/PHPCI/Plugin/PhpMessDetector.php
rename to src/PHPCensor/Plugin/PhpMessDetector.php
index da938093..b5ca9cbc 100644
--- a/src/PHPCI/Plugin/PhpMessDetector.php
+++ b/src/PHPCensor/Plugin/PhpMessDetector.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI;
-use PHPCI\Builder;
-use PHPCI\Model\Build;
+use PHPCensor;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
 
 /**
 * PHP Mess Detector Plugin - Allows PHP Mess Detector testing.
@@ -19,7 +19,7 @@ use PHPCI\Model\Build;
 * @package      PHPCI
 * @subpackage   Plugins
 */
-class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
+class PhpMessDetector implements PHPCensor\Plugin, PHPCensor\ZeroConfigPlugin
 {
     /**
      * @var \PHPCI\Builder
@@ -171,7 +171,7 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
                     $this->phpci,
                     'php_mess_detector',
                     (string)$violation,
-                    PHPCI\Model\BuildError::SEVERITY_HIGH,
+                    PHPCensor\Model\BuildError::SEVERITY_HIGH,
                     $fileName,
                     (int)$violation['beginline'],
                     (int)$violation['endline']
diff --git a/src/PHPCI/Plugin/PhpParallelLint.php b/src/PHPCensor/Plugin/PhpParallelLint.php
similarity index 96%
rename from src/PHPCI/Plugin/PhpParallelLint.php
rename to src/PHPCensor/Plugin/PhpParallelLint.php
index b69763bf..64d99c6f 100644
--- a/src/PHPCI/Plugin/PhpParallelLint.php
+++ b/src/PHPCensor/Plugin/PhpParallelLint.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
 * Php Parallel Lint Plugin - Provides access to PHP lint functionality.
diff --git a/src/PHPCI/Plugin/PhpSpec.php b/src/PHPCensor/Plugin/PhpSpec.php
similarity index 96%
rename from src/PHPCI/Plugin/PhpSpec.php
rename to src/PHPCensor/Plugin/PhpSpec.php
index 17540683..c0d4e674 100644
--- a/src/PHPCI/Plugin/PhpSpec.php
+++ b/src/PHPCensor/Plugin/PhpSpec.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI;
-use PHPCI\Builder;
-use PHPCI\Model\Build;
+use PHPCensor;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
 
 /**
 * PHP Spec Plugin - Allows PHP Spec testing.
@@ -19,7 +19,7 @@ use PHPCI\Model\Build;
 * @package      PHPCI
 * @subpackage   Plugins
 */
-class PhpSpec implements PHPCI\Plugin
+class PhpSpec implements PHPCensor\Plugin
 {
     /**
      * @var \PHPCI\Builder
diff --git a/src/PHPCI/Plugin/PhpTalLint.php b/src/PHPCensor/Plugin/PhpTalLint.php
similarity index 97%
rename from src/PHPCI/Plugin/PhpTalLint.php
rename to src/PHPCensor/Plugin/PhpTalLint.php
index 3bccba7e..f47be6d9 100644
--- a/src/PHPCI/Plugin/PhpTalLint.php
+++ b/src/PHPCensor/Plugin/PhpTalLint.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI;
-use PHPCI\Builder;
-use PHPCI\Model\Build;
+use PHPCensor;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
 
 /**
  * PHPTAL Lint Plugin - Provides access to PHPTAL lint functionality.
@@ -19,7 +19,7 @@ use PHPCI\Model\Build;
  * @package      PHPCI
  * @subpackage   Plugins
  */
-class PhpTalLint implements PHPCI\Plugin
+class PhpTalLint implements PHPCensor\Plugin
 {
     protected $directories;
     protected $recursive = true;
diff --git a/src/PHPCI/Plugin/PhpUnit.php b/src/PHPCensor/Plugin/PhpUnit.php
similarity index 97%
rename from src/PHPCI/Plugin/PhpUnit.php
rename to src/PHPCensor/Plugin/PhpUnit.php
index 696bb9cb..444ffb9b 100644
--- a/src/PHPCI/Plugin/PhpUnit.php
+++ b/src/PHPCensor/Plugin/PhpUnit.php
@@ -7,12 +7,12 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI;
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin\Util\TapParser;
+use PHPCensor;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin\Util\TapParser;
 
 /**
 * PHP Unit Plugin - Allows PHP Unit testing.
@@ -20,7 +20,7 @@ use PHPCI\Plugin\Util\TapParser;
 * @package      PHPCI
 * @subpackage   Plugins
 */
-class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
+class PhpUnit implements PHPCensor\Plugin, PHPCensor\ZeroConfigPlugin
 {
     protected $args;
     protected $phpci;
diff --git a/src/PHPCI/Plugin/Shell.php b/src/PHPCensor/Plugin/Shell.php
similarity index 95%
rename from src/PHPCI/Plugin/Shell.php
rename to src/PHPCensor/Plugin/Shell.php
index e7c80317..234a5e17 100644
--- a/src/PHPCI/Plugin/Shell.php
+++ b/src/PHPCensor/Plugin/Shell.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
  * Shell Plugin - Allows execute shell commands.
diff --git a/src/PHPCI/Plugin/SlackNotify.php b/src/PHPCensor/Plugin/SlackNotify.php
similarity index 97%
rename from src/PHPCI/Plugin/SlackNotify.php
rename to src/PHPCensor/Plugin/SlackNotify.php
index 9b13d1dd..a33739c0 100644
--- a/src/PHPCI/Plugin/SlackNotify.php
+++ b/src/PHPCensor/Plugin/SlackNotify.php
@@ -6,11 +6,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 use Maknz\Slack\Client;
 use Maknz\Slack\Attachment;
 use Maknz\Slack\AttachmentField;
diff --git a/src/PHPCI/Plugin/Sqlite.php b/src/PHPCensor/Plugin/Sqlite.php
similarity index 93%
rename from src/PHPCI/Plugin/Sqlite.php
rename to src/PHPCensor/Plugin/Sqlite.php
index d0752bae..3370f52f 100644
--- a/src/PHPCI/Plugin/Sqlite.php
+++ b/src/PHPCensor/Plugin/Sqlite.php
@@ -7,12 +7,12 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
 use PDO;
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
 * SQLite Plugin — Provides access to a SQLite database.
@@ -23,7 +23,7 @@ use PHPCI\Plugin;
 class Sqlite implements Plugin
 {
     /**
-     * @var \PHPCI\Builder
+     * @var \PHPCensor\Builder
      */
     protected $phpci;
 
diff --git a/src/PHPCI/Plugin/TechnicalDebt.php b/src/PHPCensor/Plugin/TechnicalDebt.php
similarity index 95%
rename from src/PHPCI/Plugin/TechnicalDebt.php
rename to src/PHPCensor/Plugin/TechnicalDebt.php
index e006c02a..2ae458ed 100755
--- a/src/PHPCI/Plugin/TechnicalDebt.php
+++ b/src/PHPCensor/Plugin/TechnicalDebt.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI;
-use PHPCI\Builder;
-use PHPCI\Model\Build;
+use PHPCensor;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
 
 /**
 * Technical Debt Plugin - Checks for existence of "TODO", "FIXME", etc.
@@ -20,10 +20,10 @@ use PHPCI\Model\Build;
 * @package      PHPCI
 * @subpackage   Plugins
 */
-class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
+class TechnicalDebt implements PHPCensor\Plugin, PHPCensor\ZeroConfigPlugin
 {
     /**
-     * @var \PHPCI\Builder
+     * @var \PHPCensor\Builder
      */
     protected $phpci;
 
@@ -196,7 +196,7 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
                         $this->phpci,
                         'technical_debt',
                         $content,
-                        PHPCI\Model\BuildError::SEVERITY_LOW,
+                        PHPCensor\Model\BuildError::SEVERITY_LOW,
                         $fileName,
                         $lineNumber
                     );
diff --git a/src/PHPCI/Plugin/Util/ComposerPluginInformation.php b/src/PHPCensor/Plugin/Util/ComposerPluginInformation.php
similarity index 98%
rename from src/PHPCI/Plugin/Util/ComposerPluginInformation.php
rename to src/PHPCensor/Plugin/Util/ComposerPluginInformation.php
index c9383e61..4dd38150 100644
--- a/src/PHPCI/Plugin/Util/ComposerPluginInformation.php
+++ b/src/PHPCensor/Plugin/Util/ComposerPluginInformation.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace PHPCI\Plugin\Util;
+namespace PHPCensor\Plugin\Util;
 
-use PHPCI\Plugin;
+use PHPCensor\Plugin;
 
 /**
  * Class ComposerPluginInformation
diff --git a/src/PHPCI/Plugin/Util/Executor.php b/src/PHPCensor/Plugin/Util/Executor.php
similarity index 94%
rename from src/PHPCI/Plugin/Util/Executor.php
rename to src/PHPCensor/Plugin/Util/Executor.php
index 0f58cf0b..be4bb082 100644
--- a/src/PHPCI/Plugin/Util/Executor.php
+++ b/src/PHPCensor/Plugin/Util/Executor.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace PHPCI\Plugin\Util;
+namespace PHPCensor\Plugin\Util;
 
 use b8\Store\Factory as StoreFactory;
 use Exception;
-use PHPCI\Helper\Lang;
-use PHPCI\Logging\BuildLogger;
-use PHPCI\Model\Build;
-use PHPCI\Store\BuildStore;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Logging\BuildLogger;
+use PHPCensor\Model\Build;
+use PHPCensor\Store\BuildStore;
 
 /**
  * Plugin Executor - Runs the configured plugins for a given build stage.
@@ -78,7 +78,7 @@ class Executor
     protected function getBranchSpecificPlugins(&$config, $stage, $pluginsToExecute)
     {
         /** @var \PHPCI\Model\Build $build */
-        $build  = $this->pluginFactory->getResourceFor('PHPCI\Model\Build');
+        $build  = $this->pluginFactory->getResourceFor('PHPCensor\Model\Build');
         $branch = $build->getBranch();
 
         // If we don't have any branch-specific plugins:
@@ -178,7 +178,7 @@ class Executor
         if (strpos($plugin, '\\') === false) {
             $class = str_replace('_', ' ', $plugin);
             $class = ucwords($class);
-            $class = 'PHPCI\\Plugin\\' . str_replace(' ', '', $class);
+            $class = 'PHPCensor\\Plugin\\' . str_replace(' ', '', $class);
         } else {
             $class = $plugin;
         }
@@ -235,7 +235,7 @@ class Executor
     private function getBuildSummary()
     {
         /** @var Build $build */
-        $build = $this->pluginFactory->getResourceFor('PHPCI\Model\Build');
+        $build = $this->pluginFactory->getResourceFor('PHPCensor\Model\Build');
         $metas = $this->store->getMeta('plugin-summary', $build->getProjectId(), $build->getId());
         return isset($metas[0]['meta_value']) ? $metas[0]['meta_value'] : [];
     }
@@ -248,7 +248,7 @@ class Executor
     private function setBuildSummary($summary)
     {
         /** @var Build $build */
-        $build = $this->pluginFactory->getResourceFor('PHPCI\Model\Build');
+        $build = $this->pluginFactory->getResourceFor('PHPCensor\Model\Build');
         $this->store->setMeta($build->getProjectId(), $build->getId(), 'plugin-summary', json_encode($summary));
     }
 }
diff --git a/src/PHPCI/Plugin/Util/Factory.php b/src/PHPCensor/Plugin/Util/Factory.php
similarity index 98%
rename from src/PHPCI/Plugin/Util/Factory.php
rename to src/PHPCensor/Plugin/Util/Factory.php
index 4e30f52d..416fd41d 100644
--- a/src/PHPCI/Plugin/Util/Factory.php
+++ b/src/PHPCensor/Plugin/Util/Factory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPCI\Plugin\Util;
+namespace PHPCensor\Plugin\Util;
 
 use Pimple\Container;
 
@@ -12,7 +12,7 @@ class Factory
 {
     const TYPE_ARRAY             = "array";
     const TYPE_CALLABLE          = "callable";
-    const INTERFACE_PHPCI_PLUGIN = '\PHPCI\Plugin';
+    const INTERFACE_PHPCI_PLUGIN = '\PHPCensor\Plugin';
 
     private $currentPluginOptions;
 
diff --git a/src/PHPCI/Plugin/Util/FilesPluginInformation.php b/src/PHPCensor/Plugin/Util/FilesPluginInformation.php
similarity index 98%
rename from src/PHPCI/Plugin/Util/FilesPluginInformation.php
rename to src/PHPCensor/Plugin/Util/FilesPluginInformation.php
index 314eabd8..6f063c64 100644
--- a/src/PHPCI/Plugin/Util/FilesPluginInformation.php
+++ b/src/PHPCensor/Plugin/Util/FilesPluginInformation.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace PHPCI\Plugin\Util;
+namespace PHPCensor\Plugin\Util;
 
-use PHPCI\Plugin;
+use PHPCensor\Plugin;
 
 /**
  * Class FilesPluginInformation
diff --git a/src/PHPCI/Plugin/Util/InstalledPluginInformation.php b/src/PHPCensor/Plugin/Util/InstalledPluginInformation.php
similarity index 95%
rename from src/PHPCI/Plugin/Util/InstalledPluginInformation.php
rename to src/PHPCensor/Plugin/Util/InstalledPluginInformation.php
index 821c511c..39284aae 100644
--- a/src/PHPCI/Plugin/Util/InstalledPluginInformation.php
+++ b/src/PHPCensor/Plugin/Util/InstalledPluginInformation.php
@@ -1,5 +1,5 @@
 <?php
-namespace PHPCI\Plugin\Util;
+namespace PHPCensor\Plugin\Util;
 
 /**
  * Interface InstalledPluginInformation
diff --git a/src/PHPCI/Plugin/Util/PluginInformationCollection.php b/src/PHPCensor/Plugin/Util/PluginInformationCollection.php
similarity index 97%
rename from src/PHPCI/Plugin/Util/PluginInformationCollection.php
rename to src/PHPCensor/Plugin/Util/PluginInformationCollection.php
index b5e5be68..19c9ad00 100644
--- a/src/PHPCI/Plugin/Util/PluginInformationCollection.php
+++ b/src/PHPCensor/Plugin/Util/PluginInformationCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPCI\Plugin\Util;
+namespace PHPCensor\Plugin\Util;
 
 /**
  * Class PluginInformationCollection
diff --git a/src/PHPCI/Plugin/Util/TapParser.php b/src/PHPCensor/Plugin/Util/TapParser.php
similarity index 99%
rename from src/PHPCI/Plugin/Util/TapParser.php
rename to src/PHPCensor/Plugin/Util/TapParser.php
index 5b6a49d1..4f5b14c5 100644
--- a/src/PHPCI/Plugin/Util/TapParser.php
+++ b/src/PHPCensor/Plugin/Util/TapParser.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace PHPCI\Plugin\Util;
+namespace PHPCensor\Plugin\Util;
 
 use Exception;
-use PHPCI\Helper\Lang;
+use PHPCensor\Helper\Lang;
 use Symfony\Component\Yaml\Yaml;
 
 /**
diff --git a/src/PHPCI/Plugin/Util/TestResultParsers/Codeception.php b/src/PHPCensor/Plugin/Util/TestResultParsers/Codeception.php
similarity index 97%
rename from src/PHPCI/Plugin/Util/TestResultParsers/Codeception.php
rename to src/PHPCensor/Plugin/Util/TestResultParsers/Codeception.php
index f3ee801c..e30589df 100644
--- a/src/PHPCI/Plugin/Util/TestResultParsers/Codeception.php
+++ b/src/PHPCensor/Plugin/Util/TestResultParsers/Codeception.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace PHPCI\Plugin\Util\TestResultParsers;
+namespace PHPCensor\Plugin\Util\TestResultParsers;
 
-use PHPCI\Builder;
+use PHPCensor\Builder;
 
 /**
  * Class Codeception
diff --git a/src/PHPCI/Plugin/Util/TestResultParsers/ParserInterface.php b/src/PHPCensor/Plugin/Util/TestResultParsers/ParserInterface.php
similarity index 85%
rename from src/PHPCI/Plugin/Util/TestResultParsers/ParserInterface.php
rename to src/PHPCensor/Plugin/Util/TestResultParsers/ParserInterface.php
index d0c77cb7..cb58a0bb 100644
--- a/src/PHPCI/Plugin/Util/TestResultParsers/ParserInterface.php
+++ b/src/PHPCensor/Plugin/Util/TestResultParsers/ParserInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPCI\Plugin\Util\TestResultParsers;
+namespace PHPCensor\Plugin\Util\TestResultParsers;
 
 interface ParserInterface
 {
diff --git a/src/PHPCI/Plugin/Wipe.php b/src/PHPCensor/Plugin/Wipe.php
similarity index 94%
rename from src/PHPCI/Plugin/Wipe.php
rename to src/PHPCensor/Plugin/Wipe.php
index 8357d908..55db15b2 100644
--- a/src/PHPCI/Plugin/Wipe.php
+++ b/src/PHPCensor/Plugin/Wipe.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
 * Wipe Plugin - Wipes a folder
diff --git a/src/PHPCI/Plugin/Xmpp.php b/src/PHPCensor/Plugin/Xmpp.php
similarity index 98%
rename from src/PHPCI/Plugin/Xmpp.php
rename to src/PHPCensor/Plugin/Xmpp.php
index 546fe79e..a17b5005 100644
--- a/src/PHPCI/Plugin/Xmpp.php
+++ b/src/PHPCensor/Plugin/Xmpp.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Plugin;
+namespace PHPCensor\Plugin;
 
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 /**
 * XMPP Notification - Send notification for successful or failure build
diff --git a/src/PHPCI/ProcessControl/Factory.php b/src/PHPCensor/ProcessControl/Factory.php
similarity index 97%
rename from src/PHPCI/ProcessControl/Factory.php
rename to src/PHPCensor/ProcessControl/Factory.php
index 7622fd49..32d263aa 100644
--- a/src/PHPCI/ProcessControl/Factory.php
+++ b/src/PHPCensor/ProcessControl/Factory.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\ProcessControl;
+namespace PHPCensor\ProcessControl;
 
 /**
  * Construct an appropriate ProcessControl instance.
diff --git a/src/PHPCI/ProcessControl/PosixProcessControl.php b/src/PHPCensor/ProcessControl/PosixProcessControl.php
similarity index 97%
rename from src/PHPCI/ProcessControl/PosixProcessControl.php
rename to src/PHPCensor/ProcessControl/PosixProcessControl.php
index bac55ee2..a8cf0137 100644
--- a/src/PHPCI/ProcessControl/PosixProcessControl.php
+++ b/src/PHPCensor/ProcessControl/PosixProcessControl.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\ProcessControl;
+namespace PHPCensor\ProcessControl;
 
 /**
  * Control process using the POSIX extension.
diff --git a/src/PHPCI/ProcessControl/ProcessControlInterface.php b/src/PHPCensor/ProcessControl/ProcessControlInterface.php
similarity index 95%
rename from src/PHPCI/ProcessControl/ProcessControlInterface.php
rename to src/PHPCensor/ProcessControl/ProcessControlInterface.php
index 709e0bee..ee70450b 100644
--- a/src/PHPCI/ProcessControl/ProcessControlInterface.php
+++ b/src/PHPCensor/ProcessControl/ProcessControlInterface.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\ProcessControl;
+namespace PHPCensor\ProcessControl;
 
 /**
  * A stateless service to check and kill system processes.
diff --git a/src/PHPCI/ProcessControl/UnixProcessControl.php b/src/PHPCensor/ProcessControl/UnixProcessControl.php
similarity index 97%
rename from src/PHPCI/ProcessControl/UnixProcessControl.php
rename to src/PHPCensor/ProcessControl/UnixProcessControl.php
index 8b638073..0670d266 100644
--- a/src/PHPCI/ProcessControl/UnixProcessControl.php
+++ b/src/PHPCensor/ProcessControl/UnixProcessControl.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\ProcessControl;
+namespace PHPCensor\ProcessControl;
 
 /**
  * Control processes using the "ps" and "kill" commands.
diff --git a/src/PHPCI/ProcessControl/WindowsProcessControl.php b/src/PHPCensor/ProcessControl/WindowsProcessControl.php
similarity index 97%
rename from src/PHPCI/ProcessControl/WindowsProcessControl.php
rename to src/PHPCensor/ProcessControl/WindowsProcessControl.php
index 4eb6656c..1ae4dd6f 100644
--- a/src/PHPCI/ProcessControl/WindowsProcessControl.php
+++ b/src/PHPCensor/ProcessControl/WindowsProcessControl.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\ProcessControl;
+namespace PHPCensor\ProcessControl;
 
 /**
  * Control processes using the "tasklist" and "taskkill" commands.
diff --git a/src/PHPCI/Service/BuildService.php b/src/PHPCensor/Service/BuildService.php
similarity index 96%
rename from src/PHPCI/Service/BuildService.php
rename to src/PHPCensor/Service/BuildService.php
index 9dff03cf..4de9b31f 100644
--- a/src/PHPCI/Service/BuildService.php
+++ b/src/PHPCensor/Service/BuildService.php
@@ -7,16 +7,16 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Service;
+namespace PHPCensor\Service;
 
 use b8\Config;
 use Pheanstalk\Pheanstalk;
 use Pheanstalk\PheanstalkInterface;
-use PHPCI\BuildFactory;
-use PHPCI\Helper\Lang;
-use PHPCI\Model\Build;
-use PHPCI\Model\Project;
-use PHPCI\Store\BuildStore;
+use PHPCensor\BuildFactory;
+use PHPCensor\Helper\Lang;
+use PHPCensor\Model\Build;
+use PHPCensor\Model\Project;
+use PHPCensor\Store\BuildStore;
 
 /**
  * The build service handles the creation, duplication and deletion of builds.
diff --git a/src/PHPCI/Service/BuildStatusService.php b/src/PHPCensor/Service/BuildStatusService.php
similarity index 98%
rename from src/PHPCI/Service/BuildStatusService.php
rename to src/PHPCensor/Service/BuildStatusService.php
index 977a7ec0..9cddb976 100644
--- a/src/PHPCI/Service/BuildStatusService.php
+++ b/src/PHPCensor/Service/BuildStatusService.php
@@ -7,10 +7,10 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Service;
+namespace PHPCensor\Service;
 
-use PHPCI\Model\Project;
-use PHPCI\Model\Build;
+use PHPCensor\Model\Project;
+use PHPCensor\Model\Build;
 
 /**
  * Class BuildStatusService
diff --git a/src/PHPCI/Service/ProjectService.php b/src/PHPCensor/Service/ProjectService.php
similarity index 97%
rename from src/PHPCI/Service/ProjectService.php
rename to src/PHPCensor/Service/ProjectService.php
index e7d3d4b8..3b57b3fe 100644
--- a/src/PHPCI/Service/ProjectService.php
+++ b/src/PHPCensor/Service/ProjectService.php
@@ -7,10 +7,10 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Service;
+namespace PHPCensor\Service;
 
-use PHPCI\Model\Project;
-use PHPCI\Store\ProjectStore;
+use PHPCensor\Model\Project;
+use PHPCensor\Store\ProjectStore;
 
 /**
  * The project service handles the creation, modification and deletion of projects.
diff --git a/src/PHPCI/Service/UserService.php b/src/PHPCensor/Service/UserService.php
similarity index 95%
rename from src/PHPCI/Service/UserService.php
rename to src/PHPCensor/Service/UserService.php
index 2d9b070d..2120d292 100644
--- a/src/PHPCI/Service/UserService.php
+++ b/src/PHPCensor/Service/UserService.php
@@ -7,10 +7,10 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Service;
+namespace PHPCensor\Service;
 
-use PHPCI\Model\User;
-use PHPCI\Store\UserStore;
+use PHPCensor\Model\User;
+use PHPCensor\Store\UserStore;
 
 /**
  * The user service handles the creation, modification and deletion of users.
diff --git a/src/PHPCI/Store.php b/src/PHPCensor/Store.php
similarity index 93%
rename from src/PHPCI/Store.php
rename to src/PHPCensor/Store.php
index 71522638..fe3ba882 100644
--- a/src/PHPCI/Store.php
+++ b/src/PHPCensor/Store.php
@@ -7,7 +7,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI;
+namespace PHPCensor;
 
 /**
  * PHPCI Base Store
diff --git a/src/PHPCI/Store/Base/BuildErrorStoreBase.php b/src/PHPCensor/Store/Base/BuildErrorStoreBase.php
similarity index 93%
rename from src/PHPCI/Store/Base/BuildErrorStoreBase.php
rename to src/PHPCensor/Store/Base/BuildErrorStoreBase.php
index e1b3c209..308a77bc 100644
--- a/src/PHPCI/Store/Base/BuildErrorStoreBase.php
+++ b/src/PHPCensor/Store/Base/BuildErrorStoreBase.php
@@ -4,12 +4,12 @@
  * BuildError base store for table: build_error
  */
 
-namespace PHPCI\Store\Base;
+namespace PHPCensor\Store\Base;
 
 use b8\Database;
 use b8\Exception\HttpException;
-use PHPCI\Store;
-use PHPCI\Model\BuildError;
+use PHPCensor\Store;
+use PHPCensor\Model\BuildError;
 
 /**
  * BuildError Base Store
@@ -17,7 +17,7 @@ use PHPCI\Model\BuildError;
 class BuildErrorStoreBase extends Store
 {
     protected $tableName   = 'build_error';
-    protected $modelName   = '\PHPCI\Model\BuildError';
+    protected $modelName   = '\PHPCensor\Model\BuildError';
     protected $primaryKey  = 'id';
 
     /**
diff --git a/src/PHPCI/Store/Base/BuildMetaStoreBase.php b/src/PHPCensor/Store/Base/BuildMetaStoreBase.php
similarity index 95%
rename from src/PHPCI/Store/Base/BuildMetaStoreBase.php
rename to src/PHPCensor/Store/Base/BuildMetaStoreBase.php
index 9e610eaa..5ab7d829 100644
--- a/src/PHPCI/Store/Base/BuildMetaStoreBase.php
+++ b/src/PHPCensor/Store/Base/BuildMetaStoreBase.php
@@ -4,12 +4,12 @@
  * BuildMeta base store for table: build_meta
  */
 
-namespace PHPCI\Store\Base;
+namespace PHPCensor\Store\Base;
 
 use b8\Database;
 use b8\Exception\HttpException;
-use PHPCI\Store;
-use PHPCI\Model\BuildMeta;
+use PHPCensor\Store;
+use PHPCensor\Model\BuildMeta;
 
 /**
  * BuildMeta Base Store
@@ -17,7 +17,7 @@ use PHPCI\Model\BuildMeta;
 class BuildMetaStoreBase extends Store
 {
     protected $tableName   = 'build_meta';
-    protected $modelName   = '\PHPCI\Model\BuildMeta';
+    protected $modelName   = '\PHPCensor\Model\BuildMeta';
     protected $primaryKey  = 'id';
 
     /**
diff --git a/src/PHPCI/Store/Base/BuildStoreBase.php b/src/PHPCensor/Store/Base/BuildStoreBase.php
similarity index 95%
rename from src/PHPCI/Store/Base/BuildStoreBase.php
rename to src/PHPCensor/Store/Base/BuildStoreBase.php
index 7bc09b46..6d0941ac 100644
--- a/src/PHPCI/Store/Base/BuildStoreBase.php
+++ b/src/PHPCensor/Store/Base/BuildStoreBase.php
@@ -4,12 +4,12 @@
  * Build base store for table: build
  */
 
-namespace PHPCI\Store\Base;
+namespace PHPCensor\Store\Base;
 
 use b8\Database;
 use b8\Exception\HttpException;
-use PHPCI\Store;
-use PHPCI\Model\Build;
+use PHPCensor\Store;
+use PHPCensor\Model\Build;
 
 /**
  * Build Base Store
@@ -17,7 +17,7 @@ use PHPCI\Model\Build;
 class BuildStoreBase extends Store
 {
     protected $tableName   = 'build';
-    protected $modelName   = '\PHPCI\Model\Build';
+    protected $modelName   = '\PHPCensor\Model\Build';
     protected $primaryKey  = 'id';
 
     /**
diff --git a/src/PHPCI/Store/Base/ProjectGroupStoreBase.php b/src/PHPCensor/Store/Base/ProjectGroupStoreBase.php
similarity index 88%
rename from src/PHPCI/Store/Base/ProjectGroupStoreBase.php
rename to src/PHPCensor/Store/Base/ProjectGroupStoreBase.php
index c7cd8772..10ffd7df 100644
--- a/src/PHPCI/Store/Base/ProjectGroupStoreBase.php
+++ b/src/PHPCensor/Store/Base/ProjectGroupStoreBase.php
@@ -4,12 +4,12 @@
  * ProjectGroup base store for table: project_group
  */
 
-namespace PHPCI\Store\Base;
+namespace PHPCensor\Store\Base;
 
 use b8\Database;
 use b8\Exception\HttpException;
-use PHPCI\Store;
-use PHPCI\Model\ProjectGroup;
+use PHPCensor\Store;
+use PHPCensor\Model\ProjectGroup;
 
 /**
  * ProjectGroup Base Store
@@ -17,7 +17,7 @@ use PHPCI\Model\ProjectGroup;
 class ProjectGroupStoreBase extends Store
 {
     protected $tableName   = 'project_group';
-    protected $modelName   = '\PHPCI\Model\ProjectGroup';
+    protected $modelName   = '\PHPCensor\Model\ProjectGroup';
     protected $primaryKey  = 'id';
 
     /**
diff --git a/src/PHPCI/Store/Base/ProjectStoreBase.php b/src/PHPCensor/Store/Base/ProjectStoreBase.php
similarity index 95%
rename from src/PHPCI/Store/Base/ProjectStoreBase.php
rename to src/PHPCensor/Store/Base/ProjectStoreBase.php
index 8df0e74b..cf310548 100644
--- a/src/PHPCI/Store/Base/ProjectStoreBase.php
+++ b/src/PHPCensor/Store/Base/ProjectStoreBase.php
@@ -4,12 +4,12 @@
  * Project base store for table: project
  */
 
-namespace PHPCI\Store\Base;
+namespace PHPCensor\Store\Base;
 
 use b8\Database;
 use b8\Exception\HttpException;
-use PHPCI\Store;
-use PHPCI\Model\Project;
+use PHPCensor\Store;
+use PHPCensor\Model\Project;
 
 /**
  * Project Base Store
@@ -17,7 +17,7 @@ use PHPCI\Model\Project;
 class ProjectStoreBase extends Store
 {
     protected $tableName   = 'project';
-    protected $modelName   = '\PHPCI\Model\Project';
+    protected $modelName   = '\PHPCensor\Model\Project';
     protected $primaryKey  = 'id';
 
     /**
diff --git a/src/PHPCI/Store/Base/UserStoreBase.php b/src/PHPCensor/Store/Base/UserStoreBase.php
similarity index 95%
rename from src/PHPCI/Store/Base/UserStoreBase.php
rename to src/PHPCensor/Store/Base/UserStoreBase.php
index 724b3dd0..dd6824e5 100644
--- a/src/PHPCI/Store/Base/UserStoreBase.php
+++ b/src/PHPCensor/Store/Base/UserStoreBase.php
@@ -4,12 +4,12 @@
  * User base store for table: user
  */
 
-namespace PHPCI\Store\Base;
+namespace PHPCensor\Store\Base;
 
 use b8\Database;
 use b8\Exception\HttpException;
-use PHPCI\Store;
-use PHPCI\Model\User;
+use PHPCensor\Store;
+use PHPCensor\Model\User;
 
 /**
  * User Base Store
@@ -17,7 +17,7 @@ use PHPCI\Model\User;
 class UserStoreBase extends Store
 {
     protected $tableName   = 'user';
-    protected $modelName   = '\PHPCI\Model\User';
+    protected $modelName   = '\PHPCensor\Model\User';
     protected $primaryKey  = 'id';
 
     /**
diff --git a/src/PHPCI/Store/BuildErrorStore.php b/src/PHPCensor/Store/BuildErrorStore.php
similarity index 94%
rename from src/PHPCI/Store/BuildErrorStore.php
rename to src/PHPCensor/Store/BuildErrorStore.php
index d8925ac7..2a93106b 100644
--- a/src/PHPCI/Store/BuildErrorStore.php
+++ b/src/PHPCensor/Store/BuildErrorStore.php
@@ -4,11 +4,11 @@
  * BuildError store for table: build_error
  */
 
-namespace PHPCI\Store;
+namespace PHPCensor\Store;
 
 use b8\Database;
-use PHPCI\Model\BuildError;
-use PHPCI\Store\Base\BuildErrorStoreBase;
+use PHPCensor\Model\BuildError;
+use PHPCensor\Store\Base\BuildErrorStoreBase;
 
 /**
  * BuildError Store
diff --git a/src/PHPCI/Store/BuildMetaStore.php b/src/PHPCensor/Store/BuildMetaStore.php
similarity index 92%
rename from src/PHPCI/Store/BuildMetaStore.php
rename to src/PHPCensor/Store/BuildMetaStore.php
index 556a7fb4..5753c57b 100644
--- a/src/PHPCI/Store/BuildMetaStore.php
+++ b/src/PHPCensor/Store/BuildMetaStore.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Store;
+namespace PHPCensor\Store;
 
-use PHPCI\Store\Base\BuildMetaStoreBase;
+use PHPCensor\Store\Base\BuildMetaStoreBase;
 use b8\Database;
-use PHPCI\Model\BuildMeta;
+use PHPCensor\Model\BuildMeta;
 
 /**
  * BuildMeta Store
diff --git a/src/PHPCI/Store/BuildStore.php b/src/PHPCensor/Store/BuildStore.php
similarity index 98%
rename from src/PHPCI/Store/BuildStore.php
rename to src/PHPCensor/Store/BuildStore.php
index 4ae23b71..f3d5284a 100644
--- a/src/PHPCI/Store/BuildStore.php
+++ b/src/PHPCensor/Store/BuildStore.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Store;
+namespace PHPCensor\Store;
 
 use b8\Database;
-use PHPCI\Model\Build;
-use PHPCI\Store\Base\BuildStoreBase;
+use PHPCensor\Model\Build;
+use PHPCensor\Store\Base\BuildStoreBase;
 
 /**
 * Build Store
diff --git a/src/PHPCI/Store/ProjectGroupStore.php b/src/PHPCensor/Store/ProjectGroupStore.php
similarity index 80%
rename from src/PHPCI/Store/ProjectGroupStore.php
rename to src/PHPCensor/Store/ProjectGroupStore.php
index fa254e3e..bc8c9e9b 100644
--- a/src/PHPCI/Store/ProjectGroupStore.php
+++ b/src/PHPCensor/Store/ProjectGroupStore.php
@@ -4,9 +4,9 @@
  * ProjectGroup store for table: project_group
  */
 
-namespace PHPCI\Store;
+namespace PHPCensor\Store;
 
-use PHPCI\Store\Base\ProjectGroupStoreBase;
+use PHPCensor\Store\Base\ProjectGroupStoreBase;
 
 /**
  * ProjectGroup Store
diff --git a/src/PHPCI/Store/ProjectStore.php b/src/PHPCensor/Store/ProjectStore.php
similarity index 96%
rename from src/PHPCI/Store/ProjectStore.php
rename to src/PHPCensor/Store/ProjectStore.php
index 80fc1485..f5d7ad17 100644
--- a/src/PHPCI/Store/ProjectStore.php
+++ b/src/PHPCensor/Store/ProjectStore.php
@@ -7,11 +7,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Store;
+namespace PHPCensor\Store;
 
 use b8\Database;
-use PHPCI\Model\Project;
-use PHPCI\Store\Base\ProjectStoreBase;
+use PHPCensor\Model\Project;
+use PHPCensor\Store\Base\ProjectStoreBase;
 
 /**
 * Project Store
diff --git a/src/PHPCI/Store/UserStore.php b/src/PHPCensor/Store/UserStore.php
similarity index 87%
rename from src/PHPCI/Store/UserStore.php
rename to src/PHPCensor/Store/UserStore.php
index 5a8f9ef0..38699da3 100644
--- a/src/PHPCI/Store/UserStore.php
+++ b/src/PHPCensor/Store/UserStore.php
@@ -7,9 +7,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI\Store;
+namespace PHPCensor\Store;
 
-use PHPCI\Store\Base\UserStoreBase;
+use PHPCensor\Store\Base\UserStoreBase;
 
 /**
 * User Store
diff --git a/src/PHPCI/View/Build/errors.phtml b/src/PHPCensor/View/Build/errors.phtml
similarity index 97%
rename from src/PHPCI/View/Build/errors.phtml
rename to src/PHPCensor/View/Build/errors.phtml
index 04ab9c25..c8102922 100644
--- a/src/PHPCI/View/Build/errors.phtml
+++ b/src/PHPCensor/View/Build/errors.phtml
@@ -1,5 +1,5 @@
 <?php
-use PHPCI\Helper\Lang;
+use PHPCensor\Helper\Lang;
 
 $linkTemplate = $build->getFileLinkTemplate();
 
diff --git a/src/PHPCI/View/Build/header-row.phtml b/src/PHPCensor/View/Build/header-row.phtml
similarity index 78%
rename from src/PHPCI/View/Build/header-row.phtml
rename to src/PHPCensor/View/Build/header-row.phtml
index b0559da0..f1ee6561 100644
--- a/src/PHPCI/View/Build/header-row.phtml
+++ b/src/PHPCensor/View/Build/header-row.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 <li>
     <a href="<?php print PHPCI_URL; ?>build/view/<?php print $build->getId(); ?>">
         <?php if ($build->getCommitterEmail()): ?>
@@ -10,9 +10,9 @@
         <h4>
             <?php print $build->getProject()->getTitle(); ?>
 
-            <?php if ($build->getStatus() == \PHPCI\Model\Build::STATUS_NEW): ?>
+            <?php if ($build->getStatus() == \PHPCensor\Model\Build::STATUS_NEW): ?>
             <small class="pull-right"><?php Lang::out('created_x', $build->getCreated()->format('H:i')); ?></small>
-            <?php elseif ($build->getStatus() == \PHPCI\Model\Build::STATUS_RUNNING): ?>
+            <?php elseif ($build->getStatus() == \PHPCensor\Model\Build::STATUS_RUNNING): ?>
             <small class="pull-right"><?php Lang::out('started_x', $build->getStarted()->format('H:i')); ?></small>
             <?php endif; ?>
         </h4>
diff --git a/src/PHPCI/View/Build/view.phtml b/src/PHPCensor/View/Build/view.phtml
similarity index 99%
rename from src/PHPCI/View/Build/view.phtml
rename to src/PHPCensor/View/Build/view.phtml
index bdfe5f30..86226c0a 100644
--- a/src/PHPCI/View/Build/view.phtml
+++ b/src/PHPCensor/View/Build/view.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 
 <div class="row">
     <div class="col-sm-4">
diff --git a/src/PHPCI/View/BuildStatus/view.phtml b/src/PHPCensor/View/BuildStatus/view.phtml
similarity index 99%
rename from src/PHPCI/View/BuildStatus/view.phtml
rename to src/PHPCensor/View/BuildStatus/view.phtml
index 74afdcde..d3d2a600 100644
--- a/src/PHPCI/View/BuildStatus/view.phtml
+++ b/src/PHPCensor/View/BuildStatus/view.phtml
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <title><?php print $project->getTitle(); ?> - PHPCI</title>
+        <title><?php print $project->getTitle(); ?> - PHP Censor</title>
 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/src/PHPCI/View/BuildsTable.phtml b/src/PHPCensor/View/BuildsTable.phtml
similarity index 98%
rename from src/PHPCI/View/BuildsTable.phtml
rename to src/PHPCensor/View/BuildsTable.phtml
index f26eb250..9c78218e 100644
--- a/src/PHPCI/View/BuildsTable.phtml
+++ b/src/PHPCensor/View/BuildsTable.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 
 <?php if(empty($builds) || !count($builds)): ?>
 	<tr class="">
diff --git a/src/PHPCI/View/Email/layout.phtml b/src/PHPCensor/View/Email/layout.phtml
similarity index 100%
rename from src/PHPCI/View/Email/layout.phtml
rename to src/PHPCensor/View/Email/layout.phtml
diff --git a/src/PHPCI/View/Email/long.phtml b/src/PHPCensor/View/Email/long.phtml
similarity index 63%
rename from src/PHPCI/View/Email/long.phtml
rename to src/PHPCensor/View/Email/long.phtml
index 35464504..daef0aa2 100644
--- a/src/PHPCI/View/Email/long.phtml
+++ b/src/PHPCensor/View/Email/long.phtml
@@ -1,2 +1,2 @@
 <p style="margin: 10px; background: #fafafa"><?php print $build->getCommitMessage(); ?></p>
-<pre class="ansi_color_bg_black ansi_color_fg_white" style="padding: 4px"><?php print \PHPCI\Helper\AnsiConverter::convert($build->getLog()); ?></pre>
+<pre class="ansi_color_bg_black ansi_color_fg_white" style="padding: 4px"><?php print \PHPCensor\Helper\AnsiConverter::convert($build->getLog()); ?></pre>
diff --git a/src/PHPCI/View/Email/short.phtml b/src/PHPCensor/View/Email/short.phtml
similarity index 100%
rename from src/PHPCI/View/Email/short.phtml
rename to src/PHPCensor/View/Email/short.phtml
diff --git a/src/PHPCI/View/Group/edit.phtml b/src/PHPCensor/View/Group/edit.phtml
similarity index 85%
rename from src/PHPCI/View/Group/edit.phtml
rename to src/PHPCensor/View/Group/edit.phtml
index c08a36b3..0aba8f57 100644
--- a/src/PHPCI/View/Group/edit.phtml
+++ b/src/PHPCensor/View/Group/edit.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 <div class="box box-primary">
     <div class="box-header">
         <h3 class="box-title"><?php Lang::out('group_add_edit'); ?></h3>
diff --git a/src/PHPCI/View/Group/index.phtml b/src/PHPCensor/View/Group/index.phtml
similarity index 97%
rename from src/PHPCI/View/Group/index.phtml
rename to src/PHPCensor/View/Group/index.phtml
index dfcb9268..d912d79c 100644
--- a/src/PHPCI/View/Group/index.phtml
+++ b/src/PHPCensor/View/Group/index.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 <div class="clearfix"  style="margin-bottom: 20px;">
     <a class="btn btn-success pull-right" href="<?php print PHPCI_URL . 'group/edit'; ?>">
         <?php Lang::out('group_add'); ?>
diff --git a/src/PHPCI/View/Home/index.phtml b/src/PHPCensor/View/Home/index.phtml
similarity index 93%
rename from src/PHPCI/View/Home/index.phtml
rename to src/PHPCensor/View/Home/index.phtml
index 6bce4be8..1cda16e7 100644
--- a/src/PHPCI/View/Home/index.phtml
+++ b/src/PHPCensor/View/Home/index.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 <div class="row">
 
     <div class="col-sm-5">
@@ -28,25 +28,25 @@
                     <?php
                     foreach ($builds as $build):
                         switch ($build->getStatus()) {
-                            case \PHPCI\Model\Build::STATUS_NEW:
+                            case \PHPCensor\Model\Build::STATUS_NEW:
                                 $updated = $build->getCreated();
                                 $label = Lang::get('pending');
                                 $color = 'blue';
                                 break;
 
-                            case \PHPCI\Model\Build::STATUS_RUNNING:
+                            case \PHPCensor\Model\Build::STATUS_RUNNING:
                                 $updated = $build->getStarted();
                                 $label = Lang::get('running');
                                 $color = 'yellow';
                                 break;
 
-                            case \PHPCI\Model\Build::STATUS_SUCCESS:
+                            case \PHPCensor\Model\Build::STATUS_SUCCESS:
                                 $updated = $build->getFinished();
                                 $label = Lang::get('successful');
                                 $color = 'green';
                                 break;
 
-                            case \PHPCI\Model\Build::STATUS_FAILED:
+                            case \PHPCensor\Model\Build::STATUS_FAILED:
                                 $updated = $build->getFinished();
                                 $label = Lang::get('failed');
                                 $color = 'red';
diff --git a/src/PHPCI/View/Plugin/index.phtml b/src/PHPCensor/View/Plugin/index.phtml
similarity index 86%
rename from src/PHPCI/View/Plugin/index.phtml
rename to src/PHPCensor/View/Plugin/index.phtml
index 5c186012..f6526eba 100644
--- a/src/PHPCI/View/Plugin/index.phtml
+++ b/src/PHPCensor/View/Plugin/index.phtml
@@ -1,8 +1,8 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 
 <div class="alert alert-danger">
-    <p><strong>Adding requirements to the PHPCI composer.json file is no longer recommended as a method of installing your required testing tools.</strong><br>
-        For this reason, we have removed the ability for PHPCI to modify the composer.json file for you.
+    <p><strong>Adding requirements to the PHP Censor composer.json file is no longer recommended as a method of installing your required testing tools.</strong><br>
+        For this reason, we have removed the ability for PHP Censor to modify the composer.json file for you.
         We recommend that you install testing tools using your project's own composer.json file, by adding them to the "require-dev" section of the file.</p>
 </div>
 
diff --git a/src/PHPCI/View/Project/view.phtml b/src/PHPCensor/View/Project/view.phtml
similarity index 99%
rename from src/PHPCI/View/Project/view.phtml
rename to src/PHPCensor/View/Project/view.phtml
index 8a553b63..f5a54a0d 100644
--- a/src/PHPCI/View/Project/view.phtml
+++ b/src/PHPCensor/View/Project/view.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 <script>
     var PHPCI_PROJECT_ID = <?php print $project->getId(); ?>;
     var PHPCI_PROJECT_BRANCH = '<?php print $branch; ?>';
diff --git a/src/PHPCI/View/ProjectForm.phtml b/src/PHPCensor/View/ProjectForm.phtml
similarity index 97%
rename from src/PHPCI/View/ProjectForm.phtml
rename to src/PHPCensor/View/ProjectForm.phtml
index 5accf682..96f28ee9 100644
--- a/src/PHPCI/View/ProjectForm.phtml
+++ b/src/PHPCensor/View/ProjectForm.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 <div class="row">
 
 	<div class="col-sm-8">
diff --git a/src/PHPCI/View/Session.phtml b/src/PHPCensor/View/Session.phtml
similarity index 97%
rename from src/PHPCI/View/Session.phtml
rename to src/PHPCensor/View/Session.phtml
index d5fc412f..fc68b948 100644
--- a/src/PHPCI/View/Session.phtml
+++ b/src/PHPCensor/View/Session.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/src/PHPCI/View/Session/forgotPassword.phtml b/src/PHPCensor/View/Session/forgotPassword.phtml
similarity index 96%
rename from src/PHPCI/View/Session/forgotPassword.phtml
rename to src/PHPCensor/View/Session/forgotPassword.phtml
index df04f592..069c1b6a 100644
--- a/src/PHPCI/View/Session/forgotPassword.phtml
+++ b/src/PHPCensor/View/Session/forgotPassword.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 <?php if (isset($emailed)): ?>
     <p class="alert alert-success" style="margin-bottom: 0">
         <?php Lang::out('reset_emailed'); ?>
diff --git a/src/PHPCI/View/Session/login.phtml b/src/PHPCensor/View/Session/login.phtml
similarity index 90%
rename from src/PHPCI/View/Session/login.phtml
rename to src/PHPCensor/View/Session/login.phtml
index 842c4c20..ecb7a386 100644
--- a/src/PHPCI/View/Session/login.phtml
+++ b/src/PHPCensor/View/Session/login.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 <?php if($failed): ?>
     <p class="alert alert-danger"><?php Lang::out('login_error'); ?></p>
 <?php endif; ?>
diff --git a/src/PHPCI/View/Session/resetPassword.phtml b/src/PHPCensor/View/Session/resetPassword.phtml
similarity index 96%
rename from src/PHPCI/View/Session/resetPassword.phtml
rename to src/PHPCensor/View/Session/resetPassword.phtml
index 16c2ee66..f4b39f88 100644
--- a/src/PHPCI/View/Session/resetPassword.phtml
+++ b/src/PHPCensor/View/Session/resetPassword.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 <?php if (empty($error)): ?>
 
         <div class="box-header">
diff --git a/src/PHPCI/View/Settings/index.phtml b/src/PHPCensor/View/Settings/index.phtml
similarity index 99%
rename from src/PHPCI/View/Settings/index.phtml
rename to src/PHPCensor/View/Settings/index.phtml
index c97cbbc2..b7d6fd61 100644
--- a/src/PHPCI/View/Settings/index.phtml
+++ b/src/PHPCensor/View/Settings/index.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 
 <?php if (isset($_GET['saved']) && $_GET['saved'] == 1): ?>
 <p class="alert alert-success" style="margin-bottom: 20px;">
diff --git a/src/PHPCI/View/SummaryTable.phtml b/src/PHPCensor/View/SummaryTable.phtml
similarity index 99%
rename from src/PHPCI/View/SummaryTable.phtml
rename to src/PHPCensor/View/SummaryTable.phtml
index ae069713..a43706df 100644
--- a/src/PHPCI/View/SummaryTable.phtml
+++ b/src/PHPCensor/View/SummaryTable.phtml
@@ -1,5 +1,5 @@
 <?php
-use PHPCI\Helper\Lang;
+use PHPCensor\Helper\Lang;
 
 foreach($projects as $project):
     $statuses = [];
diff --git a/src/PHPCI/View/User/index.phtml b/src/PHPCensor/View/User/index.phtml
similarity index 98%
rename from src/PHPCI/View/User/index.phtml
rename to src/PHPCensor/View/User/index.phtml
index 061be90f..3a713545 100644
--- a/src/PHPCI/View/User/index.phtml
+++ b/src/PHPCensor/View/User/index.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 <div class="clearfix"  style="margin-bottom: 20px;">
     <div class="pull-right btn-group">
         <a class="btn btn-primary" href="<?php print PHPCI_URL; ?>user/add"><?php Lang::out('add_user'); ?></a>
diff --git a/src/PHPCI/View/User/profile.phtml b/src/PHPCensor/View/User/profile.phtml
similarity index 90%
rename from src/PHPCI/View/User/profile.phtml
rename to src/PHPCensor/View/User/profile.phtml
index 5c8b5f68..0c29451e 100644
--- a/src/PHPCI/View/User/profile.phtml
+++ b/src/PHPCensor/View/User/profile.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 <?php if (isset($updated)): ?>
 <p class="alert alert-success"><?php Lang::out('your_details_updated'); ?></p>
 <?php endif; ?>
diff --git a/src/PHPCI/View/UserForm.phtml b/src/PHPCensor/View/UserForm.phtml
similarity index 100%
rename from src/PHPCI/View/UserForm.phtml
rename to src/PHPCensor/View/UserForm.phtml
diff --git a/src/PHPCI/View/exception.phtml b/src/PHPCensor/View/exception.phtml
similarity index 100%
rename from src/PHPCI/View/exception.phtml
rename to src/PHPCensor/View/exception.phtml
diff --git a/src/PHPCI/View/layout.phtml b/src/PHPCensor/View/layout.phtml
similarity index 99%
rename from src/PHPCI/View/layout.phtml
rename to src/PHPCensor/View/layout.phtml
index 973f9f2e..08c8d8e3 100644
--- a/src/PHPCI/View/layout.phtml
+++ b/src/PHPCensor/View/layout.phtml
@@ -1,4 +1,4 @@
-<?php use PHPCI\Helper\Lang; ?>
+<?php use PHPCensor\Helper\Lang; ?>
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/src/PHPCI/Worker/BuildWorker.php b/src/PHPCensor/Worker/BuildWorker.php
similarity index 97%
rename from src/PHPCI/Worker/BuildWorker.php
rename to src/PHPCensor/Worker/BuildWorker.php
index 42c45be7..e2ad593a 100644
--- a/src/PHPCI/Worker/BuildWorker.php
+++ b/src/PHPCensor/Worker/BuildWorker.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPCI\Worker;
+namespace PHPCensor\Worker;
 
 use b8\Config;
 use b8\Database;
@@ -8,10 +8,10 @@ use b8\Store\Factory;
 use Monolog\Logger;
 use Pheanstalk\Job;
 use Pheanstalk\Pheanstalk;
-use PHPCI\Builder;
-use PHPCI\BuildFactory;
-use PHPCI\Logging\BuildDBLogHandler;
-use PHPCI\Model\Build;
+use PHPCensor\Builder;
+use PHPCensor\BuildFactory;
+use PHPCensor\Logging\BuildDBLogHandler;
+use PHPCensor\Model\Build;
 
 /**
  * Class BuildWorker
diff --git a/src/PHPCI/ZeroConfigPlugin.php b/src/PHPCensor/ZeroConfigPlugin.php
similarity index 90%
rename from src/PHPCI/ZeroConfigPlugin.php
rename to src/PHPCensor/ZeroConfigPlugin.php
index 73f7746c..d2525a6d 100644
--- a/src/PHPCI/ZeroConfigPlugin.php
+++ b/src/PHPCensor/ZeroConfigPlugin.php
@@ -7,9 +7,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace PHPCI;
+namespace PHPCensor;
 
-use PHPCI\Model\Build;
+use PHPCensor\Model\Build;
 
 /**
  * PHPCI Plugin Interface - Used by all build plugins.
diff --git a/tests/PHPCI/Command/CreateAdminCommandTest.php b/tests/PHPCensor/Command/CreateAdminCommandTest.php
similarity index 91%
rename from tests/PHPCI/Command/CreateAdminCommandTest.php
rename to tests/PHPCensor/Command/CreateAdminCommandTest.php
index 15ee0bf2..53adc067 100644
--- a/tests/PHPCI/Command/CreateAdminCommandTest.php
+++ b/tests/PHPCensor/Command/CreateAdminCommandTest.php
@@ -8,7 +8,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin\Command;
+namespace Tests\PHPCensor\Plugin\Command;
 
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -34,8 +34,8 @@ class CreateAdminCommandTest extends \PHPUnit_Framework_TestCase
     {
         parent::setup();
 
-        $this->command = $this->getMockBuilder('PHPCI\\Command\\CreateAdminCommand')
-            ->setConstructorArgs([$this->getMock('PHPCI\\Store\\UserStore')])
+        $this->command = $this->getMockBuilder('PHPCensor\\Command\\CreateAdminCommand')
+            ->setConstructorArgs([$this->getMock('PHPCensor\\Store\\UserStore')])
             ->setMethods(['reloadConfig'])
             ->getMock();
 
diff --git a/tests/PHPCI/Command/CreateBuildCommandTest.php b/tests/PHPCensor/Command/CreateBuildCommandTest.php
similarity index 86%
rename from tests/PHPCI/Command/CreateBuildCommandTest.php
rename to tests/PHPCensor/Command/CreateBuildCommandTest.php
index 7311dd98..521ace2f 100644
--- a/tests/PHPCI/Command/CreateBuildCommandTest.php
+++ b/tests/PHPCensor/Command/CreateBuildCommandTest.php
@@ -7,7 +7,7 @@
  * @link            http://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Command;
+namespace Tests\PHPCensor\Command;
 
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -28,9 +28,9 @@ class CreateBuildCommandTest extends \PHPUnit_Framework_TestCase
     {
         parent::setup();
 
-        $projectMock = $this->getMock('PHPCI\\Model\\Project');
+        $projectMock = $this->getMock('PHPCensor\\Model\\Project');
 
-        $projectStoreMock = $this->getMockBuilder('PHPCI\\Store\\ProjectStore')
+        $projectStoreMock = $this->getMockBuilder('PHPCensor\\Store\\ProjectStore')
             ->getMock();
         $projectStoreMock->method('getById')
             ->will($this->returnValueMap([
@@ -38,7 +38,7 @@ class CreateBuildCommandTest extends \PHPUnit_Framework_TestCase
                 [2, 'read', null],
             ]));
 
-        $buildServiceMock = $this->getMockBuilder('PHPCI\\Service\\BuildService')
+        $buildServiceMock = $this->getMockBuilder('PHPCensor\\Service\\BuildService')
             ->disableOriginalConstructor()
             ->getMock();
         $buildServiceMock->method('createBuild')
@@ -48,7 +48,7 @@ class CreateBuildCommandTest extends \PHPUnit_Framework_TestCase
                 [$projectMock, null, 'master', null, null, null]
             );
 
-        $this->command = $this->getMockBuilder('PHPCI\\Command\\CreateBuildCommand')
+        $this->command = $this->getMockBuilder('PHPCensor\\Command\\CreateBuildCommand')
             ->setConstructorArgs([$projectStoreMock, $buildServiceMock])
             ->setMethods(['reloadConfig'])
             ->getMock();
diff --git a/tests/PHPCI/Command/InstallCommandTest.php b/tests/PHPCensor/Command/InstallCommandTest.php
similarity index 98%
rename from tests/PHPCI/Command/InstallCommandTest.php
rename to tests/PHPCensor/Command/InstallCommandTest.php
index 7aad3716..a94bfb02 100644
--- a/tests/PHPCI/Command/InstallCommandTest.php
+++ b/tests/PHPCensor/Command/InstallCommandTest.php
@@ -8,7 +8,7 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin\Command;
+namespace Tests\PHPCensor\Plugin\Command;
 
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -53,7 +53,7 @@ class InstallCommandTest extends \PHPUnit_Framework_TestCase
     {
         // Current command, we need to mock all method that interact with
         // Database & File system.
-        $command = $this->getMockBuilder('PHPCI\\Command\\InstallCommand')
+        $command = $this->getMockBuilder('PHPCensor\\Command\\InstallCommand')
             ->setMethods([
                 'reloadConfig',
                 'verifyNotInstalled',
diff --git a/tests/PHPCI/Controller/WebhookControllerTest.php b/tests/PHPCensor/Controller/WebhookControllerTest.php
similarity index 93%
rename from tests/PHPCI/Controller/WebhookControllerTest.php
rename to tests/PHPCensor/Controller/WebhookControllerTest.php
index b3b31e42..4c1e7a3b 100644
--- a/tests/PHPCI/Controller/WebhookControllerTest.php
+++ b/tests/PHPCensor/Controller/WebhookControllerTest.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Controller;
+namespace Tests\PHPCensor\Controller;
 
-use PHPCI\Controller\WebhookController;
+use PHPCensor\Controller\WebhookController;
 
 class WebhookControllerTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/PHPCI/Helper/AnsiConverterTest.php b/tests/PHPCensor/Helper/AnsiConverterTest.php
similarity index 90%
rename from tests/PHPCI/Helper/AnsiConverterTest.php
rename to tests/PHPCensor/Helper/AnsiConverterTest.php
index e8144237..057c1e1f 100644
--- a/tests/PHPCI/Helper/AnsiConverterTest.php
+++ b/tests/PHPCensor/Helper/AnsiConverterTest.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Helper;
+namespace Tests\PHPCensor\Helper;
 
-use PHPCI\Helper\AnsiConverter;
+use PHPCensor\Helper\AnsiConverter;
 use PHPUnit_Framework_TestCase;
 
 class AnsiConverterTest extends PHPUnit_Framework_TestCase
diff --git a/tests/PHPCI/Helper/BuildInterpolatorTest.php b/tests/PHPCensor/Helper/BuildInterpolatorTest.php
similarity index 88%
rename from tests/PHPCI/Helper/BuildInterpolatorTest.php
rename to tests/PHPCensor/Helper/BuildInterpolatorTest.php
index 8961b2d8..36025daa 100644
--- a/tests/PHPCI/Helper/BuildInterpolatorTest.php
+++ b/tests/PHPCensor/Helper/BuildInterpolatorTest.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin\Helper;
+namespace Tests\PHPCensor\Plugin\Helper;
 
-use PHPCI\Helper\BuildInterpolator;
+use PHPCensor\Helper\BuildInterpolator;
 
 class BuildInterpolatorTest extends \PHPUnit_Framework_TestCase
 {
@@ -37,7 +37,7 @@ class BuildInterpolatorTest extends \PHPUnit_Framework_TestCase
 
     public function testInterpolate_LeavesStringsUnchangedWhenBuildIsSet()
     {
-        $build = $this->prophesize('PHPCI\\Model\\Build')->reveal();
+        $build = $this->prophesize('PHPCensor\\Model\\Build')->reveal();
 
         $string = "Hello World";
         $expectedOutput = "Hello World";
diff --git a/tests/PHPCI/Helper/CommandExecutorTest.php b/tests/PHPCensor/Helper/CommandExecutorTest.php
similarity index 90%
rename from tests/PHPCI/Helper/CommandExecutorTest.php
rename to tests/PHPCensor/Helper/CommandExecutorTest.php
index 5c05c041..877be38b 100644
--- a/tests/PHPCI/Helper/CommandExecutorTest.php
+++ b/tests/PHPCensor/Helper/CommandExecutorTest.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Helper;
+namespace Tests\PHPCensor\Helper;
 
-use PHPCI\Helper\UnixCommandExecutor;
+use PHPCensor\Helper\UnixCommandExecutor;
 
 class CommandExecutorTest extends \PHPUnit_Framework_TestCase
 {
@@ -27,11 +27,11 @@ class CommandExecutorTest extends \PHPUnit_Framework_TestCase
         }
         parent::setUp();
 
-        $mockBuildLogger = $this->prophesize('PHPCI\Logging\BuildLogger');
+        $mockBuildLogger = $this->prophesize('PHPCensor\Logging\BuildLogger');
 
         $class = IS_WIN 
-            ? 'PHPCI\Helper\WindowsCommandExecutor'
-            : 'PHPCI\Helper\UnixCommandExecutor';
+            ? 'PHPCensor\Helper\WindowsCommandExecutor'
+            : 'PHPCensor\Helper\UnixCommandExecutor';
         $this->testedExecutor = new $class($mockBuildLogger->reveal(), __DIR__);
     }
 
diff --git a/tests/PHPCI/Helper/LangTest.php b/tests/PHPCensor/Helper/LangTest.php
similarity index 94%
rename from tests/PHPCI/Helper/LangTest.php
rename to tests/PHPCensor/Helper/LangTest.php
index b71ee41d..ed0b7b28 100644
--- a/tests/PHPCI/Helper/LangTest.php
+++ b/tests/PHPCensor/Helper/LangTest.php
@@ -8,10 +8,10 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Helper;
+namespace Tests\PHPCensor\Helper;
 
 use DateTime;
-use PHPCI\Helper\Lang;
+use PHPCensor\Helper\Lang;
 
 class LangTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/PHPCI/Helper/MailerFactoryTest.php b/tests/PHPCensor/Helper/MailerFactoryTest.php
similarity index 97%
rename from tests/PHPCI/Helper/MailerFactoryTest.php
rename to tests/PHPCensor/Helper/MailerFactoryTest.php
index c9732798..b45e6707 100644
--- a/tests/PHPCI/Helper/MailerFactoryTest.php
+++ b/tests/PHPCensor/Helper/MailerFactoryTest.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace tests\PHPCI\Service;
+namespace tests\PHPCensor\Service;
 
-use PHPCI\Helper\MailerFactory;
+use PHPCensor\Helper\MailerFactory;
 
 /**
  * Unit tests for the ProjectService class.
diff --git a/tests/PHPCI/Logging/BuildLoggerTest.php b/tests/PHPCensor/Logging/BuildLoggerTest.php
similarity index 95%
rename from tests/PHPCI/Logging/BuildLoggerTest.php
rename to tests/PHPCensor/Logging/BuildLoggerTest.php
index 35504c66..ee8d7cda 100644
--- a/tests/PHPCI/Logging/BuildLoggerTest.php
+++ b/tests/PHPCensor/Logging/BuildLoggerTest.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin\Helper;
+namespace Tests\PHPCensor\Plugin\Helper;
 
-use PHPCI\Logging\BuildLogger;
+use PHPCensor\Logging\BuildLogger;
 use Prophecy\Argument;
 use Psr\Log\LogLevel;
 
@@ -29,7 +29,7 @@ class BuildLoggerTest extends \PHPUnit_Framework_TestCase
     {
         parent::setUp();
         $this->mockLogger = $this->prophesize('\Psr\Log\LoggerInterface');
-        $this->mockBuild = $this->prophesize('\PHPCI\Model\Build');
+        $this->mockBuild = $this->prophesize('\PHPCensor\Model\Build');
 
         $this->testedBuildLogger = new BuildLogger(
             $this->mockLogger->reveal(),
diff --git a/tests/PHPCI/Logging/LoggerConfigTest.php b/tests/PHPCensor/Logging/LoggerConfigTest.php
similarity index 97%
rename from tests/PHPCI/Logging/LoggerConfigTest.php
rename to tests/PHPCensor/Logging/LoggerConfigTest.php
index 2e1729d2..51c5de33 100644
--- a/tests/PHPCI/Logging/LoggerConfigTest.php
+++ b/tests/PHPCensor/Logging/LoggerConfigTest.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin\Helper;
+namespace Tests\PHPCensor\Plugin\Helper;
 
-use \PHPCI\Logging\LoggerConfig;
+use \PHPCensor\Logging\LoggerConfig;
 
 class LoggerConfigTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/PHPCI/Model/BuildTest.php b/tests/PHPCensor/Model/BuildTest.php
similarity index 96%
rename from tests/PHPCI/Model/BuildTest.php
rename to tests/PHPCensor/Model/BuildTest.php
index b01370a5..bca938af 100644
--- a/tests/PHPCI/Model/BuildTest.php
+++ b/tests/PHPCensor/Model/BuildTest.php
@@ -9,10 +9,10 @@
  */
 
 
-namespace Tests\PHPCI\Model;
+namespace Tests\PHPCensor\Model;
 
-use PHPCI\Model\Build;
-use PHPCI\Model;
+use PHPCensor\Model\Build;
+use PHPCensor\Model;
 
 /**
  * Unit tests for the Build model class.
diff --git a/tests/PHPCI/Model/ProjectTest.php b/tests/PHPCensor/Model/ProjectTest.php
similarity index 96%
rename from tests/PHPCI/Model/ProjectTest.php
rename to tests/PHPCensor/Model/ProjectTest.php
index 567eb874..c4a6420d 100644
--- a/tests/PHPCI/Model/ProjectTest.php
+++ b/tests/PHPCensor/Model/ProjectTest.php
@@ -9,10 +9,10 @@
  */
 
 
-namespace Tests\PHPCI\Model;
+namespace Tests\PHPCensor\Model;
 
-use PHPCI\Model\Project;
-use PHPCI\Model;
+use PHPCensor\Model\Project;
+use PHPCensor\Model;
 
 /**
  * Unit tests for the Project model class.
diff --git a/tests/PHPCI/Plugin/EmailTest.php b/tests/PHPCensor/Plugin/EmailTest.php
similarity index 97%
rename from tests/PHPCI/Plugin/EmailTest.php
rename to tests/PHPCensor/Plugin/EmailTest.php
index eb2b044c..e0f835ce 100644
--- a/tests/PHPCI/Plugin/EmailTest.php
+++ b/tests/PHPCensor/Plugin/EmailTest.php
@@ -8,10 +8,10 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin;
+namespace Tests\PHPCensor\Plugin;
 
-use PHPCI\Plugin\Email as EmailPlugin;
-use PHPCI\Model\Build;
+use PHPCensor\Plugin\Email as EmailPlugin;
+use PHPCensor\Model\Build;
 
 /**
  * Unit test for the PHPUnit plugin.
@@ -62,7 +62,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase
         $self                = $this;
 
         $this->mockProject = $this->getMock(
-            '\PHPCI\Model\Project',
+            '\PHPCensor\Model\Project',
             ['getTitle'],
             [],
             "mockProject",
@@ -74,7 +74,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase
             ->will($this->returnValue("Test-Project"));
 
         $this->mockBuild = $this->getMock(
-            '\PHPCI\Model\Build',
+            '\PHPCensor\Model\Build',
             ['getLog', 'getStatus', 'getProject', 'getCommitterEmail'],
             [],
             "mockBuild",
@@ -100,7 +100,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase
             ->will($this->returnValue('committer-email@example.com'));
 
         $this->mockCiBuilder = $this->getMock(
-            '\PHPCI\Builder',
+            '\PHPCensor\Builder',
             [
                 'getSystemConfig',
                 'getBuild',
@@ -135,7 +135,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase
         $self = $this;
 
         $this->testedEmailPlugin = $this->getMock(
-            '\PHPCI\Plugin\Email',
+            '\PHPCensor\Plugin\Email',
             ['sendEmail'],
             [
                 $this->mockCiBuilder,
diff --git a/tests/PHPCI/Plugin/PharTest.php b/tests/PHPCensor/Plugin/PharTest.php
similarity index 92%
rename from tests/PHPCI/Plugin/PharTest.php
rename to tests/PHPCensor/Plugin/PharTest.php
index 7ac9669d..8a79f1ec 100644
--- a/tests/PHPCI/Plugin/PharTest.php
+++ b/tests/PHPCensor/Plugin/PharTest.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin;
+namespace Tests\PHPCensor\Plugin;
 
-use PHPCI\Plugin\Phar as PharPlugin;
+use PHPCensor\Plugin\Phar as PharPlugin;
 use Phar as PHPPhar;
 
 class PharTest extends \PHPUnit_Framework_TestCase
@@ -25,12 +25,12 @@ class PharTest extends \PHPUnit_Framework_TestCase
     protected function getPlugin(array $options = [])
     {
         $build = $this
-            ->getMockBuilder('PHPCI\Model\Build')
+            ->getMockBuilder('PHPCensor\Model\Build')
             ->disableOriginalConstructor()
             ->getMock();
 
         $phpci = $this
-            ->getMockBuilder('PHPCI\Builder')
+            ->getMockBuilder('PHPCensor\Builder')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -39,7 +39,7 @@ class PharTest extends \PHPUnit_Framework_TestCase
 
     protected function buildTemp()
     {
-        $directory = tempnam(ROOT_DIR . 'tests' . DIRECTORY_SEPARATOR . 'PHPCI' . DIRECTORY_SEPARATOR . 'temp' . DIRECTORY_SEPARATOR, 'source');
+        $directory = tempnam(ROOT_DIR . 'tests' . DIRECTORY_SEPARATOR . 'PHPCensor' . DIRECTORY_SEPARATOR . 'temp' . DIRECTORY_SEPARATOR, 'source');
         unlink($directory);
         return $directory;
     }
@@ -93,9 +93,9 @@ class PharTest extends \PHPUnit_Framework_TestCase
     public function testPlugin()
     {
         $plugin = $this->getPlugin();
-        $this->assertInstanceOf('PHPCI\Plugin', $plugin);
-        $this->assertInstanceOf('PHPCI\Model\Build', $plugin->getBuild());
-        $this->assertInstanceOf('PHPCI\Builder', $plugin->getPHPCI());
+        $this->assertInstanceOf('PHPCensor\Plugin', $plugin);
+        $this->assertInstanceOf('PHPCensor\Model\Build', $plugin->getBuild());
+        $this->assertInstanceOf('PHPCensor\Builder', $plugin->getPHPCI());
     }
 
     public function testDirectory()
diff --git a/tests/PHPCI/Plugin/Util/ComposerPluginInformationTest.php b/tests/PHPCensor/Plugin/Util/ComposerPluginInformationTest.php
similarity index 90%
rename from tests/PHPCI/Plugin/Util/ComposerPluginInformationTest.php
rename to tests/PHPCensor/Plugin/Util/ComposerPluginInformationTest.php
index 1174d44f..e52ffdde 100644
--- a/tests/PHPCI/Plugin/Util/ComposerPluginInformationTest.php
+++ b/tests/PHPCensor/Plugin/Util/ComposerPluginInformationTest.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin\Util;
+namespace Tests\PHPCensor\Plugin\Util;
 
-use PHPCI\Plugin\Util\ComposerPluginInformation;
+use PHPCensor\Plugin\Util\ComposerPluginInformation;
 
 class ComposerPluginInformationTest extends \PHPUnit_Framework_TestCase
 {
@@ -35,7 +35,7 @@ class ComposerPluginInformationTest extends \PHPUnit_Framework_TestCase
     {
         $this->phpciSetup();
         $this->assertInstanceOf(
-            '\PHPCI\Plugin\Util\ComposerPluginInformation',
+            '\PHPCensor\Plugin\Util\ComposerPluginInformation',
             $this->testedInformation
         );
     }
diff --git a/tests/PHPCI/Plugin/Util/ExamplePluginConfig.php b/tests/PHPCensor/Plugin/Util/ExamplePluginConfig.php
similarity index 89%
rename from tests/PHPCI/Plugin/Util/ExamplePluginConfig.php
rename to tests/PHPCensor/Plugin/Util/ExamplePluginConfig.php
index 34c717aa..3eb2687a 100644
--- a/tests/PHPCI/Plugin/Util/ExamplePluginConfig.php
+++ b/tests/PHPCensor/Plugin/Util/ExamplePluginConfig.php
@@ -8,7 +8,7 @@
  * @link         https://www.phptesting.org/
  */
 
-return function (PHPCI\Plugin\Util\Factory $factory) {
+return function (PHPCensor\Plugin\Util\Factory $factory) {
     $factory->registerResource(
         // This function will be called when the resource is needed.
         function() {
diff --git a/tests/PHPCI/Plugin/Util/ExecutorTest.php b/tests/PHPCensor/Plugin/Util/ExecutorTest.php
similarity index 77%
rename from tests/PHPCI/Plugin/Util/ExecutorTest.php
rename to tests/PHPCensor/Plugin/Util/ExecutorTest.php
index 6ccff5ac..188c1f6a 100644
--- a/tests/PHPCI/Plugin/Util/ExecutorTest.php
+++ b/tests/PHPCensor/Plugin/Util/ExecutorTest.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin\Util;
+namespace Tests\PHPCensor\Plugin\Util;
 
-use PHPCI\Plugin\Util\Executor;
+use PHPCensor\Plugin\Util\Executor;
 use Prophecy\Argument;
 
 class ExecutorTest extends \PHPUnit_Framework_TestCase
@@ -29,9 +29,9 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockBuildLogger = $this->prophesize('\PHPCI\Logging\BuildLogger');
-        $this->mockFactory = $this->prophesize('\PHPCI\Plugin\Util\Factory');
-        $this->mockStore = $this->prophesize('\PHPCI\Store\BuildStore');
+        $this->mockBuildLogger = $this->prophesize('\PHPCensor\Logging\BuildLogger');
+        $this->mockFactory = $this->prophesize('\PHPCensor\Plugin\Util\Factory');
+        $this->mockStore = $this->prophesize('\PHPCensor\Store\BuildStore');
         $this->testedExecutor = new Executor(
             $this->mockFactory->reveal(),
             $this->mockBuildLogger->reveal(),
@@ -43,11 +43,11 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
     {
         $options = [];
         $pluginName = 'PhpUnit';
-        $pluginNamespace = 'PHPCI\\Plugin\\';
+        $pluginNamespace = 'PHPCensor\\Plugin\\';
 
         $this->mockFactory->buildPlugin($pluginNamespace . $pluginName, $options)
                           ->shouldBeCalledTimes(1)
-                          ->willReturn($this->prophesize('PHPCI\Plugin')->reveal());
+                          ->willReturn($this->prophesize('PHPCensor\Plugin')->reveal());
 
         $this->testedExecutor->executePlugin($pluginName, $options);
     }
@@ -59,7 +59,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
 
         $this->mockFactory->buildPlugin($pluginClass, $options)
           ->shouldBeCalledTimes(1)
-          ->willReturn($this->prophesize('PHPCI\Plugin')->reveal());
+          ->willReturn($this->prophesize('PHPCensor\Plugin')->reveal());
 
         $this->testedExecutor->executePlugin($pluginClass, $options);
     }
@@ -68,13 +68,13 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
     {
         $options = [];
         $pluginName = 'PhpUnit';
-        $build = new \PHPCI\Model\Build();
+        $build = new \PHPCensor\Model\Build();
 
-        $mockPlugin = $this->prophesize('PHPCI\Plugin');
+        $mockPlugin = $this->prophesize('PHPCensor\Plugin');
         $mockPlugin->execute()->shouldBeCalledTimes(1);
 
         $this->mockFactory->buildPlugin(Argument::any(), Argument::any())->willReturn($mockPlugin->reveal());
-        $this->mockFactory->getResourceFor('PHPCI\Model\Build')->willReturn($build);
+        $this->mockFactory->getResourceFor('PHPCensor\Model\Build')->willReturn($build);
 
         $this->testedExecutor->executePlugin($pluginName, $options);
     }
@@ -86,7 +86,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
 
         $expectedReturnValue = true;
 
-        $mockPlugin = $this->prophesize('PHPCI\Plugin');
+        $mockPlugin = $this->prophesize('PHPCensor\Plugin');
         $mockPlugin->execute()->willReturn($expectedReturnValue);
 
         $this->mockFactory->buildPlugin(Argument::any(), Argument::any())->willReturn($mockPlugin->reveal());
@@ -113,7 +113,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
 
         $expectedException = new \RuntimeException("Generic Error");
 
-        $mockPlugin = $this->prophesize('PHPCI\Plugin');
+        $mockPlugin = $this->prophesize('PHPCensor\Plugin');
         $mockPlugin->execute()->willThrow($expectedException);
 
         $this->mockFactory->buildPlugin(Argument::any(), Argument::any())->willReturn($mockPlugin->reveal());
@@ -128,7 +128,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
     {
         $phpUnitPluginOptions = [];
         $behatPluginOptions   = [];
-        $build                = new \PHPCI\Model\Build();
+        $build                = new \PHPCensor\Model\Build();
 
         $config = [
            'stageOne' => [
@@ -137,16 +137,16 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
            ]
         ];
 
-        $pluginNamespace = 'PHPCI\\Plugin\\';
+        $pluginNamespace = 'PHPCensor\\Plugin\\';
 
-        $mockPhpUnitPlugin = $this->prophesize('PHPCI\Plugin');
+        $mockPhpUnitPlugin = $this->prophesize('PHPCensor\Plugin');
         $mockPhpUnitPlugin->execute()->shouldBeCalledTimes(1)->willReturn(true);
 
         $this->mockFactory->buildPlugin($pluginNamespace . 'PhpUnit', $phpUnitPluginOptions)
                           ->willReturn($mockPhpUnitPlugin->reveal());
-        $this->mockFactory->getResourceFor('PHPCI\Model\Build')->willReturn($build);
+        $this->mockFactory->getResourceFor('PHPCensor\Model\Build')->willReturn($build);
 
-        $mockBehatPlugin = $this->prophesize('PHPCI\Plugin');
+        $mockBehatPlugin = $this->prophesize('PHPCensor\Plugin');
         $mockBehatPlugin->execute()->shouldBeCalledTimes(1)->willReturn(true);
 
         $this->mockFactory->buildPlugin($pluginNamespace . 'Behat', $behatPluginOptions)
@@ -157,7 +157,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
 
     protected function getFakePluginClassName($pluginName)
     {
-        $pluginNamespace = '\\Tests\\PHPCI\\Plugin\\Util\\Fake\\';
+        $pluginNamespace = '\\Tests\\PHPCensor\\Plugin\\Util\\Fake\\';
 
         return $pluginNamespace . $pluginName;
     }
diff --git a/tests/PHPCI/Plugin/Util/FactoryTest.php b/tests/PHPCensor/Plugin/Util/FactoryTest.php
similarity index 94%
rename from tests/PHPCI/Plugin/Util/FactoryTest.php
rename to tests/PHPCensor/Plugin/Util/FactoryTest.php
index 823840e6..c367805e 100644
--- a/tests/PHPCI/Plugin/Util/FactoryTest.php
+++ b/tests/PHPCensor/Plugin/Util/FactoryTest.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin\Util;
+namespace Tests\PHPCensor\Plugin\Util;
 
-use PHPCI\Plugin\Util\Factory;
+use PHPCensor\Plugin\Util\Factory;
 
 class FactoryTest extends \PHPUnit_Framework_TestCase {
 
@@ -62,7 +62,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
 
     public function testBuildPluginFailsForNonPluginClasses()
     {
-        $this->setExpectedException('InvalidArgumentException', 'Requested class must implement \PHPCI\Plugin');
+        $this->setExpectedException('InvalidArgumentException', 'Requested class must implement \PHPCensor\Plugin');
         $plugin = $this->testedFactory->buildPlugin("stdClass");
     }
 
@@ -183,7 +183,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
         $this->testedFactory->registerResource(
             function () use ($self) {
                 return $self->getMock(
-                    'PHPCI\Builder',
+                    'PHPCensor\Builder',
                     [],
                     [],
                     '',
@@ -191,13 +191,13 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
                 );
             },
             null,
-            'PHPCI\\Builder'
+            'PHPCensor\\Builder'
         );
 
         $this->testedFactory->registerResource(
             function () use ($self) {
                 return $self->getMock(
-                    'PHPCI\Model\Build',
+                    'PHPCensor\Model\Build',
                     [],
                     [],
                     '',
@@ -205,13 +205,13 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
                 );
             },
             null,
-            'PHPCI\\Model\\Build'
+            'PHPCensor\\Model\\Build'
         );
     }
 
     protected function getFakePluginClassName($pluginName)
     {
-        $pluginNamespace = '\\Tests\\PHPCI\\Plugin\\Util\\Fake\\';
+        $pluginNamespace = '\\Tests\\PHPCensor\\Plugin\\Util\\Fake\\';
 
         return $pluginNamespace . $pluginName;
     }
diff --git a/tests/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginFull.php
similarity index 82%
rename from tests/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php
rename to tests/PHPCensor/Plugin/Util/Fake/ExamplePluginFull.php
index d7d11b41..56942a0c 100644
--- a/tests/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php
+++ b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginFull.php
@@ -8,11 +8,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin\Util\Fake;
+namespace Tests\PHPCensor\Plugin\Util\Fake;
 
-use PHPCI\Builder;
-use PHPCI\Model\Build;
-use PHPCI\Plugin;
+use PHPCensor\Builder;
+use PHPCensor\Model\Build;
+use PHPCensor\Plugin;
 
 class ExamplePluginFull implements Plugin {
     /**
diff --git a/tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
similarity index 83%
rename from tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
rename to tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
index 544ec4e3..a23bd5ad 100644
--- a/tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
+++ b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin\Util\Fake;
+namespace Tests\PHPCensor\Plugin\Util\Fake;
 
-use PHPCI\Plugin;
+use PHPCensor\Plugin;
 
 class ExamplePluginWithNoConstructorArgs implements Plugin
 {
diff --git a/tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php
similarity index 85%
rename from tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php
rename to tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php
index 9c78da6f..79d42bbc 100644
--- a/tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php
+++ b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin\Util\Fake;
+namespace Tests\PHPCensor\Plugin\Util\Fake;
 
-use PHPCI\Plugin;
+use PHPCensor\Plugin;
 
 class ExamplePluginWithSingleOptionalArg implements Plugin
 {
diff --git a/tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php
similarity index 87%
rename from tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php
rename to tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php
index b623d7b1..73d4b9ac 100644
--- a/tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php
+++ b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin\Util\Fake;
+namespace Tests\PHPCensor\Plugin\Util\Fake;
 
-use PHPCI\Plugin;
+use PHPCensor\Plugin;
 
 class ExamplePluginWithSingleRequiredArg implements Plugin
 {
diff --git a/tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
similarity index 88%
rename from tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
rename to tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
index b256c58c..1e172f1a 100644
--- a/tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
+++ b/tests/PHPCensor/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin\Util\Fake;
+namespace Tests\PHPCensor\Plugin\Util\Fake;
 
-use PHPCI\Plugin;
+use PHPCensor\Plugin;
 
 class ExamplePluginWithSingleTypedRequiredArg implements Plugin
 {
diff --git a/tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php b/tests/PHPCensor/Plugin/Util/FilesPluginInformationTest.php
similarity index 86%
rename from tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php
rename to tests/PHPCensor/Plugin/Util/FilesPluginInformationTest.php
index e9b92202..6d692b55 100644
--- a/tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php
+++ b/tests/PHPCensor/Plugin/Util/FilesPluginInformationTest.php
@@ -8,16 +8,16 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin\Util;
+namespace Tests\PHPCensor\Plugin\Util;
 
-use PHPCI\Plugin\Util\FilesPluginInformation;
+use PHPCensor\Plugin\Util\FilesPluginInformation;
 
 class FilesPluginInformationTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testGetInstalledPlugins_returnsObjects()
     {
-        $pluginDirPath = dirname(dirname(dirname(dirname(__DIR__)))) . "/src/PHPCI/Plugin/";
+        $pluginDirPath = dirname(dirname(dirname(dirname(__DIR__)))) . "/src/PHPCensor/Plugin/";
         $test          = FilesPluginInformation::newFromDir($pluginDirPath);
         $pluginInfos   = $test->getInstalledPlugins();
 
@@ -26,7 +26,7 @@ class FilesPluginInformationTest extends \PHPUnit_Framework_TestCase
 
     public function testGetPluginClasses_returnsStrings()
     {
-        $pluginDirPath = dirname(dirname(dirname(dirname(__DIR__)))) . "/src/PHPCI/Plugin";
+        $pluginDirPath = dirname(dirname(dirname(dirname(__DIR__)))) . "/src/PHPCensor/Plugin";
         $test          = FilesPluginInformation::newFromDir($pluginDirPath);
         $pluginInfos   = $test->getPluginClasses();
 
diff --git a/tests/PHPCI/Plugin/Util/TapParserTest.php b/tests/PHPCensor/Plugin/Util/TapParserTest.php
similarity index 99%
rename from tests/PHPCI/Plugin/Util/TapParserTest.php
rename to tests/PHPCensor/Plugin/Util/TapParserTest.php
index e4ac62c9..c87868d1 100644
--- a/tests/PHPCI/Plugin/Util/TapParserTest.php
+++ b/tests/PHPCensor/Plugin/Util/TapParserTest.php
@@ -8,9 +8,9 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Plugin\Util;
+namespace Tests\PHPCensor\Plugin\Util;
 
-use PHPCI\Plugin\Util\TapParser;
+use PHPCensor\Plugin\Util\TapParser;
 
 class TapParserTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/PHPCI/ProcessControl/PosixProcessControlTest.php b/tests/PHPCensor/ProcessControl/PosixProcessControlTest.php
similarity index 77%
rename from tests/PHPCI/ProcessControl/PosixProcessControlTest.php
rename to tests/PHPCensor/ProcessControl/PosixProcessControlTest.php
index 96bbf5b4..ccaf8c8b 100644
--- a/tests/PHPCI/ProcessControl/PosixProcessControlTest.php
+++ b/tests/PHPCensor/ProcessControl/PosixProcessControlTest.php
@@ -1,7 +1,7 @@
 <?php
-namespace Tests\PHPCI\ProcessControl;
+namespace Tests\PHPCensor\ProcessControl;
 
-use PHPCI\ProcessControl\PosixProcessControl;
+use PHPCensor\ProcessControl\PosixProcessControl;
 
 class PosixProcessControlTest extends UnixProcessControlTest
 {
diff --git a/tests/PHPCI/ProcessControl/ProcessControlTest.php b/tests/PHPCensor/ProcessControl/ProcessControlTest.php
similarity index 98%
rename from tests/PHPCI/ProcessControl/ProcessControlTest.php
rename to tests/PHPCensor/ProcessControl/ProcessControlTest.php
index b2316c9e..d04c400f 100644
--- a/tests/PHPCI/ProcessControl/ProcessControlTest.php
+++ b/tests/PHPCensor/ProcessControl/ProcessControlTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Tests\PHPCI\ProcessControl;
+namespace Tests\PHPCensor\ProcessControl;
 
 /**
  * Some helpers to
diff --git a/tests/PHPCI/ProcessControl/UnixProcessControlTest.php b/tests/PHPCensor/ProcessControl/UnixProcessControlTest.php
similarity index 81%
rename from tests/PHPCI/ProcessControl/UnixProcessControlTest.php
rename to tests/PHPCensor/ProcessControl/UnixProcessControlTest.php
index 9b102a73..97864a28 100644
--- a/tests/PHPCI/ProcessControl/UnixProcessControlTest.php
+++ b/tests/PHPCensor/ProcessControl/UnixProcessControlTest.php
@@ -1,7 +1,7 @@
 <?php
-namespace Tests\PHPCI\ProcessControl;
+namespace Tests\PHPCensor\ProcessControl;
 
-use PHPCI\ProcessControl\UnixProcessControl;
+use PHPCensor\ProcessControl\UnixProcessControl;
 
 class UnixProcessControlTest extends ProcessControlTest
 {
diff --git a/tests/PHPCI/ProcessControl/WindowsProcessControlTest.php b/tests/PHPCensor/ProcessControl/WindowsProcessControlTest.php
similarity index 80%
rename from tests/PHPCI/ProcessControl/WindowsProcessControlTest.php
rename to tests/PHPCensor/ProcessControl/WindowsProcessControlTest.php
index ed10fc95..6b2982c8 100644
--- a/tests/PHPCI/ProcessControl/WindowsProcessControlTest.php
+++ b/tests/PHPCensor/ProcessControl/WindowsProcessControlTest.php
@@ -1,7 +1,7 @@
 <?php
-namespace Tests\PHPCI\ProcessControl;
+namespace Tests\PHPCensor\ProcessControl;
 
-use PHPCI\ProcessControl\WindowsProcessControl;
+use PHPCensor\ProcessControl\WindowsProcessControl;
 
 class WindowsProcessControlTest extends ProcessControlTest
 {
diff --git a/tests/PHPCI/Service/BuildServiceTest.php b/tests/PHPCensor/Service/BuildServiceTest.php
similarity index 92%
rename from tests/PHPCI/Service/BuildServiceTest.php
rename to tests/PHPCensor/Service/BuildServiceTest.php
index 30df6d9a..5e9d13b7 100644
--- a/tests/PHPCI/Service/BuildServiceTest.php
+++ b/tests/PHPCensor/Service/BuildServiceTest.php
@@ -8,11 +8,11 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Service;
+namespace Tests\PHPCensor\Service;
 
-use PHPCI\Model\Build;
-use PHPCI\Model\Project;
-use PHPCI\Service\BuildService;
+use PHPCensor\Model\Build;
+use PHPCensor\Model\Project;
+use PHPCensor\Service\BuildService;
 
 /**
  * Unit tests for the ProjectService class.
@@ -33,7 +33,7 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->mockBuildStore = $this->getMock('PHPCI\Store\BuildStore');
+        $this->mockBuildStore = $this->getMock('PHPCensor\Store\BuildStore');
         $this->mockBuildStore->expects($this->any())
                                ->method('save')
                                ->will($this->returnArgument(0));
@@ -57,7 +57,7 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase
         $this->assertNull($returnValue->getStarted());
         $this->assertNull($returnValue->getFinished());
         $this->assertNull($returnValue->getLog());
-        $this->assertEquals(\PHPCI\Helper\Lang::get('manual_build'), $returnValue->getCommitMessage());
+        $this->assertEquals(\PHPCensor\Helper\Lang::get('manual_build'), $returnValue->getCommitMessage());
         $this->assertNull($returnValue->getCommitterEmail());
         $this->assertNull($returnValue->getExtra());
         $this->assertEquals('master', $returnValue->getBranch());
@@ -136,7 +136,7 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase
      */
     public function testExecute_DeleteBuild()
     {
-        $store = $this->getMock('PHPCI\Store\BuildStore');
+        $store = $this->getMock('PHPCensor\Store\BuildStore');
         $store->expects($this->once())
             ->method('delete')
             ->will($this->returnValue(true));
diff --git a/tests/PHPCI/Service/BuiltStatusServiceTest.php b/tests/PHPCensor/Service/BuiltStatusServiceTest.php
similarity index 96%
rename from tests/PHPCI/Service/BuiltStatusServiceTest.php
rename to tests/PHPCensor/Service/BuiltStatusServiceTest.php
index d9a1320c..25e749fe 100644
--- a/tests/PHPCI/Service/BuiltStatusServiceTest.php
+++ b/tests/PHPCensor/Service/BuiltStatusServiceTest.php
@@ -7,11 +7,11 @@
  * @link         http://www.phptesting.org/
  */
 
-namespace PHPCI\Service\Tests;
+namespace PHPCensor\Service\Tests;
 
-use PHPCI\Model\Build;
-use PHPCI\Model\Project;
-use PHPCI\Service\BuildStatusService;
+use PHPCensor\Model\Build;
+use PHPCensor\Model\Project;
+use PHPCensor\Service\BuildStatusService;
 
 /**
  * Unit tests for the ProjectService class.
@@ -112,7 +112,7 @@ class BuildStatusServiceTest extends \PHPUnit_Framework_TestCase
      */
     protected function getProjectMock($prevBuildId = null, $setProject = true) {
 
-        $project = $this->getMock('PHPCI\Model\Project', array('getLatestBuild'));
+        $project = $this->getMock('PHPCensor\Model\Project', array('getLatestBuild'));
 
         $prevBuild = ($prevBuildId) ? $this->getBuild($prevBuildId, false) : null;
 
diff --git a/tests/PHPCI/Service/ProjectServiceTest.php b/tests/PHPCensor/Service/ProjectServiceTest.php
similarity index 94%
rename from tests/PHPCI/Service/ProjectServiceTest.php
rename to tests/PHPCensor/Service/ProjectServiceTest.php
index 229a5d22..4e88f65a 100644
--- a/tests/PHPCI/Service/ProjectServiceTest.php
+++ b/tests/PHPCensor/Service/ProjectServiceTest.php
@@ -9,10 +9,10 @@
  */
 
 
-namespace Tests\PHPCI\Service;
+namespace Tests\PHPCensor\Service;
 
-use PHPCI\Model\Project;
-use PHPCI\Service\ProjectService;
+use PHPCensor\Model\Project;
+use PHPCensor\Service\ProjectService;
 
 /**
  * Unit tests for the ProjectService class.
@@ -33,7 +33,7 @@ class ProjectServiceTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->mockProjectStore = $this->getMock('PHPCI\Store\ProjectStore');
+        $this->mockProjectStore = $this->getMock('PHPCensor\Store\ProjectStore');
         $this->mockProjectStore->expects($this->any())
                                ->method('save')
                                ->will($this->returnArgument(0));
@@ -131,7 +131,7 @@ class ProjectServiceTest extends \PHPUnit_Framework_TestCase
      */
     public function testExecute_DeleteProject()
     {
-        $store = $this->getMock('PHPCI\Store\ProjectStore');
+        $store = $this->getMock('PHPCensor\Store\ProjectStore');
         $store->expects($this->once())
             ->method('delete')
             ->will($this->returnValue(true));
diff --git a/tests/PHPCI/Service/UserServiceTest.php b/tests/PHPCensor/Service/UserServiceTest.php
similarity index 94%
rename from tests/PHPCI/Service/UserServiceTest.php
rename to tests/PHPCensor/Service/UserServiceTest.php
index 8c325479..b526de92 100644
--- a/tests/PHPCI/Service/UserServiceTest.php
+++ b/tests/PHPCensor/Service/UserServiceTest.php
@@ -8,10 +8,10 @@
  * @link         https://www.phptesting.org/
  */
 
-namespace Tests\PHPCI\Service;
+namespace Tests\PHPCensor\Service;
 
-use PHPCI\Model\User;
-use PHPCI\Service\UserService;
+use PHPCensor\Model\User;
+use PHPCensor\Service\UserService;
 
 /**
  * Unit tests for the ProjectService class.
@@ -32,7 +32,7 @@ class UserServiceTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->mockUserStore = $this->getMock('PHPCI\Store\UserStore');
+        $this->mockUserStore = $this->getMock('PHPCensor\Store\UserStore');
         $this->mockUserStore->expects($this->any())
                                ->method('save')
                                ->will($this->returnArgument(0));
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index a16f669b..03311131 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -7,14 +7,14 @@
  * @link         http://www.phptesting.org/
  */
 
-use PHPCI\Logging\LoggerConfig;
+use PHPCensor\Logging\LoggerConfig;
 
 if (!defined('ROOT_DIR')) {
     define('ROOT_DIR', dirname(__DIR__) . DIRECTORY_SEPARATOR);
 }
 
 if (!defined('PHPCI_DIR')) {
-    define('PHPCI_DIR', ROOT_DIR . 'src' . DIRECTORY_SEPARATOR . 'PHPCI' . DIRECTORY_SEPARATOR);
+    define('PHPCI_DIR', ROOT_DIR . 'src' . DIRECTORY_SEPARATOR . 'PHPCensor' . DIRECTORY_SEPARATOR);
 }
 
 if (!defined('PHPCI_PUBLIC_DIR')) {
@@ -43,7 +43,7 @@ if (!defined('IS_WIN')) {
 
 require_once(ROOT_DIR . 'vendor/autoload.php');
 
-\PHPCI\ErrorHandler::register();
+\PHPCensor\ErrorHandler::register();
 
 if (defined('PHPCI_IS_CONSOLE') && PHPCI_IS_CONSOLE) {
     $loggerConfig = LoggerConfig::newFromFile(PHPCI_APP_DIR . "loggerconfig.php");
@@ -51,7 +51,7 @@ if (defined('PHPCI_IS_CONSOLE') && PHPCI_IS_CONSOLE) {
 
 // Load configuration if present:
 $conf = [];
-$conf['b8']['app']['namespace']          = 'PHPCI';
+$conf['b8']['app']['namespace']          = 'PHPCensor';
 $conf['b8']['app']['default_controller'] = 'Home';
 $conf['b8']['view']['path']              = PHPCI_DIR . 'View' . DIRECTORY_SEPARATOR;
 
@@ -70,4 +70,4 @@ if (!defined('PHPCI_IS_CONSOLE')) {
     define('PHPCI_IS_CONSOLE', false);
 }
 
-\PHPCI\Helper\Lang::init($config);
+\PHPCensor\Helper\Lang::init($config);