diff --git a/src/api b/src/api
index 10f8cfdea..4ee1c41d0 160000
--- a/src/api
+++ b/src/api
@@ -1 +1 @@
-Subproject commit 10f8cfdeaa961f52f3229e07c5fc9aa0fb15e734
+Subproject commit 4ee1c41d061eb4638b923cd3a430c7b63767ebdb
diff --git a/src/main/java/kamkeel/npcs/controllers/EnergyController.java b/src/main/java/kamkeel/npcs/controllers/EnergyController.java
index ffd25c400..5b6bc123a 100644
--- a/src/main/java/kamkeel/npcs/controllers/EnergyController.java
+++ b/src/main/java/kamkeel/npcs/controllers/EnergyController.java
@@ -1,12 +1,12 @@
 package kamkeel.npcs.controllers;
 
-import kamkeel.npcs.controllers.data.energy.IEnergyHandler;
+import kamkeel.npcs.controllers.data.energy.IEnergyExtender;
 import kamkeel.npcs.entity.*;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import noppes.npcs.api.IEnergyController;
+import noppes.npcs.api.IEnergyHandler;
 import noppes.npcs.api.IWorld;
 import noppes.npcs.api.entity.*;
 import noppes.npcs.api.entity.IEnergyExplosion;
@@ -22,22 +22,22 @@ import java.util.List;
  * damage through registered handlers when entities have customDamageData
  * but no sourceAbility.
  */
-public class EnergyController implements IEnergyController {
+public class EnergyController implements IEnergyHandler {
 
     public static EnergyController Instance = new EnergyController();
 
-    private final List<IEnergyHandler> handlers = new ArrayList<>();
+    private final List<IEnergyExtender> extenders = new ArrayList<>();
 
     // ═══════════════════════════════════════════════════════════════════
     // HANDLER REGISTRATION
     // ═══════════════════════════════════════════════════════════════════
 
-    public void registerHandler(IEnergyHandler handler) {
-        handlers.add(handler);
+    public void registerExtender(IEnergyExtender handler) {
+        extenders.add(handler);
     }
 
-    public List<IEnergyHandler> getHandlers() {
-        return handlers;
+    public List<IEnergyExtender> getExtenders() {
+        return extenders;
     }
 
     // ═══════════════════════════════════════════════════════════════════
@@ -53,7 +53,7 @@ public class EnergyController implements IEnergyController {
                                        double kbDirX, double kbDirZ,
                                        float damageMultiplier,
                                        NBTTagCompound damageData) {
-        for (IEnergyHandler handler : handlers) {
+        for (IEnergyExtender handler : extenders) {
             if (handler.onEnergyDamage(energyEntity, owner, target, damage,
                 knockback, knockbackUp, kbDirX, kbDirZ, damageMultiplier, damageData)) {
                 return true;
@@ -68,7 +68,7 @@ public class EnergyController implements IEnergyController {
     public float fireModifyEnergyDamage(Entity energyEntity, EntityLivingBase owner,
                                          float baseDamage, NBTTagCompound damageData) {
         float damage = baseDamage;
-        for (IEnergyHandler handler : handlers) {
+        for (IEnergyExtender handler : extenders) {
             damage = handler.modifyEnergyDamage(energyEntity, owner, damage, damageData);
         }
         return damage;
@@ -150,7 +150,7 @@ public class EnergyController implements IEnergyController {
     }
 
     // ═══════════════════════════════════════════════════════════════════
-    // IEnergyController (Script API methods)
+    // IEnergyHandler (Script API methods)
     // ═══════════════════════════════════════════════════════════════════
 
     @Override
diff --git a/src/main/java/kamkeel/npcs/controllers/data/energy/IEnergyHandler.java b/src/main/java/kamkeel/npcs/controllers/data/energy/IEnergyExtender.java
similarity index 98%
rename from src/main/java/kamkeel/npcs/controllers/data/energy/IEnergyHandler.java
rename to src/main/java/kamkeel/npcs/controllers/data/energy/IEnergyExtender.java
index bd2e39a74..2dcd2fe43 100644
--- a/src/main/java/kamkeel/npcs/controllers/data/energy/IEnergyHandler.java
+++ b/src/main/java/kamkeel/npcs/controllers/data/energy/IEnergyExtender.java
@@ -9,7 +9,7 @@ import net.minecraft.nbt.NBTTagCompound;
  * Registered with EnergyController. DBC Addon implements this to route
  * script-created energy entity damage through the DBC damage pipeline.
  */
-public interface IEnergyHandler {
+public interface IEnergyExtender {
 
     /**
      * Handle damage for an energy entity with custom damage data.
diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java
index fd301b802..1b0d392b2 100644
--- a/src/main/java/noppes/npcs/scripted/NpcAPI.java
+++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java
@@ -63,7 +63,7 @@ import noppes.npcs.api.IBlock;
 import noppes.npcs.api.ICommand;
 import noppes.npcs.api.IContainer;
 import noppes.npcs.api.IDamageSource;
-import noppes.npcs.api.IEnergyController;
+import noppes.npcs.api.IEnergyHandler;
 import noppes.npcs.api.INbt;
 import noppes.npcs.api.IParticle;
 import noppes.npcs.api.IPos;
@@ -623,7 +623,7 @@ public class NpcAPI extends AbstractNpcAPI {
     }
 
     @Override
-    public IEnergyController getEnergyController() {
+    public IEnergyHandler getEnergyHandler() {
         return EnergyController.Instance;
     }