diff --git a/README.md b/README.md
index d86fa49..9a8272c 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Let's say you have your own little URL-shortener, and each of the user submitted
 
 ## Usage
 ```php
-$slugger = new Darkshare\IncrementalSlugger\Slugger();
+$slugger = new Darkshare\Slugger();
 
 // encode id's
 $slugger->encode(1); // a
@@ -21,8 +21,3 @@ $slugger->decode('a'); // 1
 $slugger->decode('fUcod'); // 81259151
 ```
 
-# To-Can-Maybe-Do:
-- [ ] Config: Encode/decode starting from id 0 or 1
-- [ ] Internal: Make slugger able to have multiple implementations
-  - [ ] Short-style e.g. `gUcod`
-  - [ ] Blog-style e.g. `thirteen-years-of-blogging`
diff --git a/composer.json b/composer.json
index bbfae30..3b49afc 100644
--- a/composer.json
+++ b/composer.json
@@ -14,11 +14,11 @@
     },
     "require-dev": {
         "symfony/var-dumper": "^3.1",
-        "phpunit/phpunit": "^5.4"
+        "phpunit/phpunit": "~6.0"
     },
     "autoload": {
         "psr-4": {
-            "Darkshare\\IncrementalSlugger\\": "src/"
+            "Darkshare\\": "src/"
         }
     }
 }
diff --git a/src/Slugger.php b/src/Slugger.php
index 7a41bad..4d6cd12 100644
--- a/src/Slugger.php
+++ b/src/Slugger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Darkshare\IncrementalSlugger;
+namespace Darkshare;
 
 /**
  * A simple class for creating incremental slugs.
diff --git a/tests/unit/SluggerTest.php b/tests/unit/SluggerTest.php
index 00cd437..e95b332 100644
--- a/tests/unit/SluggerTest.php
+++ b/tests/unit/SluggerTest.php
@@ -1,13 +1,14 @@
 <?php
 
-use Darkshare\IncrementalSlugger\Slugger;
+use Darkshare\Slugger;
+use PHPUnit\Framework\TestCase;
 
-class SluggerTest extends PHPUnit_Framework_TestCase {
+class SluggerTest extends TestCase {
 
     /**
      * The Slugger instance under test.
      *
-     * @var Darkshare\IncrementalSlugger\Slugger
+     * @var Darkshare\Slugger
      */
     protected $slugger;