diff --git a/README.md b/README.md
index 600553ba6..9cea2d410 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Initialize a new client object:
 
 ```php
 
-$client = new Leaseweb\InfluxDB\Client($host, $port);
+$client = new InfluxDB\Client($host, $port);
 
 
 ```
diff --git a/composer.json b/composer.json
index 5308120ac..b969c7b3d 100644
--- a/composer.json
+++ b/composer.json
@@ -22,12 +22,12 @@
     },
     "autoload": {
         "psr-4" : {
-            "Leaseweb\\InfluxDB\\": "src/Leaseweb/InfluxDB"
+            "InfluxDB\\": "src/InfluxDB"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Leaseweb\\InfluxDB\\Test\\": "tests"
+            "InfluxDB\\Test\\": "tests"
         }
     }
 }
diff --git a/composer.lock b/composer.lock
index 0613c1ffe..3040b508d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "d4cd96b7a6d552bb16ed5847dd32d4e3",
+    "hash": "ef84333e4b0fdb96255d8f56a4d42e3b",
     "packages": [
         {
             "name": "guzzlehttp/guzzle",
diff --git a/src/Leaseweb/InfluxDB/Client.php b/src/InfluxDB/Client.php
similarity index 98%
rename from src/Leaseweb/InfluxDB/Client.php
rename to src/InfluxDB/Client.php
index 49d0df05f..9540a2a84 100644
--- a/src/Leaseweb/InfluxDB/Client.php
+++ b/src/InfluxDB/Client.php
@@ -3,16 +3,16 @@
  * @author Stephen "TheCodeAssassin" Hoogendijk
  */
 
-namespace Leaseweb\InfluxDB;
+namespace InfluxDB;
 
 
 use GuzzleHttp\Client as httpClient;
-use Leaseweb\InfluxDB\Client\Exception as ClientException;
+use InfluxDB\Client\Exception as ClientException;
 
 /**
  * Class Client
  *
- * @package Leaseweb\InfluxDB
+ * @package InfluxDB
  */
 class Client
 {
diff --git a/src/InfluxDB/Client/Exception.php b/src/InfluxDB/Client/Exception.php
new file mode 100644
index 000000000..1b446a2ac
--- /dev/null
+++ b/src/InfluxDB/Client/Exception.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace InfluxDB\Client;
+
+/**
+ * Class Exception
+ *
+ * @package InfluxDB\Client
+ */
+class Exception extends \InfluxDB\Exception
+{
+
+}
\ No newline at end of file
diff --git a/src/Leaseweb/InfluxDB/Database.php b/src/InfluxDB/Database.php
similarity index 94%
rename from src/Leaseweb/InfluxDB/Database.php
rename to src/InfluxDB/Database.php
index 40cd5b45c..a2a6eb848 100644
--- a/src/Leaseweb/InfluxDB/Database.php
+++ b/src/InfluxDB/Database.php
@@ -3,18 +3,18 @@
  * @author Stephen "TheCodeAssassin" Hoogendijk
  */
 
-namespace Leaseweb\InfluxDB;
+namespace InfluxDB;
 
-use Leaseweb\InfluxDB\Database\RetentionPolicy;
-use Leaseweb\InfluxDB\Query\Builder as QueryBuilder;
-use Leaseweb\InfluxDB\Database\Exception as DatabaseException;
+use InfluxDB\Database\RetentionPolicy;
+use InfluxDB\Query\Builder as QueryBuilder;
+use InfluxDB\Database\Exception as DatabaseException;
 
 /**
  * Class Database
  *
  * @todo admin functionality
  *
- * @package Leaseweb\InfluxDB
+ * @package InfluxDB
  */
 class Database
 {
diff --git a/src/InfluxDB/Database/Exception.php b/src/InfluxDB/Database/Exception.php
new file mode 100644
index 000000000..fa17ab7aa
--- /dev/null
+++ b/src/InfluxDB/Database/Exception.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @author Stephen "TheCodeAssassin" Hoogendijk
+ */
+
+namespace InfluxDB\Database;
+
+
+class Exception extends \InfluxDB\Exception
+{
+
+}
\ No newline at end of file
diff --git a/src/Leaseweb/InfluxDB/Database/RetentionPolicy.php b/src/InfluxDB/Database/RetentionPolicy.php
similarity index 91%
rename from src/Leaseweb/InfluxDB/Database/RetentionPolicy.php
rename to src/InfluxDB/Database/RetentionPolicy.php
index b775fd9e6..96fba5b6a 100644
--- a/src/Leaseweb/InfluxDB/Database/RetentionPolicy.php
+++ b/src/InfluxDB/Database/RetentionPolicy.php
@@ -3,12 +3,12 @@
  * @author Stephen "TheCodeAssassin" Hoogendijk
  */
 
-namespace Leaseweb\InfluxDB\Database;
+namespace InfluxDB\Database;
 
 /**
  * Class RetentionPolicy
  *
- * @package Leaseweb\InfluxDB\Database
+ * @package InfluxDB\Database
  */
 class RetentionPolicy
 {
diff --git a/src/Leaseweb/InfluxDB/Exception.php b/src/InfluxDB/Exception.php
similarity index 78%
rename from src/Leaseweb/InfluxDB/Exception.php
rename to src/InfluxDB/Exception.php
index c8f674344..fbf6cb5cb 100644
--- a/src/Leaseweb/InfluxDB/Exception.php
+++ b/src/InfluxDB/Exception.php
@@ -3,7 +3,7 @@
  * @author Stephen "TheCodeAssassin" Hoogendijk
  */
 
-namespace Leaseweb\InfluxDB;
+namespace InfluxDB;
 
 
 class Exception extends \Exception
diff --git a/src/Leaseweb/InfluxDB/Point.php b/src/InfluxDB/Point.php
similarity index 96%
rename from src/Leaseweb/InfluxDB/Point.php
rename to src/InfluxDB/Point.php
index 8ac6705c7..3d8f97009 100644
--- a/src/Leaseweb/InfluxDB/Point.php
+++ b/src/InfluxDB/Point.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Leaseweb\InfluxDB;
+namespace InfluxDB;
 
 /**
  * Class Point
  *
- * @package Leaseweb\InfluxDB
+ * @package InfluxDB
  */
 class Point
 {
diff --git a/src/Leaseweb/InfluxDB/Query/Builder.php b/src/InfluxDB/Query/Builder.php
similarity index 97%
rename from src/Leaseweb/InfluxDB/Query/Builder.php
rename to src/InfluxDB/Query/Builder.php
index aa61ce9b9..96865025d 100644
--- a/src/Leaseweb/InfluxDB/Query/Builder.php
+++ b/src/InfluxDB/Query/Builder.php
@@ -3,10 +3,10 @@
  * @author Stephen "TheCodeAssassin" Hoogendijk <s.hoogendijk@tech.leaseweb.com>
  */
 
-namespace Leaseweb\InfluxDB\Query;
+namespace InfluxDB\Query;
 
-use Leaseweb\InfluxDB\Database;
-use Leaseweb\InfluxDB\ResultSet;
+use InfluxDB\Database;
+use InfluxDB\ResultSet;
 
 /**
  * Class Builder
@@ -20,7 +20,7 @@ use Leaseweb\InfluxDB\ResultSet;
  *
  * $series->select('*')->from('*')->getResult();
  *
- * @package Leaseweb\InfluxDB\Query
+ * @package InfluxDB\Query
  */
 class Builder
 {
diff --git a/src/InfluxDB/Query/Exception.php b/src/InfluxDB/Query/Exception.php
new file mode 100644
index 000000000..4571efb74
--- /dev/null
+++ b/src/InfluxDB/Query/Exception.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @author Stephen "TheCodeAssassin" Hoogendijk
+ */
+
+namespace InfluxDB\Query;
+
+
+class Exception extends \InfluxDB\Exception
+{
+
+}
\ No newline at end of file
diff --git a/src/Leaseweb/InfluxDB/ResultSet.php b/src/InfluxDB/ResultSet.php
similarity index 95%
rename from src/Leaseweb/InfluxDB/ResultSet.php
rename to src/InfluxDB/ResultSet.php
index a56b3fc1e..d8ca020da 100644
--- a/src/Leaseweb/InfluxDB/ResultSet.php
+++ b/src/InfluxDB/ResultSet.php
@@ -3,14 +3,14 @@
  * @author Stephen "TheCodeAssassin" Hoogendijk
  */
 
-namespace Leaseweb\InfluxDB;
+namespace InfluxDB;
 
-use Leaseweb\InfluxDB\Client\Exception as ClientException;
+use InfluxDB\Client\Exception as ClientException;
 
 /**
  * Class ResultSet
  *
- * @package Leaseweb\InfluxDB
+ * @package InfluxDB
  */
 class ResultSet
 {
diff --git a/src/Leaseweb/InfluxDB/Client/Exception.php b/src/Leaseweb/InfluxDB/Client/Exception.php
deleted file mode 100644
index 8d4c258d0..000000000
--- a/src/Leaseweb/InfluxDB/Client/Exception.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Leaseweb\InfluxDB\Client;
-
-/**
- * Class Exception
- *
- * @package Leaseweb\InfluxDB\Client
- */
-class Exception extends \Leaseweb\InfluxDB\Exception
-{
-
-}
\ No newline at end of file
diff --git a/src/Leaseweb/InfluxDB/Database/Exception.php b/src/Leaseweb/InfluxDB/Database/Exception.php
deleted file mode 100644
index 858934f34..000000000
--- a/src/Leaseweb/InfluxDB/Database/Exception.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * @author Stephen "TheCodeAssassin" Hoogendijk
- */
-
-namespace Leaseweb\InfluxDB\Database;
-
-
-class Exception extends \Leaseweb\InfluxDB\Exception
-{
-
-}
\ No newline at end of file
diff --git a/src/Leaseweb/InfluxDB/Query/Exception.php b/src/Leaseweb/InfluxDB/Query/Exception.php
deleted file mode 100644
index 9c1e5dab9..000000000
--- a/src/Leaseweb/InfluxDB/Query/Exception.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * @author Stephen "TheCodeAssassin" Hoogendijk
- */
-
-namespace Leaseweb\InfluxDB\Query;
-
-
-class Exception extends \Leaseweb\InfluxDB\Exception
-{
-
-}
\ No newline at end of file
diff --git a/tests/unit/ClientTest.php b/tests/unit/ClientTest.php
index 4485be7e6..918d60df6 100644
--- a/tests/unit/ClientTest.php
+++ b/tests/unit/ClientTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Leaseweb\InfluxDB\Test;
+namespace InfluxDB\Test;
 
-use Leaseweb\InfluxDB\Client;
+use InfluxDB\Client;
 
 class ClientTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/unit/DatabaseTest.php b/tests/unit/DatabaseTest.php
index 2689fa83d..a351e8031 100644
--- a/tests/unit/DatabaseTest.php
+++ b/tests/unit/DatabaseTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Leaseweb\InfluxDB\Test;
+namespace InfluxDB\Test;
 
 
-use Leaseweb\InfluxDB\Client;
-use Leaseweb\InfluxDB\Database;
-use Leaseweb\InfluxDB\Point;
+use InfluxDB\Client;
+use InfluxDB\Database;
+use InfluxDB\Point;
 
 class DatabaseTest extends \PHPUnit_Framework_TestCase
 {
@@ -20,7 +20,7 @@ class DatabaseTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->mockClient = $this->getMockBuilder('\Leaseweb\InfluxDB\Client')
+        $this->mockClient = $this->getMockBuilder('\InfluxDB\Client')
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/tests/unit/PointTest.php b/tests/unit/PointTest.php
index ea693cf76..d57713b37 100644
--- a/tests/unit/PointTest.php
+++ b/tests/unit/PointTest.php
@@ -6,10 +6,10 @@
  * Time: 17:39
  */
 
-namespace Leaseweb\InfluxDB\Test;
+namespace InfluxDB\Test;
 
 
-use Leaseweb\InfluxDB\Point;
+use InfluxDB\Point;
 
 class PointTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/unit/ResultSetTest.php b/tests/unit/ResultSetTest.php
index a85c74f9d..4c04bf1e9 100644
--- a/tests/unit/ResultSetTest.php
+++ b/tests/unit/ResultSetTest.php
@@ -1,7 +1,7 @@
 <?php
-namespace Leaseweb\InfluxDB\Test;
+namespace InfluxDB\Test;
 
-use Leaseweb\InfluxDB\ResultSet;
+use InfluxDB\ResultSet;
 
 class ResultSetTest extends \PHPUnit_Framework_TestCase
 {
@@ -26,7 +26,7 @@ class ResultSetTest extends \PHPUnit_Framework_TestCase
 
     /**
      * Throws Exception if something went wrong with influxDB
-     * @expectedException \Leaseweb\InfluxDB\Exception
+     * @expectedException \InfluxDB\Exception
      */
     public function testThrowsInfluxDBException()
     {
@@ -42,7 +42,7 @@ EOD;
 
     /**
      * Throws Exception if something went wrong with influxDB after processing the query
-     * @expectedException \Leaseweb\InfluxDB\Exception
+     * @expectedException \InfluxDB\Exception
      */
     public function testThrowsInfluxDBExceptionIfAnyErrorInSeries()
     {