diff --git a/application/src/Entity/Attribut/PersonIdentityAttribut.php b/application/src/Entity/Attribut/PersonIdentitySourceAttribut.php
similarity index 87%
rename from application/src/Entity/Attribut/PersonIdentityAttribut.php
rename to application/src/Entity/Attribut/PersonIdentitySourceAttribut.php
index 933b546..12459ee 100644
--- a/application/src/Entity/Attribut/PersonIdentityAttribut.php
+++ b/application/src/Entity/Attribut/PersonIdentitySourceAttribut.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Entity\Attribut;
+namespace App\Entity\Attribut;
 
 use App\Entity\Source\Data\PersonIdentitySourceInterface;
 
-trait PersonIdentityAttribut
+trait PersonIdentitySourceAttribut
 {
     /**
      * @var PersonIdentitySourceInterface
diff --git a/application/src/Entity/Attribut/SurnameSourceAttribut.php b/application/src/Entity/Attribut/SurnameSourceAttribut.php
index c7bbd5a..e66d900 100644
--- a/application/src/Entity/Attribut/SurnameSourceAttribut.php
+++ b/application/src/Entity/Attribut/SurnameSourceAttribut.php
@@ -4,9 +4,20 @@ namespace App\Entity\Attribut;
 
 use App\Entity\Source\Data\Name\SurnameSourceInterface;
 
-interface SurnameSourceAttributInterface
+trait SurnameSourceAttribut
 {
-    public function getSurname(): SurnameSourceInterface;
+    /**
+     * @var SurnameSourceInterface
+     */
+    protected $surnameSource;
 
-    public function setSurname(SurnameSourceInterface $name): void;
+    public function getSurname(): SurnameSourceInterface
+    {
+        return $this->surnameSource;
+    }
+
+    public function setSurname(SurnameSourceInterface $name): void
+    {
+        $this->surnameSource = $name;
+    }
 }
diff --git a/application/src/Entity/Attribut/SurnameSourceAttributInterface.php b/application/src/Entity/Attribut/SurnameSourceAttributInterface.php
index e66d900..c7bbd5a 100644
--- a/application/src/Entity/Attribut/SurnameSourceAttributInterface.php
+++ b/application/src/Entity/Attribut/SurnameSourceAttributInterface.php
@@ -4,20 +4,9 @@ namespace App\Entity\Attribut;
 
 use App\Entity\Source\Data\Name\SurnameSourceInterface;
 
-trait SurnameSourceAttribut
+interface SurnameSourceAttributInterface
 {
-    /**
-     * @var SurnameSourceInterface
-     */
-    protected $surnameSource;
+    public function getSurname(): SurnameSourceInterface;
 
-    public function getSurname(): SurnameSourceInterface
-    {
-        return $this->surnameSource;
-    }
-
-    public function setSurname(SurnameSourceInterface $name): void
-    {
-        $this->surnameSource = $name;
-    }
+    public function setSurname(SurnameSourceInterface $name): void;
 }
diff --git a/application/src/Entity/Source/Combination/UserSource.php b/application/src/Entity/Source/Combination/UserSource.php
index d5d7efe..ca77af9 100644
--- a/application/src/Entity/Source/Combination/UserSource.php
+++ b/application/src/Entity/Source/Combination/UserSource.php
@@ -5,7 +5,7 @@ namespace App\Entity\Source\Combination;
 use Doctrine\ORM\Mapping as ORM;
 use App\Entity\Attribut\UserAttribut;
 use App\Entity\UserInterface;
