diff --git a/eos/effects/ammoinfluencecapneed.py b/eos/effects/ammoinfluencecapneed.py
index c30a91bd1..ee8a2229d 100644
--- a/eos/effects/ammoinfluencecapneed.py
+++ b/eos/effects/ammoinfluencecapneed.py
@@ -1,7 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (465 of 912)
+# Items from category: Charge (466 of 913)
 # Charges from group: Frequency Crystal (185 of 185)
 # Charges from group: Hybrid Charge (209 of 209)
 type = "passive"
diff --git a/eos/effects/ammoinfluencerange.py b/eos/effects/ammoinfluencerange.py
index ea6860bbe..2a42d411c 100644
--- a/eos/effects/ammoinfluencerange.py
+++ b/eos/effects/ammoinfluencerange.py
@@ -1,7 +1,7 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (571 of 912)
+# Items from category: Charge (571 of 913)
 type = "passive"
 
 
diff --git a/eos/effects/commandburstaoerolebonus.py b/eos/effects/commandburstaoerolebonus.py
index 63de8ca87..99576c074 100644
--- a/eos/effects/commandburstaoerolebonus.py
+++ b/eos/effects/commandburstaoerolebonus.py
@@ -4,9 +4,9 @@
 # Ships from group: Carrier (4 of 4)
 # Ships from group: Combat Battlecruiser (13 of 13)
 # Ships from group: Command Ship (8 of 8)
-# Ships from group: Force Auxiliary (4 of 4)
+# Ships from group: Force Auxiliary (5 of 5)
 # Ships from group: Supercarrier (6 of 6)
-# Ships from group: Titan (5 of 5)
+# Ships from group: Titan (6 of 6)
 # Subsystems named like: Defensive Warfare Processor (4 of 4)
 # Ship: Orca
 # Ship: Rorqual
diff --git a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
index 0a3e341c3..3718c9101 100644
--- a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
+++ b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
@@ -3,9 +3,9 @@
 # Used by:
 # Ships from group: Black Ops (4 of 4)
 # Ships from group: Blockade Runner (4 of 4)
-# Ships from group: Covert Ops (6 of 6)
+# Ships from group: Covert Ops (7 of 7)
 # Ships from group: Expedition Frigate (2 of 2)
-# Ships from group: Force Recon Ship (6 of 6)
+# Ships from group: Force Recon Ship (7 of 7)
 # Ships from group: Stealth Bomber (4 of 4)
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Offensive Covert Reconfiguration (4 of 4)
diff --git a/eos/effects/covertopscloakcpupercentbonus1.py b/eos/effects/covertopscloakcpupercentbonus1.py
index 7ac0f5523..e7763ec56 100644
--- a/eos/effects/covertopscloakcpupercentbonus1.py
+++ b/eos/effects/covertopscloakcpupercentbonus1.py
@@ -1,7 +1,7 @@
 # covertOpsCloakCpuPercentBonus1
 #
 # Used by:
-# Ships from group: Covert Ops (5 of 6)
+# Ships from group: Covert Ops (5 of 7)
 type = "passive"
 runTime = "early"
 
diff --git a/eos/effects/covertopscloakcpupercentbonuspiratefaction.py b/eos/effects/covertopscloakcpupercentrolebonus.py
similarity index 78%
rename from eos/effects/covertopscloakcpupercentbonuspiratefaction.py
rename to eos/effects/covertopscloakcpupercentrolebonus.py
index 6feae8252..fea79b8e2 100644
--- a/eos/effects/covertopscloakcpupercentbonuspiratefaction.py
+++ b/eos/effects/covertopscloakcpupercentrolebonus.py
@@ -1,8 +1,10 @@
-# covertOpsCloakCPUPercentBonusPirateFaction
+# covertOpsCloakCPUPercentRoleBonus
 #
 # Used by:
 # Ships from group: Expedition Frigate (2 of 2)
 # Ship: Astero
+# Ship: Enforcer
+# Ship: Pacifier
 # Ship: Victorieux Luxury Yacht
 type = "passive"
 runTime = "early"
@@ -10,4 +12,4 @@ runTime = "early"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"),
-                                  "cpu", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "cpu", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/cynosuraldurationbonus.py b/eos/effects/cynosuraldurationbonus.py
index 743d13d9e..388e64125 100644
--- a/eos/effects/cynosuraldurationbonus.py
+++ b/eos/effects/cynosuraldurationbonus.py
@@ -1,7 +1,7 @@
 # cynosuralDurationBonus
 #
 # Used by:
-# Ships from group: Force Recon Ship (5 of 6)
+# Ships from group: Force Recon Ship (6 of 7)
 type = "passive"
 
 
diff --git a/eos/effects/cynosuraltheoryconsumptionbonus.py b/eos/effects/cynosuraltheoryconsumptionbonus.py
index 0f66b0152..3d1be5194 100644
--- a/eos/effects/cynosuraltheoryconsumptionbonus.py
+++ b/eos/effects/cynosuraltheoryconsumptionbonus.py
@@ -1,7 +1,7 @@
 # cynosuralTheoryConsumptionBonus
 #
 # Used by:
-# Ships from group: Force Recon Ship (5 of 6)
+# Ships from group: Force Recon Ship (6 of 7)
 # Skill: Cynosural Field Theory
 type = "passive"
 
diff --git a/eos/effects/elitebonuscoveropsscanprobestrength2.py b/eos/effects/elitebonuscoveropsscanprobestrength2.py
index 5d6dfc8c6..7b3df9a4b 100644
--- a/eos/effects/elitebonuscoveropsscanprobestrength2.py
+++ b/eos/effects/elitebonuscoveropsscanprobestrength2.py
@@ -1,7 +1,7 @@
 # eliteBonusCoverOpsScanProbeStrength2
 #
 # Used by:
-# Ships from group: Covert Ops (6 of 6)
+# Ships from group: Covert Ops (7 of 7)
 type = "passive"
 
 
