diff --git a/eos/effects/cloaking.py b/eos/effects/cloaking.py
index 258dbc555..cb53716b2 100644
--- a/eos/effects/cloaking.py
+++ b/eos/effects/cloaking.py
@@ -13,4 +13,4 @@ def handler(fit, module, context):
     # Doesn't apply to covops cloaks
     fit.extraAttributes["cloaked"] = True
     # Apply speed penalty
-    fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityBonus"))
+    fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityModifier"))
diff --git a/eos/effects/cloakingprototype.py b/eos/effects/cloakingprototype.py
index 64993f9bb..48c480b67 100644
--- a/eos/effects/cloakingprototype.py
+++ b/eos/effects/cloakingprototype.py
@@ -13,4 +13,4 @@ def handler(fit, module, context):
     # Doesn't apply to covops cloaks
     fit.extraAttributes["cloaked"] = True
     # Apply speed penalty
-    fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityBonus"))
+    fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityModifier"))
diff --git a/eos/effects/ignorecloakvelocitypenalty.py b/eos/effects/ignorecloakvelocitypenalty.py
index 5fe1b1f10..4ddfb60b1 100644
--- a/eos/effects/ignorecloakvelocitypenalty.py
+++ b/eos/effects/ignorecloakvelocitypenalty.py
@@ -8,4 +8,4 @@ runTime = "early"
 
 def handler(fit, src, context):
     fit.modules.filteredItemForce(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "maxVelocityBonus", src.getModifiedItemAttr("velocityPenaltyReduction"))
+                                  "maxVelocityModifier", src.getModifiedItemAttr("velocityPenaltyReduction"))
diff --git a/eos/effects/industrialbonusdronedamage.py b/eos/effects/industrialbonusdronedamage.py
index 3abb92368..7a03c9ccd 100644
--- a/eos/effects/industrialbonusdronedamage.py
+++ b/eos/effects/industrialbonusdronedamage.py
@@ -4,11 +4,8 @@
 # Orca
 type = "passive"
 
-
 def handler(fit, src, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
                                  "damageMultiplier",
-                                 src.getModifiedItemAttr("industrialBonusDroneDamage"),
-                                 )
+                                 src.getModifiedItemAttr("industrialBonusDroneDamage"), stackingPenalties = True)
 
-#  TODO: test
diff --git a/eos/effects/miningdronespecbonus.py b/eos/effects/miningdronespecbonus.py
index 4ab7e9b58..d4a463df2 100644
--- a/eos/effects/miningdronespecbonus.py
+++ b/eos/effects/miningdronespecbonus.py
@@ -1,5 +1,5 @@
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Mining Drone Specialization"), "maxVelocity", src.getModifiedItemAttr("maxVelocityBonus") * lvl)
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Mining Drone Specialization"), "miningAmount", src.getModifiedItemAttr("miningAmountBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Mining Drone Specialization"), "maxVelocity", src.getModifiedItemAttr("maxVelocityBonus") * lvl)
diff --git a/eos/effects/modifymaxvelocityofshippassive.py b/eos/effects/modifymaxvelocityofshippassive.py
index 02ef1fc35..24e833fb3 100644
--- a/eos/effects/modifymaxvelocityofshippassive.py
+++ b/eos/effects/modifymaxvelocityofshippassive.py
@@ -6,5 +6,4 @@ type = "passive"
 
 
 def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityBonus"),
-                              stackingPenalties=True)
+    fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityModifier"), stackingPenalties=True)
diff --git a/eos/effects/overloadselfmissileguidancebonus5.py b/eos/effects/overloadselfmissileguidancebonus5.py
index 3067ed1fd..f92b98aea 100644
--- a/eos/effects/overloadselfmissileguidancebonus5.py
+++ b/eos/effects/overloadselfmissileguidancebonus5.py
@@ -10,7 +10,7 @@ def handler(fit, module, context):
             "aoeCloudSizeBonus",
             "explosionDelayBonus",
             "missileVelocityBonus",
-            "maxVelocityBonus",
+            "maxVelocityModifier",
             "aoeVelocityBonus"
     ):
         module.boostItemAttr(tgtAttr, module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
diff --git a/eos/effects/zcolinorcasurveyscannerbonus.py b/eos/effects/zcolinorcasurveyscannerbonus.py
index 1018bedab..dba0e66a5 100644
--- a/eos/effects/zcolinorcasurveyscannerbonus.py
+++ b/eos/effects/zcolinorcasurveyscannerbonus.py
@@ -1,10 +1,3 @@
-# zColinOrcaSurveyScannerBonus
-#
-# Used by:
-# Ship: Orca
 type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Survey Scanner",
-                                  "surveyScanRange", ship.getModifiedItemAttr("shipOrcaSurveyScannerBonus"))
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Survey Scanner", "surveyScanRange", src.getModifiedItemAttr("roleBonusSurveyScannerRange"))
diff --git a/eos/effects/zcolinorcatractorrangebonus.py b/eos/effects/zcolinorcatractorrangebonus.py
index c568b6289..6207b4eb8 100644
--- a/eos/effects/zcolinorcatractorrangebonus.py
+++ b/eos/effects/zcolinorcatractorrangebonus.py
@@ -1,10 +1,3 @@
-# zColinOrcaTractorRangeBonus
-#
-# Used by:
-# Ship: Orca
 type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxRange", ship.getModifiedItemAttr("shipOrcaTractorBeamRangeBonus1"))
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", "maxRange", src.getModifiedItemAttr("roleBonusTractorBeamRange"), stackingPenalties=True)
diff --git a/eos/effects/zcolinorcatractorvelocitybonus.py b/eos/effects/zcolinorcatractorvelocitybonus.py
index c5675aad0..176f746eb 100644
--- a/eos/effects/zcolinorcatractorvelocitybonus.py
+++ b/eos/effects/zcolinorcatractorvelocitybonus.py
@@ -6,5 +6,4 @@ type = "passive"
 
 
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxTractorVelocity", ship.getModifiedItemAttr("shipOrcaTractorBeamVelocityBonus2"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", "maxTractorVelocity", ship.getModifiedItemAttr("roleBonusTractorBeamVelocity"))
diff --git a/eve.db b/eve.db
index ba2ebff0f..be2b2c5a8 100644
Binary files a/eve.db and b/eve.db differ