diff --git a/eos/effects/ewgrouptdmaxrangebonus.py b/eos/effects/ewgrouptdmaxrangebonus.py
index 33c9d6329..e085e9f10 100644
--- a/eos/effects/ewgrouptdmaxrangebonus.py
+++ b/eos/effects/ewgrouptdmaxrangebonus.py
@@ -4,5 +4,5 @@
 # Implants named like: grade Centurion (10 of 12)
 type = "passive"
 def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
                                   "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
\ No newline at end of file
diff --git a/eos/effects/ewskilltdfalloffbonus.py b/eos/effects/ewskilltdfalloffbonus.py
index 1a11f96af..60b860ea0 100644
--- a/eos/effects/ewskilltdfalloffbonus.py
+++ b/eos/effects/ewskilltdfalloffbonus.py
@@ -4,5 +4,5 @@
 # Skill: Frequency Modulation
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
                                   "falloff", skill.getModifiedItemAttr("falloffBonus") * skill.level)
\ No newline at end of file
diff --git a/eos/effects/ewskilltdmaxrangebonus.py b/eos/effects/ewskilltdmaxrangebonus.py
index 73a80f057..03f87118a 100644
--- a/eos/effects/ewskilltdmaxrangebonus.py
+++ b/eos/effects/ewskilltdmaxrangebonus.py
@@ -6,6 +6,6 @@
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
                                   "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
                                   stackingPenalties = "skill" not in context)
diff --git a/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py b/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py
index 136f85162..65bba385e 100644
--- a/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py
+++ b/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py
@@ -6,5 +6,5 @@
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
                                   "trackingSpeedBonus", container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
diff --git a/eos/effects/ganginformationwarfarerangebonuswithecmburst.py b/eos/effects/ganginformationwarfarerangebonuswithecmburst.py
index ffbae0664..bdd216824 100644
--- a/eos/effects/ganginformationwarfarerangebonuswithecmburst.py
+++ b/eos/effects/ganginformationwarfarerangebonuswithecmburst.py
@@ -6,7 +6,7 @@ type = "gang", "active"
 gangBoost = "electronicMaxRange"
 def handler(fit, module, context):
     if "gang" not in context: return
-    groups = ("Target Painter", "Tracking Disruptor", "Remote Sensor Damper", "ECM", "ECM Burst")
+    groups = ("Target Painter", "Weapon Disruptor", "Remote Sensor Damper", "ECM", "ECM Burst")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                   "maxRange", module.getModifiedItemAttr("commandBonus"),
                                   stackingPenalties = True)
diff --git a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusac1.py b/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusac1.py
index 4b7638db9..768f7cd62 100644
--- a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusac1.py
+++ b/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusac1.py
@@ -4,5 +4,5 @@
 # Variations of ship: Arbitrator (3 of 3)
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
                                   "trackingSpeedBonus", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusrookie.py b/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusrookie.py
index d80b53451..b5ce0be09 100644
--- a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusrookie.py
+++ b/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusrookie.py
@@ -4,5 +4,5 @@
 # Ship: Impairor
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
                                   "trackingSpeedBonus", ship.getModifiedItemAttr("rookieWeaponDisruptionBonus"))