diff --git a/eos/effects/elitebonuscoveropswarpvelocity1.py b/eos/effects/elitebonuscoveropswarpvelocity1.py
new file mode 100644
index 000000000..6a661ae0f
--- /dev/null
+++ b/eos/effects/elitebonuscoveropswarpvelocity1.py
@@ -0,0 +1,7 @@
+# eliteBonusCoverOpsWarpVelocity1
+#
+# Used by:
+# Ship: Pacifier
+type = "passive"
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")
diff --git a/eos/effects/elitebonusreconwarpvelocity3.py b/eos/effects/elitebonusreconwarpvelocity3.py
new file mode 100644
index 000000000..9d7f98dfc
--- /dev/null
+++ b/eos/effects/elitebonusreconwarpvelocity3.py
@@ -0,0 +1,7 @@
+# eliteBonusReconWarpVelocity3
+#
+# Used by:
+# Ship: Enforcer
+type = "passive"
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/elitereconjumpscramblerrangebonus2.py b/eos/effects/elitereconscramblerrangebonus2.py
similarity index 85%
rename from eos/effects/elitereconjumpscramblerrangebonus2.py
rename to eos/effects/elitereconscramblerrangebonus2.py
index b9bebe9a9..d308a56ba 100644
--- a/eos/effects/elitereconjumpscramblerrangebonus2.py
+++ b/eos/effects/elitereconscramblerrangebonus2.py
@@ -1,7 +1,8 @@
-# eliteReconJumpScramblerRangeBonus2
+# eliteReconScramblerRangeBonus2
 #
 # Used by:
 # Ship: Arazu
+# Ship: Enforcer
 # Ship: Lachesis
 type = "passive"
 
diff --git a/eos/effects/elitereconstasiswebbonus1.py b/eos/effects/elitereconstasiswebbonus1.py
new file mode 100644
index 000000000..0a05274f4
--- /dev/null
+++ b/eos/effects/elitereconstasiswebbonus1.py
@@ -0,0 +1,7 @@
+# eliteReconStasisWebBonus1
+#
+# Used by:
+# Ship: Enforcer
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/entosisdurationmultiply.py b/eos/effects/entosisdurationmultiply.py
index 410ff6312..10d519002 100644
--- a/eos/effects/entosisdurationmultiply.py
+++ b/eos/effects/entosisdurationmultiply.py
@@ -1,12 +1,7 @@
 # entosisDurationMultiply
 #
 # Used by:
-# Ships from group: Carrier (4 of 4)
-# Ships from group: Dreadnought (5 of 5)
-# Ships from group: Force Auxiliary (4 of 4)
-# Ships from group: Supercarrier (6 of 6)
-# Ships from group: Titan (5 of 5)
-# Ship: Rorqual
+# Items from market group: Ships > Capital Ships (28 of 37)
 type = "passive"
 
 
diff --git a/eos/effects/minigamevirusstrengthbonus.py b/eos/effects/minigamevirusstrengthbonus.py
index 63c42ffdb..f346d387a 100644
--- a/eos/effects/minigamevirusstrengthbonus.py
+++ b/eos/effects/minigamevirusstrengthbonus.py
@@ -1,7 +1,7 @@
 # minigameVirusStrengthBonus
 #
 # Used by:
-# Ships from group: Covert Ops (6 of 6)
+# Ships from group: Covert Ops (7 of 7)
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Electronics Emergent Locus Analyzer (4 of 4)
 # Ship: Astero
diff --git a/eos/effects/reconshipcloakcpubonus1.py b/eos/effects/reconshipcloakcpubonus1.py
index 602efab28..4032baabc 100644
--- a/eos/effects/reconshipcloakcpubonus1.py
+++ b/eos/effects/reconshipcloakcpubonus1.py
@@ -1,7 +1,7 @@
 # reconShipCloakCpuBonus1
 #
 # Used by:
-# Ships from group: Force Recon Ship (6 of 6)
+# Ships from group: Force Recon Ship (6 of 7)
 type = "passive"
 runTime = "early"
 
diff --git a/eos/effects/scriptdurationbonus.py b/eos/effects/scriptdurationbonus.py
index 5b3081529..23361f87b 100644
--- a/eos/effects/scriptdurationbonus.py
+++ b/eos/effects/scriptdurationbonus.py
@@ -1,7 +1,7 @@
 # scriptDurationBonus
 #
 # Used by:
-# Charge: Focused Warp Disruption Script
+# Charges from group: Warp Disruption Script (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/scriptmassbonuspercentagebonus.py b/eos/effects/scriptmassbonuspercentagebonus.py
index e6d42eee4..dcf4a6c02 100644
--- a/eos/effects/scriptmassbonuspercentagebonus.py
+++ b/eos/effects/scriptmassbonuspercentagebonus.py
@@ -1,7 +1,7 @@
 # scriptMassBonusPercentageBonus
 #
 # Used by:
-# Charge: Focused Warp Disruption Script
+# Charges from group: Warp Disruption Script (2 of 2)
 type = "passive"
 runTime = "early"
 
diff --git a/eos/effects/scriptsignatureradiusbonusbonus.py b/eos/effects/scriptsignatureradiusbonusbonus.py
index 29b60408a..34ee9918f 100644
--- a/eos/effects/scriptsignatureradiusbonusbonus.py
+++ b/eos/effects/scriptsignatureradiusbonusbonus.py
@@ -1,7 +1,7 @@
 # scriptSignatureRadiusBonusBonus
 #
 # Used by:
-# Charge: Focused Warp Disruption Script
+# Charges from group: Warp Disruption Script (2 of 2)
 type = "passive"
 runTime = "early"
 
diff --git a/eos/effects/scriptspeedboostfactorbonusbonus.py b/eos/effects/scriptspeedboostfactorbonusbonus.py
index e7795bc1a..7ead7eb03 100644
--- a/eos/effects/scriptspeedboostfactorbonusbonus.py
+++ b/eos/effects/scriptspeedboostfactorbonusbonus.py
@@ -1,7 +1,7 @@
 # scriptSpeedBoostFactorBonusBonus
 #
 # Used by:
-# Charge: Focused Warp Disruption Script
+# Charges from group: Warp Disruption Script (2 of 2)
 type = "passive"
 runTime = "early"
 
diff --git a/eos/effects/scriptspeedfactorbonusbonus.py b/eos/effects/scriptspeedfactorbonusbonus.py
index 3df351500..f3d560d76 100644
--- a/eos/effects/scriptspeedfactorbonusbonus.py
+++ b/eos/effects/scriptspeedfactorbonusbonus.py
@@ -1,7 +1,7 @@
 # scriptSpeedFactorBonusBonus
 #
 # Used by:
-# Charge: Focused Warp Disruption Script
+# Charges from group: Warp Disruption Script (2 of 2)
 type = "passive"
 runTime = "early"
 
diff --git a/eos/effects/scriptwarpdisruptionfieldgeneratorsetdisallowinempirespace.py b/eos/effects/scriptwarpdisruptionfieldgeneratorsetdisallowinempirespace.py
index 4e9f29bd9..4c224a0ef 100644
--- a/eos/effects/scriptwarpdisruptionfieldgeneratorsetdisallowinempirespace.py
+++ b/eos/effects/scriptwarpdisruptionfieldgeneratorsetdisallowinempirespace.py
@@ -1,7 +1,7 @@
 # scriptWarpDisruptionFieldGeneratorSetDisallowInEmpireSpace
 #
 # Used by:
