diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json
index 8f275aa82dacf..d3881798fc4de 100644
--- a/data/json/items/chemicals_and_resources.json
+++ b/data/json/items/chemicals_and_resources.json
@@ -307,8 +307,7 @@
     "type": "COMESTIBLE",
     "id": "insecticide",
     "category": "chems",
-    "name": "insecticide",
-    "name_plural": "insecticide",
+    "name": { "str": "insecticide", "str_pl": "insecticide" },
     "weight": "1 g",
     "//": "Typically sold in larger quantities, but that's handed in the charge count.",
     "color": "pink",
diff --git a/data/json/items/comestibles/brewing.json b/data/json/items/comestibles/brewing.json
index b357f578c33e0..98fd5f2df77d0 100644
--- a/data/json/items/comestibles/brewing.json
+++ b/data/json/items/comestibles/brewing.json
@@ -87,8 +87,7 @@
   {
     "type": "COMESTIBLE",
     "id": "gin_mash",
-    "name": "gin mash",
-    "name_plural": "gin mashes",
+    "name": { "str": "gin mash", "str_pl": "gin mashes" },
     "description": "Gin mash, after the junipers have had time to add flavor, ready to be distilled or drunk as is.",
     "weight": "33 g",
     "color": "yellow",
diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json
index 79cc01342ee1b..cdea74d060955 100644
--- a/data/json/items/comestibles/dairy.json
+++ b/data/json/items/comestibles/dairy.json
@@ -126,8 +126,7 @@
   {
     "type": "COMESTIBLE",
     "id": "ghee",
-    "name": "ghee",
-    "name_plural": "ghee",
+    "name": { "str": "ghee", "str_pl": "ghee" },
     "copy-from": "butter",
     "weight": "13500 mg",
     "spoils_in": "90 days",
@@ -178,8 +177,7 @@
   {
     "type": "COMESTIBLE",
     "id": "cheese_hard",
-    "name": "hard cheese",
-    "name_plural": "hard cheese",
+    "name": { "str": "hard cheese", "str_pl": "hard cheese" },
     "weight": "34 g",
     "color": "yellow",
     "spoils_in": "180 days",
@@ -286,8 +284,7 @@
   {
     "type": "COMESTIBLE",
     "id": "milk_cream",
-    "name": "heavy cream",
-    "name_plural": "heavy cream",
+    "name": { "str": "heavy cream", "str_pl": "heavy cream" },
     "weight": "254 g",
     "color": "white",
     "spoils_in": "1 day",
diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json
index d37e03f9a61c1..fb8eb3c9b63a9 100644
--- a/data/json/items/comestibles/drink.json
+++ b/data/json/items/comestibles/drink.json
@@ -443,8 +443,7 @@
   {
     "type": "COMESTIBLE",
     "id": "herbal_tea",
-    "name": "herbal tea",
-    "name_plural": "herbal tea",
+    "name": { "str": "herbal tea", "str_pl": "herbal tea" },
     "weight": "250 g",
     "color": "green",
     "container": "bottle_plastic",
@@ -466,8 +465,7 @@
     "id": "hot_chocolate",
     "type": "COMESTIBLE",
     "category": "food",
-    "name": "hot chocolate",
-    "name_plural": "hot chocolate",
+    "name": { "str": "hot chocolate", "str_pl": "hot chocolate" },
     "description": "Also known as hot cocoa, this heated chocolate beverage is perfect for a cold winter day.",
     "weight": "289 g",
     "volume": "250 ml",
diff --git a/data/json/items/comestibles/frozen.json b/data/json/items/comestibles/frozen.json
index 980012f65b82b..d252569d8403c 100644
--- a/data/json/items/comestibles/frozen.json
+++ b/data/json/items/comestibles/frozen.json
@@ -54,8 +54,7 @@
   {
     "type": "COMESTIBLE",
     "id": "icecream",
-    "name": "ice cream",
-    "name_plural": "ice cream scoops",
+    "name": { "str": "ice cream", "str_pl": "ice cream scoops" },
     "description": "A sweet, frozen food made of milk with liberal amounts of sugar.",
     "weight": "70 g",
     "volume": "250 ml",
@@ -161,8 +160,7 @@
     "type": "COMESTIBLE",
     "copy-from": "icecream",
     "id": "icecream_gelato",
-    "name": "gelato",
-    "name_plural": "gelato scoops",
+    "name": { "str": "gelato", "str_pl": "gelato scoops" },
     "description": "Italian-style ice cream.  Less airy, and more dense, giving it a richer flavor and texture.",
     "calories": 240,
     "price": 300,
diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json
index ca485517902ee..d83bfadf59658 100644
--- a/data/json/items/comestibles/med.json
+++ b/data/json/items/comestibles/med.json
@@ -267,8 +267,7 @@
     "id": "chem_hydrogen_peroxide",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": "hydrogen peroxide",
-    "name_plural": "hydrogen peroxide",
+    "name": { "str": "hydrogen peroxide", "str_pl": "hydrogen peroxide" },
     "description": "Dilute hydrogen peroxide, for use as an antiseptic and for bleaching hair or textiles.  Foams a little when in contact with organic matter, but otherwise harmless.",
     "weight": "28 g",
     "volume": "250 ml",
@@ -638,8 +637,7 @@
     "id": "heroin",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": "heroin",
-    "name_plural": "heroin",
+    "name": { "str": "heroin", "str_pl": "heroin" },
     "description": "An extremely strong opioid narcotic derived from morphine.  Incredibly addictive, the risk of overdose is extreme, and the drug is contraindicated for nearly all medical purposes.",
     "weight": "1 g",
     "volume": "250 ml",
@@ -1001,8 +999,7 @@
     "id": "quikclot",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": "hemostatic powder",
-    "name_plural": "hemostatic powder",
+    "name": { "str": "hemostatic powder", "str_pl": "hemostatic powder" },
     "description": "A powdered antihemorrhagic compound that reacts with blood to immediately form a gel-like substance that stops bleeding.",
     "weight": "5 g",
     "volume": "250 ml",
diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
index 96e69fb43fa2d..552aec3d5d3b9 100644
--- a/data/json/items/comestibles/other.json
+++ b/data/json/items/comestibles/other.json
@@ -632,8 +632,7 @@
   {
     "type": "COMESTIBLE",
     "id": "grass",
-    "name": "grass",
-    "name_plural": "grasses",
+    "name": { "str": "grass", "str_pl": "grasses" },
     "weight": "100 g",
     "color": "green",
     "comestible_type": "FOOD",
@@ -643,7 +642,7 @@
     "description": "Some grass, edible by grazers and ruminants only.  Seeing this item is a bug.",
     "price": 0,
     "material": "veggy",
-    "flags": "TRADER_AVOID",
+    "flags": [ "TRADER_AVOID" ],
     "volume": "250 ml"
   },
   {
diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json
index 1c6fcf34347e5..65a87e10b7d7c 100644
--- a/data/json/items/comestibles/raw_veggy.json
+++ b/data/json/items/comestibles/raw_veggy.json
@@ -388,8 +388,7 @@
   {
     "type": "COMESTIBLE",
     "id": "hops",
-    "name": "hops flower",
-    "name_plural": "hops flowers",
+    "name": { "str": "hops flower", "str_pl": "hops flowers" },
     "weight": "92 g",
     "color": "light_green",
     "comestible_type": "FOOD",
diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json
index dc87867532478..92ac602939d13 100644
--- a/data/json/items/comestibles/sandwich.json
+++ b/data/json/items/comestibles/sandwich.json
@@ -2,8 +2,7 @@
   {
     "type": "COMESTIBLE",
     "id": "sandwich_cheese_grilled",
-    "name": "grilled cheese sandwich",
-    "name_plural": "grilled cheese sandwiches",
+    "name": { "str": "grilled cheese sandwich", "str_pl": "grilled cheese sandwiches" },
     "weight": "106 g",
     "color": "brown",
     "spoils_in": "1 day 10 hours",
diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json
index 826e6323e2660..1211540de7961 100644
--- a/data/json/items/comestibles/seed.json
+++ b/data/json/items/comestibles/seed.json
@@ -38,8 +38,7 @@
     "id": "seed_hops",
     "copy-from": "seed",
     "type": "COMESTIBLE",
-    "name": "hop rhizomes",
-    "name_plural": "hop rhizomes",
+    "name": { "str": "hop rhizomes", "str_pl": "hop rhizomes" },
     "description": "Roots of a hop plant, for growing your own.",
     "weight": "152 g",
     "price": 160,
@@ -75,8 +74,7 @@
     "id": "seed_huckleberries",
     "copy-from": "seed_fruit",
     "type": "COMESTIBLE",
-    "name": "huckleberry seeds",
-    "name_plural": "huckleberry seeds",
+    "name": { "str": "huckleberry seeds", "str_pl": "huckleberry seeds" },
     "description": "Some huckleberry seeds.",
     "seed_data": { "plant_name": "huckleberry", "fruit": "huckleberries", "byproducts": [ "withered" ], "grow": "91 days" }
   },
@@ -119,8 +117,7 @@
     "id": "seed_grapes",
     "copy-from": "seed_fruit",
     "type": "COMESTIBLE",
-    "name": "grape seeds",
-    "name_plural": "grape seeds",
+    "name": { "str": "grape seeds", "str_pl": "grape seeds" },
     "description": "Some grape seeds.",
     "seed_data": { "plant_name": "grape", "fruit": "grapes", "byproducts": [ "withered" ], "grow": "91 days" }
   },
@@ -243,8 +240,7 @@
     "id": "seed_garlic",
     "copy-from": "seed",
     "price": 50,
-    "name": "garlic seeds",
-    "name_plural": "garlic seeds",
+    "name": { "str": "garlic seeds", "str_pl": "garlic seeds" },
     "description": "Some garlic seeds.",
     "seed_data": { "plant_name": "garlic", "fruit": "garlic", "byproducts": [ "withered" ], "grow": "65 days" }
   },