diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json
index 93ca03a12c934..1f950b88d9a20 100644
--- a/data/json/items/armor/arms_armor.json
+++ b/data/json/items/armor/arms_armor.json
@@ -62,8 +62,7 @@
     "id": "armguard_hard",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of hard arm guards",
-    "name_plural": "pairs of hard arm guards",
+    "name": { "str": "pair of hard arm guards", "str_pl": "pairs of hard arm guards" },
     "description": "A pair of neoprene arm sleeves covered with molded plastic sheaths.",
     "weight": "350 g",
     "volume": "3 L",
diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json
index a28926a77fd09..09da0205de8f1 100644
--- a/data/json/items/armor/boots.json
+++ b/data/json/items/armor/boots.json
@@ -123,8 +123,7 @@
     "id": "boots_acidchitin",
     "copy-from": "boots_chitin",
     "type": "ARMOR",
-    "name": "pair of biosilicified chitin boots",
-    "name_plural": "pairs of biosilicified chitin boots",
+    "name": { "str": "pair of biosilicified chitin boots", "str_pl": "pairs of biosilicified chitin boots" },
     "description": "Boots crafted from carefully cleaned and pruned biosilicified exoskeletons of acidic ants.  Acid-resistant and very durable.",
     "material": [ "acidchitin" ],
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 },
@@ -458,8 +457,7 @@
     "id": "boots_western",
     "copy-from": "boots",
     "type": "ARMOR",
-    "name": "pair of western boots",
-    "name_plural": "pairs of western boots",
+    "name": { "str": "pair of western boots", "str_pl": "pairs of western boots" },
     "description": "Stiff leather boots with intricate embroidery and one-inch heels.  They look good, but aren't made for running.  Each boot is large enough to conceal a small holdout pistol.",
     "coverage": 95,
     "proportional": { "weight": 1.2, "volume": 1.2, "price": 2, "encumbrance": 2 },
@@ -1221,8 +1219,7 @@
     "id": "chainmail_feet",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of chainmail chausses",
-    "name_plural": "pairs of chainmail chausses",
+    "name": { "str": "pair of chainmail chausses", "str_pl": "pairs of chainmail chausses" },
     "description": "Customized chainmail chausses that cover the feet, like booties made of chainmail.",
     "weight": "2006 g",
     "volume": "500 ml",
diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json
index 3430b9cc9d2cb..8edcd0a1b0a1a 100644
--- a/data/json/items/armor/gloves.json
+++ b/data/json/items/armor/gloves.json
@@ -49,8 +49,7 @@
     "id": "chainmail_hands",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of chainmail gloves",
-    "name_plural": "pairs of chainmail gloves",
+    "name": { "str": "pair of chainmail gloves", "str_pl": "pairs of chainmail gloves" },
     "description": "Customized chainmail gloves.  They fully enclose the fingers and provide excellent protection, but are somewhat cumbersome.",
     "weight": "2006 g",
     "volume": "500 ml",
