diff --git a/application/src/Entity/Attribut/FirstNameSourceAttribut.php b/application/src/Entity/Attribut/FirstNameSourceAttribut.php
new file mode 100644
index 0000000..742dee3
--- /dev/null
+++ b/application/src/Entity/Attribut/FirstNameSourceAttribut.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Entity\Attribut;
+
+use App\Entity\Source\Data\Name\FirstNameSourceInterface;
+
+trait FirstNameSourceAttribut
+{
+    /**
+     * @var FirstNameSourceInterface
+     */
+    protected $firstNameSource;
+
+    public function getFirstNameSource(): FirstNameSourceInterface
+    {
+        return $this->firstNameSource;
+    }
+
+    public function setFirstNameSource(FirstNameSourceInterface $name): void
+    {
+        $this->firstNameSource = $name;
+    }
+}
diff --git a/application/src/Entity/Attribut/FirstNameSourceAttributInterface.php b/application/src/Entity/Attribut/FirstNameSourceAttributInterface.php
new file mode 100644
index 0000000..6e93e6c
--- /dev/null
+++ b/application/src/Entity/Attribut/FirstNameSourceAttributInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Entity\Attribut;
+
+use App\Entity\Source\Data\Name\FirstNameSourceInterface;
+
+interface FirstNameSourceAttributInterface
+{
+    public function getFirstNameSource(): FirstNameSourceInterface;
+
+    public function setFirstNameSource(FirstNameSourceInterface $name): void;
+}
diff --git a/application/src/Entity/Source/Combination/FullPersonNameSource.php b/application/src/Entity/Source/Combination/FullPersonNameSource.php
new file mode 100644
index 0000000..1681e50
--- /dev/null
+++ b/application/src/Entity/Source/Combination/FullPersonNameSource.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Entity\Source\Combination;
+
+class FullPersonNameSource extends AbstractCombinationSource implements FullPersonNameSourceInterface
+{
+}
diff --git a/application/src/Entity/Source/Combination/FullPersonNameSourceInterface.php b/application/src/Entity/Source/Combination/FullPersonNameSourceInterface.php
index c2da201..44fb443 100644
--- a/application/src/Entity/Source/Combination/FullPersonNameSourceInterface.php
+++ b/application/src/Entity/Source/Combination/FullPersonNameSourceInterface.php
@@ -2,7 +2,6 @@
 
 namespace App\Entity\Source\Combination;
 
-use App\Entity\Source\Data\Name\FirstNameSourceInterface;
 use App\Entity\Source\Data\Name\SurnameSourceInterface;
 
 /**
@@ -12,10 +11,6 @@ use App\Entity\Source\Data\Name\SurnameSourceInterface;
  */
 interface FullPersonNameSourceInterface extends CombinationSourceInterface
 {
-    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/PersonIdentitySource.php b/application/src/Entity/Source/Combination/PersonIdentitySource.php
new file mode 100644
index 0000000..f1c827f
--- /dev/null
+++ b/application/src/Entity/Source/Combination/PersonIdentitySource.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Entity\Source\Data;
+
+use App\Entity\Attribut\FullPersonNameSourceAttribut;
+use App\Entity\Source\Combination\FullPersonNameSourceInterface;
+use App\Entity\Source\Combination\FullPersonNameSource;
+
+class PersonIdentitySource extends AbstractDataSource implements PersonIdentitySourceInterface
+{
+    use FullPersonNameSourceAttribut;
+
+    /**
+     * @var FullPersonNameSourceInterface
+     */
+    protected $fullPersonNameSource;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->fullPersonNameSource = new FullPersonNameSource();
+    }
+}
diff --git a/application/src/Entity/Source/Combination/PersonIdentitySourceInterface.php b/application/src/Entity/Source/Combination/PersonIdentitySourceInterface.php
index 447d122..cd90c0b 100644
--- a/application/src/Entity/Source/Combination/PersonIdentitySourceInterface.php
+++ b/application/src/Entity/Source/Combination/PersonIdentitySourceInterface.php
@@ -2,8 +2,8 @@
 
 namespace App\Entity\Source\Data;
 
