diff --git a/application/src/Entity/Meta/Law.php b/application/src/Entity/Meta/Law.php
index 79deca4..34b6a30 100644
--- a/application/src/Entity/Meta/Law.php
+++ b/application/src/Entity/Meta/Law.php
@@ -9,7 +9,7 @@ use App\Entity\Attribut\RelationAttribut;
 /**
  *
  * @author kevinfrantz
- * @ORM\Table(name="law")
+ * @ORM\Table(name="meta_law")
  * @ORM\Entity(repositoryClass="App\Repository\LawRepository")
  */
 class Law extends AbstractMeta implements LawInterface
diff --git a/application/src/Entity/Meta/RecieverGroup.php b/application/src/Entity/Meta/RecieverGroup.php
index 5eccd17..a1eed1d 100644
--- a/application/src/Entity/Meta/RecieverGroup.php
+++ b/application/src/Entity/Meta/RecieverGroup.php
@@ -13,7 +13,7 @@ use App\Entity\Attribut\RelationAttributInterface;
 
 /**
  * @author kevinfrantz
- * @ORM\Table(name="reciever_group")
+ * @ORM\Table(name="meta_reciever_group")
  * @ORM\Entity()
  */
 class RecieverGroup extends AbstractMeta implements RecieverGroupInterface
diff --git a/application/src/Entity/Meta/Relation.php b/application/src/Entity/Meta/Relation.php
index a7f6318..9e40b23 100644
--- a/application/src/Entity/Meta/Relation.php
+++ b/application/src/Entity/Meta/Relation.php
@@ -18,7 +18,7 @@ use Doctrine\Common\Collections\Collection;
  * Also it is used to capsel the logic relation to an own logical unit. 
  * @author kevinfrantz
  * @todo rename and refactor this class
- * @ORM\Table(name="node")
+ * @ORM\Table(name="meta_relation")
  * @ORM\Entity()
  */
 class Relation extends AbstractMeta implements RelationInterface
@@ -32,7 +32,7 @@ class Relation extends AbstractMeta implements RelationInterface
     /**
      * Parents represent the creators of the relation
      * @ORM\ManyToMany(targetEntity="Relation")
-     * @ORM\JoinTable(name="relation_parents",
+     * @ORM\JoinTable(name="meta_relation_parents",
      *      joinColumns={@ORM\JoinColumn(name="relation_id", referencedColumnName="id")},
      *      inverseJoinColumns={@ORM\JoinColumn(name="relation_id", referencedColumnName="id")}
      *      )
@@ -46,7 +46,7 @@ class Relation extends AbstractMeta implements RelationInterface
      * @todo Replace this by self referencing 
      * @see https://www.doctrine-project.org/projects/doctrine-orm/en/2.6/reference/association-mapping.html
      * @ORM\ManyToMany(targetEntity="Relation")
-     * @ORM\JoinTable(name="relation_childs",
+     * @ORM\JoinTable(name="meta_relation_childs",
      *      joinColumns={@ORM\JoinColumn(name="relation_id", referencedColumnName="id")},
      *      inverseJoinColumns={@ORM\JoinColumn(name="relation_id", referencedColumnName="id")}
      *      )
diff --git a/application/src/Entity/Meta/Right.php b/application/src/Entity/Meta/Right.php
index 078542f..845e384 100644
--- a/application/src/Entity/Meta/Right.php
+++ b/application/src/Entity/Meta/Right.php
@@ -17,7 +17,7 @@ use App\Entity\Attribut\RelationAttribut;
 
 /**
  * @author kevinfrantz
- * @ORM\Table(name="`right`")
+ * @ORM\Table(name="meta_right")
  * @ORM\Entity(repositoryClass="App\Repository\RightRepository")
  */
 class Right extends AbstractMeta implements RightInterface
diff --git a/application/src/Entity/Source/AbstractSource.php b/application/src/Entity/Source/AbstractSource.php
index 3ef3b1b..4b859da 100644
--- a/application/src/Entity/Source/AbstractSource.php
+++ b/application/src/Entity/Source/AbstractSource.php
@@ -34,6 +34,8 @@ abstract class AbstractSource extends AbstractEntity implements SourceInterface
     protected $relation;
 
     /**
+     * @todo Implement that just one table on database level is needed!
+     * @todo Rename table to use the right schema
      * @var Collection|GroupSource[]
      * @ORM\ManyToMany(targetEntity="GroupSource")
      */
diff --git a/application/src/Entity/Source/GroupSource.php b/application/src/Entity/Source/GroupSource.php
index b79fd00..ac23307 100644
--- a/application/src/Entity/Source/GroupSource.php
+++ b/application/src/Entity/Source/GroupSource.php
@@ -9,7 +9,7 @@ use App\Entity\Source\Attribut\MembersAttribut;
 /**
  *
  * @author kevinfrantz
- * @ORM\Table(name="source_sources")
+ * @ORM\Table(name="source_group")
  * @ORM\Entity
  */
 class GroupSource extends AbstractSource implements MembersAttributInterface