diff --git a/eos/effects/elitebonuselectronicattackshipenergyneutrange1.py b/eos/effects/elitebonuselectronicattackshipenergyneutrange1.py
index d443e20c9..867982c0b 100644
--- a/eos/effects/elitebonuselectronicattackshipenergyneutrange1.py
+++ b/eos/effects/elitebonuselectronicattackshipenergyneutrange1.py
@@ -4,5 +4,5 @@
 # Ship: Sentinel
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                   "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships")
diff --git a/eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py b/eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py
index 9bc17e752..7974ce9ca 100644
--- a/eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py
+++ b/eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py
@@ -4,5 +4,5 @@
 # Ship: Sentinel
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships")
diff --git a/eos/effects/elitebonusvampiredrainamount2.py b/eos/effects/elitebonusvampiredrainamount2.py
index 96b934a87..267e5c7d7 100644
--- a/eos/effects/elitebonusvampiredrainamount2.py
+++ b/eos/effects/elitebonusvampiredrainamount2.py
@@ -5,5 +5,5 @@
 # Ship: Pilgrim
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/elitereconbonusenergyneutamount2.py b/eos/effects/elitereconbonusenergyneutamount2.py
index 940318998..6570460dd 100644
--- a/eos/effects/elitereconbonusenergyneutamount2.py
+++ b/eos/effects/elitereconbonusenergyneutamount2.py
@@ -5,5 +5,5 @@
 # Ship: Pilgrim
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                   "energyDestabilizationAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/elitereconbonusenergyneutrange1.py b/eos/effects/elitereconbonusenergyneutrange1.py
index 566b9e868..12f4b54f2 100644
--- a/eos/effects/elitereconbonusenergyneutrange1.py
+++ b/eos/effects/elitereconbonusenergyneutrange1.py
@@ -4,5 +4,5 @@
 # Ship: Curse
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                   "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/elitereconbonusneutrange3.py b/eos/effects/elitereconbonusneutrange3.py
index 4bb877b0b..e203118c8 100644
--- a/eos/effects/elitereconbonusneutrange3.py
+++ b/eos/effects/elitereconbonusneutrange3.py
@@ -4,5 +4,5 @@
 # Ship: Pilgrim
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                   "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/elitereconbonusvamprange3.py b/eos/effects/elitereconbonusvamprange3.py
index c870e93ae..9b944f150 100644
--- a/eos/effects/elitereconbonusvamprange3.py
+++ b/eos/effects/elitereconbonusvamprange3.py
@@ -4,5 +4,5 @@
 # Ship: Pilgrim
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferRange", ship.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/elitereconenergyvampirerangebonus1.py b/eos/effects/elitereconenergyvampirerangebonus1.py
index 23ccc34cc..387740b25 100644
--- a/eos/effects/elitereconenergyvampirerangebonus1.py
+++ b/eos/effects/elitereconenergyvampirerangebonus1.py
@@ -4,5 +4,5 @@
 # Ship: Curse
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/shipbonusenergyneutrangeab2.py b/eos/effects/shipbonusenergyneutrangeab2.py
index dee87f0fb..b0602ef11 100644
--- a/eos/effects/shipbonusenergyneutrangeab2.py
+++ b/eos/effects/shipbonusenergyneutrangeab2.py
@@ -4,5 +4,5 @@
 # Ship: Armageddon
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                   "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusenergyneutrangead2.py b/eos/effects/shipbonusenergyneutrangead2.py
index d5531edd7..3357d9ed7 100644
--- a/eos/effects/shipbonusenergyneutrangead2.py
+++ b/eos/effects/shipbonusenergyneutrangead2.py
@@ -4,5 +4,5 @@
 # Ship: Dragoon
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                   "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipbonusenergyvampirerangeab2.py b/eos/effects/shipbonusenergyvampirerangeab2.py
index 2dded0794..66e1ae926 100644
--- a/eos/effects/shipbonusenergyvampirerangeab2.py
+++ b/eos/effects/shipbonusenergyvampirerangeab2.py
@@ -4,5 +4,5 @@
 # Ship: Armageddon
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferRange", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/shipbonusenergyvampirerangead2.py b/eos/effects/shipbonusenergyvampirerangead2.py
index d3fe34378..a71170696 100644
--- a/eos/effects/shipbonusenergyvampirerangead2.py
+++ b/eos/effects/shipbonusenergyvampirerangead2.py
@@ -4,5 +4,5 @@
 # Ship: Dragoon
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferRange", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/shipenergydrainamountaf1.py b/eos/effects/shipenergydrainamountaf1.py
index 67f97345c..21239c039 100644
--- a/eos/effects/shipenergydrainamountaf1.py
+++ b/eos/effects/shipenergydrainamountaf1.py
@@ -5,5 +5,5 @@
 # Ship: Sentinel
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipenergyneutralizerrangebonusac.py b/eos/effects/shipenergyneutralizerrangebonusac.py
index 2d5b8767f..f4109c4e2 100644
--- a/eos/effects/shipenergyneutralizerrangebonusac.py
+++ b/eos/effects/shipenergyneutralizerrangebonusac.py
@@ -4,5 +4,5 @@
 # Ship: Vangel
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                   "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipenergyneutralizerrangebonusaf2.py b/eos/effects/shipenergyneutralizerrangebonusaf2.py
index fb5e5a88b..d574dbb13 100644
--- a/eos/effects/shipenergyneutralizerrangebonusaf2.py
+++ b/eos/effects/shipenergyneutralizerrangebonusaf2.py
@@ -4,5 +4,5 @@
 # Ship: Malice
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                   "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipenergyneutralizertransferamountbonusab.py b/eos/effects/shipenergyneutralizertransferamountbonusab.py
index b3b69c078..3a005e1fc 100644
--- a/eos/effects/shipenergyneutralizertransferamountbonusab.py
+++ b/eos/effects/shipenergyneutralizertransferamountbonusab.py
@@ -4,5 +4,5 @@
 # Ship: Bhaalgorn
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                   "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/shipenergyneutralizertransferamountbonusac.py b/eos/effects/shipenergyneutralizertransferamountbonusac.py
index 436ef71e7..1c4546fd3 100644
--- a/eos/effects/shipenergyneutralizertransferamountbonusac.py
+++ b/eos/effects/shipenergyneutralizertransferamountbonusac.py
@@ -5,5 +5,5 @@
 # Ship: Vangel
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                   "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipenergyneutralizertransferamountbonusaf.py b/eos/effects/shipenergyneutralizertransferamountbonusaf.py
index 88e0f7bd3..6e525dcb1 100644
--- a/eos/effects/shipenergyneutralizertransferamountbonusaf.py
+++ b/eos/effects/shipenergyneutralizertransferamountbonusaf.py
@@ -5,5 +5,5 @@
 # Ship: Sentinel
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                   "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipenergyneutralizertransferamountbonusaf2.py b/eos/effects/shipenergyneutralizertransferamountbonusaf2.py
index ee16f8188..36a9f2b95 100644
--- a/eos/effects/shipenergyneutralizertransferamountbonusaf2.py
+++ b/eos/effects/shipenergyneutralizertransferamountbonusaf2.py
@@ -4,5 +4,5 @@
 # Ship: Malice
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                   "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipenergyvampireamountbonusfixedaf2.py b/eos/effects/shipenergyvampireamountbonusfixedaf2.py
index 0e76b07c9..09ca0424d 100644
--- a/eos/effects/shipenergyvampireamountbonusfixedaf2.py
+++ b/eos/effects/shipenergyvampireamountbonusfixedaf2.py
@@ -4,5 +4,5 @@
 # Ship: Malice
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferAmount", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipenergyvampirerangebonusfixedac.py b/eos/effects/shipenergyvampirerangebonusfixedac.py
index b2cf784b8..b18bc906b 100644
--- a/eos/effects/shipenergyvampirerangebonusfixedac.py
+++ b/eos/effects/shipenergyvampirerangebonusfixedac.py
@@ -4,5 +4,5 @@
 # Ship: Vangel
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferRange", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipenergyvampirerangebonusfixedaf2.py b/eos/effects/shipenergyvampirerangebonusfixedaf2.py
index 5a794654f..8a84b1b14 100644
--- a/eos/effects/shipenergyvampirerangebonusfixedaf2.py
+++ b/eos/effects/shipenergyvampirerangebonusfixedaf2.py
@@ -4,5 +4,5 @@
 # Ship: Malice
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferRange", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/shipenergyvampiretransferamountbonusab.py b/eos/effects/shipenergyvampiretransferamountbonusab.py
index dbeb39356..012d52331 100644
--- a/eos/effects/shipenergyvampiretransferamountbonusab.py
+++ b/eos/effects/shipenergyvampiretransferamountbonusab.py
@@ -4,5 +4,5 @@
 # Ship: Bhaalgorn
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/shipenergyvampiretransferamountbonusac.py b/eos/effects/shipenergyvampiretransferamountbonusac.py
index f8932bc65..e7bb68862 100644
--- a/eos/effects/shipenergyvampiretransferamountbonusac.py
+++ b/eos/effects/shipenergyvampiretransferamountbonusac.py
@@ -5,5 +5,5 @@
 # Ship: Vangel
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipneutdestabilizationamountbonusrookie.py b/eos/effects/shipneutdestabilizationamountbonusrookie.py
index 09ec51339..d333686cc 100644
--- a/eos/effects/shipneutdestabilizationamountbonusrookie.py
+++ b/eos/effects/shipneutdestabilizationamountbonusrookie.py
@@ -4,5 +4,5 @@
 # Ship: Hematos
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                   "energyDestabilizationAmount", ship.getModifiedItemAttr("rookieNeutDrain"))
diff --git a/eos/effects/shipnostransferamountbonusrookie.py b/eos/effects/shipnostransferamountbonusrookie.py
index be9240bb3..810539815 100644
--- a/eos/effects/shipnostransferamountbonusrookie.py
+++ b/eos/effects/shipnostransferamountbonusrookie.py
@@ -4,5 +4,5 @@
 # Ship: Hematos
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferAmount", ship.getModifiedItemAttr("rookieNosDrain"))
diff --git a/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py b/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py
index 9cb8a1ace..55e7d5614 100644
--- a/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py
+++ b/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py
@@ -4,5 +4,5 @@
 # Subsystem: Legion Electronics - Energy Parasitic Complex
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                   "energyDestabilizationAmount", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"), skill="Amarr Electronic Systems")
diff --git a/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py b/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py
index 2eb6990b4..080d3dc92 100644
--- a/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py
+++ b/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py
@@ -4,5 +4,5 @@
 # Subsystem: Legion Electronics - Energy Parasitic Complex
 type = "passive"
 def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                   "powerTransferAmount", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"), skill="Amarr Electronic Systems")
diff --git a/eos/effects/systemenergyneutmultiplier.py b/eos/effects/systemenergyneutmultiplier.py
index bafb24f06..8c6328c98 100644
--- a/eos/effects/systemenergyneutmultiplier.py
+++ b/eos/effects/systemenergyneutmultiplier.py
@@ -5,6 +5,6 @@
 runTime = "early"
 type = ("projected", "passive")
 def handler(fit, beacon, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Destabilizer",
+    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Neutralizer",
                                      "energyDestabilizationAmount", beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"),
                                      stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemenergyvampiremultiplier.py b/eos/effects/systemenergyvampiremultiplier.py
index 1d6c71d01..15a634762 100644
--- a/eos/effects/systemenergyvampiremultiplier.py
+++ b/eos/effects/systemenergyvampiremultiplier.py
@@ -5,6 +5,6 @@
 runTime = "early"
 type = ("projected", "passive")
 def handler(fit, beacon, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Vampire",
+    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Nosferatu",
                                      "powerTransferAmount", beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"),
                                      stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eve.db b/eve.db
index e8b2f0337..4ca166e48 100644
Binary files a/eve.db and b/eve.db differ