-use App\Entity\Attribut\NameAttributInterface;
+use App\Entity\Attribut\FullPersonNameSourceAttributInterface;
 
-interface PersonIdentitySourceInterface extends DataSourceInterface, NameAttributInterface
+interface PersonIdentitySourceInterface extends DataSourceInterface, FullPersonNameSourceAttributInterface
 {
 }
diff --git a/application/src/Entity/Source/Combination/PesonIdentitySource.php b/application/src/Entity/Source/Combination/PesonIdentitySource.php
deleted file mode 100644
index fe551b5..0000000
--- a/application/src/Entity/Source/Combination/PesonIdentitySource.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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/tests/Unit/Entity/Attribut/FirstNameSourceAttributTest.php b/application/tests/Unit/Entity/Attribut/FirstNameSourceAttributTest.php
new file mode 100644
index 0000000..2c1adb5
--- /dev/null
+++ b/application/tests/Unit/Entity/Attribut/FirstNameSourceAttributTest.php
@@ -0,0 +1,39 @@
+<?php
+
+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;
+
+/**
+ * @author kevinfrantz
+ */
+class FirstNameSourceAttributTest extends TestCase
+{
+    /**
+     * @var FirstNameSourceAttributInterface
+     */
+    protected $name;
+
+    public function setUp(): void
+    {
+        $this->name = new class() implements FirstNameSourceAttributInterface {
+            use FirstNameSourceAttribut;
+        };
+    }
+
+    public function testConstructor(): void
+    {
+        $this->expectException(\TypeError::class);
+        $this->name->getFirstNameSource();
+    }
+
+    public function testAccessors(): void
+    {
+        $name = $this->createMock(FirstNameSourceInterface::class);
+        $this->assertNull($this->name->setFirstNameSource($name));
+        $this->assertEquals($name, $this->name->getFirstNameSource());
+    }
+}
diff --git a/application/tests/Unit/Entity/Attribut/FullPersonNameSourceAttributTest.php b/application/tests/Unit/Entity/Attribut/FullPersonNameSourceAttributTest.php
index 9db8027..51c961c 100644
--- a/application/tests/Unit/Entity/Attribut/FullPersonNameSourceAttributTest.php
+++ b/application/tests/Unit/Entity/Attribut/FullPersonNameSourceAttributTest.php
@@ -34,6 +34,6 @@ class FullPersonNameSourceAttributTest extends TestCase
     {
         $fullname = $this->createMock(FullPersonNameSourceInterface::class);
         $this->assertNull($this->fullname->setFullPersonNameSource($fullname));
-        $this->assertEquals($collection, $this->fullname->getFullPersonNameSource());
+        $this->assertEquals($fullname, $this->fullname->getFullPersonNameSource());
     }
 }
diff --git a/application/tests/Unit/Entity/Source/Combination/PersonIdentitySourceTest.php b/application/tests/Unit/Entity/Source/Combination/PersonIdentitySourceTest.php
new file mode 100644
index 0000000..6d370e0
--- /dev/null
+++ b/application/tests/Unit/Entity/Source/Combination/PersonIdentitySourceTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace tests\unit\Entity\Source\Combination;
+
+use PHPUnit\Framework\TestCase;
+use App\Entity\Source\Data\PersonIdentitySourceInterface;
+use App\Entity\Source\Data\PersonIdentitySource;
+use App\Entity\Source\Combination\FullPersonNameSourceInterface;
+
+class PersonIdentitySourceTest extends TestCase
+{
+    /**
+     * @var PersonIdentitySourceInterface
+     */
+    public $identitySource;
+
+    public function setUp(): void
+    {
+        $this->userSource = new PersonIdentitySource();
+    }
+
+    public function testConstructor(): void
+    {
+        $this->assertInstanceOf(FullPersonNameSourceInterface::class, $this->identitySource->getFullPersonNameSource());
+    }
+}