diff --git a/UPGRADING.md b/UPGRADING.md
index 19a8741..9a59d9a 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -3,4 +3,6 @@
 ## Version 1 to 2
 ***
 
+* The namespace has been migrated from `Sparks\Settings` to `CodeIgniter\Settings`; any references will need to be updated.
 * Due to the addition of contexts the `BaseHandler` abstract class was changed. Update any handlers that extend this class to include the new and changed methods.
+* The main library (`Settings`) now requires a Settings config for the constructor (this is supplied by the Service); update any direct calls to the library constructor.
diff --git a/composer.json b/composer.json
index 41c5197..b79fa47 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Sparks\\Settings\\": "src"
+            "CodeIgniter\\Settings\\": "src"
         },
         "exclude-from-classmap": [
             "**/Database/Migrations/**"
diff --git a/src/Config/Services.php b/src/Config/Services.php
index 2baf619..d7862f5 100644
--- a/src/Config/Services.php
+++ b/src/Config/Services.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sparks\Settings\Config;
+namespace CodeIgniter\Settings\Config;
 
 use CodeIgniter\Config\BaseService;
-use Sparks\Settings\Config\Settings as SettingsConfig;
-use Sparks\Settings\Settings;
+use CodeIgniter\Settings\Config\Settings as SettingsConfig;
+use CodeIgniter\Settings\Settings;
 
 /**
  * Services Configuration file.
diff --git a/src/Config/Settings.php b/src/Config/Settings.php
index 467e753..b2729fa 100644
--- a/src/Config/Settings.php
+++ b/src/Config/Settings.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Sparks\Settings\Config;
+namespace CodeIgniter\Settings\Config;
 
-use Sparks\Settings\Handlers\DatabaseHandler;
+use CodeIgniter\Settings\Handlers\DatabaseHandler;
 
 class Settings
 {
diff --git a/src/Database/Migrations/2021-07-04-041948_CreateSettingsTable.php b/src/Database/Migrations/2021-07-04-041948_CreateSettingsTable.php
index 708c822..c7b0053 100644
--- a/src/Database/Migrations/2021-07-04-041948_CreateSettingsTable.php
+++ b/src/Database/Migrations/2021-07-04-041948_CreateSettingsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sparks\Settings\Database\Migrations;
+namespace CodeIgniter\Settings\Database\Migrations;
 
 use CodeIgniter\Database\Migration;
 
diff --git a/src/Database/Migrations/2021-11-14-143905_AddContextColumn.php b/src/Database/Migrations/2021-11-14-143905_AddContextColumn.php
index 8cdc73d..5898512 100644
--- a/src/Database/Migrations/2021-11-14-143905_AddContextColumn.php
+++ b/src/Database/Migrations/2021-11-14-143905_AddContextColumn.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sparks\Settings\Database\Migrations;
+namespace CodeIgniter\Settings\Database\Migrations;
 
 use CodeIgniter\Database\Migration;
 
diff --git a/src/Handlers/BaseHandler.php b/src/Handlers/BaseHandler.php
index 53177e2..e2bd393 100644
--- a/src/Handlers/BaseHandler.php
+++ b/src/Handlers/BaseHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sparks\Settings\Handlers;
+namespace CodeIgniter\Settings\Handlers;
 
 use RuntimeException;
 
diff --git a/src/Handlers/DatabaseHandler.php b/src/Handlers/DatabaseHandler.php
index 5279c8d..fd38378 100644
--- a/src/Handlers/DatabaseHandler.php
+++ b/src/Handlers/DatabaseHandler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Sparks\Settings\Handlers;
+namespace CodeIgniter\Settings\Handlers;
 
 use CodeIgniter\I18n\Time;
 use RuntimeException;
diff --git a/src/Settings.php b/src/Settings.php
index 232081b..721fd93 100644
--- a/src/Settings.php
+++ b/src/Settings.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Sparks\Settings;
+namespace CodeIgniter\Settings;
 
+use CodeIgniter\Settings\Config\Settings as SettingsConfig;
 use InvalidArgumentException;
 use RuntimeException;
-use Sparks\Settings\Config\Settings as SettingsConfig;
 
 /**
  * Allows developers a single location to store and
diff --git a/tests/HelperTest.php b/tests/HelperTest.php
index 5229676..3ac49e2 100644
--- a/tests/HelperTest.php
+++ b/tests/HelperTest.php
@@ -3,8 +3,8 @@
 namespace CodeIgniter4\Tests;
 
 use CodeIgniter\I18n\Time;
+use CodeIgniter\Settings\Settings;
 use CodeIgniter\Test\DatabaseTestTrait;
-use Sparks\Settings\Settings;
 use Tests\Support\TestCase;
 
 /**
diff --git a/tests/SettingsTest.php b/tests/SettingsTest.php
index 6fe105a..259d690 100644
--- a/tests/SettingsTest.php
+++ b/tests/SettingsTest.php
@@ -3,8 +3,8 @@
 namespace Tests;
 
 use CodeIgniter\I18n\Time;
+use CodeIgniter\Settings\Settings;
 use CodeIgniter\Test\DatabaseTestTrait;
-use Sparks\Settings\Settings;
 use Tests\Support\TestCase;
 
 /**
diff --git a/tests/_support/TestCase.php b/tests/_support/TestCase.php
index a0ee942..b64ffd5 100644
--- a/tests/_support/TestCase.php
+++ b/tests/_support/TestCase.php
@@ -9,7 +9,7 @@ abstract class TestCase extends CIUnitTestCase
 {
     use Expeditable;
 
-    protected $namespace = 'Sparks\Settings';
+    protected $namespace = 'CodeIgniter\Settings';
     protected $refresh   = true;
 
     /**