-use Entity\Attribut\PersonIdentityAttribut;
+use App\Entity\Attribut\PersonIdentitySourceAttribut;
 
 /**
  * @author kevinfrantz
@@ -14,7 +14,7 @@ use Entity\Attribut\PersonIdentityAttribut;
  */
 class UserSource extends AbstractCombinationSource implements UserSourceInterface
 {
-    use UserAttribut,PersonIdentityAttribut;
+    use UserAttribut,PersonIdentitySourceAttribut;
 
     /**
      * @ORM\OneToOne(targetEntity="App\Entity\User",cascade={"persist", "remove"})
diff --git a/application/src/Entity/Source/Data/Name/AbstractNameSource.php b/application/src/Entity/Source/Data/Name/AbstractNameSource.php
index 32c0180..8559f3f 100644
--- a/application/src/Entity/Source/Data/Name/AbstractNameSource.php
+++ b/application/src/Entity/Source/Data/Name/AbstractNameSource.php
@@ -5,6 +5,7 @@ namespace App\Entity\Source\Data\Name;
 use App\Entity\Source\Data\AbstractDataSource;
 use App\Entity\Attribut\NameAttribut;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @author kevinfrantz
@@ -13,9 +14,23 @@ use Doctrine\ORM\Mapping as ORM;
  * @ORM\Table(name="source_data_name")
  * @ORM\InheritanceType("SINGLE_TABLE")
  * @ORM\DiscriminatorColumn(name="discr", type="string")
- * @ORM\DiscriminatorMap({"nickname" = "NicknameSource","firstname" = "FirstNameSource", "lastname" = "LastNameSource"})
+ * @ORM\DiscriminatorMap({"nickname" = "NicknameSource","firstname" = "FirstNameSource", "surname" = "SurnameSource"})
  */
 abstract class AbstractNameSource extends AbstractDataSource implements NameSourceInterface
 {
     use NameAttribut;
+
+    /**
+     * @todo Implement an extra assert Layer! - maybe ;)
+     * @ORM\Column(type="string",length=255)
+     * @Assert\NotBlank()
+     *
+     * @var string
+     */
+    protected $name;
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
 }
diff --git a/application/src/Entity/Source/Data/Name/FirstNameSource.php b/application/src/Entity/Source/Data/Name/FirstNameSource.php
new file mode 100644
index 0000000..6f252c3
--- /dev/null
+++ b/application/src/Entity/Source/Data/Name/FirstNameSource.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Entity\Source\Data\Name;
+
+final class FirstNameSource extends AbstractNameSource implements FirstNameSourceInterface
+{
+}
diff --git a/application/src/Entity/Source/Data/Name/NicknameSource.php b/application/src/Entity/Source/Data/Name/NicknameSource.php
index 806758b..7cbdf70 100644
--- a/application/src/Entity/Source/Data/Name/NicknameSource.php
+++ b/application/src/Entity/Source/Data/Name/NicknameSource.php
@@ -2,30 +2,13 @@
 
 namespace App\Entity\Source\Data\Name;
 
-use App\Entity\Attribut\NameAttribut;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @author kevinfrantz
- * @ORM\Table(name="source_data_nickname")
+ * @ORM\Table(name="source_data_name_nickname")
  * @ORM\Entity()
  */
 final class NicknameSource extends AbstractNameSource implements NicknameSourceInterface
 {
-    use NameAttribut;
-
-    /**
-     * @todo Implement an extra assert Layer!
-     * @ORM\Column(type="string",length=255)
-     * @Assert\NotBlank()
-     *
-     * @var string
-     */
-    protected $name;
-
-    public function __construct()
-    {
-        parent::__construct();
-    }
 }
diff --git a/application/src/Entity/Source/Data/Name/SurnameSource.php b/application/src/Entity/Source/Data/Name/SurnameSource.php
new file mode 100644
index 0000000..5733e45
--- /dev/null
+++ b/application/src/Entity/Source/Data/Name/SurnameSource.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Entity\Source\Data\Name;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @author kevinfrantz
+ * @ORM\Table(name="source_data_name_surname")
+ * @ORM\Entity()
+ */
+final class SurnameSource extends AbstractNameSource implements SurnameSourceInterface
+{
+}
diff --git a/application/tests/Unit/Entity/Attribut/PersonIdentitySourceAttributTest.php b/application/tests/Unit/Entity/Attribut/PersonIdentitySourceAttributTest.php
index 5a7a003..38b599f 100644
--- a/application/tests/Unit/Entity/Attribut/PersonIdentitySourceAttributTest.php
+++ b/application/tests/Unit/Entity/Attribut/PersonIdentitySourceAttributTest.php
@@ -4,7 +4,7 @@ namespace Tests\Unit\Entity\Attribut;
 
 use PHPUnit\Framework\TestCase;
 use App\Entity\Attribut\PersonIdentitySourceAttributInterface;
-use Entity\Attribut\PersonIdentityAttribut;
+use App\Entity\Attribut\PersonIdentitySourceAttribut;
 use App\Entity\Source\Data\PersonIdentitySourceInterface;
 
 /**
@@ -22,7 +22,7 @@ class PersonIdentitySourceAttributTest extends TestCase
     public function setUp(): void
     {
         $this->identity = new class() implements PersonIdentitySourceAttributInterface {
-            use PersonIdentityAttribut;
+            use PersonIdentitySourceAttribut;
         };
     }