diff --git a/src/Buildin/UnityGameCyclieProcesses.cs b/src/Buildin/UnityGameCyclieProcesses.cs
index 24eead0..8e3bc34 100644
--- a/src/Buildin/UnityGameCyclieProcesses.cs
+++ b/src/Buildin/UnityGameCyclieProcesses.cs
@@ -9,7 +9,7 @@ namespace DCFApixels.DragonECS
     [MetaGroup(EcsUnityConsts.PACK_GROUP, EcsConsts.PROCESSES_GROUP)]
     [MetaDescription(EcsConsts.AUTHOR, "The process to run when EcsPipeline.DrawGizmos() is called.")]
     [MetaID("DragonECS_5DDBBB80920163B891A5BF52F9718A30")]
-    public interface IEcsGizmosProcess : IEcsProcess
+    public interface IEcsGizmos : IEcsProcess
     {
         public void DrawGizmos();
     }
@@ -18,7 +18,7 @@ namespace DCFApixels.DragonECS
     [MetaGroup(EcsUnityConsts.PACK_GROUP, EcsConsts.PROCESSES_GROUP)]
     [MetaDescription(EcsConsts.AUTHOR, "The process to run when EcsPipeline.LateRun() is called.")]
     [MetaID("DragonECS_BCE8BB8092015F2442B767645FD7F6CA")]
-    public interface IEcsLateRunProcess : IEcsProcess
+    public interface IEcsLateRun : IEcsProcess
     {
         public void LateRun();
     }
@@ -27,7 +27,7 @@ namespace DCFApixels.DragonECS
     [MetaGroup(EcsUnityConsts.PACK_GROUP, EcsConsts.PROCESSES_GROUP)]
     [MetaDescription(EcsConsts.AUTHOR, "The process to run when EcsPipeline.FixedRun() is called.")]
     [MetaID("DragonECS_54F4BB8092010228FAAD78F9D2352117")]
-    public interface IEcsFixedRunProcess : IEcsProcess
+    public interface IEcsFixedRun : IEcsProcess
     {
         public void FixedRun();
     }
@@ -55,7 +55,7 @@ namespace DCFApixels.DragonECS.Unity.Internal
     [MetaDescription(EcsConsts.AUTHOR, "...")]
     [MetaTags(MetaTags.HIDDEN)]
     [MetaID("DragonECS_2DD8BC809201633E2761D5AEF65B7090")]
-    public class EcsLateGizmosRunner : EcsRunner<IEcsGizmosProcess>, IEcsGizmosProcess
+    public class EcsLateGizmosRunner : EcsRunner<IEcsGizmos>, IEcsGizmos
     {
         private RunHelper _helper;
         protected override void OnSetup()
@@ -73,7 +73,7 @@ namespace DCFApixels.DragonECS.Unity.Internal
     [MetaDescription(EcsConsts.AUTHOR, "...")]
     [MetaTags(MetaTags.HIDDEN)]
     [MetaID("DragonECS_EDE8BC809201603B47C3A9D1EFD4EE95")]
-    public class EcsLateRunRunner : EcsRunner<IEcsLateRunProcess>, IEcsLateRunProcess
+    public class EcsLateRunRunner : EcsRunner<IEcsLateRun>, IEcsLateRun
     {
         private RunHelper _helper;
         protected override void OnSetup()
@@ -91,7 +91,7 @@ namespace DCFApixels.DragonECS.Unity.Internal
     [MetaDescription(EcsConsts.AUTHOR, "...")]
     [MetaTags(MetaTags.HIDDEN)]
     [MetaID("DragonECS_45F7BC809201866AA05F6DC096A47F01")]
-    public class EcsFixedRunRunner : EcsRunner<IEcsFixedRunProcess>, IEcsFixedRunProcess
+    public class EcsFixedRunRunner : EcsRunner<IEcsFixedRun>, IEcsFixedRun
     {
         private RunHelper _helper;
         protected override void OnSetup()
diff --git a/src/Templates/EntityTemplate/ComponentTemplateProperty.cs b/src/Templates/EntityTemplate/ComponentTemplateProperty.cs
index 514c461..b881029 100644
--- a/src/Templates/EntityTemplate/ComponentTemplateProperty.cs
+++ b/src/Templates/EntityTemplate/ComponentTemplateProperty.cs
@@ -83,12 +83,12 @@ namespace DCFApixels.DragonECS
         public readonly struct Null { }
     }
 
-    public sealed class ComponentTemplateReferenceAttribute : PropertyAttribute, IReferenceButtonAttribute
+    public sealed class ComponentTemplateFieldAttribute : PropertyAttribute, IReferenceButtonAttribute
     {
         public Type[] PredicateTypes;
         Type[] IReferenceButtonAttribute.PredicateTypes { get { return PredicateTypes; } }
         bool IReferenceButtonAttribute.IsHideButtonIfNotNull { get { return true; } }
-        public ComponentTemplateReferenceAttribute() { }
+        public ComponentTemplateFieldAttribute() { }
     }
     public sealed class ComponentTemplateAttribute : PropertyAttribute { }
 }
\ No newline at end of file
diff --git a/src/Templates/EntityTemplate/Editor/ComponentTemplatePropertyDrawer.cs b/src/Templates/EntityTemplate/Editor/ComponentTemplatePropertyDrawer.cs
index 1e5235e..0b3706a 100644
--- a/src/Templates/EntityTemplate/Editor/ComponentTemplatePropertyDrawer.cs
+++ b/src/Templates/EntityTemplate/Editor/ComponentTemplatePropertyDrawer.cs
@@ -26,8 +26,8 @@ namespace DCFApixels.DragonECS.Unity.Editors
             _drawer.Draw(position, root, property, label);
         }
     }
-    [CustomPropertyDrawer(typeof(ComponentTemplateReferenceAttribute), true)]
-    internal class ComponentTemplateReferenceDrawer : ExtendedPropertyDrawer<ComponentTemplateReferenceAttribute>
+    [CustomPropertyDrawer(typeof(ComponentTemplateFieldAttribute), true)]
+    internal class ComponentTemplateReferenceDrawer : ExtendedPropertyDrawer<ComponentTemplateFieldAttribute>
     {
         private const float DamagedComponentHeight = 18f * 2f;
         private ComponentTemplatesDropDown _componentDropDown;