diff --git a/eos/effects/shipbonusdreadnoughtg1kinthermdamagebonus.py b/eos/effects/shipbonusdreadnoughtg1kinthermdamagebonus.py
index 1aa835fdc..e79593c44 100644
--- a/eos/effects/shipbonusdreadnoughtg1kinthermdamagebonus.py
+++ b/eos/effects/shipbonusdreadnoughtg1kinthermdamagebonus.py
@@ -6,15 +6,15 @@ type = "passive"
 
 
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "kineticDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "kineticDamage",
                                   src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "thermalDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "thermalDamage",
                                   src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "kineticDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "kineticDamage",
                                   src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "thermalDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "thermalDamage",
                                   src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "thermalDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "thermalDamage",
                                   src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "kineticDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "kineticDamage",
                                   src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
diff --git a/eos/effects/shipbonustitang1kinthermdamagebonus.py b/eos/effects/shipbonustitang1kinthermdamagebonus.py
index e2cda411d..7e8745859 100644
--- a/eos/effects/shipbonustitang1kinthermdamagebonus.py
+++ b/eos/effects/shipbonustitang1kinthermdamagebonus.py
@@ -6,15 +6,15 @@ type = "passive"
 
 
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "thermalDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "thermalDamage",
                                   src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "kineticDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "kineticDamage",
                                   src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "thermalDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "thermalDamage",
                                   src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "kineticDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "kineticDamage",
                                   src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "thermalDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "thermalDamage",
                                   src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "kineticDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "kineticDamage",
                                   src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
diff --git a/eos/effects/shipbonustitang2alldamagebonus.py b/eos/effects/shipbonustitang2alldamagebonus.py
index f8e475305..42525d080 100644
--- a/eos/effects/shipbonustitang2alldamagebonus.py
+++ b/eos/effects/shipbonustitang2alldamagebonus.py
@@ -6,21 +6,21 @@ type = "passive"
 
 
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "thermalDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "thermalDamage",
                                   src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "explosiveDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "explosiveDamage",
                                   src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "emDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "emDamage",
                                   src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "thermalDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "thermalDamage",
                                   src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "emDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "emDamage",
                                   src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "explosiveDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "explosiveDamage",
                                   src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "emDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "emDamage",
                                   src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "thermalDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "thermalDamage",
                                   src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "explosiveDamage",
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "explosiveDamage",
                                   src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")