diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json
index 92a9aaa1adf11..01ee9cac05a8b 100644
--- a/data/json/items/armor/ammo_pouch.json
+++ b/data/json/items/armor/ammo_pouch.json
@@ -101,8 +101,7 @@
   {
     "id": "chestpouch",
     "type": "ARMOR",
-    "name": "chest ammo pouch",
-    "name_plural": "chest ammo pouches",
+    "name": { "str": "chest ammo pouch", "str_pl": "chest ammo pouches" },
     "description": "A fabric ammo pouch that can be strapped to your chest which is capable of holding a single magazine close at hand.",
     "weight": "140 g",
     "volume": "250 ml",
@@ -129,8 +128,7 @@
   {
     "id": "chestrig",
     "type": "ARMOR",
-    "name": "chest rig",
-    "name_plural": "chest rig",
+    "name": { "str": "chest rig", "str_pl": "chest rig" },
     "description": "Popularized during the Vietnam War, chest rigs like these are typically plain, barebones affairs consisting of three or more pouches in a row, with straps to secure them on your chest.  This one can hold four magazines in its pouches.",
     "weight": "425 g",
     "volume": "500 ml",
@@ -158,8 +156,7 @@
   {
     "id": "javelin_bag",
     "type": "ARMOR",
-    "name": "javelin bag",
-    "name_plural": "javelin bags",
+    "name": { "str": "javelin bag" },
     "description": "An open medieval-looking bag, designed to store javelins for easy reach.",
     "weight": "600 g",
     "volume": "1250 ml",
diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json
index a352b31a8c050..c728e32b41ec5 100644
--- a/data/json/items/armor/bandolier.json
+++ b/data/json/items/armor/bandolier.json
@@ -195,8 +195,7 @@
   {
     "id": "grenade_pouch",
     "type": "ARMOR",
-    "name": "grenade pouch",
-    "name_plural": "grenade pouches",
+    "name": { "str": "grenade pouch", "str_pl": "grenade pouches" },
     "description": "A small pouch for storing cartridge grenades with straps for attaching it to your belt or other webbing.",
     "weight": "90 g",
     "volume": "250 ml",
diff --git a/data/json/items/armor/hats.json b/data/json/items/armor/hats.json
index 271cffc4251b2..822c45e8596a2 100644
--- a/data/json/items/armor/hats.json
+++ b/data/json/items/armor/hats.json
@@ -391,8 +391,7 @@
     "id": "kippah",
     "repairs_like": "balclava",
     "type": "ARMOR",
-    "name": "kippah",
-    "name_plural": "kippahs",
+    "name": { "str": "kippah" },
     "description": "A thin, rounded skullcap.  A traditional headdress in Judaism.",
     "weight": "80 g",
     "volume": "250 ml",
@@ -411,8 +410,7 @@
     "id": "kufi",
     "repairs_like": "balclava",
     "type": "ARMOR",
-    "name": "kufi cap",
-    "name_plural": "kufi caps",
+    "name": { "str": "kufi cap" },
     "description": "A brimless, short and rounded cap.",
     "weight": "88 g",
     "volume": "500 ml",
diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json
index 03030e21cf257..7373c12545714 100644
--- a/data/json/items/armor/helmets.json
+++ b/data/json/items/armor/helmets.json
@@ -289,8 +289,7 @@
     "id": "helmet_galea",
     "type": "ARMOR",
     "category": "armor",
-    "name": "galea",
-    "name_plural": "galeae",
+    "name": { "str": "galea", "str_pl": "galeae" },
     "description": "An Imperial Roman helmet, with distinct projections protecting the sides of the head.",
     "weight": "1310 g",
     "volume": "2500 ml",
diff --git a/data/json/items/armor/jewelry.json b/data/json/items/armor/jewelry.json
index 3d6334afb97ae..d9751eaced9e1 100644
--- a/data/json/items/armor/jewelry.json
+++ b/data/json/items/armor/jewelry.json
@@ -224,8 +224,7 @@
   {
     "id": "diving_watch",
     "type": "ARMOR",
-    "name": "diver's watch",
-    "name_plural": "diver's watches",
+    "name": { "str": "diver's watch", "str_pl": "diver's watches" },
     "description": "A waterproof, self-winding watch on a stainless steel watchband.  Tells the time and current temperature.  Activate to check the digital thermometer.",
     "weight": "65 g",
     "volume": "250 ml",
diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
index e2ab3f6b261ec..ac4cdcdb570f1 100644
--- a/data/json/items/armor/legs_armor.json
+++ b/data/json/items/armor/legs_armor.json
@@ -53,8 +53,7 @@
     "id": "chainmail_legs",
     "type": "ARMOR",
     "category": "armor",
-    "name": "chainmail leggings",
-    "name_plural": "pairs of chainmail leggings",
+    "name": { "str": "chainmail leggings", "str_pl": "pairs of chainmail leggings" },
     "description": "Customized chainmail legs.  Their straps keep everything in place, and the lack of toes and heels allows them to work perfectly well with footwear.",
     "weight": "4212 g",
     "volume": "1500 ml",
@@ -95,8 +94,7 @@
     "id": "fencing_pants",
     "repairs_like": "survivor_suit",
     "type": "ARMOR",
-    "name": "fencing pants",
-    "name_plural": "fencing pants",
+    "name": { "str": "fencing pants", "str_pl": "fencing pants" },
     "description": "A pair of reinforced pants used by fencers to prevent injuries.",
     "weight": "450 g",
     "volume": "2 L",
diff --git a/data/json/items/armor/legs_clothes.json b/data/json/items/armor/legs_clothes.json
index bc5c0673e58b9..74f8e8681aa3b 100644
--- a/data/json/items/armor/legs_clothes.json
+++ b/data/json/items/armor/legs_clothes.json
@@ -23,8 +23,7 @@
   {
     "id": "breeches",
     "type": "ARMOR",
-    "name": "breeches",
-    "name_plural": "breeches",
+    "name": { "str": "breeches", "str_pl": "breeches" },
     "description": "A well-made pair of old-fashioned pants, made of stiff yet baggy material.  Comfortable, but lacks pockets.",
     "weight": "520 g",
     "volume": "1750 ml",
@@ -67,8 +66,7 @@
   {
     "id": "hot_pants",
     "type": "ARMOR",
-    "name": "hot pants",
-    "name_plural": "hot pants",
+    "name": { "str": "hot pants", "str_pl": "hot pants" },
     "description": "A simple pair of short shorts.",
     "weight": "92 g",
     "volume": "250 ml",
@@ -85,8 +83,7 @@
   {
     "id": "hot_pants_fur",
     "type": "ARMOR",
-    "name": "fur hot pants",
-    "name_plural": "fur hot pants",
+    "name": { "str": "fur hot pants", "str_pl": "fur hot pants" },
     "description": "A simple pair of fur short shorts.",
     "weight": "118 g",
     "volume": "250 ml",
@@ -123,8 +120,7 @@
   {
     "id": "jeans",
     "type": "ARMOR",
-    "name": "jeans",
-    "name_plural": "jeans",
+    "name": { "str": "jeans", "str_pl": "jeans" },
     "description": "A pair of blue jeans with two deep pockets.",
     "weight": "600 g",
     "volume": "2 L",
@@ -397,8 +393,7 @@
   {
     "id": "pants_fur",
     "type": "ARMOR",
-    "name": "fur pants",
-    "name_plural": "fur pants",
+    "name": { "str": "fur pants", "str_pl": "fur pants" },
     "description": "A hefty pair of fur-lined pants.",
     "weight": "920 g",
     "volume": "4 L",
@@ -521,8 +516,7 @@
   {
     "id": "shorts_cargo",
     "type": "ARMOR",
-    "name": "cargo shorts",
-    "name_plural": "cargo shorts",
+    "name": { "str": "cargo shorts", "str_pl": "cargo shorts" },
     "description": "A pair of shorts lined with pockets, offering decent storage.",
     "weight": "340 g",
     "volume": "1500 ml",
@@ -543,8 +537,7 @@
   {
     "id": "shorts_denim",
     "type": "ARMOR",
-    "name": "denim shorts",
-    "name_plural": "denim shorts",
+    "name": { "str": "denim shorts", "str_pl": "denim shorts" },
     "description": "A pair of denim shorts.  Thick and tough, they provide excellent protection from cuts.",
     "weight": "260 g",
     "volume": "1250 ml",
diff --git a/data/json/items/armor/masks.json b/data/json/items/armor/masks.json
index 5b78f43146ac7..3772a63820d8a 100644
--- a/data/json/items/armor/masks.json
+++ b/data/json/items/armor/masks.json
@@ -70,8 +70,7 @@
     "id": "bondage_mask_zipped",
     "copy-from": "bondage_mask",
     "type": "ARMOR",
-    "name": "bondage mask (zipped)",
-    "name_plural": "bondage masks (zipped)",
+    "name": { "str": "bondage mask (zipped)", "str_pl": "bondage masks (zipped)" },
     "description": "A tight mask made of black leather.  The eyes and mouth have been zipped closed.",
     "looks_like": "bondage_mask",
     "flags": [ "VARSIZE", "BLIND" ],
diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
index 7fbfb34def0e5..9aa70cd340ab4 100644
--- a/data/json/items/armor/torso_armor.json
+++ b/data/json/items/armor/torso_armor.json
@@ -131,8 +131,7 @@
     "id": "cuirass_lightplate",
     "type": "ARMOR",
     "category": "armor",
-    "name": "cuirass",
-    "name_plural": "cuirasses",
+    "name": { "str": "cuirass", "str_pl": "cuirasses" },
     "description": "A steel breastplate, and a vital part of plate armor.  Even as full armor went into decline, cuirasses remained in use among cavalry in Europe.",
     "weight": "4200 g",
     "volume": "6 L",
diff --git a/data/json/items/armor/undergarment.json b/data/json/items/armor/undergarment.json
index d908f1992f094..4533322b56fdf 100644
--- a/data/json/items/armor/undergarment.json
+++ b/data/json/items/armor/undergarment.json
@@ -146,8 +146,7 @@
   {
     "id": "boy_shorts",
     "type": "ARMOR",
-    "name": "boy shorts",
-    "name_plural": "boy shorts",
+    "name": { "str": "boy shorts", "str_pl": "boy shorts" },
     "description": "Female underwear similar to men's boxer shorts, but much more close-fitting.",
     "weight": "42 g",
     "volume": "250 ml",
@@ -183,15 +182,14 @@
   {
     "id": "briefs",
     "type": "ARMOR",
-    "name": "briefs",
-    "name_plural": "briefs",
+    "name": { "str": "briefs", "str_pl": "briefs" },
     "description": "A pair of briefs.  Comfortable underwear worn by men.",
     "weight": "32 g",
     "volume": "250 ml",
     "price": 1000,
     "material": [ "cotton" ],
     "symbol": "[",
-    "looks_like": "boxer-briefs",
+    "looks_like": "boxer_briefs",
     "color": "white",
     "covers": [ "LEGS" ],
     "coverage": 15,
@@ -542,8 +540,7 @@
   {
     "id": "under_armor_shorts",
     "type": "ARMOR",
-    "name": "compression shorts",
-    "name_plural": "compression shorts",
+    "name": { "str": "compression shorts", "str_pl": "compression shorts" },
     "description": "Nylon sportswear that clings to your upper legs, aiding muscle tone and maintaining warmth.",
     "weight": "82 g",
     "volume": "250 ml",