diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json
index 01ee9cac05a8b..e20e75e3b3e8e 100644
--- a/data/json/items/armor/ammo_pouch.json
+++ b/data/json/items/armor/ammo_pouch.json
@@ -211,8 +211,7 @@
   {
     "type": "ARMOR",
     "id": "legpouch_large",
-    "name": "leg ammo pouch",
-    "name_plural": "leg ammo pouches",
+    "name": { "str": "leg ammo pouch", "str_pl": "leg ammo pouches" },
     "description": "A fabric ammo pouch that can be strapped to your leg and capable of holding two magazine close at hand.",
     "weight": "120 g",
     "volume": "250 ml",
diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json
index 1f950b88d9a20..6f3fb52314350 100644
--- a/data/json/items/armor/arms_armor.json
+++ b/data/json/items/armor/arms_armor.json
@@ -3,8 +3,7 @@
     "id": "2byarm_guard",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of 2-by-arm guards",
-    "name_plural": "pairs of 2-by-arm guards",
+    "name": { "str": "pair of 2-by-arm guards", "str_pl": "pairs of 2-by-arm guards" },
     "description": "A pair of improvised arm guards made from broken pieces of a two by four that are tied to your arms with rags and string.  They offer good protection, but are really uncomfortable to wear.",
     "weight": "300 g",
     "volume": "1500 ml",
diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json
index c728e32b41ec5..eca9eafefbb9a 100644
--- a/data/json/items/armor/bandolier.json
+++ b/data/json/items/armor/bandolier.json
@@ -237,8 +237,7 @@
   {
     "id": "grenadebandolier",
     "type": "ARMOR",
-    "name": "large grenade pouch",
-    "name_plural": "large grenade pouches",
+    "name": { "str": "large grenade pouch", "str_pl": "large grenade pouches" },
     "description": "A pouch for holding up to four full-sized grenades of various types.",
     "weight": "600 g",
     "volume": "1250 ml",
@@ -247,7 +246,7 @@
     "rigid": false,
     "material": "cotton",
     "symbol": "[",
-    "looks_like": "belt",
+    "looks_like": "leather_belt",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 15,
diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json
index 8a2d3b904de56..db4e81faa2cab 100644
--- a/data/json/items/armor/boots.json
+++ b/data/json/items/armor/boots.json
@@ -332,8 +332,7 @@
     "id": "boots_plate",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of armored boots",
-    "name_plural": "pairs of armored boots",
+    "name": { "str": "pair of armored boots", "str_pl": "pairs of armored boots" },
     "description": "An extremely heavy set of armor plated boots.",
     "weight": "1890 g",
     "volume": "3250 ml",
@@ -515,8 +514,7 @@
     "id": "boots_xlsurvivor",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of XL survivor boots",
-    "name_plural": "pairs of XL survivor boots",
+    "name": { "str": "pair of XL survivor boots", "str_pl": "pairs of XL survivor boots" },
     "description": "A massive pair of customized leather boots, armored with kevlar and modified to provide maximum protection from harm and the elements, even when knee-deep in the dead.",
     "weight": "2460 g",
     "volume": "5 L",
@@ -1296,8 +1294,7 @@
   {
     "id": "socks_ankle",
     "type": "ARMOR",
-    "name": "pair of ankle socks",
-    "name_plural": "pairs of ankle socks",
+    "name": { "str": "pair of ankle socks", "str_pl": "pairs of ankle socks" },
     "description": "Short socks, commonly used for sports.  These are designed to protect your feet from friction, not temperature",
     "weight": "25 g",
     "volume": "200 ml",
diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json
index cc96722a6c9eb..15a2d4a797e1d 100644
--- a/data/json/items/armor/gloves.json
+++ b/data/json/items/armor/gloves.json
@@ -234,8 +234,7 @@
     "id": "gloves_fingerless_mod",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of armored fingerless gloves",
-    "name_plural": "pairs of armored fingerless gloves",
+    "name": { "str": "pair of armored fingerless gloves", "str_pl": "pairs of armored fingerless gloves" },
     "description": "A pair of leather gloves with no fingers, allowing greater manual dexterity.  These have been crudely reinforced with steel guards across the back.",
     "weight": "380 g",
     "volume": "500 ml",
@@ -758,8 +757,7 @@
     "id": "gloves_xlsurvivor",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of XL survivor gloves",
-    "name_plural": "pairs of XL survivor gloves",
+    "name": { "str": "pair of XL survivor gloves", "str_pl": "pairs of XL survivor gloves" },
     "description": "A massive pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.",
     "weight": "480 g",
     "volume": "1500 ml",
diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
index ac4cdcdb570f1..44516813b899c 100644
--- a/data/json/items/armor/legs_armor.json
+++ b/data/json/items/armor/legs_armor.json
@@ -3,8 +3,7 @@
     "id": "2byshin_guard",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of 2-by-shin guards",
-    "name_plural": "pairs of 2-by-shin guards",
+    "name": { "str": "pair of 2-by-shin guards", "str_pl": "pairs of 2-by-shin guards" },
     "description": "A pair of improvised shin guards made from broken pieces of a two by four that are tied to your shins with rags and string.  They offer good protection, but are really hard to run with.",
     "weight": "300 g",
     "volume": "1500 ml",
@@ -72,8 +71,7 @@
   {
     "id": "chaps_leather",
     "type": "ARMOR",
-    "name": "leather chaps",
-    "name_plural": "leather chaps",
+    "name": { "str": "leather chaps", "str_pl": "leather chaps" },
     "description": "A pair of black leather chaps.  Very tough and light, but doesn't offer any storage.",
     "weight": "1414 g",
     "volume": "1250 ml",
@@ -269,15 +267,14 @@
     "id": "lsurvivor_pants",
     "type": "ARMOR",
     "category": "armor",
-    "name": "light survivor cargo pants",
-    "name_plural": "light survivor cargo pants",
+    "name": { "str": "light survivor cargo pants", "str_pl": "light survivor cargo pants" },
     "description": "Lightweight, Kevlar armored cargo pants designed to hold as much as possible.  Strong and mostly waterproof.",
     "weight": "920 g",
     "volume": "3500 ml",
     "price": 40000,
     "material": [ "kevlar", "cotton" ],
     "symbol": "[",
-    "looks_like": "survivor_pants",
+    "looks_like": "pants_survivor",
     "color": "green",
     "covers": [ "LEGS" ],
     "coverage": 95,
@@ -292,8 +289,7 @@
     "id": "motorbike_pants",
     "repairs_like": "survivor_suit",
     "type": "ARMOR",
-    "name": "motorcycle pants",
-    "name_plural": "pairs of motorcycle pants",
+    "name": { "str": "motorcycle pants", "str_pl": "pairs of motorcycle pants" },
     "description": "A pair of pants designed for dirt bikers and motorcyclists.",
     "weight": "1340 g",
     "volume": "750 ml",
diff --git a/data/json/items/armor/legs_clothes.json b/data/json/items/armor/legs_clothes.json
index 74f8e8681aa3b..828dd2858dd09 100644
--- a/data/json/items/armor/legs_clothes.json
+++ b/data/json/items/armor/legs_clothes.json
@@ -101,8 +101,7 @@
   {
     "id": "hot_pants_leather",
     "type": "ARMOR",
-    "name": "leather hot pants",
-    "name_plural": "leather hot pants",
+    "name": { "str": "leather hot pants", "str_pl": "leather hot pants" },
     "description": "A simple pair of leather short shorts.",
     "weight": "106 g",
     "volume": "250 ml",
@@ -202,8 +201,7 @@
   {
     "id": "leggings",
     "type": "ARMOR",
-    "name": "leggings",
-    "name_plural": "leggings",
+    "name": { "str": "leggings", "str_pl": "leggings" },
     "description": "Skin-tight nylon leggings, sometimes used when exercising, that keep your legs nice and warm.",
     "weight": "155 g",
     "volume": "500 ml",
@@ -426,8 +424,7 @@
   {
     "id": "pants_leather",
     "type": "ARMOR",
-    "name": "leather pants",
-    "name_plural": "leather pants",
+    "name": { "str": "leather pants", "str_pl": "leather pants" },
     "description": "A pair of black leather pants.  Very tough, but cumbersome and without much storage.",
     "weight": "980 g",
     "volume": "2500 ml",
@@ -473,8 +470,7 @@
     "id": "postman_shorts",
     "repairs_like": "jeans",
     "type": "ARMOR",
-    "name": "mail carrier shorts",
-    "name_plural": "mail carrier shorts",
+    "name": { "str": "mail carrier shorts", "str_pl": "mail carrier shorts" },
     "description": "A pair of dark blue shorts, the kind used by postal service workers.",
     "weight": "230 g",
     "volume": "1 L",
diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json
index 68f26366fd86c..fc264b3b6dfa7 100644
--- a/data/json/items/armor/storage.json
+++ b/data/json/items/armor/storage.json
@@ -480,8 +480,7 @@
   {
     "id": "leather_pouch",
     "type": "ARMOR",
-    "name": "leather pouch",
-    "name_plural": "leather pouches",
+    "name": { "str": "leather pouch", "str_pl": "leather pouches" },
     "description": "A bag stitched together from leather scraps.  Doesn't hold an awful lot but is easy to wear.",
     "weight": "610 g",
     "volume": "500 ml",
diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
index 9aa70cd340ab4..324be4998c164 100644
--- a/data/json/items/armor/torso_armor.json
+++ b/data/json/items/armor/torso_armor.json
@@ -44,8 +44,7 @@
   {
     "id": "armor_lorica",
     "type": "ARMOR",
-    "name": "lorica segmentata",
-    "name_plural": "lorica segmentata",
+    "name": { "str": "lorica segmentata", "str_pl": "lorica segmentata" },
     "description": "An ancient Roman laminar armor, made of overlapping metal strips connected to internal leather straps.",
     "weight": "5286 g",
     "volume": "6 L",
diff --git a/data/json/items/armor/undergarment.json b/data/json/items/armor/undergarment.json
index 4533322b56fdf..913cd1747320f 100644
--- a/data/json/items/armor/undergarment.json
+++ b/data/json/items/armor/undergarment.json
@@ -2,8 +2,7 @@
   {
     "id": "arm_warmers",
     "type": "ARMOR",
-    "name": "pair of arm warmers",
-    "name_plural": "pairs of arm warmers",
+    "name": { "str": "pair of arm warmers", "str_pl": "pairs of arm warmers" },
     "description": "Snug, soft cloth sleeves to keep your arms warm.",
     "weight": "32 g",
     "volume": "250 ml",
@@ -354,8 +353,7 @@
   {
     "id": "leg_warmers_xl",
     "type": "ARMOR",
-    "name": "pair of XL leg warmers",
-    "name_plural": "pairs of XL leg warmers",
+    "name": { "str": "pair of XL leg warmers", "str_pl": "pairs of XL leg warmers" },
     "description": "Large, soft, snug cloth sleeves to keep your exotic anatomy warm.",
     "weight": "50 g",
     "volume": "750 ml",