diff --git a/eos/effects/boosterarmorhppenalty.py b/eos/effects/boosterarmorhppenalty.py
index 8f270f3e6..0620ca719 100644
--- a/eos/effects/boosterarmorhppenalty.py
+++ b/eos/effects/boosterarmorhppenalty.py
@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants named like: Booster (12 of 33)
+# Implants named like: Booster (12 of 35)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect
diff --git a/eos/effects/boostershieldcapacitypenalty.py b/eos/effects/boostershieldcapacitypenalty.py
index 6e0b11eb7..90f290bc1 100644
--- a/eos/effects/boostershieldcapacitypenalty.py
+++ b/eos/effects/boostershieldcapacitypenalty.py
@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants named like: Booster (12 of 33)
+# Implants from group: Booster (12 of 69)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect
diff --git a/eos/effects/servicemodulefullpowerhitpointpostassign.py b/eos/effects/servicemodulefullpowerhitpointpostassign.py
index 7fdc46eff..04c8b0fbe 100644
--- a/eos/effects/servicemodulefullpowerhitpointpostassign.py
+++ b/eos/effects/servicemodulefullpowerhitpointpostassign.py
@@ -3,6 +3,7 @@
 # Used by:
 # Structure Modules from group: Structure Citadel Service Module (2 of 2)
 # Structure Modules from group: Structure Engineering Service Module (6 of 6)
+# Structure Modules from group: Structure Navigation Service Module (2 of 2)
 # Structure Modules from group: Structure Resource Processing Service Module (4 of 4)
 # Structure Module: Standup Moon Drill I
 type = "passive"
diff --git a/eos/effects/structurearmorhpmultiply.py b/eos/effects/structurearmorhpbonus.py
similarity index 51%
rename from eos/effects/structurearmorhpmultiply.py
rename to eos/effects/structurearmorhpbonus.py
index 7095c29d5..9c2c727ae 100644
--- a/eos/effects/structurearmorhpmultiply.py
+++ b/eos/effects/structurearmorhpbonus.py
@@ -1,4 +1,4 @@
-# structureArmorHPMultiply
+# structureArmorHPBonus
 #
 # Used by:
 # Structure Modules from group: Structure Armor Reinforcer (2 of 2)
@@ -7,4 +7,4 @@ runTime = "early"
 
 
 def handler(fit, src, context):
-    fit.ship.multiplyItemAttr("hiddenArmorHPMultiplier", src.getModifiedItemAttr("armorHPMultiplier"))
+    fit.ship.boostItemAttr("hiddenArmorHPMultiplier", src.getModifiedItemAttr("armorHpBonus"), stackingPenalties=True)
diff --git a/eve.db b/eve.db
index e8d6c0862..10721d9ec 100644
Binary files a/eve.db and b/eve.db differ