diff --git a/application/src/Entity/Attribut/FullPersonNameSourceAttribut.php b/application/src/Entity/Attribut/FullPersonNameSourceAttribut.php
new file mode 100644
index 0000000..5a8aff6
--- /dev/null
+++ b/application/src/Entity/Attribut/FullPersonNameSourceAttribut.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Entity\Attribut;
+
+use App\Entity\Source\Combination\FullPersonNameSourceInterface;
+
+trait FullPersonNameSourceAttribut
+{
+    /**
+     * @var FullPersonNameSourceInterface
+     */
+    protected $fullPersonNameSource;
+
+    public function getFullPersonNameSource(): FullPersonNameSourceInterface
+    {
+        return $this->fullPersonNameSource;
+    }
+
+    public function setFullPersonNameSource(FullPersonNameSourceInterface $fullname): void
+    {
+        $this->fullPersonNameSource = $fullname;
+    }
+}
diff --git a/application/src/Entity/Attribut/FullPersonNameSourceAttributInterface.php b/application/src/Entity/Attribut/FullPersonNameSourceAttributInterface.php
new file mode 100644
index 0000000..74f9675
--- /dev/null
+++ b/application/src/Entity/Attribut/FullPersonNameSourceAttributInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Entity\Attribut;
+
+use App\Entity\Source\Combination\FullPersonNameSourceInterface;
+
+interface FullPersonNameSourceAttributInterface
+{
+    public function getFullPersonNameSource(): FullPersonNameSourceInterface;
+
+    public function setFullPersonNameSource(FullPersonNameSourceInterface $fullname): void;
+}
diff --git a/application/src/Entity/Attribut/PersonIdentityAttribut.php b/application/src/Entity/Attribut/PersonIdentityAttribut.php
new file mode 100644
index 0000000..933b546
--- /dev/null
+++ b/application/src/Entity/Attribut/PersonIdentityAttribut.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Entity\Attribut;
+
+use App\Entity\Source\Data\PersonIdentitySourceInterface;
+
+trait PersonIdentityAttribut
+{
+    /**
+     * @var PersonIdentitySourceInterface
+     */
+    protected $personIdentitySource;
+
+    public function getPersonIdentitySource(): PersonIdentitySourceInterface
+    {
+        return $this->personIdentitySource;
+    }
+
+    public function setPersonIdentitySource(PersonIdentitySourceInterface $identity): void
+    {
+        $this->personIdentitySource = $identity;
+    }
+}
diff --git a/application/src/Entity/Attribut/PersonIdentitySourceAttributInterface.php b/application/src/Entity/Attribut/PersonIdentitySourceAttributInterface.php
new file mode 100644
index 0000000..2039a6f
--- /dev/null
+++ b/application/src/Entity/Attribut/PersonIdentitySourceAttributInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Entity\Attribut;
+
+use App\Entity\Source\Data\PersonIdentitySourceInterface;
+
+interface PersonIdentitySourceAttributInterface
+{
+    public function getPersonIdentitySource(): PersonIdentitySourceInterface;
+
+    public function setPersonIdentitySource(PersonIdentitySourceInterface $identity): void;
+}
diff --git a/application/src/Entity/Source/Combination/AbstractCombinationSource.php b/application/src/Entity/Source/Combination/AbstractCombinationSource.php
index c0816d2..869f568 100644
--- a/application/src/Entity/Source/Combination/AbstractCombinationSource.php
+++ b/application/src/Entity/Source/Combination/AbstractCombinationSource.php
@@ -1,8 +1,9 @@
 <?php
+
 namespace App\Entity\Source\Combination;
 
 use App\Entity\Source\AbstractSource;
 