-# Charge: Focused Warp Disruption Script
+# Charges from group: Warp Disruption Script (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/scriptwarpscramblerangebonus.py b/eos/effects/scriptwarpscramblerangebonus.py
index adbcbc88e..cc253590b 100644
--- a/eos/effects/scriptwarpscramblerangebonus.py
+++ b/eos/effects/scriptwarpscramblerangebonus.py
@@ -1,7 +1,7 @@
 # scriptWarpScrambleRangeBonus
 #
 # Used by:
-# Charge: Focused Warp Disruption Script
+# Charges from group: Warp Disruption Script (2 of 2)
 type = "passive"
 
 
diff --git a/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py b/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py
index 9e2f091fe..d9209c608 100644
--- a/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py
+++ b/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py
@@ -3,7 +3,6 @@
 # Used by:
 # Implants named like: Zainou 'Gnome' Shield Management SM (6 of 6)
 # Modules named like: Core Defense Field Extender (8 of 8)
-# Modules named like: QA Multiship Module Players (4 of 4)
 # Implant: Genolution Core Augmentation CA-3
 # Implant: Sansha Modified 'Gnome' Implant
 # Skill: Shield Management
diff --git a/eos/effects/shipadvancedspaceshipcommandagilitybonus.py b/eos/effects/shipadvancedspaceshipcommandagilitybonus.py
index 725dfb43d..d7e58addf 100644
--- a/eos/effects/shipadvancedspaceshipcommandagilitybonus.py
+++ b/eos/effects/shipadvancedspaceshipcommandagilitybonus.py
@@ -1,7 +1,7 @@
 # shipAdvancedSpaceshipCommandAgilityBonus
 #
 # Used by:
-# Items from market group: Ships > Capital Ships (34 of 34)
+# Items from market group: Ships > Capital Ships (37 of 37)
 type = "passive"
 
 
diff --git a/eos/effects/shipbonusdreadnoughta1energywarfareamountbonus.py b/eos/effects/shipbonusdreadnoughta1energywarfareamountbonus.py
new file mode 100644
index 000000000..527eba0c2
--- /dev/null
+++ b/eos/effects/shipbonusdreadnoughta1energywarfareamountbonus.py
@@ -0,0 +1,8 @@
+# shipBonusDreadnoughtA1EnergyWarfareAmountBonus
+#
+# Used by:
+# Ship: Chemosh
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyNeutralizerAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughtm1webrangebonus.py b/eos/effects/shipbonusdreadnoughtm1webrangebonus.py
new file mode 100644
index 000000000..d258b3efc
--- /dev/null
+++ b/eos/effects/shipbonusdreadnoughtm1webrangebonus.py
@@ -0,0 +1,7 @@
+# shipBonusDreadnoughtM1WebRangeBonus
+#
+# Used by:
+# Ship: Chemosh
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")
diff --git a/eos/effects/shipbonusdreadnoughtm1webbonus.py b/eos/effects/shipbonusdreadnoughtm1webstrengthbonus.py
similarity index 87%
rename from eos/effects/shipbonusdreadnoughtm1webbonus.py
rename to eos/effects/shipbonusdreadnoughtm1webstrengthbonus.py
index 040ce5086..c822336ba 100644
--- a/eos/effects/shipbonusdreadnoughtm1webbonus.py
+++ b/eos/effects/shipbonusdreadnoughtm1webstrengthbonus.py
@@ -1,4 +1,4 @@
-# shipBonusDreadnoughtM1WebBonus
+# shipBonusDreadnoughtM1WebStrengthBonus
 #
 # Used by:
 # Ship: Vehement
diff --git a/eos/effects/shipbonusdronemwdboostrole.py b/eos/effects/shipbonusdronemwdboostrole.py
index 6b342b2b0..a9960c71a 100644
--- a/eos/effects/shipbonusdronemwdboostrole.py
+++ b/eos/effects/shipbonusdronemwdboostrole.py
@@ -8,4 +8,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxVelocity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "maxVelocity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonusforceauxiliarya1nosferatudrainamount.py b/eos/effects/shipbonusforceauxiliarya1nosferatudrainamount.py
new file mode 100644
index 000000000..9544149f1
--- /dev/null
+++ b/eos/effects/shipbonusforceauxiliarya1nosferatudrainamount.py
@@ -0,0 +1,7 @@
+# shipBonusForceAuxiliaryA1NosferatuDrainAmount
+#
+# Used by:
+# Ship: Dagon
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
diff --git a/eos/effects/shipbonusforceauxiliarya1nosferaturangebonus.py b/eos/effects/shipbonusforceauxiliarya1nosferaturangebonus.py
new file mode 100644
index 000000000..aabd0b7fb
--- /dev/null
+++ b/eos/effects/shipbonusforceauxiliarya1nosferaturangebonus.py
@@ -0,0 +1,8 @@
+# shipBonusForceAuxiliaryA1NosferatuRangeBonus
+#
+# Used by:
+# Ship: Dagon
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
diff --git a/eos/effects/shipbonusforceauxiliarym1remotearmorrepairduration.py b/eos/effects/shipbonusforceauxiliarym1remotearmorrepairduration.py
new file mode 100644
index 000000000..cec5a745e
--- /dev/null
+++ b/eos/effects/shipbonusforceauxiliarym1remotearmorrepairduration.py
@@ -0,0 +1,7 @@
+# shipBonusForceAuxiliaryM1RemoteArmorRepairDuration
+#
+# Used by:
+# Ship: Dagon
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1"), skill="Minmatar Carrier")
diff --git a/eos/effects/shipbonusforceauxiliarym1remotecycletime.py b/eos/effects/shipbonusforceauxiliarym1remoteduration.py
similarity index 94%
rename from eos/effects/shipbonusforceauxiliarym1remotecycletime.py
rename to eos/effects/shipbonusforceauxiliarym1remoteduration.py
index 9ab5ae04c..71d8d8e07 100644
--- a/eos/effects/shipbonusforceauxiliarym1remotecycletime.py
+++ b/eos/effects/shipbonusforceauxiliarym1remoteduration.py
@@ -1,4 +1,4 @@
-# shipBonusForceAuxiliaryM1RemoteCycleTime
+# shipBonusForceAuxiliaryM1RemoteDuration
 #
 # Used by:
 # Ship: Lif
