diff --git a/application/src/Entity/Attribut/FirstNameSourceAttribut.php b/application/src/Entity/Attribut/FirstNameSourceAttribut.php
index 742dee3..d3dde8d 100644
--- a/application/src/Entity/Attribut/FirstNameSourceAttribut.php
+++ b/application/src/Entity/Attribut/FirstNameSourceAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\Source\Data\Name\FirstNameSourceInterface;
+use App\Entity\Source\Primitive\Name\FirstNameSourceInterface;
 
 trait FirstNameSourceAttribut
 {
diff --git a/application/src/Entity/Attribut/FirstNameSourceAttributInterface.php b/application/src/Entity/Attribut/FirstNameSourceAttributInterface.php
index 6e93e6c..7cba291 100644
--- a/application/src/Entity/Attribut/FirstNameSourceAttributInterface.php
+++ b/application/src/Entity/Attribut/FirstNameSourceAttributInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\Source\Data\Name\FirstNameSourceInterface;
+use App\Entity\Source\Primitive\Name\FirstNameSourceInterface;
 
 interface FirstNameSourceAttributInterface
 {
diff --git a/application/src/Entity/Attribut/NameSourceAttribut.php b/application/src/Entity/Attribut/NameSourceAttribut.php
index 369eb37..c3689f2 100644
--- a/application/src/Entity/Attribut/NameSourceAttribut.php
+++ b/application/src/Entity/Attribut/NameSourceAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\Source\Data\Name\NameSourceInterface;
+use App\Entity\Source\Primitive\Name\NameSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/NameSourceAttributInterface.php b/application/src/Entity/Attribut/NameSourceAttributInterface.php
index 1cf6762..2d3ebb9 100644
--- a/application/src/Entity/Attribut/NameSourceAttributInterface.php
+++ b/application/src/Entity/Attribut/NameSourceAttributInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\Source\Data\Name\NameSourceInterface;
+use App\Entity\Source\Primitive\Name\NameSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Attribut/SurnameSourceAttribut.php b/application/src/Entity/Attribut/SurnameSourceAttribut.php
index 76f23d8..ccd7e4b 100644
--- a/application/src/Entity/Attribut/SurnameSourceAttribut.php
+++ b/application/src/Entity/Attribut/SurnameSourceAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\Source\Data\Name\SurnameSourceInterface;
+use App\Entity\Source\Primitive\Name\SurnameSourceInterface;
 
 trait SurnameSourceAttribut
 {
diff --git a/application/src/Entity/Attribut/SurnameSourceAttributInterface.php b/application/src/Entity/Attribut/SurnameSourceAttributInterface.php
index b51cf6a..018653d 100644
--- a/application/src/Entity/Attribut/SurnameSourceAttributInterface.php
+++ b/application/src/Entity/Attribut/SurnameSourceAttributInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\Source\Data\Name\SurnameSourceInterface;
+use App\Entity\Source\Primitive\Name\SurnameSourceInterface;
 
 interface SurnameSourceAttributInterface
 {
diff --git a/application/src/Entity/Source/AbstractSource.php b/application/src/Entity/Source/AbstractSource.php
index e5ed454..9fc1629 100644
--- a/application/src/Entity/Source/AbstractSource.php
+++ b/application/src/Entity/Source/AbstractSource.php
@@ -23,7 +23,7 @@ use App\Entity\Source\Collection\TreeCollectionSourceInterface;
  * @ORM\Table(name="source")
  * @ORM\InheritanceType("JOINED")
  * @ORM\DiscriminatorColumn(name="discr", type="string")
- * @ORM\DiscriminatorMap({"data" = "App\Entity\Source\Data\AbstractDataSource", "collection" = "App\Entity\Source\Collection\AbstractCollectionSource","operation"="App\Entity\Source\Operation\AbstractOperation"})
+ * @ORM\DiscriminatorMap({"data" = "App\Entity\Source\Primitive\AbstractDataSource", "collection" = "App\Entity\Source\Collection\AbstractCollectionSource","operation"="App\Entity\Source\Operation\AbstractOperation"})
  */
 abstract class AbstractSource extends AbstractEntity implements SourceInterface
 {
diff --git a/application/src/Entity/Source/Combination/CombinationSourceInterface.php b/application/src/Entity/Source/Combination/CombinationSourceInterface.php
index c443759..9c06c69 100644
--- a/application/src/Entity/Source/Combination/CombinationSourceInterface.php
+++ b/application/src/Entity/Source/Combination/CombinationSourceInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Source\Combination;
 
-use App\Entity\Source\Data\DataSourceInterface;
+use App\Entity\Source\Primitive\DataSourceInterface;
 
 interface CombinationSourceInterface extends DataSourceInterface
 {
diff --git a/application/src/Entity/Source/Combination/FullPersonNameSource.php b/application/src/Entity/Source/Combination/FullPersonNameSource.php
index 2ce1df9..1d9c0aa 100644
--- a/application/src/Entity/Source/Combination/FullPersonNameSource.php
+++ b/application/src/Entity/Source/Combination/FullPersonNameSource.php
@@ -4,11 +4,11 @@ namespace App\Entity\Source\Combination;
 
 use App\Entity\Attribut\FirstNameSourceAttribut;
 use App\Entity\Attribut\SurnameSourceAttribut;
-use App\Entity\Source\Data\Name\SurnameSource;
-use App\Entity\Source\Data\Name\FirstNameSource;
+use App\Entity\Source\Primitive\Name\SurnameSource;
+use App\Entity\Source\Primitive\Name\FirstNameSource;
 use Doctrine\ORM\Mapping as ORM;
-use App\Entity\Source\Data\Name\SurnameSourceInterface;
-use App\Entity\Source\Data\Name\FirstNameSourceInterface;
+use App\Entity\Source\Primitive\Name\SurnameSourceInterface;
+use App\Entity\Source\Primitive\Name\FirstNameSourceInterface;
 
 /**
  * @author kevinfrantz
@@ -20,7 +20,7 @@ class FullPersonNameSource extends AbstractCombinationSource implements FullPers
     use FirstNameSourceAttribut,SurnameSourceAttribut;
 
     /**
-     * @ORM\OneToOne(targetEntity="App\Entity\Source\Data\Name\SurnameSource",cascade={"persist", "remove"})
+     * @ORM\OneToOne(targetEntity="App\Entity\Source\Primitive\Name\SurnameSource",cascade={"persist", "remove"})
      * @ORM\JoinColumn(name="surname_id", referencedColumnName="id",onDelete="CASCADE")
      *
      * @var SurnameSourceInterface
@@ -28,7 +28,7 @@ class FullPersonNameSource extends AbstractCombinationSource implements FullPers
     protected $surnameSource;
 
     /**
-     * @ORM\OneToOne(targetEntity="App\Entity\Source\Data\Name\FirstNameSource",cascade={"persist", "remove"})
+     * @ORM\OneToOne(targetEntity="App\Entity\Source\Primitive\Name\FirstNameSource",cascade={"persist", "remove"})
      * @ORM\JoinColumn(name="firstname_id", referencedColumnName="id",onDelete="CASCADE")
      *
      * @var FirstNameSourceInterface
diff --git a/application/src/Entity/Source/Combination/UserSourceInterface.php b/application/src/Entity/Source/Combination/UserSourceInterface.php
index 9bd1e2f..d343e5d 100644
--- a/application/src/Entity/Source/Combination/UserSourceInterface.php
+++ b/application/src/Entity/Source/Combination/UserSourceInterface.php
@@ -4,7 +4,7 @@ namespace App\Entity\Source\Combination;
 
 use App\Entity\Attribut\UserAttributInterface;
 use App\Entity\Attribut\PersonIdentitySourceAttributInterface;
-use App\Entity\Source\Data\DataSourceInterface;
+use App\Entity\Source\Primitive\DataSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Source/Data/AbstractDataSource.php b/application/src/Entity/Source/Primitive/AbstractDataSource.php
similarity index 72%
rename from application/src/Entity/Source/Data/AbstractDataSource.php
rename to application/src/Entity/Source/Primitive/AbstractDataSource.php
index ae1646e..dc8d9cc 100644
--- a/application/src/Entity/Source/Data/AbstractDataSource.php
+++ b/application/src/Entity/Source/Primitive/AbstractDataSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Data;
+namespace App\Entity\Source\Primitive;
 
 use Doctrine\ORM\Mapping as ORM;
 use App\Entity\Source\AbstractSource;
@@ -12,7 +12,7 @@ use App\Entity\Source\AbstractSource;
  * @ORM\Table(name="source_data")
  * @ORM\InheritanceType("JOINED")
  * @ORM\DiscriminatorColumn(name="discr", type="string")
- * @ORM\DiscriminatorMap({"name" = "App\Entity\Source\Data\Name\AbstractNameSource"})
+ * @ORM\DiscriminatorMap({"name" = "App\Entity\Source\Primitive\Name\AbstractNameSource"})
  */
 abstract class AbstractDataSource extends AbstractSource implements DataSourceInterface
 {
diff --git a/application/src/Entity/Source/Data/DataSourceInterface.php b/application/src/Entity/Source/Primitive/DataSourceInterface.php
similarity index 73%
rename from application/src/Entity/Source/Data/DataSourceInterface.php
rename to application/src/Entity/Source/Primitive/DataSourceInterface.php
index 2cfafaf..20d53a2 100644
--- a/application/src/Entity/Source/Data/DataSourceInterface.php
+++ b/application/src/Entity/Source/Primitive/DataSourceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Data;
+namespace App\Entity\Source\Primitive;
 
 use App\Entity\Source\SourceInterface;
 
diff --git a/application/src/Entity/Source/Data/Name/AbstractNameSource.php b/application/src/Entity/Source/Primitive/Name/AbstractNameSource.php
similarity index 91%
rename from application/src/Entity/Source/Data/Name/AbstractNameSource.php
rename to application/src/Entity/Source/Primitive/Name/AbstractNameSource.php
index a757482..435681e 100644
--- a/application/src/Entity/Source/Data/Name/AbstractNameSource.php
+++ b/application/src/Entity/Source/Primitive/Name/AbstractNameSource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Source\Data\Name;
+namespace App\Entity\Source\Primitive\Name;
 
-use App\Entity\Source\Data\AbstractDataSource;
+use App\Entity\Source\Primitive\AbstractDataSource;
 use App\Entity\Attribut\NameAttribut;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
diff --git a/application/src/Entity/Source/Data/Name/FirstNameSource.php b/application/src/Entity/Source/Primitive/Name/FirstNameSource.php
similarity index 80%
rename from application/src/Entity/Source/Data/Name/FirstNameSource.php
rename to application/src/Entity/Source/Primitive/Name/FirstNameSource.php
index 27756b0..c0e2de1 100644
--- a/application/src/Entity/Source/Data/Name/FirstNameSource.php
+++ b/application/src/Entity/Source/Primitive/Name/FirstNameSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Data\Name;
+namespace App\Entity\Source\Primitive\Name;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/application/src/Entity/Source/Data/Name/FirstNameSourceInterface.php b/application/src/Entity/Source/Primitive/Name/FirstNameSourceInterface.php
similarity index 63%
rename from application/src/Entity/Source/Data/Name/FirstNameSourceInterface.php
rename to application/src/Entity/Source/Primitive/Name/FirstNameSourceInterface.php
index 4d005bd..c04b583 100644
--- a/application/src/Entity/Source/Data/Name/FirstNameSourceInterface.php
+++ b/application/src/Entity/Source/Primitive/Name/FirstNameSourceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Data\Name;
+namespace App\Entity\Source\Primitive\Name;
 
 interface FirstNameSourceInterface extends NameSourceInterface
 {
diff --git a/application/src/Entity/Source/Data/Name/NameSourceInterface.php b/application/src/Entity/Source/Primitive/Name/NameSourceInterface.php
similarity index 59%
rename from application/src/Entity/Source/Data/Name/NameSourceInterface.php
rename to application/src/Entity/Source/Primitive/Name/NameSourceInterface.php
index 9605669..0d51909 100644
--- a/application/src/Entity/Source/Data/Name/NameSourceInterface.php
+++ b/application/src/Entity/Source/Primitive/Name/NameSourceInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Entity\Source\Data\Name;
+namespace App\Entity\Source\Primitive\Name;
 
-use App\Entity\Source\Data\DataSourceInterface;
+use App\Entity\Source\Primitive\DataSourceInterface;
 use App\Entity\Attribut\NameAttributInterface;
 
 interface NameSourceInterface extends DataSourceInterface, NameAttributInterface
diff --git a/application/src/Entity/Source/Data/Name/NicknameSource.php b/application/src/Entity/Source/Primitive/Name/NicknameSource.php
similarity index 80%
rename from application/src/Entity/Source/Data/Name/NicknameSource.php
rename to application/src/Entity/Source/Primitive/Name/NicknameSource.php
index 5cddb4b..6eb9260 100644
--- a/application/src/Entity/Source/Data/Name/NicknameSource.php
+++ b/application/src/Entity/Source/Primitive/Name/NicknameSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Data\Name;
+namespace App\Entity\Source\Primitive\Name;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/application/src/Entity/Source/Data/Name/NicknameSourceInterface.php b/application/src/Entity/Source/Primitive/Name/NicknameSourceInterface.php
similarity index 70%
rename from application/src/Entity/Source/Data/Name/NicknameSourceInterface.php
rename to application/src/Entity/Source/Primitive/Name/NicknameSourceInterface.php
index 12b1b89..c55e2d2 100644
--- a/application/src/Entity/Source/Data/Name/NicknameSourceInterface.php
+++ b/application/src/Entity/Source/Primitive/Name/NicknameSourceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Data\Name;
+namespace App\Entity\Source\Primitive\Name;
 
 /**
  * @author kevinfrantz
diff --git a/application/src/Entity/Source/Data/Name/SurnameSource.php b/application/src/Entity/Source/Primitive/Name/SurnameSource.php
similarity index 79%
rename from application/src/Entity/Source/Data/Name/SurnameSource.php
rename to application/src/Entity/Source/Primitive/Name/SurnameSource.php
index 6155c28..0b3a523 100644
--- a/application/src/Entity/Source/Data/Name/SurnameSource.php
+++ b/application/src/Entity/Source/Primitive/Name/SurnameSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Data\Name;
+namespace App\Entity\Source\Primitive\Name;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/application/src/Entity/Source/Data/Name/SurnameSourceInterface.php b/application/src/Entity/Source/Primitive/Name/SurnameSourceInterface.php
similarity index 62%
rename from application/src/Entity/Source/Data/Name/SurnameSourceInterface.php
rename to application/src/Entity/Source/Primitive/Name/SurnameSourceInterface.php
index 38b569f..02d0d04 100644
--- a/application/src/Entity/Source/Data/Name/SurnameSourceInterface.php
+++ b/application/src/Entity/Source/Primitive/Name/SurnameSourceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Data\Name;
+namespace App\Entity\Source\Primitive\Name;
 
 interface SurnameSourceInterface extends NameSourceInterface
 {
diff --git a/application/src/Form/NameSourceType.php b/application/src/Form/NameSourceType.php
index 90f90ad..a6a1c21 100644
--- a/application/src/Form/NameSourceType.php
+++ b/application/src/Form/NameSourceType.php
@@ -5,7 +5,7 @@ namespace App\Form;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
-use App\Entity\Source\Data\NameSource;
+use App\Entity\Source\Primitive\NameSource;
 
 class NameSourceType extends AbstractType
 {
diff --git a/application/tests/Unit/Entity/Attribut/FirstNameSourceAttributTest.php b/application/tests/Unit/Entity/Attribut/FirstNameSourceAttributTest.php
index 2c1adb5..2fee90c 100644
--- a/application/tests/Unit/Entity/Attribut/FirstNameSourceAttributTest.php
+++ b/application/tests/Unit/Entity/Attribut/FirstNameSourceAttributTest.php
@@ -5,7 +5,7 @@ namespace Tests\Unit\Entity\Attribut;
 use PHPUnit\Framework\TestCase;
 use App\Entity\Attribut\FirstNameSourceAttribut;
 use App\Entity\Attribut\FirstNameSourceAttributInterface;
-use App\Entity\Source\Data\Name\FirstNameSourceInterface;
+use App\Entity\Source\Primitive\Name\FirstNameSourceInterface;
 
 /**
  * @author kevinfrantz
diff --git a/application/tests/Unit/Entity/Attribut/NameSourceAttributTest.php b/application/tests/Unit/Entity/Attribut/NameSourceAttributTest.php
index d1cfbb4..a0a2491 100644
--- a/application/tests/Unit/Entity/Attribut/NameSourceAttributTest.php
+++ b/application/tests/Unit/Entity/Attribut/NameSourceAttributTest.php
@@ -5,7 +5,7 @@ namespace tests\unit\Entity\Attribut;
 use PHPUnit\Framework\TestCase;
 use App\Entity\Attribut\NameSourceAttributInterface;
 use App\Entity\Attribut\NameSourceAttribut;
-use App\Entity\Source\Data\Name\NameSourceInterface;
+use App\Entity\Source\Primitive\Name\NameSourceInterface;
 
 class NameSourceAttributTest extends TestCase
 {
diff --git a/application/tests/Unit/Entity/Source/Combination/FullPersonNameSourceTest.php b/application/tests/Unit/Entity/Source/Combination/FullPersonNameSourceTest.php
index ac4b898..fccd1a9 100644
--- a/application/tests/Unit/Entity/Source/Combination/FullPersonNameSourceTest.php
+++ b/application/tests/Unit/Entity/Source/Combination/FullPersonNameSourceTest.php
@@ -5,8 +5,8 @@ namespace tests\unit\Entity\Source\Combination;
 use PHPUnit\Framework\TestCase;
 use App\Entity\Source\Combination\FullPersonNameSourceInterface;
 use App\Entity\Source\Combination\FullPersonNameSource;
-use App\Entity\Source\Data\Name\SurnameSourceInterface;
-use App\Entity\Source\Data\Name\FirstNameSourceInterface;
+use App\Entity\Source\Primitive\Name\SurnameSourceInterface;
+use App\Entity\Source\Primitive\Name\FirstNameSourceInterface;
 
 class FullPersonNameSourceTest extends TestCase
 {
diff --git a/application/tests/Unit/Entity/Source/Data/Name/AbstractNameSourceTest.php b/application/tests/Unit/Entity/Source/Data/Name/AbstractNameSourceTest.php
index e7d4ba9..558172d 100644
--- a/application/tests/Unit/Entity/Source/Data/Name/AbstractNameSourceTest.php
+++ b/application/tests/Unit/Entity/Source/Data/Name/AbstractNameSourceTest.php
@@ -3,8 +3,8 @@
 namespace tests\unit\Entity\Source\Data;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Source\Data\Name\NameSourceInterface;
-use App\Entity\Source\Data\Name\AbstractNameSource;
+use App\Entity\Source\Primitive\Name\NameSourceInterface;
+use App\Entity\Source\Primitive\Name\AbstractNameSource;
 
 /**
  * @author kevinfrantz