-abstract class AbstractCombinationSource extends AbstractSource implements CombinationSourceInterface 
+abstract class AbstractCombinationSource extends AbstractSource implements CombinationSourceInterface
 {
-}
\ No newline at end of file
+}
diff --git a/application/src/Entity/Source/Combination/CombinationSourceInterface.php b/application/src/Entity/Source/Combination/CombinationSourceInterface.php
index 8f889f8..c443759 100644
--- a/application/src/Entity/Source/Combination/CombinationSourceInterface.php
+++ b/application/src/Entity/Source/Combination/CombinationSourceInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace App\Entity\Source\Combination;
 
 use App\Entity\Source\Data\DataSourceInterface;
@@ -6,4 +7,3 @@ use App\Entity\Source\Data\DataSourceInterface;
 interface CombinationSourceInterface extends DataSourceInterface
 {
 }
-
diff --git a/application/src/Entity/Source/Combination/FullPersonNameSourceInterface.php b/application/src/Entity/Source/Combination/FullPersonNameSourceInterface.php
index 9567c75..c2da201 100644
--- a/application/src/Entity/Source/Combination/FullPersonNameSourceInterface.php
+++ b/application/src/Entity/Source/Combination/FullPersonNameSourceInterface.php
@@ -1,21 +1,22 @@
 <?php
+
 namespace App\Entity\Source\Combination;
 
 use App\Entity\Source\Data\Name\FirstNameSourceInterface;
 use App\Entity\Source\Data\Name\SurnameSourceInterface;
 
 /**
- * @todo Maybe a middle name would be helpfull in the future ;) 
- * @author kevinfrantz
+ * @todo Maybe a middle name would be helpfull in the future ;)
  *
+ * @author kevinfrantz
  */
 interface FullPersonNameSourceInterface extends CombinationSourceInterface
 {
-    public function getFirstName():FirstNameSourceInterface;
-    
-    public function setFirstName(FirstNameSourceInterface $name):void;
-    
-    public function getSurname():SurnameSourceInterface;
-    
-    public function setSurname(SurnameSourceInterface $name):void;
-}
\ No newline at end of file
+    public function getFirstName(): FirstNameSourceInterface;
+
+    public function setFirstName(FirstNameSourceInterface $name): void;
+
+    public function getSurname(): SurnameSourceInterface;
+
+    public function setSurname(SurnameSourceInterface $name): void;
+}
diff --git a/application/src/Entity/Source/Combination/IdentitySource.php b/application/src/Entity/Source/Combination/IdentitySource.php
deleted file mode 100644
index 7ac03bd..0000000
--- a/application/src/Entity/Source/Combination/IdentitySource.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-namespace App\Entity\Source\Data;
-
-class IdentitySource extends AbstractDataSource implements IdentityInterface
-{
-    
-}
-
diff --git a/application/src/Entity/Source/Combination/IdentityInterface.php b/application/src/Entity/Source/Combination/PersonIdentitySourceInterface.php
similarity index 50%
rename from application/src/Entity/Source/Combination/IdentityInterface.php
rename to application/src/Entity/Source/Combination/PersonIdentitySourceInterface.php
index 400e47a..447d122 100644
--- a/application/src/Entity/Source/Combination/IdentityInterface.php
+++ b/application/src/Entity/Source/Combination/PersonIdentitySourceInterface.php
@@ -1,8 +1,9 @@
 <?php
+
 namespace App\Entity\Source\Data;
 
 use App\Entity\Attribut\NameAttributInterface;
 
-interface IdentityInterface extends DataSourceInterface, NameAttributInterface
+interface PersonIdentitySourceInterface extends DataSourceInterface, NameAttributInterface
 {
 }
