diff --git a/eos/effects/systemarmorremoterepairamount.py b/eos/effects/systemarmorremoterepairamount.py
index ec0e84f4b..288ccfefd 100644
--- a/eos/effects/systemarmorremoterepairamount.py
+++ b/eos/effects/systemarmorremoterepairamount.py
@@ -5,6 +5,6 @@
 runTime = "early"
 type = ("projected", "passive")
 def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Remote Armor Repairer",
+    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
                                      "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountMultiplierRemote"),
                                      stackingPenalties=True)
diff --git a/eos/effects/systemarmorrepairamount.py b/eos/effects/systemarmorrepairamount.py
index 1c659a1b2..5ba4e2aa1 100644
--- a/eos/effects/systemarmorrepairamount.py
+++ b/eos/effects/systemarmorrepairamount.py
@@ -5,6 +5,7 @@
 runTime = "early"
 type = ("projected", "passive")
 def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Armor Repair Unit",
+    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Repair Systems")
+                                              or mod.item.requiresSkill("Capital Repair Systems"),
                                      "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountMultiplier"),
                                      stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemshieldremoterepairamount.py b/eos/effects/systemshieldremoterepairamount.py
index e1b1b4582..5c2edef34 100644
--- a/eos/effects/systemshieldremoterepairamount.py
+++ b/eos/effects/systemshieldremoterepairamount.py
@@ -5,6 +5,6 @@
 runTime = "early"
 type = ("projected", "passive")
 def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Remote Shield Booster",
+    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
                                      "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplierRemote"),
                                      stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/systemshieldrepairamountshieldskills.py b/eos/effects/systemshieldrepairamountshieldskills.py
index 7ce51af06..40dc3377d 100644
--- a/eos/effects/systemshieldrepairamountshieldskills.py
+++ b/eos/effects/systemshieldrepairamountshieldskills.py
@@ -5,6 +5,7 @@
 runTime = "early"
 type = ("projected", "passive")
 def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
+    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Shield Operation")
+                                              or mod.item.requiresSkill("Capital Shield Operation"),
                                      "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplier"),
                                      stackingPenalties=True, penaltyGroup="postMul")