diff --git a/app/Activity.php b/app/Activity.php
index bbbe5e893..34daa2760 100644
--- a/app/Activity.php
+++ b/app/Activity.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow;
+namespace BookStack;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -32,7 +32,7 @@ class Activity extends Model
      */
     public function user()
     {
-        return $this->belongsTo('Oxbow\User');
+        return $this->belongsTo('BookStack\User');
     }
 
     /**
diff --git a/app/Book.php b/app/Book.php
index c6e5f60a7..66ac883ef 100644
--- a/app/Book.php
+++ b/app/Book.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow;
+namespace BookStack;
 
 class Book extends Entity
 {
@@ -19,12 +19,12 @@ class Book extends Entity
 
     public function pages()
     {
-        return $this->hasMany('Oxbow\Page');
+        return $this->hasMany('BookStack\Page');
     }
 
     public function chapters()
     {
-        return $this->hasMany('Oxbow\Chapter');
+        return $this->hasMany('BookStack\Chapter');
     }
 
     public function children()
diff --git a/app/Chapter.php b/app/Chapter.php
index 4e011cec9..ce131f314 100644
--- a/app/Chapter.php
+++ b/app/Chapter.php
@@ -1,4 +1,4 @@
-<?php namespace Oxbow;
+<?php namespace BookStack;
 
 
 class Chapter extends Entity
@@ -8,12 +8,12 @@ class Chapter extends Entity
 
     public function book()
     {
-        return $this->belongsTo('Oxbow\Book');
+        return $this->belongsTo('BookStack\Book');
     }
 
     public function pages()
     {
-        return $this->hasMany('Oxbow\Page')->orderBy('priority', 'ASC');
+        return $this->hasMany('BookStack\Page')->orderBy('priority', 'ASC');
     }
 
     public function getUrl()
diff --git a/app/Console/Commands/Inspire.php b/app/Console/Commands/Inspire.php
index 1875acd3c..4b115cfb9 100644
--- a/app/Console/Commands/Inspire.php
+++ b/app/Console/Commands/Inspire.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow\Console\Commands;
+namespace BookStack\Console\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Inspiring;
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index f3b9795e8..bfad4f762 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow\Console;
+namespace BookStack\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
@@ -13,7 +13,7 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-        \Oxbow\Console\Commands\Inspire::class,
+        \BookStack\Console\Commands\Inspire::class,
     ];
 
     /**
diff --git a/app/EmailConfirmation.php b/app/EmailConfirmation.php
index a8f8f80b8..46912e733 100644
--- a/app/EmailConfirmation.php
+++ b/app/EmailConfirmation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow;
+namespace BookStack;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -10,6 +10,6 @@ class EmailConfirmation extends Model
 
     public function user()
     {
-        return $this->belongsTo('Oxbow\User');
+        return $this->belongsTo('BookStack\User');
     }
 }
diff --git a/app/Entity.php b/app/Entity.php
index d2c5bd5c1..7aee4d3b0 100644
--- a/app/Entity.php
+++ b/app/Entity.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow;
+namespace BookStack;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -12,7 +12,7 @@ abstract class Entity extends Model
      */
     public function createdBy()
     {
-        return $this->belongsTo('Oxbow\User', 'created_by');
+        return $this->belongsTo('BookStack\User', 'created_by');
     }
 
     /**
@@ -21,7 +21,7 @@ abstract class Entity extends Model
      */
     public function updatedBy()
     {
-        return $this->belongsTo('Oxbow\User', 'updated_by');
+        return $this->belongsTo('BookStack\User', 'updated_by');
     }
 
     /**
@@ -41,7 +41,7 @@ abstract class Entity extends Model
      */
     public function activity()
     {
-        return $this->morphMany('Oxbow\Activity', 'entity')->orderBy('created_at', 'desc');
+        return $this->morphMany('BookStack\Activity', 'entity')->orderBy('created_at', 'desc');
     }
 
     /**
diff --git a/app/Events/Event.php b/app/Events/Event.php
index ac6cba07c..dfe173828 100644
--- a/app/Events/Event.php
+++ b/app/Events/Event.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow\Events;
+namespace BookStack\Events;
 
 abstract class Event
 {
diff --git a/app/Exceptions/ConfirmationEmailException.php b/app/Exceptions/ConfirmationEmailException.php
index 570eed2e9..f343eff82 100644
--- a/app/Exceptions/ConfirmationEmailException.php
+++ b/app/Exceptions/ConfirmationEmailException.php
@@ -1,4 +1,4 @@
-<?php namespace Oxbow\Exceptions;
+<?php namespace BookStack\Exceptions;
 
 
 class ConfirmationEmailException extends NotifyException
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index d18a9bd2c..792bdd266 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow\Exceptions;
+namespace BookStack\Exceptions;
 
 use Exception;
 use Symfony\Component\HttpKernel\Exception\HttpException;
diff --git a/app/Exceptions/NotifyException.php b/app/Exceptions/NotifyException.php
index c9ff9975d..113100b6b 100644
--- a/app/Exceptions/NotifyException.php
+++ b/app/Exceptions/NotifyException.php
@@ -1,4 +1,4 @@
-<?php namespace Oxbow\Exceptions;
+<?php namespace BookStack\Exceptions;
 
 
 class NotifyException extends \Exception
diff --git a/app/Exceptions/SocialDriverNotConfigured.php b/app/Exceptions/SocialDriverNotConfigured.php
index 35fd59e01..6e1b76226 100644
--- a/app/Exceptions/SocialDriverNotConfigured.php
+++ b/app/Exceptions/SocialDriverNotConfigured.php
@@ -1,4 +1,4 @@
-<?php namespace Oxbow\Exceptions;
+<?php namespace BookStack\Exceptions;
 
 
 class SocialDriverNotConfigured extends \Exception
diff --git a/app/Exceptions/SocialSignInException.php b/app/Exceptions/SocialSignInException.php
index 774a2a3ba..1f5ad18af 100644
--- a/app/Exceptions/SocialSignInException.php
+++ b/app/Exceptions/SocialSignInException.php
@@ -1,4 +1,4 @@
-<?php namespace Oxbow\Exceptions;
+<?php namespace BookStack\Exceptions;
 
 
 class SocialSignInException extends NotifyException
diff --git a/app/Exceptions/UserRegistrationException.php b/app/Exceptions/UserRegistrationException.php
index 1c673a110..cb1e32517 100644
--- a/app/Exceptions/UserRegistrationException.php
+++ b/app/Exceptions/UserRegistrationException.php
@@ -1,4 +1,4 @@
-<?php namespace Oxbow\Exceptions;
+<?php namespace BookStack\Exceptions;
 
 
 class UserRegistrationException extends NotifyException
diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
index 717c4fc4d..507322c3d 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Oxbow\Http\Controllers\Auth;
+namespace BookStack\Http\Controllers\Auth;
 
 use Illuminate\Http\Request;
-use Oxbow\Exceptions\SocialSignInException;
-use Oxbow\Exceptions\UserRegistrationException;
-use Oxbow\Repos\UserRepo;
-use Oxbow\Services\EmailConfirmationService;
-use Oxbow\Services\SocialAuthService;
-use Oxbow\SocialAccount;
+use BookStack\Exceptions\SocialSignInException;
+use BookStack\Exceptions\UserRegistrationException;
+use BookStack\Repos\UserRepo;
+use BookStack\Services\EmailConfirmationService;
+use BookStack\Services\SocialAuthService;
+use BookStack\SocialAccount;
 use Validator;
-use Oxbow\Http\Controllers\Controller;
+use BookStack\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ThrottlesLogins;
 use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
 
@@ -131,7 +131,7 @@ class AuthController extends Controller
      * @param bool|false|SocialAccount $socialAccount
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @throws UserRegistrationException
-     * @throws \Oxbow\Exceptions\ConfirmationEmailException
+     * @throws \BookStack\Exceptions\ConfirmationEmailException
      */
     protected function registerUser(array $userData, $socialAccount = false)
     {
diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php
index 053979288..038e444d2 100644
--- a/app/Http/Controllers/Auth/PasswordController.php
+++ b/app/Http/Controllers/Auth/PasswordController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Oxbow\Http\Controllers\Auth;
+namespace BookStack\Http\Controllers\Auth;
 
-use Oxbow\Http\Controllers\Controller;
+use BookStack\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 
 class PasswordController extends Controller
diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 0092a78a9..c078aea47 100644
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;
 
 use Activity;
 use Illuminate\Http\Request;
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
-use Oxbow\Http\Requests;
-use Oxbow\Repos\BookRepo;
-use Oxbow\Repos\ChapterRepo;
-use Oxbow\Repos\PageRepo;
+use BookStack\Http\Requests;
+use BookStack\Repos\BookRepo;
+use BookStack\Repos\ChapterRepo;
+use BookStack\Repos\PageRepo;
 
 class BookController extends Controller
 {
diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php
index dd58608cb..f7b4f6dab 100644
--- a/app/Http/Controllers/ChapterController.php
+++ b/app/Http/Controllers/ChapterController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;
 
 use Activity;
 use Illuminate\Http\Request;
 
 use Illuminate\Support\Facades\Auth;
-use Oxbow\Http\Requests;
-use Oxbow\Http\Controllers\Controller;
-use Oxbow\Repos\BookRepo;
-use Oxbow\Repos\ChapterRepo;
+use BookStack\Http\Requests;
+use BookStack\Http\Controllers\Controller;
+use BookStack\Repos\BookRepo;
+use BookStack\Repos\ChapterRepo;
 
 class ChapterController extends Controller
 {
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 13859fed4..4cc865d29 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;
 
 use HttpRequestException;
 use Illuminate\Foundation\Bus\DispatchesJobs;
@@ -9,7 +9,7 @@ use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
-use Oxbow\User;
+use BookStack\User;
 
 abstract class Controller extends BaseController
 {
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 3ed1da4c1..3f5d338de 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;
 
 use Illuminate\Http\Request;
 
-use Oxbow\Http\Requests;
-use Oxbow\Http\Controllers\Controller;
-use Oxbow\Repos\BookRepo;
-use Oxbow\Services\ActivityService;
-use Oxbow\Services\Facades\Activity;
+use BookStack\Http\Requests;
+use BookStack\Http\Controllers\Controller;
+use BookStack\Repos\BookRepo;
+use BookStack\Services\ActivityService;
+use BookStack\Services\Facades\Activity;
 
 class HomeController extends Controller
 {
diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index 8eafc79b5..dc494183a 100644
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;
 
 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Intervention\Image\Facades\Image as ImageTool;
 use Illuminate\Support\Facades\DB;
-use Oxbow\Http\Requests;
-use Oxbow\Image;
-use Oxbow\Repos\PageRepo;
+use BookStack\Http\Requests;
+use BookStack\Image;
+use BookStack\Repos\PageRepo;
 
 class ImageController extends Controller
 {
diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index c0ffa14b8..c2867caa8 100644
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;
 
 use Activity;
 use Illuminate\Http\Request;
 
 use Illuminate\Support\Facades\Auth;
-use Oxbow\Http\Requests;
-use Oxbow\Repos\BookRepo;
-use Oxbow\Repos\ChapterRepo;
-use Oxbow\Repos\PageRepo;
+use BookStack\Http\Requests;
+use BookStack\Repos\BookRepo;
+use BookStack\Repos\ChapterRepo;
+use BookStack\Repos\PageRepo;
 
 class PageController extends Controller
 {
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 360e1139e..c6222156d 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;
 
 use Illuminate\Http\Request;
 
-use Oxbow\Http\Requests;
-use Oxbow\Http\Controllers\Controller;
-use Oxbow\Repos\BookRepo;
-use Oxbow\Repos\ChapterRepo;
-use Oxbow\Repos\PageRepo;
+use BookStack\Http\Requests;
+use BookStack\Http\Controllers\Controller;
+use BookStack\Repos\BookRepo;
+use BookStack\Repos\ChapterRepo;
+use BookStack\Repos\PageRepo;
 
 class SearchController extends Controller
 {
diff --git a/app/Http/Controllers/SettingController.php b/app/Http/Controllers/SettingController.php
index 822ee662d..3e96de62e 100644
--- a/app/Http/Controllers/SettingController.php
+++ b/app/Http/Controllers/SettingController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;
 
 use Illuminate\Http\Request;
 
-use Oxbow\Http\Requests;
-use Oxbow\Http\Controllers\Controller;
+use BookStack\Http\Requests;
+use BookStack\Http\Controllers\Controller;
 use Setting;
 
 class SettingController extends Controller
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 65263cd12..dacb91a7b 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;
 
 use Illuminate\Http\Request;
 
 use Illuminate\Support\Facades\Hash;
-use Oxbow\Http\Requests;
-use Oxbow\Repos\UserRepo;
-use Oxbow\Services\SocialAuthService;
-use Oxbow\User;
+use BookStack\Http\Requests;
+use BookStack\Repos\UserRepo;
+use BookStack\Services\SocialAuthService;
+use BookStack\User;
 
 class UserController extends Controller
 {
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 9f3444c88..a1f2a581f 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow\Http;
+namespace BookStack\Http;
 
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
@@ -13,11 +13,11 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
-        \Oxbow\Http\Middleware\EncryptCookies::class,
+        \BookStack\Http\Middleware\EncryptCookies::class,
         \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
         \Illuminate\Session\Middleware\StartSession::class,
         \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-        \Oxbow\Http\Middleware\VerifyCsrfToken::class,
+        \BookStack\Http\Middleware\VerifyCsrfToken::class,
     ];
 
     /**
@@ -26,9 +26,9 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth'       => \Oxbow\Http\Middleware\Authenticate::class,
+        'auth'       => \BookStack\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'guest'      => \Oxbow\Http\Middleware\RedirectIfAuthenticated::class,
-        'perm'       => \Oxbow\Http\Middleware\PermissionMiddleware::class
+        'guest'      => \BookStack\Http\Middleware\RedirectIfAuthenticated::class,
+        'perm'       => \BookStack\Http\Middleware\PermissionMiddleware::class
     ];
 }
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index f3c6f5925..ebd830ffe 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Oxbow\Http\Middleware;
+namespace BookStack\Http\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
-use Oxbow\Exceptions\UserRegistrationException;
+use BookStack\Exceptions\UserRegistrationException;
 use Setting;
 
 class Authenticate
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
index e757897be..2d14a85f3 100644
--- a/app/Http/Middleware/EncryptCookies.php
+++ b/app/Http/Middleware/EncryptCookies.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow\Http\Middleware;
+namespace BookStack\Http\Middleware;
 
 use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;
 
diff --git a/app/Http/Middleware/PermissionMiddleware.php b/app/Http/Middleware/PermissionMiddleware.php
index c832aeabc..28ffff643 100644
--- a/app/Http/Middleware/PermissionMiddleware.php
+++ b/app/Http/Middleware/PermissionMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow\Http\Middleware;
+namespace BookStack\Http\Middleware;
 
 use Closure;
 use Illuminate\Support\Facades\Session;
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index 69b16cd07..ab8ce4d3a 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow\Http\Middleware;
+namespace BookStack\Http\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
index fc5bd2351..356d466a2 100644
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow\Http\Middleware;
+namespace BookStack\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
 
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index 78a4551ee..cda901e44 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow\Http\Requests;
+namespace BookStack\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Image.php b/app/Image.php
index cb8ee7c59..7c77440f9 100644
--- a/app/Image.php
+++ b/app/Image.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow;
+namespace BookStack;
 
 
 class Image extends Entity
diff --git a/app/Jobs/Job.php b/app/Jobs/Job.php
index 497763541..780af746b 100644
--- a/app/Jobs/Job.php
+++ b/app/Jobs/Job.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow\Jobs;
+namespace BookStack\Jobs;
 
 use Illuminate\Bus\Queueable;
 
diff --git a/app/Page.php b/app/Page.php
index 0fda5dec3..25bb22f8a 100644
--- a/app/Page.php
+++ b/app/Page.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow;
+namespace BookStack;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -19,12 +19,12 @@ class Page extends Entity
 
     public function book()
     {
-        return $this->belongsTo('Oxbow\Book');
+        return $this->belongsTo('BookStack\Book');
     }
 
     public function chapter()
     {
-        return $this->belongsTo('Oxbow\Chapter');
+        return $this->belongsTo('BookStack\Chapter');
     }
 
     public function hasChapter()
@@ -35,7 +35,7 @@ class Page extends Entity
 
     public function revisions()
     {
-        return $this->hasMany('Oxbow\PageRevision')->orderBy('created_at', 'desc');
+        return $this->hasMany('BookStack\PageRevision')->orderBy('created_at', 'desc');
     }
 
     public function getUrl()
diff --git a/app/PageRevision.php b/app/PageRevision.php
index baabe0f12..52c37e390 100644
--- a/app/PageRevision.php
+++ b/app/PageRevision.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow;
+namespace BookStack;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -10,12 +10,12 @@ class PageRevision extends Model
 
     public function createdBy()
     {
-        return $this->belongsTo('Oxbow\User', 'created_by');
+        return $this->belongsTo('BookStack\User', 'created_by');
     }
 
     public function page()
     {
-        return $this->belongsTo('Oxbow\Page');
+        return $this->belongsTo('BookStack\Page');
     }
 
     public function getUrl()
diff --git a/app/Permission.php b/app/Permission.php
index 44776901f..6859ed56e 100644
--- a/app/Permission.php
+++ b/app/Permission.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow;
+namespace BookStack;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -11,6 +11,6 @@ class Permission extends Model
      */
     public function roles()
     {
-        return $this->belongsToMany('Oxbow\Permissions');
+        return $this->belongsToMany('BookStack\Permissions');
     }
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 5be29756d..8bcbcbdad 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Oxbow\Providers;
+namespace BookStack\Providers;
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\ServiceProvider;
-use Oxbow\User;
+use BookStack\User;
 
 class AppServiceProvider extends ServiceProvider
 {
diff --git a/app/Providers/CustomFacadeProvider.php b/app/Providers/CustomFacadeProvider.php
index f5dd37424..e99b236c4 100644
--- a/app/Providers/CustomFacadeProvider.php
+++ b/app/Providers/CustomFacadeProvider.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Oxbow\Providers;
+namespace BookStack\Providers;
 
 use Illuminate\Support\ServiceProvider;
-use Oxbow\Services\ActivityService;
-use Oxbow\Services\SettingService;
+use BookStack\Services\ActivityService;
+use BookStack\Services\SettingService;
 
 class CustomFacadeProvider extends ServiceProvider
 {
@@ -26,12 +26,12 @@ class CustomFacadeProvider extends ServiceProvider
     public function register()
     {
         $this->app->bind('activity', function() {
-            return new ActivityService($this->app->make('Oxbow\Activity'));
+            return new ActivityService($this->app->make('BookStack\Activity'));
         });
 
         $this->app->bind('setting', function() {
             return new SettingService(
-                $this->app->make('Oxbow\Setting'),
+                $this->app->make('BookStack\Setting'),
                 $this->app->make('Illuminate\Contracts\Cache\Repository')
             );
         });
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 1d97e7e25..f754b87a9 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow\Providers;
+namespace BookStack\Providers;
 
 use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
@@ -13,8 +13,8 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
-        'Oxbow\Events\SomeEvent' => [
-            'Oxbow\Listeners\EventListener',
+        'BookStack\Events\SomeEvent' => [
+            'BookStack\Listeners\EventListener',
         ],
     ];
 
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index dd166525a..2d9cd3b85 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow\Providers;
+namespace BookStack\Providers;
 
 use Illuminate\Routing\Router;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
@@ -14,7 +14,7 @@ class RouteServiceProvider extends ServiceProvider
      *
      * @var string
      */
-    protected $namespace = 'Oxbow\Http\Controllers';
+    protected $namespace = 'BookStack\Http\Controllers';
 
     /**
      * Define your route model bindings, pattern filters, etc.
diff --git a/app/Providers/SocialiteServiceProvider.php b/app/Providers/SocialiteServiceProvider.php
index ce94c4201..f7fb30f81 100644
--- a/app/Providers/SocialiteServiceProvider.php
+++ b/app/Providers/SocialiteServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace Oxbow\Providers;
+<?php namespace BookStack\Providers;
 
 
 use Illuminate\Support\ServiceProvider;
diff --git a/app/Repos/BookRepo.php b/app/Repos/BookRepo.php
index 88b3a8b1e..9d37cf952 100644
--- a/app/Repos/BookRepo.php
+++ b/app/Repos/BookRepo.php
@@ -1,7 +1,7 @@
-<?php namespace Oxbow\Repos;
+<?php namespace BookStack\Repos;
 
 use Illuminate\Support\Str;
-use Oxbow\Book;
+use BookStack\Book;
 
 class BookRepo
 {
diff --git a/app/Repos/ChapterRepo.php b/app/Repos/ChapterRepo.php
index 9c03f29b5..4aba1dc12 100644
--- a/app/Repos/ChapterRepo.php
+++ b/app/Repos/ChapterRepo.php
@@ -1,8 +1,8 @@
-<?php namespace Oxbow\Repos;
+<?php namespace BookStack\Repos;
 
 
 use Illuminate\Support\Str;
-use Oxbow\Chapter;
+use BookStack\Chapter;
 
 class ChapterRepo
 {
diff --git a/app/Repos/PageRepo.php b/app/Repos/PageRepo.php
index 7dfc1976a..441d5980e 100644
--- a/app/Repos/PageRepo.php
+++ b/app/Repos/PageRepo.php
@@ -1,10 +1,10 @@
-<?php namespace Oxbow\Repos;
+<?php namespace BookStack\Repos;
 
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
-use Oxbow\Page;
-use Oxbow\PageRevision;
+use BookStack\Page;
+use BookStack\PageRevision;
 
 class PageRepo
 {
diff --git a/app/Repos/UserRepo.php b/app/Repos/UserRepo.php
index 732b092f3..5122aac77 100644
--- a/app/Repos/UserRepo.php
+++ b/app/Repos/UserRepo.php
@@ -1,8 +1,8 @@
-<?php namespace Oxbow\Repos;
+<?php namespace BookStack\Repos;
 
 
-use Oxbow\Role;
-use Oxbow\User;
+use BookStack\Role;
+use BookStack\User;
 
 class UserRepo
 {
diff --git a/app/Role.php b/app/Role.php
index d35b349a8..3e58164c5 100644
--- a/app/Role.php
+++ b/app/Role.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow;
+namespace BookStack;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -17,7 +17,7 @@ class Role extends Model
      */
     public function users()
     {
-        return $this->belongsToMany('Oxbow\User');
+        return $this->belongsToMany('BookStack\User');
     }
 
     /**
@@ -25,7 +25,7 @@ class Role extends Model
      */
     public function permissions()
     {
-        return $this->belongsToMany('Oxbow\Permission');
+        return $this->belongsToMany('BookStack\Permission');
     }
 
     /**
diff --git a/app/Services/ActivityService.php b/app/Services/ActivityService.php
index a515eea1c..5bfee81ab 100644
--- a/app/Services/ActivityService.php
+++ b/app/Services/ActivityService.php
@@ -1,8 +1,8 @@
-<?php namespace Oxbow\Services;
+<?php namespace BookStack\Services;
 
 use Illuminate\Support\Facades\Auth;
-use Oxbow\Activity;
-use Oxbow\Entity;
+use BookStack\Activity;
+use BookStack\Entity;
 use Session;
 
 class ActivityService
@@ -100,7 +100,7 @@ class ActivityService
      */
     function entityActivity($entity, $count = 20, $page = 0)
     {
-        $activity = $entity->hasMany('Oxbow\Activity')->orderBy('created_at', 'desc')
+        $activity = $entity->hasMany('BookStack\Activity')->orderBy('created_at', 'desc')
             ->skip($count * $page)->take($count)->get();
 
         return $this->filterSimilar($activity);
diff --git a/app/Services/EmailConfirmationService.php b/app/Services/EmailConfirmationService.php
index 31fe1da08..ffe21eec4 100644
--- a/app/Services/EmailConfirmationService.php
+++ b/app/Services/EmailConfirmationService.php
@@ -1,15 +1,15 @@
-<?php namespace Oxbow\Services;
+<?php namespace BookStack\Services;
 
 
 use Carbon\Carbon;
 use Illuminate\Contracts\Mail\Mailer;
 use Illuminate\Mail\Message;
-use Oxbow\EmailConfirmation;
-use Oxbow\Exceptions\ConfirmationEmailException;
-use Oxbow\Exceptions\UserRegistrationException;
-use Oxbow\Repos\UserRepo;
-use Oxbow\Setting;
-use Oxbow\User;
+use BookStack\EmailConfirmation;
+use BookStack\Exceptions\ConfirmationEmailException;
+use BookStack\Exceptions\UserRegistrationException;
+use BookStack\Repos\UserRepo;
+use BookStack\Setting;
+use BookStack\User;
 
 class EmailConfirmationService
 {
diff --git a/app/Services/Facades/Activity.php b/app/Services/Facades/Activity.php
index 0a52a76e2..ea04cfc47 100644
--- a/app/Services/Facades/Activity.php
+++ b/app/Services/Facades/Activity.php
@@ -1,4 +1,4 @@
-<?php namespace Oxbow\Services\Facades;
+<?php namespace BookStack\Services\Facades;
 
 
 use Illuminate\Support\Facades\Facade;
diff --git a/app/Services/Facades/Setting.php b/app/Services/Facades/Setting.php
index eb584416b..021653004 100644
--- a/app/Services/Facades/Setting.php
+++ b/app/Services/Facades/Setting.php
@@ -1,4 +1,4 @@
-<?php namespace Oxbow\Services\Facades;
+<?php namespace BookStack\Services\Facades;
 
 
 use Illuminate\Support\Facades\Facade;
diff --git a/app/Services/SettingService.php b/app/Services/SettingService.php
index cab29f454..7f2549c7d 100644
--- a/app/Services/SettingService.php
+++ b/app/Services/SettingService.php
@@ -1,6 +1,6 @@
-<?php namespace Oxbow\Services;
+<?php namespace BookStack\Services;
 
-use Oxbow\Setting;
+use BookStack\Setting;
 use Illuminate\Contracts\Cache\Repository as Cache;
 
 /**
@@ -8,7 +8,7 @@ use Illuminate\Contracts\Cache\Repository as Cache;
  *
  * The settings are a simple key-value database store.
  *
- * @package Oxbow\Services
+ * @package BookStack\Services
  */
 class SettingService
 {
diff --git a/app/Services/SocialAuthService.php b/app/Services/SocialAuthService.php
index b39a82d9f..c96446ddf 100644
--- a/app/Services/SocialAuthService.php
+++ b/app/Services/SocialAuthService.php
@@ -1,14 +1,14 @@
-<?php namespace Oxbow\Services;
+<?php namespace BookStack\Services;
 
 use GuzzleHttp\Exception\ClientException;
 use Laravel\Socialite\Contracts\Factory as Socialite;
-use Oxbow\Exceptions\SocialDriverNotConfigured;
-use Oxbow\Exceptions\SocialSignInException;
-use Oxbow\Exceptions\UserRegistrationException;
-use Oxbow\Http\Controllers\Auth\AuthController;
-use Oxbow\Repos\UserRepo;
-use Oxbow\SocialAccount;
-use Oxbow\User;
+use BookStack\Exceptions\SocialDriverNotConfigured;
+use BookStack\Exceptions\SocialSignInException;
+use BookStack\Exceptions\UserRegistrationException;
+use BookStack\Http\Controllers\Auth\AuthController;
+use BookStack\Repos\UserRepo;
+use BookStack\SocialAccount;
+use BookStack\User;
 
 class SocialAuthService
 {
diff --git a/app/Setting.php b/app/Setting.php
index af36a1a7e..05bd2c226 100644
--- a/app/Setting.php
+++ b/app/Setting.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow;
+namespace BookStack;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/SocialAccount.php b/app/SocialAccount.php
index 2e526ecc4..2d63b5198 100644
--- a/app/SocialAccount.php
+++ b/app/SocialAccount.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow;
+namespace BookStack;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -11,6 +11,6 @@ class SocialAccount extends Model
 
     public function user()
     {
-        return $this->belongsTo('Oxbow\User');
+        return $this->belongsTo('BookStack\User');
     }
 }
diff --git a/app/User.php b/app/User.php
index b2fa5cd1b..c7ce6b11e 100644
--- a/app/User.php
+++ b/app/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oxbow;
+namespace BookStack;
 
 use Illuminate\Auth\Authenticatable;
 use Illuminate\Database\Eloquent\Model;
@@ -53,7 +53,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function roles()
     {
-        return $this->belongsToMany('Oxbow\Role');
+        return $this->belongsToMany('BookStack\Role');
     }
 
     public function getRoleAttribute()
@@ -103,7 +103,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function socialAccounts()
     {
-        return $this->hasMany('Oxbow\SocialAccount');
+        return $this->hasMany('BookStack\SocialAccount');
     }
 
     /**
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 6c6b0bf36..371f93913 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -28,17 +28,17 @@ $app = new Illuminate\Foundation\Application(
 
 $app->singleton(
     Illuminate\Contracts\Http\Kernel::class,
-    Oxbow\Http\Kernel::class
+    BookStack\Http\Kernel::class
 );
 
 $app->singleton(
     Illuminate\Contracts\Console\Kernel::class,
-    Oxbow\Console\Kernel::class
+    BookStack\Console\Kernel::class
 );
 
 $app->singleton(
     Illuminate\Contracts\Debug\ExceptionHandler::class,
-    Oxbow\Exceptions\Handler::class
+    BookStack\Exceptions\Handler::class
 );
 
 /*
diff --git a/composer.json b/composer.json
index ef5379d46..19bf5b08f 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
             "database"
         ],
         "psr-4": {
-            "Oxbow\\": "app/"
+            "BookStack\\": "app/"
         }
     },
     "autoload-dev": {
diff --git a/config/app.php b/config/app.php
index 9780558b9..44b3542a6 100644
--- a/config/app.php
+++ b/config/app.php
@@ -148,10 +148,10 @@ return [
         /*
          * Application Service Providers...
          */
-        Oxbow\Providers\AppServiceProvider::class,
-        Oxbow\Providers\EventServiceProvider::class,
-        Oxbow\Providers\RouteServiceProvider::class,
-        Oxbow\Providers\CustomFacadeProvider::class,
+        BookStack\Providers\AppServiceProvider::class,
+        BookStack\Providers\EventServiceProvider::class,
+        BookStack\Providers\RouteServiceProvider::class,
+        BookStack\Providers\CustomFacadeProvider::class,
 
     ],
 
@@ -212,8 +212,8 @@ return [
          * Custom
          */
 
-        'Activity'  => Oxbow\Services\Facades\Activity::class,
-        'Setting'   => Oxbow\Services\Facades\Setting::class,
+        'Activity'  => BookStack\Services\Facades\Activity::class,
+        'Setting'   => BookStack\Services\Facades\Setting::class,
 
     ],
 
diff --git a/config/auth.php b/config/auth.php
index f9ee12aba..d4f58587d 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -28,7 +28,7 @@ return [
     |
     */
 
-    'model' => Oxbow\User::class,
+    'model' => BookStack\User::class,
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/services.php b/config/services.php
index be9d6eb15..604a8657f 100644
--- a/config/services.php
+++ b/config/services.php
@@ -30,7 +30,7 @@ return [
     ],
 
     'stripe'   => [
-        'model'  => Oxbow\User::class,
+        'model'  => BookStack\User::class,
         'key'    => '',
         'secret' => '',
     ],
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index e68c2f293..a47e02b72 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -11,7 +11,7 @@
 |
 */
 
-$factory->define(Oxbow\User::class, function ($faker) {
+$factory->define(BookStack\User::class, function ($faker) {
     return [
         'name'           => $faker->name,
         'email'          => $faker->email,
@@ -20,21 +20,21 @@ $factory->define(Oxbow\User::class, function ($faker) {
     ];
 });
 
-$factory->define(Oxbow\Book::class, function ($faker) {
+$factory->define(BookStack\Book::class, function ($faker) {
     return [
         'name'        => $faker->sentence,
         'description' => $faker->paragraph
     ];
 });
 
-$factory->define(Oxbow\Chapter::class, function ($faker) {
+$factory->define(BookStack\Chapter::class, function ($faker) {
     return [
         'name'        => $faker->sentence,
         'description' => $faker->paragraph
     ];
 });
 
-$factory->define(Oxbow\Page::class, function ($faker) {
+$factory->define(BookStack\Page::class, function ($faker) {
     return [
         'name' => $faker->sentence,
         'html' => '<p>' . implode('</p>', $faker->paragraphs(5)) . '</p>'
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index 68a2940a4..3a374f251 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -21,7 +21,7 @@ class CreateUsersTable extends Migration
             $table->timestamps();
         });
 
-        \Oxbow\User::create([
+        \BookStack\User::create([
             'name' => 'Admin',
             'email' => 'admin@admin.com',
             'password' => \Illuminate\Support\Facades\Hash::make('password')
diff --git a/database/migrations/2015_08_29_105422_add_roles_and_permissions.php b/database/migrations/2015_08_29_105422_add_roles_and_permissions.php
index 1f7f6126d..7247a0a38 100644
--- a/database/migrations/2015_08_29_105422_add_roles_and_permissions.php
+++ b/database/migrations/2015_08_29_105422_add_roles_and_permissions.php
@@ -68,19 +68,19 @@ class AddRolesAndPermissions extends Migration
 
 
         // Create default roles
-        $admin = new \Oxbow\Role();
+        $admin = new \BookStack\Role();
         $admin->name = 'admin';
         $admin->display_name = 'Admin';
         $admin->description = 'Administrator of the whole application';
         $admin->save();
 
-        $editor = new \Oxbow\Role();
+        $editor = new \BookStack\Role();
         $editor->name = 'editor';
         $editor->display_name = 'Editor';
         $editor->description = 'User can edit Books, Chapters & Pages';
         $editor->save();
 
-        $viewer = new \Oxbow\Role();
+        $viewer = new \BookStack\Role();
         $viewer->name = 'viewer';
         $viewer->display_name = 'Viewer';
         $viewer->description = 'User can view books & their content behind authentication';
@@ -91,7 +91,7 @@ class AddRolesAndPermissions extends Migration
         $ops = ['Create', 'Update', 'Delete'];
         foreach ($entities as $entity) {
             foreach ($ops as $op) {
-                $newPermission = new \Oxbow\Permission();
+                $newPermission = new \BookStack\Permission();
                 $newPermission->name = strtolower($entity) . '-' . strtolower($op);
                 $newPermission->display_name = $op . ' ' . $entity . 's';
                 $newPermission->save();
@@ -105,7 +105,7 @@ class AddRolesAndPermissions extends Migration
         $ops = ['Create', 'Update', 'Delete'];
         foreach ($entities as $entity) {
             foreach ($ops as $op) {
-                $newPermission = new \Oxbow\Permission();
+                $newPermission = new \BookStack\Permission();
                 $newPermission->name = strtolower($entity) . '-' . strtolower($op);
                 $newPermission->display_name = $op . ' ' . $entity;
                 $newPermission->save();
@@ -115,7 +115,7 @@ class AddRolesAndPermissions extends Migration
 
         // Set all current users as admins
         // (At this point only the initially create user should be an admin)
-        $users = \Oxbow\User::all();
+        $users = \BookStack\User::all();
         foreach ($users as $user) {
             $user->attachRole($admin);
         }
diff --git a/phpspec.yml b/phpspec.yml
index 2cea9d0e0..58f1d982e 100644
--- a/phpspec.yml
+++ b/phpspec.yml
@@ -1,5 +1,5 @@
 suites:
     main:
-        namespace: Oxbow
-        psr4_prefix: Oxbow
+        namespace: BookStack
+        psr4_prefix: BookStack
         src_path: app
\ No newline at end of file
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index cc6c6a230..5e484be65 100644
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -35,9 +35,9 @@
                 <div class="form-group">
                     <label for="setting-registration-role">Default user role after registration</label>
                     <select id="setting-registration-role" name="setting-registration-role" @if($errors->has('setting-registration-role')) class="neg" @endif>
-                        @foreach(\Oxbow\Role::all() as $role)
+                        @foreach(\BookStack\Role::all() as $role)
                             <option value="{{$role->id}}"
-                                    @if(\Setting::get('registration-role', \Oxbow\Role::getDefault()->id) == $role->id) selected @endif
+                                    @if(\Setting::get('registration-role', \BookStack\Role::getDefault()->id) == $role->id) selected @endif
                                     >
                                 {{ $role->display_name }}
                             </option>
diff --git a/resources/views/users/form.blade.php b/resources/views/users/form.blade.php
index 05c4ac02b..a8aa7e63f 100644
--- a/resources/views/users/form.blade.php
+++ b/resources/views/users/form.blade.php
@@ -11,7 +11,7 @@
 @if($currentUser->can('user-update'))
     <div class="form-group">
         <label for="role">User Role</label>
-        @include('form.role-select', ['name' => 'role', 'options' => \Oxbow\Role::all(), 'displayKey' => 'display_name'])
+        @include('form.role-select', ['name' => 'role', 'options' => \BookStack\Role::all(), 'displayKey' => 'display_name'])
     </div>
 @endif
 
diff --git a/tests/EntityTest.php b/tests/EntityTest.php
index 1cfc21773..ddbed731e 100644
--- a/tests/EntityTest.php
+++ b/tests/EntityTest.php
@@ -18,7 +18,7 @@ class EntityTest extends TestCase
         $this->bookDelete($book);
     }
 
-    public function bookDelete(\Oxbow\Book $book)
+    public function bookDelete(\BookStack\Book $book)
     {
         $this->asAdmin()
             ->visit($book->getUrl())
@@ -32,7 +32,7 @@ class EntityTest extends TestCase
             ->notSeeInDatabase('books', ['id' => $book->id]);
     }
 
-    public function bookUpdate(\Oxbow\Book $book)
+    public function bookUpdate(\BookStack\Book $book)
     {
         $newName = $book->name . ' Updated';
         $this->asAdmin()
@@ -46,12 +46,12 @@ class EntityTest extends TestCase
             ->seePageIs($book->getUrl() . '-updated')
             ->see($newName);
 
-        return \Oxbow\Book::find($book->id);
+        return \BookStack\Book::find($book->id);
     }
 
     public function pageCreation($chapter)
     {
-        $page = factory(\Oxbow\Page::class)->make([
+        $page = factory(\BookStack\Page::class)->make([
             'name' => 'My First Page'
         ]);
 
@@ -68,13 +68,13 @@ class EntityTest extends TestCase
             ->seePageIs($chapter->book->getUrl() . '/page/my-first-page')
             ->see($page->name);
 
-        $page = \Oxbow\Page::where('slug', '=', 'my-first-page')->where('chapter_id', '=', $chapter->id)->first();
+        $page = \BookStack\Page::where('slug', '=', 'my-first-page')->where('chapter_id', '=', $chapter->id)->first();
         return $page;
     }
 
-    public function chapterCreation(\Oxbow\Book $book)
+    public function chapterCreation(\BookStack\Book $book)
     {
-        $chapter = factory(\Oxbow\Chapter::class)->make([
+        $chapter = factory(\BookStack\Chapter::class)->make([
             'name' => 'My First Chapter'
         ]);
 
@@ -91,13 +91,13 @@ class EntityTest extends TestCase
             ->seePageIs($book->getUrl() . '/chapter/my-first-chapter')
             ->see($chapter->name)->see($chapter->description);
 
-        $chapter = \Oxbow\Chapter::where('slug', '=', 'my-first-chapter')->where('book_id', '=', $book->id)->first();
+        $chapter = \BookStack\Chapter::where('slug', '=', 'my-first-chapter')->where('book_id', '=', $book->id)->first();
         return $chapter;
     }
 
     public function bookCreation()
     {
-        $book = factory(\Oxbow\Book::class)->make([
+        $book = factory(\BookStack\Book::class)->make([
             'name' => 'My First Book'
         ]);
         $this->asAdmin()
@@ -113,7 +113,7 @@ class EntityTest extends TestCase
             ->seePageIs('/books/my-first-book')
             ->see($book->name)->see($book->description);
 
-        $book = \Oxbow\Book::where('slug', '=', 'my-first-book')->first();
+        $book = \BookStack\Book::where('slug', '=', 'my-first-book')->first();
         return $book;
     }
 
diff --git a/tests/TestCase.php b/tests/TestCase.php
index d48bb3ef2..67a18777a 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -32,7 +32,7 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
     public function asAdmin()
     {
         if($this->admin === null) {
-            $this->admin = \Oxbow\User::find(1);
+            $this->admin = \BookStack\User::find(1);
         }
         return $this->actingAs($this->admin);
     }