diff --git a/application/src/Entity/Source/Combination/PesonIdentitySource.php b/application/src/Entity/Source/Combination/PesonIdentitySource.php
new file mode 100644
index 0000000..fe551b5
--- /dev/null
+++ b/application/src/Entity/Source/Combination/PesonIdentitySource.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Entity\Source\Data;
+
+class PesonIdentitySource extends AbstractDataSource implements PersonIdentitySourceInterface
+{
+    /**
+     * @Assert\Type(type="App\Entity\Source\NameSource")
+     * @Assert\Valid()
+     * @ORM\OneToOne(targetEntity="NameSource",cascade={"persist", "remove"})
+     * @ORM\JoinColumn(name="name_id", referencedColumnName="id")
+     *
+     * @var NameSourceInterface
+     */
+    protected $nameSource;
+}
diff --git a/application/src/Entity/Source/Combination/UserSource.php b/application/src/Entity/Source/Combination/UserSource.php
index 9185c89..ce5b8e0 100644
--- a/application/src/Entity/Source/Combination/UserSource.php
+++ b/application/src/Entity/Source/Combination/UserSource.php
@@ -3,10 +3,9 @@
 namespace App\Entity\Source\Data;
 
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Validator\Constraints as Assert;
 use App\Entity\Attribut\UserAttribut;
-use App\Entity\Attribut\NameSourceAttribut;
 use App\Entity\UserInterface;
+use Entity\Attribut\PersonIdentityAttribut;
 
 /**
  * @author kevinfrantz
@@ -15,7 +14,7 @@ use App\Entity\UserInterface;
  */
 class UserSource extends AbstractDataSource implements UserSourceInterface
 {
-    use UserAttribut,NameSourceAttribut;
+    use UserAttribut,PersonIdentityAttribut;
 
     /**
      * @ORM\OneToOne(targetEntity="App\Entity\User",cascade={"persist", "remove"})
@@ -25,19 +24,8 @@ class UserSource extends AbstractDataSource implements UserSourceInterface
      */
     protected $user;
 
-    /**
-     * @Assert\Type(type="App\Entity\Source\NameSource")
-     * @Assert\Valid()
-     * @ORM\OneToOne(targetEntity="NameSource",cascade={"persist", "remove"})
-     * @ORM\JoinColumn(name="name_id", referencedColumnName="id")
-     *
-     * @var NameSourceInterface
-     */
-    protected $nameSource;
-
     public function __construct()
     {
-        $this->nameSource = new NameSource();
         parent::__construct();
     }
 }
diff --git a/application/src/Entity/Source/Combination/UserSourceInterface.php b/application/src/Entity/Source/Combination/UserSourceInterface.php
index 6d3e157..22808c6 100644
--- a/application/src/Entity/Source/Combination/UserSourceInterface.php
+++ b/application/src/Entity/Source/Combination/UserSourceInterface.php
@@ -3,11 +3,11 @@
 namespace App\Entity\Source\Data;
 
 use App\Entity\Attribut\UserAttributInterface;
-use App\Entity\Attribut\NameSourceAttributInterface;
+use App\Entity\Attribut\PersonIdentitySourceAttributInterface;
 
 /**
  * @author kevinfrantz
  */
-interface UserSourceInterface extends DataSourceInterface, UserAttributInterface, NameSourceAttributInterface
+interface UserSourceInterface extends DataSourceInterface, UserAttributInterface, PersonIdentitySourceAttributInterface
 {
 }
diff --git a/application/src/Entity/Source/Data/Name/AbstractNameSource.php b/application/src/Entity/Source/Data/Name/AbstractNameSource.php
index 864bfc2..c851230 100644
--- a/application/src/Entity/Source/Data/Name/AbstractNameSource.php
+++ b/application/src/Entity/Source/Data/Name/AbstractNameSource.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace App\Entity\Source\Data\Name;
 
 use App\Entity\Source\Data\AbstractDataSource;
@@ -6,4 +7,3 @@ use App\Entity\Source\Data\AbstractDataSource;
 class AbstractNameSource extends AbstractDataSource implements NameSourceInterface
 {
 }
-
diff --git a/application/src/Entity/Source/Data/Name/FirstNameSourceInterface.php b/application/src/Entity/Source/Data/Name/FirstNameSourceInterface.php
index b8644eb..4d005bd 100644
--- a/application/src/Entity/Source/Data/Name/FirstNameSourceInterface.php
+++ b/application/src/Entity/Source/Data/Name/FirstNameSourceInterface.php
@@ -1,7 +1,7 @@
 <?php
