diff --git a/data/json/items/armor/cloaks.json b/data/json/items/armor/cloaks.json
index 4e7eec53c9316..a45895a65fd40 100644
--- a/data/json/items/armor/cloaks.json
+++ b/data/json/items/armor/cloaks.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "american_flag",
-    "repairs_like": "miner_hat",
+    "repairs_like": "sheet",
     "type": "ARMOR",
     "name": "American flag",
     "description": "A large American flag made to fly in even the worst conditions.",
diff --git a/data/json/items/armor/coats.json b/data/json/items/armor/coats.json
index 0a619c08ba18d..390dd9fa15ec5 100644
--- a/data/json/items/armor/coats.json
+++ b/data/json/items/armor/coats.json
@@ -1217,7 +1217,7 @@
   },
   {
     "id": "tux",
-    "repairs_like": "miner_hat",
+    "repairs_like": "trenchcoat",
     "type": "ARMOR",
     "name": "tuxedo",
     "description": "A full-body tuxedo.  Makes the apocalypse feel a little more classy.",
@@ -1239,7 +1239,7 @@
   },
   {
     "id": "waistcoat",
-    "repairs_like": "miner_hat",
+    "repairs_like": "trenchcoat",
     "type": "ARMOR",
     "name": "waistcoat",
     "description": "An elegant waistcoat.  Ideal for those occasions when wearing only a shirt would be too casual and a suit would be just overdoing it.",
@@ -1260,7 +1260,7 @@
   },
   {
     "id": "winter_jacket_army",
-    "repairs_like": "miner_hat",
+    "repairs_like": "trenchcoat",
     "type": "ARMOR",
     "name": "army winter jacket",
     "name_plural": "army winter jackets",
diff --git a/data/json/items/armor/hats.json b/data/json/items/armor/hats.json
index 758a74fce34f4..ee5665b96ba24 100644
--- a/data/json/items/armor/hats.json
+++ b/data/json/items/armor/hats.json
@@ -1,7 +1,7 @@
 [
   {
     "id": "10gal_hat",
-    "repairs_like": "miner_hat",
+    "repairs_like": "tricorne",
     "type": "ARMOR",
     "name": "ten-gallon hat",
     "description": "These may not be the Great Plains, but you can still be the Boss with this high-crowned, wide-brimmed hat.",
@@ -570,7 +570,7 @@
   },
   {
     "id": "turban",
-    "repairs_like": "miner_hat",
+    "repairs_like": "balaclava",
     "type": "ARMOR",
     "name": "turban",
     "description": "Rags worn around the head.",
@@ -591,7 +591,7 @@
   },
   {
     "id": "hat_golf",
-    "repairs_like": "miner_hat",
+    "repairs_like": "balaclava",
     "type": "ARMOR",
     "name": "golf cap",
     "//": "Head encumbrance stops you from wearing additional headgear.  No helmet over a ballcap, sorry.  But brimmed gear gets the anti-glare flag!",
diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
index d11189c372f16..2686bbdbe956d 100644
--- a/data/json/items/armor/legs_armor.json
+++ b/data/json/items/armor/legs_armor.json
@@ -93,7 +93,7 @@
   },
   {
     "id": "fencing_pants",
-    "repairs_like": "miner_hat",
+    "repairs_like": "survivor_suit",
     "type": "ARMOR",
     "name": "fencing pants",
     "name_plural": "fencing pants",
diff --git a/data/json/items/armor/misc.json b/data/json/items/armor/misc.json
index 157eabac485eb..2c186d149c55d 100644
--- a/data/json/items/armor/misc.json
+++ b/data/json/items/armor/misc.json
@@ -214,7 +214,7 @@
   },
   {
     "id": "veil_wedding",
-    "repairs_like": "miner_hat",
+    "repairs_like": "balaclava",
     "type": "ARMOR",
     "name": "wedding veil",
     "name_plural": "wedding veils",
diff --git a/data/json/items/armor/scarfs.json b/data/json/items/armor/scarfs.json
index 980912eb865ae..7292517520c64 100644
--- a/data/json/items/armor/scarfs.json
+++ b/data/json/items/armor/scarfs.json
@@ -21,7 +21,7 @@
   },
   {
     "id": "headscarf",
-    "repairs_like": "miner_hat",
+    "repairs_like": "balaclava",
     "type": "ARMOR",
     "name": "headscarf",
     "description": "A loose cloth worn over the head and around the neck.",
diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json
index befa814821138..fd00d3208cb51 100644
--- a/data/json/items/armor/storage.json
+++ b/data/json/items/armor/storage.json
@@ -236,7 +236,7 @@
   },
   {
     "id": "case_violin",
-    "repairs_like": "miner_hat",
+    "repairs_like": "bigback",
     "type": "ARMOR",
     "name": "violin case",
     "description": "Useful to carry your precious musical instrument around protected from any harm.",
@@ -970,7 +970,7 @@
   },
   {
     "id": "vest",
-    "repairs_like": "miner_hat",
+    "repairs_like": "trenchcoat",
     "type": "ARMOR",
     "name": "utility vest",
     "description": "A light vest covered in pockets and straps for storage.",
diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
index 43f7e58782ea3..c7e63dde1dea1 100644
--- a/data/json/items/armor/suits_protection.json
+++ b/data/json/items/armor/suits_protection.json
@@ -263,7 +263,7 @@
   },
   {
     "id": "armor_riot",
-    "repairs_like": "miner_hat",
+    "repairs_like": "survivor_suit",
     "type": "ARMOR",
     "category": "armor",
     "name": "riot armor",
@@ -523,7 +523,7 @@
   },
   {
     "id": "hazmat_suit",
-    "repairs_like": "miner_hat",
+    "repairs_like": "aep_suit",
     "type": "ARMOR",
     "name": "hazmat suit",
     "description": "An impermeable whole-body garment worn as protection against hazardous materials.  Though very restrictive and fragile, wearing it will provide complete protection against ambient radiation.  It requires a separate gas mask for full protection.",
@@ -611,7 +611,7 @@
   },
   {
     "id": "robofac_enviro_suit",
-    "repairs_like": "miner_hat",
+    "repairs_like": "aep_suit",
     "type": "ARMOR",
     "name": "Hub 01 environmental suit",
     "description": "A lightweight environmental suit worn by Hub personnel in their rare forays aboveground.  Colored brown and blue, the white seal of Hub 01 is embroidered on both of its upper arms.  It requires a separate gas mask for full protection.",
diff --git a/data/json/items/armor/torso_clothes.json b/data/json/items/armor/torso_clothes.json
index 82460b29581d9..b5981d230e541 100644
--- a/data/json/items/armor/torso_clothes.json
+++ b/data/json/items/armor/torso_clothes.json
@@ -584,7 +584,7 @@
   },
   {
     "id": "tshirt_text",
-    "repairs_like": "miner_hat",
+    "repairs_like": "tshirt",
     "type": "ARMOR",
     "name": "t-shirt",
     "description": "A short-sleeved cotton shirt.",
@@ -609,7 +609,7 @@
   },
   {
     "id": "tshirt_tour",
-    "repairs_like": "miner_hat",
+    "repairs_like": "tshirt",
     "type": "ARMOR",
     "copy-from": "tshirt",
     "name": "tour t-shirt",
diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
index 6920e5e5af4ca..ee11cdf2f94de 100644
--- a/data/json/items/tool_armor.json
+++ b/data/json/items/tool_armor.json
@@ -1177,7 +1177,7 @@
   },
   {
     "id": "mask_bunker",
-    "repairs_like": "miner_hat",
+    "repairs_like": "mask_gas",
     "type": "TOOL_ARMOR",
     "category": "armor",
     "symbol": "[",
@@ -1638,7 +1638,7 @@
   },
   {
     "id": "folding_poncho_on",
-    "repairs_like": "miner_hat",
+    "repairs_like": "sheet",
     "type": "TOOL_ARMOR",
     "category": "clothing",
     "symbol": "[",
@@ -1661,7 +1661,7 @@
   {
     "type": "TOOL",
     "id": "emer_blanket",
-    "repairs_like": "miner_hat",
+    "repairs_like": "sheet",
     "symbol": ",",
     "color": "light_gray",
     "name": "folded emergency blanket",
@@ -2292,7 +2292,6 @@
   {
     "type": "TOOL_ARMOR",
     "id": "mask_ski",
-    "repairs_like": "miner_hat",
     "name": "ski mask",
     "category": "clothing",
     "weight": "86 g",
@@ -2593,7 +2592,6 @@
   },
   {
     "id": "powered_earmuffs",
-    "repairs_like": "miner_hat",
     "type": "TOOL_ARMOR",
     "category": "armor",
     "symbol": "[",
@@ -2778,7 +2776,7 @@
   },
   {
     "id": "helmet_riot",
-    "repairs_like": "miner_hat",
+    "repairs_like": "helmet_barbute",
     "type": "TOOL_ARMOR",
     "category": "armor",
     "name": "riot helmet",