diff --git a/composer.json b/composer.json
index fa0286e..ec01fc3 100644
--- a/composer.json
+++ b/composer.json
@@ -14,9 +14,9 @@
     ],
     "autoload":{
         "psr-4":{
-            "CSV\\": "src",
-            "CSV\\extensions\\": "src\\extensions",
-            "CSV\\tests\\": "tests"
+            "ParseCsv\\": "src",
+            "ParseCsv\\extensions\\": "src\\extensions",
+            "ParseCsv\\tests\\": "tests"
         }
     },
     "require-dev": {
diff --git a/src/Csv.php b/src/Csv.php
index 7fe2fb0..74381e4 100644
--- a/src/Csv.php
+++ b/src/Csv.php
@@ -1,7 +1,7 @@
 <?php
-namespace CSV;
+namespace ParseCsv;
 
-use CSV\extensions\DatatypeTrait;
+use ParseCsv\extensions\DatatypeTrait;
 
 class Csv {
 
diff --git a/src/extensions/DatatypeTrait.php b/src/extensions/DatatypeTrait.php
index e6b1246..75dd4a9 100644
--- a/src/extensions/DatatypeTrait.php
+++ b/src/extensions/DatatypeTrait.php
@@ -1,5 +1,5 @@
 <?php
-namespace CSV\extensions;
+namespace ParseCsv\extensions;
 
 trait DatatypeTrait {
 
diff --git a/tests/methods/ConstructTest.php b/tests/methods/ConstructTest.php
index 2ebf221..a170310 100644
--- a/tests/methods/ConstructTest.php
+++ b/tests/methods/ConstructTest.php
@@ -1,7 +1,7 @@
 <?php
-namespace CSV\tests\methods;
+namespace ParseCsv\tests\methods;
 
-use CSV\Csv;
+use ParseCsv\Csv;
 use PHPUnit\Framework\TestCase;
 
 class ConstructTest extends TestCase
diff --git a/tests/methods/ParseTest.php b/tests/methods/ParseTest.php
index e3c4ed0..2f29049 100644
--- a/tests/methods/ParseTest.php
+++ b/tests/methods/ParseTest.php
@@ -1,7 +1,7 @@
 <?php
-namespace CSV\tests\methods;
+namespace ParseCsv\tests\methods;
 
-use CSV\Csv;
+use ParseCsv\Csv;
 use PHPUnit_Framework_TestCase as TestCase;
 
 class ParseTest extends TestCase
diff --git a/tests/methods/SaveTest.php b/tests/methods/SaveTest.php
index 644ac01..0918b69 100644
--- a/tests/methods/SaveTest.php
+++ b/tests/methods/SaveTest.php
@@ -1,7 +1,7 @@
 <?php
-namespace CSV\tests\methods;
+namespace ParseCsv\tests\methods;
 
-use CSV\Csv;
+use ParseCsv\Csv;
 use PHPUnit_Framework_TestCase as TestCase;
 
 class SaveTest extends TestCase
diff --git a/tests/properties/default_values_test.php b/tests/properties/default_values_test.php
index 2117094..74077ca 100644
--- a/tests/properties/default_values_test.php
+++ b/tests/properties/default_values_test.php
@@ -1,6 +1,10 @@
 <?php
+namespace ParseCsv\tests\properties;
 
-class default_values_properties_Test extends PHPUnit\Framework\TestCase {
+use ParseCsv\Csv;
+use PHPUnit_Framework_TestCase as TestCase;
+
+class default_values_properties_Test extends TestCase {
 
     /**
      * CSV
diff --git a/tests/properties/worthless_test.php b/tests/properties/worthless_test.php
index 5459b59..7a9b993 100644
--- a/tests/properties/worthless_test.php
+++ b/tests/properties/worthless_test.php
@@ -1,6 +1,10 @@
 <?php
+namespace ParseCsv\tests\properties;
 
-class worthless_properties_Test extends PHPUnit\Framework\TestCase {
+use ParseCsv\Csv;
+use PHPUnit_Framework_TestCase as TestCase;
+
+class DefaultValuesTest extends TestCase {
 
     /**
      * CSV
@@ -36,7 +40,7 @@ class worthless_properties_Test extends PHPUnit\Framework\TestCase {
      */
     public function setUp() {
         //setup parse CSV
-        $this->csv = new parseCSV();
+        $this->csv = new Csv();
 
         //setup the reflection class
         $this->reflection = new ReflectionClass($this->csv);