diff --git a/eos/effects/energyneutralizerentity.py b/eos/effects/energyneutralizerentity.py
index 136509df7..14817a94b 100644
--- a/eos/effects/energyneutralizerentity.py
+++ b/eos/effects/energyneutralizerentity.py
@@ -4,16 +4,17 @@
 # Drones from group: Energy Neutralizer Drone (3 of 3)
 from eos.types import State
 type = "active", "projected"
-def handler(fit, module, context):
-    if "projected" in context and ((hasattr(module, "state") \
-    and module.state >= State.ACTIVE) or hasattr(container, "amountActive")):
-        amount = module.getModifiedItemAttr("energyNeutralizerAmount")
-        time = module.getModifiedItemAttr("duration")
+
+
+def handler(fit, src, context):
+    if "projected" in context and ((hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
+        amount = src.getModifiedItemAttr("energyNeutralizerAmount")
+        time = src.getModifiedItemAttr("duration")
         rigSize = fit.ship.getModifiedItemAttr("rigSize")
-        modifierLarge = module.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
-        modifierMedium = module.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
-        modifierSmall = module.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
-        energyNeutralizerSignatureResolution = module.getModifiedItemAttr("energyNeutralizerSignatureResolution")
+        modifierLarge = src.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
+        modifierMedium = src.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
+        modifierSmall = src.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
+        energyNeutralizerSignatureResolution = src.getModifiedItemAttr("energyNeutralizerSignatureResolution")
         signatureRadius = fit.ship.getModifiedItemAttr("signatureRadius")
 
         #Signature reduction, uses the bomb formula as per CCP Larrikin
diff --git a/eos/effects/energyneutralizerfalloff.py b/eos/effects/energyneutralizerfalloff.py
index 0cea5d766..c4933be59 100644
--- a/eos/effects/energyneutralizerfalloff.py
+++ b/eos/effects/energyneutralizerfalloff.py
@@ -4,16 +4,17 @@
 # Modules from group: Energy Neutralizer (51 of 51)
 from eos.types import State
 type = "active", "projected"
-def handler(fit, module, context):
-    if "projected" in context and ((hasattr(module, "state") \
-    and module.state >= State.ACTIVE) or hasattr(container, "amountActive")):
-        amount = module.getModifiedItemAttr("energyNeutralizerAmount")
-        time = module.getModifiedItemAttr("duration")
+
+
+def handler(fit, src, context):
+    if "projected" in context and ((hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
+        amount = src.getModifiedItemAttr("energyNeutralizerAmount")
+        time = src.getModifiedItemAttr("duration")
         rigSize = fit.ship.getModifiedItemAttr("rigSize")
-        modifierLarge = module.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
-        modifierMedium = module.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
-        modifierSmall = module.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
-        energyNeutralizerSignatureResolution = module.getModifiedItemAttr("energyNeutralizerSignatureResolution")
+        modifierLarge = src.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
+        modifierMedium = src.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
+        modifierSmall = src.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
+        energyNeutralizerSignatureResolution = src.getModifiedItemAttr("energyNeutralizerSignatureResolution")
         signatureRadius = fit.ship.getModifiedItemAttr("signatureRadius")
 
         #Signature reduction, uses the bomb formula as per CCP Larrikin
@@ -36,4 +37,3 @@ def handler(fit, module, context):
             amount = amount*modifierLarge
 
         fit.addDrain(time, amount, 0)
-
diff --git a/eos/effects/energynosferatufalloff.py b/eos/effects/energynosferatufalloff.py
index 0ef37e515..8dad1ea3d 100644
--- a/eos/effects/energynosferatufalloff.py
+++ b/eos/effects/energynosferatufalloff.py
@@ -4,14 +4,16 @@
 # Modules from group: Energy Nosferatu (51 of 51)
 type = "active", "projected"
 runTime = "late"
-def handler(fit, module, context):
-    amount = module.getModifiedItemAttr("powerTransferAmount")
-    time = module.getModifiedItemAttr("duration")
+
+
+def handler(fit, src, context):
+    amount = src.getModifiedItemAttr("powerTransferAmount")
+    time = src.getModifiedItemAttr("duration")
     rigSize = fit.ship.getModifiedItemAttr("rigSize")
-    modifierLarge = module.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
-    modifierMedium = module.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
-    modifierSmall = module.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
-    energyNeutralizerSignatureResolution = module.getModifiedItemAttr("energyNeutralizerSignatureResolution")
+    modifierLarge = src.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
+    modifierMedium = src.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
+    modifierSmall = src.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
+    energyNeutralizerSignatureResolution = src.getModifiedItemAttr("energyNeutralizerSignatureResolution")
     signatureRadius = fit.ship.getModifiedItemAttr("signatureRadius")
 
     if "projected" in context:
@@ -36,4 +38,4 @@ def handler(fit, module, context):
 
         fit.addDrain(time, amount, 0)
     elif "module" in context:
-        module.itemModifiedAttributes.force("capacitorNeed", -amount)
\ No newline at end of file
+        src.itemModifiedAttributes.force("capacitorNeed", -amount)
\ No newline at end of file
diff --git a/eos/effects/entityenergyneutralizerfalloff.py b/eos/effects/entityenergyneutralizerfalloff.py
index baa8429b6..06da16b45 100644
--- a/eos/effects/entityenergyneutralizerfalloff.py
+++ b/eos/effects/entityenergyneutralizerfalloff.py
@@ -4,16 +4,17 @@
 # Drones from group: Energy Neutralizer Drone (3 of 3)
 from eos.types import State
 type = "active", "projected"
-def handler(fit, module, context):
-    if "projected" in context and ((hasattr(module, "state") \
-    and module.state >= State.ACTIVE) or hasattr(module, "amountActive")):
-        amount = module.getModifiedItemAttr("energyNeutralizerAmount")
-        time = module.getModifiedItemAttr("energyNeutralizerDuration")
+
+
+def handler(fit, src, context):
+    if "projected" in context and ((hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
+        amount = src.getModifiedItemAttr("energyNeutralizerAmount")
+        time = src.getModifiedItemAttr("energyNeutralizerDuration")
         rigSize = fit.ship.getModifiedItemAttr("rigSize")
-        modifierLarge = module.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
-        modifierMedium = module.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
-        modifierSmall = module.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
-        energyNeutralizerSignatureResolution = module.getModifiedItemAttr("energyNeutralizerSignatureResolution")
+        modifierLarge = src.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
+        modifierMedium = src.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
+        modifierSmall = src.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
+        energyNeutralizerSignatureResolution = src.getModifiedItemAttr("energyNeutralizerSignatureResolution")
         signatureRadius = fit.ship.getModifiedItemAttr("signatureRadius")
 
         #Signature reduction, uses the bomb formula as per CCP Larrikin
diff --git a/eos/effects/fighterabilityenergyneutralizer.py b/eos/effects/fighterabilityenergyneutralizer.py
index 56fd963d3..4eeaeb633 100644
--- a/eos/effects/fighterabilityenergyneutralizer.py
+++ b/eos/effects/fighterabilityenergyneutralizer.py
@@ -3,24 +3,21 @@
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
 """
-from eos.types import State
-
 # User-friendly name for the ability
 displayName = "Energy Neutralizer"
-
 prefix = "fighterAbilityEnergyNeutralizer"
-
 type = "active", "projected"
 
-def handler(fit, module, context):
+
+def handler(fit, src, context):
     if "projected" in context:
-        amount = module.getModifiedItemAttr("{}Amount".format(prefix))
-        time = module.getModifiedItemAttr("{}Duration".format(prefix))
+        amount = src.getModifiedItemAttr("{}Amount".format(prefix))
+        time = src.getModifiedItemAttr("{}Duration".format(prefix))
         rigSize = fit.ship.getModifiedItemAttr("rigSize")
-        modifierLarge = module.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
-        modifierMedium = module.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
-        modifierSmall = module.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
-        energyNeutralizerSignatureResolution = module.getModifiedItemAttr("energyNeutralizerSignatureResolution")
+        modifierLarge = src.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
+        modifierMedium = src.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
+        modifierSmall = src.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
+        energyNeutralizerSignatureResolution = src.getModifiedItemAttr("energyNeutralizerSignatureResolution")
         signatureRadius = fit.ship.getModifiedItemAttr("signatureRadius")
 
         #Signature reduction, uses the bomb formula as per CCP Larrikin