diff --git a/eos/effects/shipbonusheavydronearmorhppiratefaction.py b/eos/effects/shipbonusheavydronearmorhppiratefaction.py
index c5dc193ab..369005a2d 100644
--- a/eos/effects/shipbonusheavydronearmorhppiratefaction.py
+++ b/eos/effects/shipbonusheavydronearmorhppiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py b/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py
index b1a03b0f4..6682948a8 100644
--- a/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py
+++ b/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonusheavydronehppiratefaction.py b/eos/effects/shipbonusheavydronehppiratefaction.py
index 58a3c7eb4..9c12a7101 100644
--- a/eos/effects/shipbonusheavydronehppiratefaction.py
+++ b/eos/effects/shipbonusheavydronehppiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonusheavydroneshieldhppiratefaction.py b/eos/effects/shipbonusheavydroneshieldhppiratefaction.py
index 60d10086f..f2575bf91 100644
--- a/eos/effects/shipbonusheavydroneshieldhppiratefaction.py
+++ b/eos/effects/shipbonusheavydroneshieldhppiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonushybridtrackinggf2.py b/eos/effects/shipbonushybridtrackinggf2.py
index dabf163d6..77b58a6d6 100644
--- a/eos/effects/shipbonushybridtrackinggf2.py
+++ b/eos/effects/shipbonushybridtrackinggf2.py
@@ -3,6 +3,7 @@
 # Used by:
 # Ship: Ares
 # Ship: Federation Navy Comet
+# Ship: Pacifier
 # Ship: Tristan
 type = "passive"
 
diff --git a/eos/effects/shipbonusletoptimalrangepiratefaction.py b/eos/effects/shipbonusletoptimalrangepiratefaction.py
index d2f044b5f..680c7ef2d 100644
--- a/eos/effects/shipbonusletoptimalrangepiratefaction.py
+++ b/eos/effects/shipbonusletoptimalrangepiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonuslightdronearmorhppiratefaction.py b/eos/effects/shipbonuslightdronearmorhppiratefaction.py
index aaefc8119..7f4706023 100644
--- a/eos/effects/shipbonuslightdronearmorhppiratefaction.py
+++ b/eos/effects/shipbonuslightdronearmorhppiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py b/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py
index e5a9b340c..75451999c 100644
--- a/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py
+++ b/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonuslightdronehppiratefaction.py b/eos/effects/shipbonuslightdronehppiratefaction.py
index af6b5dae4..2511b9736 100644
--- a/eos/effects/shipbonuslightdronehppiratefaction.py
+++ b/eos/effects/shipbonuslightdronehppiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonuslightdroneshieldhppiratefaction.py b/eos/effects/shipbonuslightdroneshieldhppiratefaction.py
index 8bbff53f2..0e7b7b147 100644
--- a/eos/effects/shipbonuslightdroneshieldhppiratefaction.py
+++ b/eos/effects/shipbonuslightdroneshieldhppiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonusmediumdronearmorhppiratefaction.py b/eos/effects/shipbonusmediumdronearmorhppiratefaction.py
index e48c99319..2d5373b43 100644
--- a/eos/effects/shipbonusmediumdronearmorhppiratefaction.py
+++ b/eos/effects/shipbonusmediumdronearmorhppiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py b/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py
index 6adbcb51b..627698037 100644
--- a/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py
+++ b/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonusmediumdronehppiratefaction.py b/eos/effects/shipbonusmediumdronehppiratefaction.py
index 287bd32ad..3a41ee95c 100644
--- a/eos/effects/shipbonusmediumdronehppiratefaction.py
+++ b/eos/effects/shipbonusmediumdronehppiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py b/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py
index eb68ee3fb..593009a33 100644
--- a/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py
+++ b/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonusmediumenergyturretdamagepiratefaction.py b/eos/effects/shipbonusmediumenergyturretdamagepiratefaction.py
index 428e548a0..8e3662ced 100644
--- a/eos/effects/shipbonusmediumenergyturretdamagepiratefaction.py
+++ b/eos/effects/shipbonusmediumenergyturretdamagepiratefaction.py
@@ -10,4 +10,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonusmedmissileflighttimecc2.py b/eos/effects/shipbonusmedmissileflighttimecc2.py
new file mode 100644
index 000000000..7bf6a461f
--- /dev/null
+++ b/eos/effects/shipbonusmedmissileflighttimecc2.py
@@ -0,0 +1,8 @@
+# shipBonusMedMissileFlightTimeCC2
+#
+# Used by:
+# Ship: Enforcer
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "explosionDelay", src.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), "explosionDelay", src.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/shipbonusmetoptimalac2.py b/eos/effects/shipbonusmetoptimalac2.py
index 50d9ce4a4..758ede0d7 100644
--- a/eos/effects/shipbonusmetoptimalac2.py
+++ b/eos/effects/shipbonusmetoptimalac2.py
@@ -1,6 +1,7 @@
 # shipBonusMETOptimalAC2
 #
 # Used by:
+# Ship: Enforcer
 # Ship: Omen Navy Issue
 type = "passive"
 
diff --git a/eos/effects/shipbonusmetoptimalrangepiratefaction.py b/eos/effects/shipbonusmetoptimalrangepiratefaction.py
index 5380edc07..10451c94f 100644
--- a/eos/effects/shipbonusmetoptimalrangepiratefaction.py
+++ b/eos/effects/shipbonusmetoptimalrangepiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonuspiratefrigateprojdamage.py b/eos/effects/shipbonuspiratefrigateprojdamage.py
index 406b847e9..e3710e611 100644
--- a/eos/effects/shipbonuspiratefrigateprojdamage.py
+++ b/eos/effects/shipbonuspiratefrigateprojdamage.py
@@ -10,4 +10,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonuspiratesmallhybriddmg.py b/eos/effects/shipbonuspiratesmallhybriddmg.py
index 596934d24..a9a7fb9eb 100644
--- a/eos/effects/shipbonuspiratesmallhybriddmg.py
+++ b/eos/effects/shipbonuspiratesmallhybriddmg.py
@@ -9,4 +9,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonusremoterepairamountpiratefaction.py b/eos/effects/shipbonusremoterepairamountpiratefaction.py
index f8152a605..3ac0e69fb 100644
--- a/eos/effects/shipbonusremoterepairamountpiratefaction.py
+++ b/eos/effects/shipbonusremoterepairamountpiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonusdreadnoughtrole1damagebonus.py b/eos/effects/shipbonusrole1capitalhybriddamagebonus.py
similarity index 87%
rename from eos/effects/shipbonusdreadnoughtrole1damagebonus.py
rename to eos/effects/shipbonusrole1capitalhybriddamagebonus.py
index 0cba1617a..4144b30b4 100644
--- a/eos/effects/shipbonusdreadnoughtrole1damagebonus.py
+++ b/eos/effects/shipbonusrole1capitalhybriddamagebonus.py
@@ -1,4 +1,4 @@
-# shipBonusDreadnoughtRole1DamageBonus
+# shipBonusRole1CapitalHybridDamageBonus
 #
 # Used by:
 # Ship: Vehement
