diff --git a/eos/effects/commandburstaoerolebonus.py b/eos/effects/commandburstaoerolebonus.py
index 752846300..3d8b9430d 100644
--- a/eos/effects/commandburstaoerolebonus.py
+++ b/eos/effects/commandburstaoerolebonus.py
@@ -1,17 +1,3 @@
-# Command Burst AOE Bonus
-#
-# Used by:
-# Orca
 type = "passive"
-
-
-#  TODO: this isn't applying correctly :(
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in
-                                              (
-                                                  "Command Burst",
-                                              ),
-                                  "maxRange",
-                                  src.getModifiedItemAttr("roleBonusCommandBurstAoERange"),
-                                  )
-#  TODO: test
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "maxRange", src.getModifiedItemAttr("roleBonusCommandBurstAoERange"), stackingPenalties=True)
diff --git a/eos/effects/elitebonuscommanddestroyersiege1.py b/eos/effects/elitebonuscommanddestroyershield1.py
similarity index 100%
rename from eos/effects/elitebonuscommanddestroyersiege1.py
rename to eos/effects/elitebonuscommanddestroyershield1.py
diff --git a/eos/effects/zcolinorcacargobonus.py b/eos/effects/zcolinorcacargobonus.py
index f513bb0ee..bd0f45aac 100644
--- a/eos/effects/zcolinorcacargobonus.py
+++ b/eos/effects/zcolinorcacargobonus.py
@@ -4,7 +4,5 @@
 # Ship: Orca
 type = "passive"
 
-
 def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipOrcaCargoBonusOrca1"),
-                           skill="Industrial Command Ships")
+    pass
diff --git a/eos/effects/zcolinorcaforemanmodbonus.py b/eos/effects/zcolinorcaforemanmodbonus.py
index 28db599f6..8d19848fc 100644
--- a/eos/effects/zcolinorcaforemanmodbonus.py
+++ b/eos/effects/zcolinorcaforemanmodbonus.py
@@ -6,6 +6,4 @@ type = "passive"
 
 
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Director"),
-                                  "commandBonus", ship.getModifiedItemAttr("shipOrcaForemanBonus"),
-                                  skill="Industrial Command Ships")
+    pass