diff --git a/.gitignore b/.gitignore
index 00bed89..8168fb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 vendor/
 composer.lock
 phpunit.xml
-.DS_Store
\ No newline at end of file
+.DS_Store
diff --git a/composer.json b/composer.json
index 79a1804..80ccdb0 100644
--- a/composer.json
+++ b/composer.json
@@ -19,6 +19,9 @@
         "satooshi/php-coveralls": "dev-master"
     },
     "autoload": {
-        "psr-4": {"minphp\\Input\\": "src"}
+        "psr-4": {"Minphp\\Input\\": "src"}
+    },
+    "autoload-dev": {
+        "psr-4": {"Minphp\\Input\\Tests\\": "tests"}
     }
 }
diff --git a/src/Input.php b/src/Input.php
index caadf78..a0d9064 100644
--- a/src/Input.php
+++ b/src/Input.php
@@ -1,7 +1,7 @@
 <?php
-namespace minphp\Input;
+namespace Minphp\Input;
 
-use \Exception;
+use Exception;
 
 /**
  * Supplies methods useful in verifying and formatting input data. Provides a
diff --git a/tests/InputTest.php b/tests/InputTest.php
index c78907e..be21e50 100644
--- a/tests/InputTest.php
+++ b/tests/InputTest.php
@@ -1,10 +1,11 @@
 <?php
-namespace minphp\Input;
+namespace Minphp\Input\Tests;
 
-use \PHPUnit_Framework_TestCase;
+use PHPUnit_Framework_TestCase;
+use Minphp\Input\Input;
 
 /**
- * @coversDefaultClass \minphp\Input\Input
+ * @coversDefaultClass \Minphp\Input\Input
  */
 class InputTest extends PHPUnit_Framework_TestCase
 {