diff --git a/application/src/Entity/Attribut/FullPersonNameSourceAttribut.php b/application/src/Entity/Attribut/FullPersonNameSourceAttribut.php
index 5a8aff6..8b36a83 100644
--- a/application/src/Entity/Attribut/FullPersonNameSourceAttribut.php
+++ b/application/src/Entity/Attribut/FullPersonNameSourceAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\Source\Combination\FullPersonNameSourceInterface;
+use App\Entity\Source\Complex\FullPersonNameSourceInterface;
 
 trait FullPersonNameSourceAttribut
 {
diff --git a/application/src/Entity/Attribut/FullPersonNameSourceAttributInterface.php b/application/src/Entity/Attribut/FullPersonNameSourceAttributInterface.php
index 74f9675..3cd1876 100644
--- a/application/src/Entity/Attribut/FullPersonNameSourceAttributInterface.php
+++ b/application/src/Entity/Attribut/FullPersonNameSourceAttributInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\Source\Combination\FullPersonNameSourceInterface;
+use App\Entity\Source\Complex\FullPersonNameSourceInterface;
 
 interface FullPersonNameSourceAttributInterface
 {
diff --git a/application/src/Entity/Attribut/PersonIdentitySourceAttribut.php b/application/src/Entity/Attribut/PersonIdentitySourceAttribut.php
index 5345e25..74ae883 100644
--- a/application/src/Entity/Attribut/PersonIdentitySourceAttribut.php
+++ b/application/src/Entity/Attribut/PersonIdentitySourceAttribut.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\Source\Combination\PersonIdentitySourceInterface;
+use App\Entity\Source\Complex\PersonIdentitySourceInterface;
 
 trait PersonIdentitySourceAttribut
 {
diff --git a/application/src/Entity/Attribut/PersonIdentitySourceAttributInterface.php b/application/src/Entity/Attribut/PersonIdentitySourceAttributInterface.php
index a759331..9538de0 100644
--- a/application/src/Entity/Attribut/PersonIdentitySourceAttributInterface.php
+++ b/application/src/Entity/Attribut/PersonIdentitySourceAttributInterface.php
@@ -2,7 +2,7 @@
 
 namespace App\Entity\Attribut;
 
-use App\Entity\Source\Combination\PersonIdentitySourceInterface;
+use App\Entity\Source\Complex\PersonIdentitySourceInterface;
 
 interface PersonIdentitySourceAttributInterface
 {
diff --git a/application/src/Entity/Source/Combination/AbstractCombinationSource.php b/application/src/Entity/Source/Complex/AbstractCombinationSource.php
similarity index 93%
rename from application/src/Entity/Source/Combination/AbstractCombinationSource.php
rename to application/src/Entity/Source/Complex/AbstractCombinationSource.php
index 0357cec..4fd076b 100644
--- a/application/src/Entity/Source/Combination/AbstractCombinationSource.php
+++ b/application/src/Entity/Source/Complex/AbstractCombinationSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Combination;
+namespace App\Entity\Source\Complex;
 
 use App\Entity\Source\AbstractSource;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/application/src/Entity/Source/Combination/CombinationSourceInterface.php b/application/src/Entity/Source/Complex/CombinationSourceInterface.php
similarity index 76%
rename from application/src/Entity/Source/Combination/CombinationSourceInterface.php
rename to application/src/Entity/Source/Complex/CombinationSourceInterface.php
index 9c06c69..7139b8d 100644
--- a/application/src/Entity/Source/Combination/CombinationSourceInterface.php
+++ b/application/src/Entity/Source/Complex/CombinationSourceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Combination;
+namespace App\Entity\Source\Complex;
 
 use App\Entity\Source\Primitive\DataSourceInterface;
 
diff --git a/application/src/Entity/Source/Combination/FullPersonNameSource.php b/application/src/Entity/Source/Complex/FullPersonNameSource.php
similarity index 97%
rename from application/src/Entity/Source/Combination/FullPersonNameSource.php
rename to application/src/Entity/Source/Complex/FullPersonNameSource.php
index 1d9c0aa..ad4dfdf 100644
--- a/application/src/Entity/Source/Combination/FullPersonNameSource.php
+++ b/application/src/Entity/Source/Complex/FullPersonNameSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Combination;
+namespace App\Entity\Source\Complex;
 
 use App\Entity\Attribut\FirstNameSourceAttribut;
 use App\Entity\Attribut\SurnameSourceAttribut;
diff --git a/application/src/Entity/Source/Combination/FullPersonNameSourceInterface.php b/application/src/Entity/Source/Complex/FullPersonNameSourceInterface.php
similarity index 89%
rename from application/src/Entity/Source/Combination/FullPersonNameSourceInterface.php
rename to application/src/Entity/Source/Complex/FullPersonNameSourceInterface.php
index 5643bd6..db047f5 100644
--- a/application/src/Entity/Source/Combination/FullPersonNameSourceInterface.php
+++ b/application/src/Entity/Source/Complex/FullPersonNameSourceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Combination;
+namespace App\Entity\Source\Complex;
 
 use App\Entity\Attribut\FirstNameSourceAttributInterface;
 use App\Entity\Attribut\SurnameSourceAttributInterface;
diff --git a/application/src/Entity/Source/Combination/PersonIdentitySource.php b/application/src/Entity/Source/Complex/PersonIdentitySource.php
similarity index 94%
rename from application/src/Entity/Source/Combination/PersonIdentitySource.php
rename to application/src/Entity/Source/Complex/PersonIdentitySource.php
index ad512d5..fc22d32 100644
--- a/application/src/Entity/Source/Combination/PersonIdentitySource.php
+++ b/application/src/Entity/Source/Complex/PersonIdentitySource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Combination;
+namespace App\Entity\Source\Complex;
 
 use App\Entity\Attribut\FullPersonNameSourceAttribut;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/application/src/Entity/Source/Combination/PersonIdentitySourceInterface.php b/application/src/Entity/Source/Complex/PersonIdentitySourceInterface.php
similarity index 82%
rename from application/src/Entity/Source/Combination/PersonIdentitySourceInterface.php
rename to application/src/Entity/Source/Complex/PersonIdentitySourceInterface.php
index 4deccf9..0195f1b 100644
--- a/application/src/Entity/Source/Combination/PersonIdentitySourceInterface.php
+++ b/application/src/Entity/Source/Complex/PersonIdentitySourceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Combination;
+namespace App\Entity\Source\Complex;
 
 use App\Entity\Attribut\FullPersonNameSourceAttributInterface;
 
diff --git a/application/src/Entity/Source/Combination/UserSource.php b/application/src/Entity/Source/Complex/UserSource.php
similarity index 96%
rename from application/src/Entity/Source/Combination/UserSource.php
rename to application/src/Entity/Source/Complex/UserSource.php
index 2d67516..39d26a2 100644
--- a/application/src/Entity/Source/Combination/UserSource.php
+++ b/application/src/Entity/Source/Complex/UserSource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Combination;
+namespace App\Entity\Source\Complex;
 
 use Doctrine\ORM\Mapping as ORM;
 use App\Entity\Attribut\UserAttribut;
diff --git a/application/src/Entity/Source/Combination/UserSourceInterface.php b/application/src/Entity/Source/Complex/UserSourceInterface.php
similarity index 88%
rename from application/src/Entity/Source/Combination/UserSourceInterface.php
rename to application/src/Entity/Source/Complex/UserSourceInterface.php
index d343e5d..349f1b7 100644
--- a/application/src/Entity/Source/Combination/UserSourceInterface.php
+++ b/application/src/Entity/Source/Complex/UserSourceInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Entity\Source\Combination;
+namespace App\Entity\Source\Complex;
 
 use App\Entity\Attribut\UserAttributInterface;
 use App\Entity\Attribut\PersonIdentitySourceAttributInterface;
diff --git a/application/src/Entity/User.php b/application/src/Entity/User.php
index 096e163..f56b9fe 100644
--- a/application/src/Entity/User.php
+++ b/application/src/Entity/User.php
@@ -6,8 +6,8 @@ use Doctrine\ORM\Mapping as ORM;
 use FOS\UserBundle\Model\User as BaseUser;
 use App\Entity\Attribut\SourceAttribut;
 use App\Entity\Attribut\IdAttribut;
-use App\Entity\Source\Combination\UserSourceInterface;
-use App\Entity\Source\Combination\UserSource;
+use App\Entity\Source\Complex\UserSourceInterface;
+use App\Entity\Source\Complex\UserSource;
 use App\Entity\Attribut\VersionAttribut;
 
 /**
@@ -21,7 +21,7 @@ class User extends BaseUser implements UserInterface
 
     /**
      * @var UserSourceInterface
-     * @ORM\OneToOne(targetEntity="App\Entity\Source\Combination\UserSource",cascade={"persist", "remove"})
+     * @ORM\OneToOne(targetEntity="App\Entity\Source\Complex\UserSource",cascade={"persist", "remove"})
      * @ORM\JoinColumn(name="source_user_id", referencedColumnName="id", onDelete="CASCADE")
      */
     protected $source;
diff --git a/application/tests/Unit/Entity/Attribut/FullPersonNameSourceAttributTest.php b/application/tests/Unit/Entity/Attribut/FullPersonNameSourceAttributTest.php
index 51c961c..74131fb 100644
--- a/application/tests/Unit/Entity/Attribut/FullPersonNameSourceAttributTest.php
+++ b/application/tests/Unit/Entity/Attribut/FullPersonNameSourceAttributTest.php
@@ -3,7 +3,7 @@
 namespace Tests\Unit\Entity\Attribut;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Source\Combination\FullPersonNameSourceInterface;
+use App\Entity\Source\Complex\FullPersonNameSourceInterface;
 use App\Entity\Attribut\FullPersonNameSourceAttributInterface;
 use App\Entity\Attribut\FullPersonNameSourceAttribut;
 
diff --git a/application/tests/Unit/Entity/Attribut/PersonIdentitySourceAttributTest.php b/application/tests/Unit/Entity/Attribut/PersonIdentitySourceAttributTest.php
index 8257bbb..7abe9d5 100644
--- a/application/tests/Unit/Entity/Attribut/PersonIdentitySourceAttributTest.php
+++ b/application/tests/Unit/Entity/Attribut/PersonIdentitySourceAttributTest.php
@@ -5,7 +5,7 @@ namespace Tests\Unit\Entity\Attribut;
 use PHPUnit\Framework\TestCase;
 use App\Entity\Attribut\PersonIdentitySourceAttributInterface;
 use App\Entity\Attribut\PersonIdentitySourceAttribut;
-use App\Entity\Source\Combination\PersonIdentitySourceInterface;
+use App\Entity\Source\Complex\PersonIdentitySourceInterface;
 
 /**
  * @todo Implement abstract test class for entity attributs
diff --git a/application/tests/Unit/Entity/Source/Combination/FullPersonNameSourceTest.php b/application/tests/Unit/Entity/Source/Complex/FullPersonNameSourceTest.php
similarity index 87%
rename from application/tests/Unit/Entity/Source/Combination/FullPersonNameSourceTest.php
rename to application/tests/Unit/Entity/Source/Complex/FullPersonNameSourceTest.php
index fccd1a9..8340444 100644
--- a/application/tests/Unit/Entity/Source/Combination/FullPersonNameSourceTest.php
+++ b/application/tests/Unit/Entity/Source/Complex/FullPersonNameSourceTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace tests\unit\Entity\Source\Combination;
+namespace tests\unit\Entity\Source\Complex;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Source\Combination\FullPersonNameSourceInterface;
-use App\Entity\Source\Combination\FullPersonNameSource;
+use App\Entity\Source\Complex\FullPersonNameSourceInterface;
+use App\Entity\Source\Complex\FullPersonNameSource;
 use App\Entity\Source\Primitive\Name\SurnameSourceInterface;
 use App\Entity\Source\Primitive\Name\FirstNameSourceInterface;
 
diff --git a/application/tests/Unit/Entity/Source/Combination/PersonIdentitySourceTest.php b/application/tests/Unit/Entity/Source/Complex/PersonIdentitySourceTest.php
similarity index 75%
rename from application/tests/Unit/Entity/Source/Combination/PersonIdentitySourceTest.php
rename to application/tests/Unit/Entity/Source/Complex/PersonIdentitySourceTest.php
index 807ff45..2aa6cb4 100644
--- a/application/tests/Unit/Entity/Source/Combination/PersonIdentitySourceTest.php
+++ b/application/tests/Unit/Entity/Source/Complex/PersonIdentitySourceTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace tests\unit\Entity\Source\Combination;
+namespace tests\unit\Entity\Source\Complex;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Source\Combination\PersonIdentitySourceInterface;
-use App\Entity\Source\Combination\PersonIdentitySource;
-use App\Entity\Source\Combination\FullPersonNameSourceInterface;
+use App\Entity\Source\Complex\PersonIdentitySourceInterface;
+use App\Entity\Source\Complex\PersonIdentitySource;
+use App\Entity\Source\Complex\FullPersonNameSourceInterface;
 
 class PersonIdentitySourceTest extends TestCase
 {
diff --git a/application/tests/Unit/Entity/Source/Combination/UserSourceTest.php b/application/tests/Unit/Entity/Source/Complex/UserSourceTest.php
similarity index 75%
rename from application/tests/Unit/Entity/Source/Combination/UserSourceTest.php
rename to application/tests/Unit/Entity/Source/Complex/UserSourceTest.php
index f3f6019..ba74dde 100644
--- a/application/tests/Unit/Entity/Source/Combination/UserSourceTest.php
+++ b/application/tests/Unit/Entity/Source/Complex/UserSourceTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace tests\unit\Entity\Source\Combination;
+namespace tests\unit\Entity\Source\Complex;
 
 use PHPUnit\Framework\TestCase;
-use App\Entity\Source\Combination\UserSourceInterface;
-use App\Entity\Source\Combination\UserSource;
+use App\Entity\Source\Complex\UserSourceInterface;
+use App\Entity\Source\Complex\UserSource;
 use Doctrine\Common\Collections\Collection;
-use App\Entity\Source\Combination\PersonIdentitySourceInterface;
+use App\Entity\Source\Complex\PersonIdentitySourceInterface;
 
 class UserSourceTest extends TestCase
 {
diff --git a/application/tests/Unit/Entity/UserTest.php b/application/tests/Unit/Entity/UserTest.php
index b3a1bfd..df76790 100644
--- a/application/tests/Unit/Entity/UserTest.php
+++ b/application/tests/Unit/Entity/UserTest.php
@@ -4,7 +4,7 @@ namespace tests\unit\Entity;
 
 use PHPUnit\Framework\TestCase;
 use App\Entity\User;
-use App\Entity\Source\Combination\UserSource;
+use App\Entity\Source\Complex\UserSource;
 use App\Entity\UserInterface;
 
 /**