+
 namespace App\Entity\Source\Data\Name;
 
 interface FirstNameSourceInterface extends NameSourceInterface
 {
 }
-
diff --git a/application/src/Entity/Source/Data/Name/NameSourceInterface.php b/application/src/Entity/Source/Data/Name/NameSourceInterface.php
index fe95063..9605669 100644
--- a/application/src/Entity/Source/Data/Name/NameSourceInterface.php
+++ b/application/src/Entity/Source/Data/Name/NameSourceInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace App\Entity\Source\Data\Name;
 
 use App\Entity\Source\Data\DataSourceInterface;
@@ -6,4 +7,4 @@ use App\Entity\Attribut\NameAttributInterface;
 
 interface NameSourceInterface extends DataSourceInterface, NameAttributInterface
 {
-}
\ No newline at end of file
+}
diff --git a/application/src/Entity/Source/Data/Name/NicknameSource.php b/application/src/Entity/Source/Data/Name/NicknameSource.php
index 61f6df8..ce1e528 100644
--- a/application/src/Entity/Source/Data/Name/NicknameSource.php
+++ b/application/src/Entity/Source/Data/Name/NicknameSource.php
@@ -19,6 +19,7 @@ final class NicknameSource extends AbstractNameSource implements NicknameSourceI
      * @todo Implement an extra assert Layer!
      * @ORM\Column(type="string",length=255)
      * @Assert\NotBlank()
+     *
      * @var string
      */
     protected $name;
diff --git a/application/src/Entity/Source/Data/Name/SurnameSourceInterface.php b/application/src/Entity/Source/Data/Name/SurnameSourceInterface.php
index 389b06d..38b569f 100644
--- a/application/src/Entity/Source/Data/Name/SurnameSourceInterface.php
+++ b/application/src/Entity/Source/Data/Name/SurnameSourceInterface.php
@@ -1,7 +1,7 @@
 <?php
+
 namespace App\Entity\Source\Data\Name;
 
 interface SurnameSourceInterface extends NameSourceInterface
 {
 }