diff --git a/eos/effects/shipbonusforceauxiliaryrole1cpubonus.py b/eos/effects/shipbonusrole1commandburstcpubonus.py
similarity index 73%
rename from eos/effects/shipbonusforceauxiliaryrole1cpubonus.py
rename to eos/effects/shipbonusrole1commandburstcpubonus.py
index cda897b72..1959f3821 100644
--- a/eos/effects/shipbonusforceauxiliaryrole1cpubonus.py
+++ b/eos/effects/shipbonusrole1commandburstcpubonus.py
@@ -1,7 +1,7 @@
-# shipBonusForceAuxiliaryRole1CPUBonus
+# shipBonusRole1CommandBurstCPUBonus
 #
 # Used by:
-# Ships from group: Force Auxiliary (4 of 4)
+# Ships from group: Force Auxiliary (5 of 5)
 type = "passive"
 
 
diff --git a/eos/effects/shipbonustitanrole1numwarfarelinks.py b/eos/effects/shipbonusrole1numwarfarelinks.py
similarity index 77%
rename from eos/effects/shipbonustitanrole1numwarfarelinks.py
rename to eos/effects/shipbonusrole1numwarfarelinks.py
index 67a017e32..23ca99188 100644
--- a/eos/effects/shipbonustitanrole1numwarfarelinks.py
+++ b/eos/effects/shipbonusrole1numwarfarelinks.py
@@ -1,7 +1,7 @@
-# shipBonusTitanRole1NumWarfareLinks
+# shipBonusRole1NumWarfareLinks
 #
 # Used by:
-# Ships from group: Titan (5 of 5)
+# Ships from group: Titan (6 of 6)
 type = "passive"
 
 
diff --git a/eos/effects/shipbonustitanrole2armorshieldmodulebonus.py b/eos/effects/shipbonusrole2armorplatesshieldextendersbonus.py
similarity index 83%
rename from eos/effects/shipbonustitanrole2armorshieldmodulebonus.py
rename to eos/effects/shipbonusrole2armorplatesshieldextendersbonus.py
index a964d0635..5711fd4e4 100644
--- a/eos/effects/shipbonustitanrole2armorshieldmodulebonus.py
+++ b/eos/effects/shipbonusrole2armorplatesshieldextendersbonus.py
@@ -1,7 +1,7 @@
-# shipBonusTitanRole2ArmorShieldModuleBonus
+# shipBonusRole2ArmorPlates&ShieldExtendersBonus
 #
 # Used by:
-# Ships from group: Titan (5 of 5)
+# Ships from group: Titan (6 of 6)
 type = "passive"
 
 
diff --git a/eos/effects/shipbonusforceauxiliaryrole2logisticdronebonus.py b/eos/effects/shipbonusrole2logisticdronebonus.py
similarity index 87%
rename from eos/effects/shipbonusforceauxiliaryrole2logisticdronebonus.py
rename to eos/effects/shipbonusrole2logisticdronebonus.py
index 53bb50f5f..7bd585081 100644
--- a/eos/effects/shipbonusforceauxiliaryrole2logisticdronebonus.py
+++ b/eos/effects/shipbonusrole2logisticdronebonus.py
@@ -1,7 +1,7 @@
-# shipBonusForceAuxiliaryRole2LogisticDroneBonus
+# shipBonusRole2LogisticDroneBonus
 #
 # Used by:
-# Ships from group: Force Auxiliary (4 of 4)
+# Ships from group: Force Auxiliary (5 of 5)
 type = "passive"
 
 
diff --git a/eos/effects/shipbonusrole3capitalenergydamagebonus.py b/eos/effects/shipbonusrole3capitalenergydamagebonus.py
new file mode 100644
index 000000000..2baf7a3cf
--- /dev/null
+++ b/eos/effects/shipbonusrole3capitalenergydamagebonus.py
@@ -0,0 +1,8 @@
+# shipBonusRole3CapitalEnergyDamageBonus
+#
+# Used by:
+# Ship: Chemosh
+# Ship: Molok
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/shipbonustitanrole3damagebonus.py b/eos/effects/shipbonusrole3capitalhybriddamagebonus.py
similarity index 87%
rename from eos/effects/shipbonustitanrole3damagebonus.py
rename to eos/effects/shipbonusrole3capitalhybriddamagebonus.py
index 1bb3e16a6..c79148d3e 100644
--- a/eos/effects/shipbonustitanrole3damagebonus.py
+++ b/eos/effects/shipbonusrole3capitalhybriddamagebonus.py
@@ -1,4 +1,4 @@
-# shipBonusTitanRole3DamageBonus
+# shipBonusRole3CapitalHybridDamageBonus
 #
 # Used by:
 # Ship: Vanquisher
diff --git a/eos/effects/shipbonusforceauxiliaryrole3numwarfarelinks.py b/eos/effects/shipbonusrole3numwarfarelinks.py
similarity index 73%
rename from eos/effects/shipbonusforceauxiliaryrole3numwarfarelinks.py
rename to eos/effects/shipbonusrole3numwarfarelinks.py
index 69a19a64b..28f769880 100644
--- a/eos/effects/shipbonusforceauxiliaryrole3numwarfarelinks.py
+++ b/eos/effects/shipbonusrole3numwarfarelinks.py
@@ -1,7 +1,7 @@
-# shipBonusForceAuxiliaryRole3NumWarfareLinks
+# shipBonusRole3NumWarfareLinks
 #
 # Used by:
-# Ships from group: Force Auxiliary (4 of 4)
+# Ships from group: Force Auxiliary (5 of 5)
 type = "passive"
 
 
