diff --git a/README.md b/README.md
index 19afa51..265baa4 100644
--- a/README.md
+++ b/README.md
@@ -67,15 +67,15 @@ Once you have [Configured](#configuration), client can be initialised by passing
 $config = [
 	'key' => "123456789012345678901234",
 ];
-$client = new Craftsys\MSG91\Client($config);
+$client = new Craftsys\MSG91Client\Client($config);
 ```
 
-The package in distributed under `Craftsys\MSG91` namespace which can used if your are working in a namespace environment.
+The package in distributed under `Craftsys\MSG91Client` namespace which can used if your are working in a namespace environment.
 
 ```php
 <?php
 // in your use statement sections
-use Craftsys\MSG91\Client;
+use Craftsys\MSG91Client\Client;
 
 // somewhere in this source file where you need the client
 $client = new Client();
@@ -90,13 +90,13 @@ Next, follow along with [examples](#examples) to learn more
 The client is responsible for interacting with MSG91 apis.
 
 ```php
-$client =  new Craftsys\MSG91\Client($config);
+$client =  new Craftsys\MSG91Client\Client($config);
 ```
 
 Client can also be initialised without a configuration which can be set by calling `setConfig($config)` method on the client instance.
 
 ```php
-$client =  new Craftsys\MSG91\Client();
+$client =  new Craftsys\MSG91Client\Client();
 $client->setConfig($config);
 ```
 
@@ -105,7 +105,7 @@ $client->setConfig($config);
 You can also pass a custom `GuzzleHttp\Client` as the second argument on the Client's constructor.
 
 ```php
-$client = new Craftsys\MSG91\Client($config, new GuzzleHttp\Client());
+$client = new Craftsys\MSG91Client\Client($config, new GuzzleHttp\Client());
 ```
 
 ### Managing OTPs
diff --git a/composer.json b/composer.json
index 870af3d..e813336 100644
--- a/composer.json
+++ b/composer.json
@@ -41,12 +41,12 @@
   "minimum-stability": "dev",
   "autoload": {
     "psr-4": {
-      "Craftsys\\MSG91\\": "src/"
+      "Craftsys\\MSG91Client\\": "src/"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Craftsys\\MSG91\\Test\\": "tests/"
+      "Craftsys\\MSG91Client\\Test\\": "tests/"
     }
   },
   "scripts": {
diff --git a/src/BaseMessage.php b/src/BaseMessage.php
index 36c1522..99355e3 100644
--- a/src/BaseMessage.php
+++ b/src/BaseMessage.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Craftsys\MSG91;
+namespace Craftsys\MSG91Client;
 
-use Craftsys\MSG91\Exceptions\ConnectionError;
-use Craftsys\MSG91\Exceptions\ResponseError;
-use Craftsys\MSG91\Exceptions\AuthKeyRequired;
+use Craftsys\MSG91Client\Exceptions\ConnectionError;
+use Craftsys\MSG91Client\Exceptions\ResponseError;
+use Craftsys\MSG91Client\Exceptions\AuthKeyRequired;
 use Exception;
 use GuzzleHttp\Client as HttpClient;
 use GuzzleHttp\Exception\ClientException;
diff --git a/src/Client.php b/src/Client.php
index 1966f06..326c4b3 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craftsys\MSG91;
+namespace Craftsys\MSG91Client;
 
 use GuzzleHttp\Client as HttpClient;
 
diff --git a/src/Config.php b/src/Config.php
index 105e8e3..16ad820 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craftsys\MSG91;
+namespace Craftsys\MSG91Client;
 
 class Config
 {
diff --git a/src/Exceptions/AuthKeyRequired.php b/src/Exceptions/AuthKeyRequired.php
index faa8e81..2ca02e6 100644
--- a/src/Exceptions/AuthKeyRequired.php
+++ b/src/Exceptions/AuthKeyRequired.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craftsys\MSG91\Exceptions;
+namespace Craftsys\MSG91Client\Exceptions;
 
 use Exception;
 
diff --git a/src/Exceptions/ConnectionError.php b/src/Exceptions/ConnectionError.php
index 2d98e9f..d6d35b9 100644
--- a/src/Exceptions/ConnectionError.php
+++ b/src/Exceptions/ConnectionError.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craftsys\MSG91\Exceptions;
+namespace Craftsys\MSG91Client\Exceptions;
 
 use Exception;
 use GuzzleHttp\Exception\ClientException;
diff --git a/src/Exceptions/ResponseError.php b/src/Exceptions/ResponseError.php
index 0e8cc4f..d89abc1 100644
--- a/src/Exceptions/ResponseError.php
+++ b/src/Exceptions/ResponseError.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craftsys\MSG91\Exceptions;
+namespace Craftsys\MSG91Client\Exceptions;
 
 use Exception;
 
@@ -11,7 +11,6 @@ class ResponseError extends Exception
      */
     public function __construct(?string $message = "")
     {
-        echo $message;
         return new Exception("MSG91 responded with an error. `{$message}`");
     }
 }
diff --git a/src/Message.php b/src/Message.php
index 3d81939..c9ba4e5 100644
--- a/src/Message.php
+++ b/src/Message.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craftsys\MSG91;
+namespace Craftsys\MSG91Client;
 
 class Message extends BaseMessage
 {
diff --git a/src/OTPMessage.php b/src/OTPMessage.php
index 292eb08..c51f774 100644
--- a/src/OTPMessage.php
+++ b/src/OTPMessage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craftsys\MSG91;
+namespace Craftsys\MSG91Client;
 
 use GuzzleHttp\Client as HttpClient;
 
diff --git a/src/Response.php b/src/Response.php
index d22e351..ac61d32 100644
--- a/src/Response.php
+++ b/src/Response.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craftsys\MSG91;
+namespace Craftsys\MSG91Client;
 
 use Psr\Http\Message\ResponseInterface;
 use Exception;
diff --git a/src/URLs.php b/src/URLs.php
index 33261e8..6b2dcb8 100644
--- a/src/URLs.php
+++ b/src/URLs.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craftsys\MSG91;
+namespace Craftsys\MSG91Client;
 
 class URLs
 {
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index f81c23e..42f790e 100644
--- a/tests/ConfigTest.php
+++ b/tests/ConfigTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craftsys\MSG91\Test;
+namespace Craftsys\MSG91Client\Test;
 
-use Craftsys\MSG91\Config;
+use Craftsys\MSG91Client\Config;
 
 class ConfigTest extends TestCase
 {
diff --git a/tests/OtpServiceTest.php b/tests/OtpServiceTest.php
index ea9239d..b3c940b 100644
--- a/tests/OtpServiceTest.php
+++ b/tests/OtpServiceTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Craftsys\MSG91\Test;
+namespace Craftsys\MSG91Client\Test;
 
-use Craftsys\MSG91\Client;
+use Craftsys\MSG91Client\Client;
 use GuzzleHttp\Client as HttpClient;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
diff --git a/tests/TestCase.php b/tests/TestCase.php
index ee21494..358ba9d 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Craftsys\MSG91\Test;
+namespace Craftsys\MSG91Client\Test;
 
 use PHPUnit\Framework\TestCase as BaseTestCase;