diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityBeam.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityBeam.java
index 45772eedb..994824594 100644
--- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityBeam.java
+++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityBeam.java
@@ -3,7 +3,6 @@ package kamkeel.npcs.controllers.data.ability.type;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import kamkeel.npcs.controllers.data.ability.AbilityVariant;
-import kamkeel.npcs.controllers.data.ability.AnchorPoint;
 import kamkeel.npcs.controllers.data.ability.LockMovementType;
 import kamkeel.npcs.controllers.data.ability.RotationMode;
 import kamkeel.npcs.controllers.data.ability.TargetingMode;
@@ -25,7 +24,7 @@ import java.util.List;
  * Energy Beam ability: A homing head with a trailing path.
  * Supports 1-8 projectiles with shared visuals and per-projectile anchor points.
  */
-public class AbilityBeam extends AbstractEnergyProjectileAbility<EntityAbilityBeam> implements IAbilityEnergyBeam {
+public class AbilityBeam extends AbilityEnergyProjectile<EntityAbilityBeam> implements IAbilityEnergyBeam {
 
     private float beamWidth = 0.4f;
     private float headSize = 0.6f;
diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDisc.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDisc.java
index 5a542ce7d..d159870cb 100644
--- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDisc.java
+++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDisc.java
@@ -23,7 +23,7 @@ import java.util.List;
  * Supports 1-8 projectiles with shared visuals and per-projectile anchor points.
  * Has optional boomerang behavior to return to owner.
  */
-public class AbilityDisc extends AbstractEnergyProjectileAbility<EntityAbilityDisc> implements IAbilityDisc {
+public class AbilityDisc extends AbilityEnergyProjectile<EntityAbilityDisc> implements IAbilityDisc {
 
     private float discRadius = 1.0f;
     private float discThickness = 0.2f;
diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbstractEnergyProjectileAbility.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityEnergyProjectile.java
similarity index 99%
rename from src/main/java/kamkeel/npcs/controllers/data/ability/type/AbstractEnergyProjectileAbility.java
rename to src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityEnergyProjectile.java
index f3ee572c2..f98803e7e 100644
--- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbstractEnergyProjectileAbility.java
+++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityEnergyProjectile.java
@@ -6,7 +6,6 @@ import kamkeel.npcs.controllers.data.ability.Ability;
 import kamkeel.npcs.controllers.data.ability.AnchorPoint;
 import kamkeel.npcs.controllers.data.ability.TargetingMode;
 import kamkeel.npcs.controllers.data.ability.data.*;
-import kamkeel.npcs.controllers.data.ability.gui.AbilityFieldDefs;
 import kamkeel.npcs.controllers.data.telegraph.Telegraph;
 import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance;
 import kamkeel.npcs.controllers.data.telegraph.TelegraphType;
@@ -30,7 +29,7 @@ import java.util.List;
  *
  * @param <E> The entity type this ability spawns
  */
-public abstract class AbstractEnergyProjectileAbility<E extends EntityAbilityProjectile>
+public abstract class AbilityEnergyProjectile<E extends EntityAbilityProjectile>
     extends Ability implements IAbilityEnergyProjectile {
 
     protected static final int MAX_PROJECTILES = 8;
@@ -57,7 +56,7 @@ public abstract class AbstractEnergyProjectileAbility<E extends EntityAbilityPro
 
     // ==================== CONSTRUCTOR ====================
 
-    protected AbstractEnergyProjectileAbility(
+    protected AbilityEnergyProjectile(
         EnergyDisplayData displayData,
         EnergyCombatData combatData,
         EnergyHomingData homingData,
diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityLaserShot.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityLaserShot.java
index 3ce1e33fb..efc3dafbd 100644
--- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityLaserShot.java
+++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityLaserShot.java
@@ -25,7 +25,7 @@ import java.util.List;
  * Travels in a straight line from origin, damaging all entities it passes through.
  * Single-projectile only (always projectileCount=1).
  */
-public class AbilityLaserShot extends AbstractEnergyProjectileAbility<EntityAbilityLaser> implements IAbilityLaserShot {
+public class AbilityLaserShot extends AbilityEnergyProjectile<EntityAbilityLaser> implements IAbilityLaserShot {
 
     private float laserWidth = 0.3f;
     private float expansionSpeed = 3.0f;
diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrb.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrb.java
index 42f24757e..4fb4e202d 100644
--- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrb.java
+++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrb.java
@@ -22,7 +22,7 @@ import java.util.List;
  * Orb ability: Spawns homing projectile sphere(s) that track target.
  * Supports 1-8 projectiles with shared visuals and per-projectile anchor points.
  */
-public class AbilityOrb extends AbstractEnergyProjectileAbility<EntityAbilityOrb> implements IAbilityOrb {
+public class AbilityOrb extends AbilityEnergyProjectile<EntityAbilityOrb> implements IAbilityOrb {
 
     private float orbSize = 1.0f;