diff --git a/composer.json b/composer.json
index ec11059..4c6bc42 100644
--- a/composer.json
+++ b/composer.json
@@ -16,8 +16,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "TorstenHettstedtUnitTests\\Colors\\" : "tests/unit",
-            "TorstenHettstedtTests\\Helper\\" : "tests/_support/Helper"
+            "TorstenHettstedt\\Colors\\Tests\\Unit\\" : "tests/unit",
+            "TorstenHettstedt\\Colors\\Tests\\Helper\\" : "tests/_support/Helper"
         }
     },
     "require": {
diff --git a/tests/_support/Helper/ValidColorValuesProvider.php b/tests/_support/Helper/ValidColorValuesProvider.php
index ca33cc8..60f6b67 100644
--- a/tests/_support/Helper/ValidColorValuesProvider.php
+++ b/tests/_support/Helper/ValidColorValuesProvider.php
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace TorstenHettstedtTests\Helper;
+namespace TorstenHettstedt\Colors\Tests\Helper;
 
 
 class ValidColorValuesProvider
diff --git a/tests/unit/ColorModels/AbstractColorModelUnit.php b/tests/unit/ColorModels/AbstractColorModelUnit.php
index 542b1ff..90fe58e 100644
--- a/tests/unit/ColorModels/AbstractColorModelUnit.php
+++ b/tests/unit/ColorModels/AbstractColorModelUnit.php
@@ -1,7 +1,7 @@
 <?php /** @noinspection PhpArrayShapeAttributeCanBeAddedInspection */
 
 
-namespace TorstenHettstedtUnitTests\Colors\ColorModels;
+namespace TorstenHettstedt\Colors\Tests\Unit\ColorModels;
 
 use Codeception\Test\Unit;
 
diff --git a/tests/unit/ColorModels/CyanMagentaYellowKeyTest.php b/tests/unit/ColorModels/CyanMagentaYellowKeyTest.php
index e18129f..bffb391 100644
--- a/tests/unit/ColorModels/CyanMagentaYellowKeyTest.php
+++ b/tests/unit/ColorModels/CyanMagentaYellowKeyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace TorstenHettstedtUnitTests\Colors\ColorModels;
+namespace TorstenHettstedt\Colors\Tests\Unit\ColorModels;
 
 use InvalidArgumentException;
 use TorstenHettstedt\Colors\ColorModels\CyanMagentaYellowKey;
diff --git a/tests/unit/ColorModels/HueSaturationValueTest.php b/tests/unit/ColorModels/HueSaturationValueTest.php
index 7a57300..6600266 100644
--- a/tests/unit/ColorModels/HueSaturationValueTest.php
+++ b/tests/unit/ColorModels/HueSaturationValueTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace TorstenHettstedtUnitTests\Colors\ColorModels;
+namespace TorstenHettstedt\Colors\Tests\Unit\ColorModels;
 
 use InvalidArgumentException;
 use TorstenHettstedt\Colors\ColorModels\HueSaturationValue;
diff --git a/tests/unit/ColorModels/RedGreenBlueTest.php b/tests/unit/ColorModels/RedGreenBlueTest.php
index e754089..7c4da0d 100644
--- a/tests/unit/ColorModels/RedGreenBlueTest.php
+++ b/tests/unit/ColorModels/RedGreenBlueTest.php
@@ -1,6 +1,6 @@
 <?php /** @noinspection PhpArrayShapeAttributeCanBeAddedInspection */
 
-namespace TorstenHettstedtUnitTests\Colors\ColorModels;
+namespace TorstenHettstedt\Colors\Tests\Unit\ColorModels;
 
 use InvalidArgumentException;
 use TorstenHettstedt\Colors\ColorModels\RedGreenBlue;
diff --git a/tests/unit/Transformer/CyanMagentaYellowKeyTransformerTest.php b/tests/unit/Transformer/CyanMagentaYellowKeyTransformerTest.php
index 011d265..98f1607 100644
--- a/tests/unit/Transformer/CyanMagentaYellowKeyTransformerTest.php
+++ b/tests/unit/Transformer/CyanMagentaYellowKeyTransformerTest.php
@@ -1,12 +1,12 @@
 <?php /** @noinspection PhpArrayShapeAttributeCanBeAddedInspection */
 
-namespace TorstenHettstedtUnitTests\Colors\Transformer;
+namespace TorstenHettstedt\Colors\Tests\Unit\Transformer;
 
 use Codeception\Test\Unit;
 use Exception;
 use TorstenHettstedt\Colors\ColorModels\CyanMagentaYellowKey;
+use TorstenHettstedt\Colors\Tests\Helper\ValidColorValuesProvider;
 use TorstenHettstedt\Colors\Transformer\CyanMagentaYellowKeyTransformer;
-use TorstenHettstedtTests\Helper\ValidColorValuesProvider;
 
 class CyanMagentaYellowKeyTransformerTest extends Unit
 {
diff --git a/tests/unit/Transformer/HueSaturationValueTransformerTest.php b/tests/unit/Transformer/HueSaturationValueTransformerTest.php
index 9694d21..b6ac0c5 100644
--- a/tests/unit/Transformer/HueSaturationValueTransformerTest.php
+++ b/tests/unit/Transformer/HueSaturationValueTransformerTest.php
@@ -1,12 +1,12 @@
 <?php /** @noinspection PhpArrayShapeAttributeCanBeAddedInspection */
 
-namespace TorstenHettstedtUnitTests\Colors\Transformer;
+namespace TorstenHettstedt\Colors\Tests\Unit\Transformer;
 
 use Codeception\Test\Unit;
 use Exception;
 use TorstenHettstedt\Colors\ColorModels\HueSaturationValue;
+use TorstenHettstedt\Colors\Tests\Helper\ValidColorValuesProvider;
 use TorstenHettstedt\Colors\Transformer\HueSaturationValueTransformer;
-use TorstenHettstedtTests\Helper\ValidColorValuesProvider;
 
 class HueSaturationValueTransformerTest extends Unit
 {
diff --git a/tests/unit/Transformer/RedGreenBlueTransformerTest.php b/tests/unit/Transformer/RedGreenBlueTransformerTest.php
index 2862afc..9aae62a 100644
--- a/tests/unit/Transformer/RedGreenBlueTransformerTest.php
+++ b/tests/unit/Transformer/RedGreenBlueTransformerTest.php
@@ -1,12 +1,12 @@
 <?php /** @noinspection PhpArrayShapeAttributeCanBeAddedInspection */
 
-namespace TorstenHettstedtUnitTests\Colors\Transformer;
+namespace TorstenHettstedt\Colors\Tests\Unit\Transformer;
 
 use Codeception\Test\Unit;
 use Exception;
 use TorstenHettstedt\Colors\ColorModels\RedGreenBlue;
+use TorstenHettstedt\Colors\Tests\Helper\ValidColorValuesProvider;
 use TorstenHettstedt\Colors\Transformer\RedGreenBlueTransformer;
-use TorstenHettstedtTests\Helper\ValidColorValuesProvider;
 
 class RedGreenBlueTransformerTest extends Unit
 {