diff --git a/data/json/items/armor/jewelry.json b/data/json/items/armor/jewelry.json
index ba838fd4e19fd..82b31bee6f276 100644
--- a/data/json/items/armor/jewelry.json
+++ b/data/json/items/armor/jewelry.json
@@ -772,11 +772,10 @@
   {
     "id": "gold_ear",
     "type": "ARMOR",
-    "name": "pair of gold earrings",
-    "name_plural": "pairs of gold earrings",
+    "name": { "str": "pair of gold earrings", "str_pl": "pairs of gold earrings" },
     "description": "A pair of shiny gold earrings.  You can wear it if you like, but it won't provide any effects.",
     "weight": "10 g",
-    "volume": 0,
+    "volume": "1 ml",
     "price": 13000,
     "price_postapoc": 500,
     "material": [ "gold" ],
@@ -856,8 +855,7 @@
   {
     "id": "gold_watch",
     "type": "ARMOR",
-    "name": "gold watch",
-    "name_plural": "gold watches",
+    "name": { "str": "gold watch", "str_pl": "gold watches" },
     "description": "A gold-plated steel self-winding wristwatch, suitable for a retirement present.  Tells the time and looks good.",
     "weight": "60 g",
     "volume": "250 ml",
@@ -887,8 +885,7 @@
   {
     "id": "silver_watch",
     "type": "ARMOR",
-    "name": "silver watch",
-    "name_plural": "silver watches",
+    "name": { "str": "silver watch", "str_pl": "silver watches" },
     "description": "An elegant silver watch, crafted from silver-plated stainless steel.  It's much cheaper than other metal watches, and more classy than an ordinary wristwatch.",
     "weight": "80 g",
     "volume": "250 ml",
@@ -919,11 +916,10 @@
   {
     "id": "silver_ear",
     "type": "ARMOR",
-    "name": "pair of silver earrings",
-    "name_plural": "pairs of silver earrings",
+    "name": { "str": "pair of silver earrings", "str_pl": "pairs of silver earrings" },
     "description": "A pair of beautiful silver earrings.  You can wear it if you like, but it won't provide any effects.",
     "weight": "9 g",
-    "volume": 0,
+    "volume": "1 ml",
     "price": 8000,
     "price_postapoc": 200,
     "material": [ "silver" ],
@@ -934,8 +930,7 @@
   {
     "id": "sf_watch",
     "type": "ARMOR",
-    "name": "fancy watch",
-    "name_plural": "fancy watches",
+    "name": { "str": "fancy watch", "str_pl": "fancy watches" },
     "//": "That's about the midpoint for a rolex.",
     "description": "A rather large and expensively made wristwatch.  Tells the time in elegantly wrought gold with silver detailing.  It's really the only timepiece suitable for someone of your exquisitely discerning tastes.",
     "weight": "80 g",
@@ -997,11 +992,10 @@
   {
     "id": "jade_brooch",
     "type": "ARMOR",
-    "name": "jade brooch",
-    "name_plural": "jade brooches",
+    "name": { "str": "jade brooch", "str_pl": "jade brooches" },
     "description": "A hand-crafted jade brooch of Oriental origin.  You can wear it if you like, but it won't provide any effects.",
     "weight": "26 g",
-    "volume": 0,
+    "volume": "1 ml",
     "price": 90000,
     "price_postapoc": 1900,
     "material": [ "stone" ],
@@ -1026,8 +1020,7 @@
   {
     "id": "platinum_watch",
     "type": "ARMOR",
-    "name": "platinum watch",
-    "name_plural": "platinum watches",
+    "name": { "str": "platinum watch", "str_pl": "platinum watches" },
     "description": "Flex on those gold-watch wearers with the rare, expensive and superior platinum watch.  This one is made from solid platinum.",
     "weight": "80 g",
     "volume": "250 ml",
@@ -1076,11 +1069,10 @@
   {
     "id": "platinum_ear",
     "type": "ARMOR",
-    "name": "pair of platinum earrings",
-    "name_plural": "pairs of platinum earrings",
+    "name": { "str": "pair of platinum earrings", "str_pl": "pairs of platinum earrings" },
     "description": "A pair of plain platinum earrings - if gold is getting boring, just use another rare metal.  You can wear it if you like, but it won't provide any effects.",
     "weight": "15 g",
-    "volume": 0,
+    "volume": "1 ml",
     "price": 12000,
     "price_postapoc": 2900,
     "material": [ "platinum" ],
@@ -1287,8 +1279,7 @@
   {
     "id": "wristwatch",
     "type": "ARMOR",
-    "name": "wrist watch",
-    "name_plural": "wrist watches",
+    "name": { "str": "wrist watch", "str_pl": "wrist watches" },
     "description": "A simple wristwatch on a plastic band.  Tells the time and has an alarm clock feature.",
     "weight": "50 g",
     "volume": "250 ml",
@@ -1396,8 +1387,7 @@
   {
     "id": "fur_cat_ears",
     "type": "ARMOR",
-    "name": "pair of fuzzy cat ears",
-    "name_plural": "pairs of fuzzy cat ears",
+    "name": { "str": "pair of fuzzy cat ears", "str_pl": "pairs of fuzzy cat ears" },
     "description": "A fuzzy pair of brownish cat ears on a headband.  It does nothing, but there's no reason not to look good even if no one's looking.",
     "weight": "20 g",
     "volume": "250 ml",
@@ -1412,8 +1402,7 @@
     "id": "faux_fur_cat_ears",
     "type": "ARMOR",
     "copy-from": "fur_cat_ears",
-    "name": "pair of faux fur cat ears",
-    "name_plural": "pairs of faux fur cat ears",
+    "name": { "str": "pair of faux fur cat ears", "str_pl": "pairs of faux fur cat ears" },
     "description": "A fuzzy pair of garishly colored cat ears on a headband.  It does nothing, but there's no reason not to look good even if no one's looking.",
     "material": [ "faux_fur" ],
     "color": "pink"
@@ -1468,8 +1457,7 @@
   {
     "id": "leather_cat_ears",
     "type": "ARMOR",
-    "name": "pair of leather cat ears",
-    "name_plural": "pairs of leather cat ears",
+    "name": { "str": "pair of leather cat ears", "str_pl": "pairs of leather cat ears" },
     "description": "A shiny pair of black cat ears on a headband.  It does nothing, but there's no reason not to look good even if no one's looking.",
     "weight": "20 g",
     "volume": "250 ml",
diff --git a/data/json/items/armor/legs_clothes.json b/data/json/items/armor/legs_clothes.json
index 1d01f50810722..380dcfadddbbe 100644
--- a/data/json/items/armor/legs_clothes.json
+++ b/data/json/items/armor/legs_clothes.json
@@ -427,8 +427,7 @@
     "id": "pants_faux_fur",
     "type": "ARMOR",
     "copy-from": "pants_fur",
-    "name": "faux fur pants",
-    "name_plural": "faux fur pants",
+    "name": { "str": "faux fur pants", "str_pl": "faux fur pants" },
     "description": "A pair of long cotton pants lined with warm imitation fur.",
     "material": [ "faux_fur", "cotton" ],
     "covers": [ "LEGS" ],
diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json
index 6e253a3f5d5af..befa814821138 100644
--- a/data/json/items/armor/storage.json
+++ b/data/json/items/armor/storage.json
@@ -413,7 +413,7 @@
     "symbol": "[",
     "looks_like": "plastic_shopping_bag",
     "color": "pink",
-    "proportional": { "weight": 6, "volume": 6, "price": 6, "quench": 6, "calories": 6, "healthy": 6, "fun": 6 },
+    "proportional": { "weight": 6.0, "volume": 6.0, "price": 6.0, "quench": 6.0, "calories": 6.0, "healthy": 6.0, "fun": 6.0 },
     "armor_data": {
       "covers": [ "ARM_EITHER", "HAND_EITHER" ],
       "coverage": 5,
@@ -433,7 +433,7 @@
     "symbol": "[",
     "looks_like": "hide_bag",
     "color": "pink",
-    "proportional": { "weight": 6, "volume": 6, "price": 6, "quench": 6, "calories": 6, "healthy": 6, "fun": 6 },
+    "proportional": { "weight": 6.0, "volume": 6.0, "price": 6.0, "quench": 6.0, "calories": 6.0, "healthy": 6.0, "fun": 6.0 },
     "armor_data": {
       "covers": [ "ARM_EITHER", "HAND_EITHER" ],
       "coverage": 5,
@@ -502,8 +502,7 @@
   {
     "id": "legrig",
     "type": "ARMOR",
-    "name": "pair of drop leg pouches",
-    "name_plural": "pairs of drop leg pouches",
+    "name": { "str": "pair of drop leg pouches", "str_pl": "pairs of drop leg pouches" },
     "description": "A set of pouches that can be worn on the thighs using buckled straps.  This variety is favored by the military.",
     "weight": "205 g",
     "volume": "500 ml",
@@ -685,8 +684,7 @@
   {
     "id": "ragpouch",
     "type": "ARMOR",
-    "name": "pouch",
-    "name_plural": "pouches",
+    "name": { "str": "pouch", "str_pl": "pouches" },
     "description": "A makeshift bag, cobbled together from rags.  Really gets in the way, but provides a decent amount of storage.",
     "weight": "560 g",
     "volume": "500 ml",
diff --git a/data/json/items/armor/torso_clothes.json b/data/json/items/armor/torso_clothes.json
index b20147b450796..82460b29581d9 100644
--- a/data/json/items/armor/torso_clothes.json
+++ b/data/json/items/armor/torso_clothes.json
@@ -289,8 +289,7 @@
   {
     "id": "leotard",
     "type": "ARMOR",
-    "name": "leotard",
-    "name_plural": "leotard",
+    "name": { "str": "leotard", "str_pl": "leotard" },
     "description": "A skin-tight spandex garment, covering the body from the groin to the shoulders.  With its deep scoop-cut back and high waist cuts, this garment is perfect for showcasing your physique on the stage.",
     "weight": "60 g",
     "volume": "500 ml",