diff --git a/eos/effects/shipbonusrole4nosferatucpubonus.py b/eos/effects/shipbonusrole4nosferatucpubonus.py
new file mode 100644
index 000000000..1d4de3a3b
--- /dev/null
+++ b/eos/effects/shipbonusrole4nosferatucpubonus.py
@@ -0,0 +1,8 @@
+# shipBonusRole4NosferatuCPUBonus
+#
+# Used by:
+# Ship: Dagon
+# Ship: Rabisu
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "cpu", src.getModifiedItemAttr("shipBonusRole4"))
diff --git a/eos/effects/shipbonusrole5capitalremotearmorrepairpowergridbonus.py b/eos/effects/shipbonusrole5capitalremotearmorrepairpowergridbonus.py
new file mode 100644
index 000000000..89c87168b
--- /dev/null
+++ b/eos/effects/shipbonusrole5capitalremotearmorrepairpowergridbonus.py
@@ -0,0 +1,7 @@
+# shipBonusRole5CapitalRemoteArmorRepairPowergridBonus
+#
+# Used by:
+# Ship: Dagon
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "power", src.getModifiedItemAttr("shipBonusRole5"))
diff --git a/eos/effects/remotearmorpowerneedbonuseffect.py b/eos/effects/shipbonusrole5remotearmorrepairpowergridbonus.py
similarity index 63%
rename from eos/effects/remotearmorpowerneedbonuseffect.py
rename to eos/effects/shipbonusrole5remotearmorrepairpowergridbonus.py
index f8f7b1661..3f764d908 100644
--- a/eos/effects/remotearmorpowerneedbonuseffect.py
+++ b/eos/effects/shipbonusrole5remotearmorrepairpowergridbonus.py
@@ -1,4 +1,4 @@
-# remoteArmorPowerNeedBonusEffect
+# shipBonusRole5RemoteArmorRepairPowergridBonus
 #
 # Used by:
 # Ships from group: Logistics (3 of 6)
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "power",
-                                  src.getModifiedItemAttr("remoteArmorPowerNeedBonus"))
+                                  src.getModifiedItemAttr("shipBonusRole5"))
diff --git a/eos/effects/shipbonussentrydronearmorhppiratefaction.py b/eos/effects/shipbonussentrydronearmorhppiratefaction.py
index b2cf85c49..a1f49486f 100644
--- a/eos/effects/shipbonussentrydronearmorhppiratefaction.py
+++ b/eos/effects/shipbonussentrydronearmorhppiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py b/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py
index 27da3b576..f218f02ed 100644
--- a/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py
+++ b/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonussentrydronehppiratefaction.py b/eos/effects/shipbonussentrydronehppiratefaction.py
index 0399ccfc8..fab5592b9 100644
--- a/eos/effects/shipbonussentrydronehppiratefaction.py
+++ b/eos/effects/shipbonussentrydronehppiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonussentrydroneshieldhppiratefaction.py b/eos/effects/shipbonussentrydroneshieldhppiratefaction.py
index d69820fca..42db4065f 100644
--- a/eos/effects/shipbonussentrydroneshieldhppiratefaction.py
+++ b/eos/effects/shipbonussentrydroneshieldhppiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonussmallenergyturretdamagepiratefaction.py b/eos/effects/shipbonussmallenergyturretdamagepiratefaction.py
index 76eedd0b3..f4b2ccfca 100644
--- a/eos/effects/shipbonussmallenergyturretdamagepiratefaction.py
+++ b/eos/effects/shipbonussmallenergyturretdamagepiratefaction.py
@@ -12,4 +12,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipbonussmallmissileflighttimecf1.py b/eos/effects/shipbonussmallmissileflighttimecf1.py
new file mode 100644
index 000000000..2f755750c
--- /dev/null
+++ b/eos/effects/shipbonussmallmissileflighttimecf1.py
@@ -0,0 +1,8 @@
+# shipBonusSmallMissileFlightTimeCF1
+#
+# Used by:
+# Ship: Pacifier
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "explosionDelay", src.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), "explosionDelay", src.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/shipmissilespeedbonuscf.py b/eos/effects/shipbonussmallmissilerofcf2.py
similarity index 86%
rename from eos/effects/shipmissilespeedbonuscf.py
rename to eos/effects/shipbonussmallmissilerofcf2.py
index c73d8a7db..9849ecc4b 100644
--- a/eos/effects/shipmissilespeedbonuscf.py
+++ b/eos/effects/shipbonussmallmissilerofcf2.py
@@ -1,8 +1,9 @@
-# shipMissileSpeedBonusCF
+# shipBonusSmallMissileRoFCF2
 #
 # Used by:
 # Ship: Buzzard
 # Ship: Hawk
+# Ship: Pacifier
 type = "passive"
 
 
diff --git a/eos/effects/shipbonussptfalloffmf2.py b/eos/effects/shipbonussptfalloffmf2.py
index 9ec05f2c4..abc07cbca 100644
--- a/eos/effects/shipbonussptfalloffmf2.py
+++ b/eos/effects/shipbonussptfalloffmf2.py
@@ -1,6 +1,7 @@
 # shipBonusSPTFalloffMF2
 #
 # Used by:
+# Ship: Pacifier
 # Ship: Rifter
 type = "passive"
 
diff --git a/eos/effects/shipbonussptrofmf.py b/eos/effects/shipbonussptrofmf.py
new file mode 100644
index 000000000..6b226c3bf
--- /dev/null
+++ b/eos/effects/shipbonussptrofmf.py
@@ -0,0 +1,7 @@
+# shipBonusSPTRoFMF
+#
+# Used by:
+# Ship: Pacifier
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), "speed", src.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py b/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py
index 47e1b063b..08f67f3ab 100644
--- a/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py
+++ b/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py
@@ -1,7 +1,7 @@
 # shipBonusSurveyProbeExplosionDelaySkillSurveyCovertOps3
 #
 # Used by:
-# Ships from group: Covert Ops (4 of 6)
+# Ships from group: Covert Ops (5 of 7)
 type = "passive"
 
 
diff --git a/eos/effects/shipbonustitana1energywarfareamountbonus.py b/eos/effects/shipbonustitana1energywarfareamountbonus.py
new file mode 100644
index 000000000..c61632b44
--- /dev/null
+++ b/eos/effects/shipbonustitana1energywarfareamountbonus.py
@@ -0,0 +1,8 @@
+# shipBonusTitanA1EnergyWarfareAmountBonus
+#
+# Used by:
+# Ship: Molok
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyNeutralizerAmount", src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")
diff --git a/eos/effects/shipbonustitana3warpstrength.py b/eos/effects/shipbonustitana3warpstrength.py
index c7c5bfca5..e5fee5ffc 100644
--- a/eos/effects/shipbonustitana3warpstrength.py
+++ b/eos/effects/shipbonustitana3warpstrength.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Avatar
+# Ship: Molok
 type = "passive"
 
 
diff --git a/eos/effects/shipbonustitanm1webrangebonus.py b/eos/effects/shipbonustitanm1webrangebonus.py
new file mode 100644
index 000000000..0fd26a1b7
--- /dev/null
+++ b/eos/effects/shipbonustitanm1webrangebonus.py
@@ -0,0 +1,7 @@
+# shipBonusTitanM1WebRangeBonus
+#
+# Used by:
+# Ship: Molok
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")
diff --git a/eos/effects/shipbonustitanm1webbonus.py b/eos/effects/shipbonustitanm1webstrengthbonus.py
similarity index 89%
rename from eos/effects/shipbonustitanm1webbonus.py
rename to eos/effects/shipbonustitanm1webstrengthbonus.py
index 6abfca9dd..54ba011c7 100644
--- a/eos/effects/shipbonustitanm1webbonus.py
+++ b/eos/effects/shipbonustitanm1webstrengthbonus.py
@@ -1,4 +1,4 @@
-# shipBonusTitanM1WebBonus
+# shipBonusTitanM1WebStrengthBonus
 #
 # Used by:
 # Ship: Vanquisher