-
diff --git a/application/tests/Unit/Entity/Attribut/FullPersonNameSourceAttributTest.php b/application/tests/Unit/Entity/Attribut/FullPersonNameSourceAttributTest.php
new file mode 100644
index 0000000..9db8027
--- /dev/null
+++ b/application/tests/Unit/Entity/Attribut/FullPersonNameSourceAttributTest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Tests\Unit\Entity\Attribut;
+
+use PHPUnit\Framework\TestCase;
+use App\Entity\Source\Combination\FullPersonNameSourceInterface;
+use App\Entity\Attribut\FullPersonNameSourceAttributInterface;
+use App\Entity\Attribut\FullPersonNameSourceAttribut;
+
+/**
+ * @author kevinfrantz
+ */
+class FullPersonNameSourceAttributTest extends TestCase
+{
+    /**
+     * @var FullPersonNameSourceAttributInterface
+     */
+    protected $fullname;
+
+    public function setUp(): void
+    {
+        $this->fullname = new class() implements FullPersonNameSourceAttributInterface {
+            use FullPersonNameSourceAttribut;
+        };
+    }
+
+    public function testConstructor(): void
+    {
+        $this->expectException(\TypeError::class);
+        $this->fullname->getFullPersonNameSource();
+    }
+
+    public function testAccessors(): void
+    {
+        $fullname = $this->createMock(FullPersonNameSourceInterface::class);
+        $this->assertNull($this->fullname->setFullPersonNameSource($fullname));
+        $this->assertEquals($collection, $this->fullname->getFullPersonNameSource());
+    }
+}
diff --git a/application/tests/Unit/Entity/Attribut/PersonIdentitySourceAttributTest.php b/application/tests/Unit/Entity/Attribut/PersonIdentitySourceAttributTest.php
new file mode 100644
index 0000000..5a7a003
--- /dev/null
+++ b/application/tests/Unit/Entity/Attribut/PersonIdentitySourceAttributTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Tests\Unit\Entity\Attribut;
+
+use PHPUnit\Framework\TestCase;
+use App\Entity\Attribut\PersonIdentitySourceAttributInterface;
+use Entity\Attribut\PersonIdentityAttribut;
+use App\Entity\Source\Data\PersonIdentitySourceInterface;
+
+/**
+ * @todo Implement abstract test class for entity attributs
+ *
+ * @author kevinfrantz
+ */
+class PersonIdentitySourceAttributTest extends TestCase
+{
+    /**
+     * @var PersonIdentitySourceAttributInterface
+     */
+    protected $identity;
+
+    public function setUp(): void
+    {
+        $this->identity = new class() implements PersonIdentitySourceAttributInterface {
+            use PersonIdentityAttribut;
+        };
+    }
+
+    public function testConstructor(): void
+    {
+        $this->expectException(\TypeError::class);
+        $this->identity->getIdentitySource();
+    }
+
+    public function testAccessors(): void
+    {
+        $identity = $this->createMock(PersonIdentitySourceInterface::class);
+        $this->assertNull($this->identity->setIdentitySource($identity));
+        $this->assertEquals($collection, $this->identity->getIdentitySource());
+    }
+}
diff --git a/application/tests/Unit/Entity/Source/Data/UserSourceTest.php b/application/tests/Unit/Entity/Source/Combination/UserSourceTest.php
similarity index 73%
rename from application/tests/Unit/Entity/Source/Data/UserSourceTest.php
rename to application/tests/Unit/Entity/Source/Combination/UserSourceTest.php
index 4acd747..9c87583 100644
--- a/application/tests/Unit/Entity/Source/Data/UserSourceTest.php
+++ b/application/tests/Unit/Entity/Source/Combination/UserSourceTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace tests\unit\Entity\Source\Data;
+namespace tests\unit\Entity\Source\Combination;
 
 use PHPUnit\Framework\TestCase;
 use App\Entity\Source\Data\UserSourceInterface;
 use App\Entity\Source\Data\UserSource;
 use Doctrine\Common\Collections\Collection;
-use App\Entity\Source\Data\NameSourceInterface;
+use App\Entity\Source\Data\PersonIdentitySourceInterface;
 
 class UserSourceTest extends TestCase
 {
@@ -23,7 +23,7 @@ class UserSourceTest extends TestCase
     public function testConstructor(): void
     {
         $this->assertInstanceOf(Collection::class, $this->userSource->getMemberships());
-        $this->assertInstanceOf(NameSourceInterface::class, $this->userSource->getNameSource());
+        $this->assertInstanceOf(PersonIdentitySourceInterface::class, $this->userSource->getIdentitySource());
         $this->expectException(\TypeError::class);
         $this->userSource->getUser();
     }
diff --git a/application/tests/Unit/Entity/Source/Data/IdentitySourceTest.php b/application/tests/Unit/Entity/Source/Data/IdentitySourceTest.php
index 04dd4f3..3b7a460 100644
--- a/application/tests/Unit/Entity/Source/Data/IdentitySourceTest.php
+++ b/application/tests/Unit/Entity/Source/Data/IdentitySourceTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace tests\unit\Entity\Source\Data;
 
 use PHPUnit\Framework\TestCase;
@@ -12,19 +13,21 @@ class IdentitySourceTest extends TestCase
      * @var IdentityInterface
      */
     protected $identity;
-    
-    public function setUp():void{
+
+    public function setUp(): void
+    {
         $this->identity = new IdentitySource();
     }
-    
-    public function testConstructor():void{
+
+    public function testConstructor(): void
+    {
         $this->assertInstanceOf(FullPersonNameSourceInterface::class, $this->identity->getName());
     }
-    
-    public function testName():void{
+
+    public function testName(): void
+    {
         $name = $this->createMock(FullPersonNameSourceInterface::class);
         $this->assertNull($this->identity->setName($name));
         $this->assertEquals($name, $this->identity->getName());
     }
 }
-