diff --git a/Engine.Core/Engine.Core.puml b/Engine.Core/Engine.Core.puml
index 70fba87..d15c481 100644
--- a/Engine.Core/Engine.Core.puml
+++ b/Engine.Core/Engine.Core.puml
@@ -6,41 +6,41 @@ skinparam nodesep 100
 
 title Core Engine Relations
 
-interface Engine.Core.Abstract.IEntity extends Engine.Core.Abstract.IInitializable {}
-interface Engine.Core.Abstract.IUniverseObject extends Engine.Core.Abstract.IEntity, Engine.Core.Abstract.INameable {}
+interface Engine.Core.IEntity extends Engine.Core.IInitializable {}
+interface Engine.Core.IUniverseObject extends Engine.Core.IEntity, Engine.Core.INameable {}
 
-interface Engine.Core.Abstract.INameable {}
+interface Engine.Core.INameable {}
 
-Engine.Core.Abstract.IUniverseObject --> Engine.Core.Abstract.IBehaviourController: has
-Engine.Core.Abstract.IBehaviourController "1" --> "0..*" Engine.Core.Abstract.IBehaviour: has
+Engine.Core.IUniverseObject --> Engine.Core.IBehaviourController: has
+Engine.Core.IBehaviourController "1" --> "0..*" Engine.Core.IBehaviour: has
 
-interface Engine.Core.Abstract.IBehaviourController {}
-interface Engine.Core.Abstract.IBehaviour {}
-interface Engine.Core.Abstract.IBehaviour2D extends Engine.Core.Abstract.IBehaviour {}
-interface Engine.Core.Abstract.IBehaviour3D extends Engine.Core.Abstract.IBehaviour {}
+interface Engine.Core.IBehaviourController {}
+interface Engine.Core.IBehaviour {}
+interface Engine.Core.IBehaviour2D extends Engine.Core.IBehaviour {}
+interface Engine.Core.IBehaviour3D extends Engine.Core.IBehaviour {}
 
-interface Engine.Core.Abstract.IUniverse {}
-Engine.Core.Abstract.IUniverse "1" -r-> "0..*" Engine.Core.Abstract.IUniverseObject: has
+interface Engine.Core.IUniverse {}
+Engine.Core.IUniverse "1" -r-> "0..*" Engine.Core.IUniverseObject: has
 
 ' together {
-'     interface Engine.Core.Abstract.IAssignable {}
-'     interface Engine.Core.Abstract.IHasStateEnable extends Engine.Core.Abstract.IAssignable {}
-'     interface Engine.Core.Abstract.IHasUniverse extends Engine.Core.Abstract.IAssignable {}
-'     interface Engine.Core.Abstract.IHasUniverseObject extends Engine.Core.Abstract.IAssignable {}
-'     interface Engine.Core.Abstract.IHasBehaviourController extends Engine.Core.Abstract.IAssignable {}
-'     ' Engine.Core.Abstract.IHasStateEnable --> Engine.Core.Abstract.IStateEnable: has
-'     ' Engine.Core.Abstract.IHasUniverse --> Engine.Core.Abstract.IUniverse: has
-'     ' Engine.Core.Abstract.IHasUniverseObject --> Engine.Core.Abstract.IUniverseObject: has
-'     ' Engine.Core.Abstract.IHasBehaviourController --> Engine.Core.Abstract.IBehaviourController: has
+'     interface Engine.Core.IAssignable {}
+'     interface Engine.Core.IHasStateEnable extends Engine.Core.IAssignable {}
+'     interface Engine.Core.IHasUniverse extends Engine.Core.IAssignable {}
+'     interface Engine.Core.IHasUniverseObject extends Engine.Core.IAssignable {}
+'     interface Engine.Core.IHasBehaviourController extends Engine.Core.IAssignable {}
+'     ' Engine.Core.IHasStateEnable --> Engine.Core.IStateEnable: has
+'     ' Engine.Core.IHasUniverse --> Engine.Core.IUniverse: has
+'     ' Engine.Core.IHasUniverseObject --> Engine.Core.IUniverseObject: has
+'     ' Engine.Core.IHasBehaviourController --> Engine.Core.IBehaviourController: has
 ' }
 
 together {
-    interface Engine.Core.Abstract.ITransform2D {}
-    interface Engine.Core.Abstract.ICamera2D {}
-    interface Engine.Core.Abstract.ICoroutineYield {}
-    interface Engine.Core.Abstract.IStateEnable {}
-    interface Engine.Core.Abstract.IInitializable {}
-    interface Engine.Core.Abstract.IBehaviourCollector {}
+    interface Engine.Core.ITransform2D {}
+    interface Engine.Core.ICamera2D {}
+    interface Engine.Core.ICoroutineYield {}
+    interface Engine.Core.IStateEnable {}
+    interface Engine.Core.IInitializable {}
+    interface Engine.Core.IBehaviourCollector {}
 }
 
 @enduml