diff --git a/eos/effects/shipbonustitanm3warpstrength.py b/eos/effects/shipbonustitanm3warpstrength.py
index de59fc61e..7fba2f0da 100644
--- a/eos/effects/shipbonustitanm3warpstrength.py
+++ b/eos/effects/shipbonustitanm3warpstrength.py
@@ -1,8 +1,7 @@
 # shipBonusTitanM3WarpStrength
 #
 # Used by:
-# Ship: Ragnarok
-# Ship: Vanquisher
+# Ships from group: Titan (3 of 6)
 type = "passive"
 
 
diff --git a/eos/effects/shipcapitalagilitybonus.py b/eos/effects/shipcapitalagilitybonus.py
index 71c8e0ca4..4313eb4b4 100644
--- a/eos/effects/shipcapitalagilitybonus.py
+++ b/eos/effects/shipcapitalagilitybonus.py
@@ -1,12 +1,7 @@
 # shipCapitalAgilityBonus
 #
 # Used by:
-# Ships from group: Carrier (4 of 4)
-# Ships from group: Dreadnought (5 of 5)
-# Ships from group: Force Auxiliary (4 of 4)
-# Ships from group: Supercarrier (6 of 6)
-# Ships from group: Titan (5 of 5)
-# Ship: Rorqual
+# Items from market group: Ships > Capital Ships (28 of 37)
 type = "passive"
 
 
diff --git a/eos/effects/shipetdamageaf.py b/eos/effects/shipetdamageaf.py
index bc11bd6b9..939e163fa 100644
--- a/eos/effects/shipetdamageaf.py
+++ b/eos/effects/shipetdamageaf.py
@@ -4,6 +4,7 @@
 # Ship: Crucifier Navy Issue
 # Ship: Crusader
 # Ship: Imperial Navy Slicer
+# Ship: Pacifier
 type = "passive"
 
 
diff --git a/eos/effects/shipetoptimalrange2af.py b/eos/effects/shipetoptimalrange2af.py
index 49602fd47..99b829ab7 100644
--- a/eos/effects/shipetoptimalrange2af.py
+++ b/eos/effects/shipetoptimalrange2af.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Imperial Navy Slicer
+# Ship: Pacifier
 type = "passive"
 
 
diff --git a/eos/effects/shipheavyassaultmissileemdmgpiratecruiser.py b/eos/effects/shipheavyassaultmissileemdmgpiratecruiser.py
index 50aecade1..4aff9d4a1 100644
--- a/eos/effects/shipheavyassaultmissileemdmgpiratecruiser.py
+++ b/eos/effects/shipheavyassaultmissileemdmgpiratecruiser.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                    "emDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipheavyassaultmissileexpdmgpiratecruiser.py b/eos/effects/shipheavyassaultmissileexpdmgpiratecruiser.py
index 089ec066b..be21d8f51 100644
--- a/eos/effects/shipheavyassaultmissileexpdmgpiratecruiser.py
+++ b/eos/effects/shipheavyassaultmissileexpdmgpiratecruiser.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipheavyassaultmissilekindmgpiratecruiser.py b/eos/effects/shipheavyassaultmissilekindmgpiratecruiser.py
index 81706525a..bbc9b2a43 100644
--- a/eos/effects/shipheavyassaultmissilekindmgpiratecruiser.py
+++ b/eos/effects/shipheavyassaultmissilekindmgpiratecruiser.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipheavyassaultmissilethermdmgpiratecruiser.py b/eos/effects/shipheavyassaultmissilethermdmgpiratecruiser.py
index 15d354e63..928d0a52c 100644
--- a/eos/effects/shipheavyassaultmissilethermdmgpiratecruiser.py
+++ b/eos/effects/shipheavyassaultmissilethermdmgpiratecruiser.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipheavymissileemdmgpiratecruiser.py b/eos/effects/shipheavymissileemdmgpiratecruiser.py
index 567d8a110..2b3003818 100644
--- a/eos/effects/shipheavymissileemdmgpiratecruiser.py
+++ b/eos/effects/shipheavymissileemdmgpiratecruiser.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                    "emDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipheavymissileexpdmgpiratecruiser.py b/eos/effects/shipheavymissileexpdmgpiratecruiser.py
index b2f3179cb..73ca9bf7f 100644
--- a/eos/effects/shipheavymissileexpdmgpiratecruiser.py
+++ b/eos/effects/shipheavymissileexpdmgpiratecruiser.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipheavymissilekindmgpiratecruiser.py b/eos/effects/shipheavymissilekindmgpiratecruiser.py
index 0d3543ddd..e1efd07ec 100644
--- a/eos/effects/shipheavymissilekindmgpiratecruiser.py
+++ b/eos/effects/shipheavymissilekindmgpiratecruiser.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipheavymissilethermdmgpiratecruiser.py b/eos/effects/shipheavymissilethermdmgpiratecruiser.py
index f50b05771..28990be6a 100644
--- a/eos/effects/shipheavymissilethermdmgpiratecruiser.py
+++ b/eos/effects/shipheavymissilethermdmgpiratecruiser.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shiphtdmgbonusfixedgc.py b/eos/effects/shiphtdmgbonusfixedgc.py
index 39ebd7b33..e6dfd16a2 100644
--- a/eos/effects/shiphtdmgbonusfixedgc.py
+++ b/eos/effects/shiphtdmgbonusfixedgc.py
@@ -4,6 +4,7 @@
 # Ship: Adrestia
 # Ship: Arazu
 # Ship: Deimos
+# Ship: Enforcer
 # Ship: Exequror Navy Issue
 # Ship: Guardian-Vexor
 # Ship: Thorax
diff --git a/eos/effects/shiphybriddmgpiratebattleship.py b/eos/effects/shiphybriddmgpiratebattleship.py
index dd959b187..417ed58aa 100644
--- a/eos/effects/shiphybriddmgpiratebattleship.py
+++ b/eos/effects/shiphybriddmgpiratebattleship.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shiphybriddmgpiratecruiser.py b/eos/effects/shiphybriddmgpiratecruiser.py
index b0987b4b4..7d01b20c6 100644
--- a/eos/effects/shiphybriddmgpiratecruiser.py
+++ b/eos/effects/shiphybriddmgpiratecruiser.py
@@ -8,4 +8,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shiphybridtrackinggc2.py b/eos/effects/shiphybridtrackinggc2.py
index 5f2eac55a..4169cca0d 100644
--- a/eos/effects/shiphybridtrackinggc2.py
+++ b/eos/effects/shiphybridtrackinggc2.py
@@ -1,6 +1,7 @@
 # shipHybridTrackingGC2
 #
 # Used by:
