diff --git a/readme.md b/readme.md
index c01e8fa..ae49136 100644
--- a/readme.md
+++ b/readme.md
@@ -3,5 +3,5 @@ Laravel Country & State Helper
 Please use Doug Sisk's version.
 https://github.com/DougSisk/laravel-country-state
 
-This branch is just me trying to deal with some OpenShift issues, as well as php 5.4 probems.
+This branch is just me trying to deal with some OpenShift issues, as well as php 5.4 problems.
 Also, I'm new to github.
\ No newline at end of file
diff --git a/src/CountryState.php b/src/CountryState.php
index bb37d98..daf5537 100644
--- a/src/CountryState.php
+++ b/src/CountryState.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DougSisk\CountryState;
+namespace TarekAdam\CountryState;
 
 use Phine\Country\Loader\Loader;
 
diff --git a/src/CountryStateController.php b/src/CountryStateController.php
index b57ca1d..1c44de0 100644
--- a/src/CountryStateController.php
+++ b/src/CountryStateController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DougSisk\CountryState;
+namespace TarekAdam\CountryState;
 
 use Illuminate\Routing\Controller;
 
diff --git a/src/CountryStateFacade.php b/src/CountryStateFacade.php
index 019a105..9a1e464 100644
--- a/src/CountryStateFacade.php
+++ b/src/CountryStateFacade.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DougSisk\CountryState;
+namespace TarekAdam\CountryState;
 
 use Illuminate\Support\Facades\Facade;
 
diff --git a/src/CountryStateServiceProvider.php b/src/CountryStateServiceProvider.php
index 6a99a12..48f7e46 100644
--- a/src/CountryStateServiceProvider.php
+++ b/src/CountryStateServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DougSisk\CountryState;
+namespace TarekAdam\CountryState;
 
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\ServiceProvider;
@@ -14,7 +14,7 @@ class CountryStateServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->singleton('CountryState', CountryState::class);
+        $this->app->singleton('CountryState', 'TarekAdam\CountryState\CountryStateServiceProvider');
         $this->mergeConfigFrom(__DIR__ . '/config/countrystate.php', 'countrystate');
     }
 
@@ -28,7 +28,7 @@ public function boot()
         ]);
 
         $routeConfig = [
-            'namespace' => 'DougSisk\CountryState',
+            'namespace' => 'TarekAdam\CountryState',
             'prefix' => $this->app['config']->get('countrystate.routePrefix'),
         ];
 
@@ -42,7 +42,7 @@ public function boot()
             ]);
         });
 
-        AliasLoader::getInstance()->alias('CountryState', 'DougSisk\CountryState\CountryStateFacade');
+        AliasLoader::getInstance()->alias('CountryState', 'TarekAdam\CountryState\CountryStateFacade');
     }
 
     /**