diff --git a/src/Buildin/UnityComponents.cs b/src/Buildin/UnityComponents.cs
index 5a531c8..aa79743 100644
--- a/src/Buildin/UnityComponents.cs
+++ b/src/Buildin/UnityComponents.cs
@@ -39,7 +39,7 @@ namespace DCFApixels.DragonECS
         }
         public sealed override void Apply(int worldID, int entityID)
         {
-            EcsWorld.GetPool<EcsPool<UnityComponent<T>>>(worldID).TryAddOrGet(entityID) = component;
+            EcsWorld.GetPoolInstance<EcsPool<UnityComponent<T>>>(worldID).TryAddOrGet(entityID) = component;
         }
         public override void OnValidate(UnityEngine.Object obj)
         {
diff --git a/src/EntityTemplate/Templates/ComponentTemplateBase.cs b/src/EntityTemplate/Templates/ComponentTemplateBase.cs
index b4a3e6b..288b663 100644
--- a/src/EntityTemplate/Templates/ComponentTemplateBase.cs
+++ b/src/EntityTemplate/Templates/ComponentTemplateBase.cs
@@ -82,7 +82,7 @@ namespace DCFApixels.DragonECS
     {
         public override void Apply(int worldID, int entityID)
         {
-            EcsWorld.GetPool<EcsPool<T>>(worldID).TryAddOrGet(entityID) = component;
+            EcsWorld.GetPoolInstance<EcsPool<T>>(worldID).TryAddOrGet(entityID) = component;
         }
     }
     public abstract class TagComponentTemplate<T> : ComponentTemplateBase<T>
@@ -90,7 +90,7 @@ namespace DCFApixels.DragonECS
     {
         public override void Apply(int worldID, int entityID)
         {
-            EcsWorld.GetPool<EcsTagPool<T>>(worldID).Set(entityID, true);
+            EcsWorld.GetPoolInstance<EcsTagPool<T>>(worldID).Set(entityID, true);
         }
     }
 }
diff --git a/src/Internal/Editor/EcsGUI.cs b/src/Internal/Editor/EcsGUI.cs
index ec16950..433a0f8 100644
--- a/src/Internal/Editor/EcsGUI.cs
+++ b/src/Internal/Editor/EcsGUI.cs
@@ -46,7 +46,7 @@ namespace DCFApixels.DragonECS.Unity.Editors
             }
             public static void DrawRuntimeComponents(int entityID, EcsWorld world, bool isWithFoldout = true)
             {
-                var componentTypeIDs = world.GetComponentTypeIDs(entityID);
+                var componentTypeIDs = world.GetComponentTypeIDsFor(entityID);
 
                 GUILayout.BeginVertical(UnityEditorUtility.GetStyle(Color.black, 0.2f));
 
@@ -61,7 +61,7 @@ namespace DCFApixels.DragonECS.Unity.Editors
                     IsShowHidden = EditorGUI.Toggle(GUILayoutUtility.GetLastRect(), "Show Hidden", IsShowHidden);
                     foreach (var componentTypeID in componentTypeIDs)
                     {
-                        var pool = world.GetPool(componentTypeID);
+                        var pool = world.GetPoolInstance(componentTypeID);
                         {
                             DrawRuntimeComponent(entityID, pool);
                         }