+# Ship: Enforcer
 # Ship: Thorax
 type = "passive"
 
diff --git a/eos/effects/shiplaserdamagepiratebattleship.py b/eos/effects/shiplaserdamagepiratebattleship.py
index 7625b2383..ff1e9558a 100644
--- a/eos/effects/shiplaserdamagepiratebattleship.py
+++ b/eos/effects/shiplaserdamagepiratebattleship.py
@@ -8,4 +8,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipmetcdamagebonusac.py b/eos/effects/shipmetcdamagebonusac.py
index 485d71457..8cdb47763 100644
--- a/eos/effects/shipmetcdamagebonusac.py
+++ b/eos/effects/shipmetcdamagebonusac.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Augoror Navy Issue
+# Ship: Enforcer
 # Ship: Maller
 # Ship: Omen Navy Issue
 type = "passive"
diff --git a/eos/effects/shipmissilerofcc.py b/eos/effects/shipmissilerofcc.py
index 785726f9c..bda638ace 100644
--- a/eos/effects/shipmissilerofcc.py
+++ b/eos/effects/shipmissilerofcc.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ships named like: Caracal (2 of 2)
+# Ship: Enforcer
 type = "passive"
 
 
diff --git a/eos/effects/shipmissilevelocitypiratefactionfrigate.py b/eos/effects/shipmissilevelocitypiratefactionfrigate.py
index 4e4e03685..16c3df09c 100644
--- a/eos/effects/shipmissilevelocitypiratefactionfrigate.py
+++ b/eos/effects/shipmissilevelocitypiratefactionfrigate.py
@@ -9,4 +9,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipmissilevelocitypiratefactionlight.py b/eos/effects/shipmissilevelocitypiratefactionlight.py
index ece99d75b..1cea02ec3 100644
--- a/eos/effects/shipmissilevelocitypiratefactionlight.py
+++ b/eos/effects/shipmissilevelocitypiratefactionlight.py
@@ -8,4 +8,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipmissilevelocitypiratefactionrocket.py b/eos/effects/shipmissilevelocitypiratefactionrocket.py
index 23cf6f34b..cc6e55c5d 100644
--- a/eos/effects/shipmissilevelocitypiratefactionrocket.py
+++ b/eos/effects/shipmissilevelocitypiratefactionrocket.py
@@ -8,4 +8,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipprojectiledmgpiratecruiser.py b/eos/effects/shipprojectiledmgpiratecruiser.py
index 6753262b9..f8c60bd63 100644
--- a/eos/effects/shipprojectiledmgpiratecruiser.py
+++ b/eos/effects/shipprojectiledmgpiratecruiser.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipprojectilerofpiratebattleship.py b/eos/effects/shipprojectilerofpiratebattleship.py
index dac3c2544..9b0a7168f 100644
--- a/eos/effects/shipprojectilerofpiratebattleship.py
+++ b/eos/effects/shipprojectilerofpiratebattleship.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "speed", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipprojectilerofpiratecruiser.py b/eos/effects/shipprojectilerofpiratecruiser.py
index fae33e206..25a500674 100644
--- a/eos/effects/shipprojectilerofpiratecruiser.py
+++ b/eos/effects/shipprojectilerofpiratecruiser.py
@@ -8,4 +8,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "speed", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shippturretfalloffbonusmc2.py b/eos/effects/shippturretfalloffbonusmc2.py
index b47f36f1d..85f4a70f8 100644
--- a/eos/effects/shippturretfalloffbonusmc2.py
+++ b/eos/effects/shippturretfalloffbonusmc2.py
@@ -1,6 +1,7 @@
 # shipPTurretFalloffBonusMC2
 #
 # Used by:
+# Ship: Enforcer
 # Ship: Stabber
 type = "passive"
 
diff --git a/eos/effects/shippturretspeedbonusmc.py b/eos/effects/shippturretspeedbonusmc.py
index 713a2b7de..1f360a87a 100644
--- a/eos/effects/shippturretspeedbonusmc.py
+++ b/eos/effects/shippturretspeedbonusmc.py
@@ -3,6 +3,7 @@
 # Used by:
 # Variations of ship: Rupture (3 of 3)
 # Variations of ship: Stabber (3 of 3)
+# Ship: Enforcer
 # Ship: Huginn
 # Ship: Scythe Fleet Issue
 type = "passive"
diff --git a/eos/effects/shipscanprobestrengthbonuspiratefaction.py b/eos/effects/shipscanprobestrengthbonuspiratefaction.py
index c5146f252..26ccc7c2c 100644
--- a/eos/effects/shipscanprobestrengthbonuspiratefaction.py
+++ b/eos/effects/shipscanprobestrengthbonuspiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipshtdmgbonusgf.py b/eos/effects/shipshtdmgbonusgf.py
index 3162880ba..d99426da0 100644
--- a/eos/effects/shipshtdmgbonusgf.py
+++ b/eos/effects/shipshtdmgbonusgf.py
@@ -5,6 +5,7 @@
 # Ship: Atron
 # Ship: Federation Navy Comet
 # Ship: Helios
+# Ship: Pacifier
 # Ship: Taranis
 type = "passive"
 
diff --git a/eos/effects/shipsmallmissiledmgpiratefaction.py b/eos/effects/shipsmallmissiledmgpiratefaction.py
index db9e10202..3a21076cc 100644
--- a/eos/effects/shipsmallmissiledmgpiratefaction.py
+++ b/eos/effects/shipsmallmissiledmgpiratefaction.py
@@ -10,4 +10,4 @@ def handler(fit, ship, context):
     for damageType in ("em", "explosive", "kinetic", "thermal"):
         fit.modules.filteredChargeBoost(
             lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-            "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusPirateFaction"))
+            "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/shipxlprojectiledamagerole.py b/eos/effects/shipxlprojectiledamagerole.py
index 62f670f18..eaa09058e 100644
--- a/eos/effects/shipxlprojectiledamagerole.py
+++ b/eos/effects/shipxlprojectiledamagerole.py
@@ -4,4 +4,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eve.db b/eve.db
index f0717cc7c..f48a57a45 100644
Binary files a/eve.db and b/eve.db differ