diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json
index bff17204bd439..aa9902b202e08 100644
--- a/data/json/items/comestibles/alcohol.json
+++ b/data/json/items/comestibles/alcohol.json
@@ -1047,8 +1047,7 @@
     "type": "COMESTIBLE",
     "id": "cheap_whiskey",
     "copy-from": "whiskey",
-    "name": "cheap whiskey",
-    "name_plural": "cheap whiskey",
+    "name": { "str": "cheap whiskey", "str_pl": "cheap whiskey" },
     "description": "Really cheap blended whiskey.",
     "price": 1800,
     "fun": 12
diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
index a300072c95fc0..c063cb317ae1a 100644
--- a/data/json/items/comestibles/carnivore.json
+++ b/data/json/items/comestibles/carnivore.json
@@ -106,8 +106,7 @@
     "id": "meat",
     "copy-from": "flesh",
     "type": "COMESTIBLE",
-    "name": "chunk of meat",
-    "name_plural": "chunks of meat",
+    "name": { "str": "chunk of meat", "str_pl": "chunks of meat" },
     "description": "Freshly butchered meat.  You could eat it raw, but cooking it is better.",
     "weight": "296 g",
     "volume": "250 ml",
@@ -137,8 +136,7 @@
     "id": "mutant_meat",
     "type": "COMESTIBLE",
     "copy-from": "meat",
-    "name": "chunk of mutant meat",
-    "name_plural": "chunks of mutant meat",
+    "name": { "str": "chunk of mutant meat", "str_pl": "chunks of mutant meat" },
     "description": "Meat from a heavily mutated animal.  It has an unsettling loose and spongy texture, but smells… mostly normal.  There are strange tangles and formations in it that don't appear natural at all: bits of bone and hair crusted up inside the muscle, as if trying to form another organism.  Still, seems digestible at least, if you cook it and remove the worst parts.",
     "looks_like": "meat",
     "cooks_like": "mutant_meat_cooked",
@@ -622,8 +620,7 @@
     "id": "mutant_fat",
     "type": "COMESTIBLE",
     "copy-from": "fat",
-    "name": "chunk of mutant fat",
-    "name_plural": "chunks of mutant fat",
+    "name": { "str": "chunk of mutant fat", "str_pl": "chunks of mutant fat" },
     "description": "Freshly butchered fat from a heavily mutated animal.  You could eat it raw, but it is better used as an ingredient in other foods or projects.",
     "looks_like": "fat",
     "proportional": { "price": 0.2 },
@@ -673,8 +670,7 @@
     "type": "COMESTIBLE",
     "id": "meat_tainted",
     "category": "other",
-    "name": "chunk of tainted meat",
-    "name_plural": "chunks of tainted meat",
+    "name": { "str": "chunk of tainted meat", "str_pl": "chunks of tainted meat" },
     "weight": "238 g",
     "color": "red",
     "spoils_in": "4 hours",
diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json
index e37f9a3cd1663..c7a7d2770a143 100644
--- a/data/json/items/comestibles/drink.json
+++ b/data/json/items/comestibles/drink.json
@@ -145,8 +145,7 @@
   {
     "type": "COMESTIBLE",
     "id": "chamomile_tea",
-    "name": "chamomile tea",
-    "name_plural": "chamomile tea",
+    "name": { "str": "chamomile tea", "str_pl": "chamomile tea" },
     "copy-from": "tea",
     "color": "green",
     "use_action": "SLEEP",
@@ -225,8 +224,7 @@
   {
     "type": "COMESTIBLE",
     "id": "chicory_coffee",
-    "name": "chicory brew",
-    "name_plural": "chicory brew",
+    "name": { "str": "chicory brew", "str_pl": "chicory brew" },
     "weight": "252 g",
     "color": "brown",
     "comestible_type": "DRINK",
diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json
index c4fd10bb8aa19..045a069879d04 100644
--- a/data/json/items/comestibles/junkfood.json
+++ b/data/json/items/comestibles/junkfood.json
@@ -276,8 +276,7 @@
   {
     "type": "COMESTIBLE",
     "id": "candy2",
-    "name": "chocolate candy",
-    "name_plural": "chocolate candies",
+    "name": { "str": "chocolate candy", "str_pl": "chocolate candies" },
     "weight": "57 g",
     "color": "red",
     "spoils_in": "360 days",
@@ -298,8 +297,7 @@
   {
     "type": "COMESTIBLE",
     "id": "candy3",
-    "name": "chewy candy",
-    "name_plural": "chewy candies",
+    "name": { "str": "chewy candy", "str_pl": "chewy candy" },
     "weight": "46 g",
     "color": "yellow",
     "spoils_in": "360 days",
@@ -701,8 +699,7 @@
   {
     "type": "COMESTIBLE",
     "id": "nachosc",
-    "name": "cheese nachos",
-    "name_plural": "cheese nachos",
+    "name": { "str": "cheese nachos", "str_pl": "cheese nachos" },
     "weight": "85 g",
     "color": "yellow",
     "spoils_in": "1 day",
@@ -891,8 +888,7 @@
   {
     "type": "COMESTIBLE",
     "id": "chilidogs",
-    "name": "chili dogs",
-    "name_plural": "chili dogs",
+    "name": { "str": "chili dogs", "str_pl": "chili dogs" },
     "weight": "318 g",
     "color": "red",
     "spoils_in": "1 day",
@@ -947,8 +943,7 @@
     "type": "COMESTIBLE",
     "id": "choc_pancakes",
     "copy-from": "pancakes",
-    "name": "chocolate pancake",
-    "name_plural": "chocolate pancakes",
+    "name": { "str": "chocolate pancake", "str_pl": "chocolate pancakes" },
     "weight": "78 g",
     "healthy": 0,
     "calories": 219,
@@ -1002,8 +997,7 @@
   {
     "type": "COMESTIBLE",
     "id": "cheese_fries",
-    "name": "cheese fries",
-    "name_plural": "cheese fries",
+    "name": { "str": "cheese fries", "str_pl": "cheese fries" },
     "weight": "101 g",
     "color": "yellow",
     "spoils_in": "3 days",
diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json
index 3cabf6c4a608e..37d5cab07fede 100644
--- a/data/json/items/comestibles/meat_dishes.json
+++ b/data/json/items/comestibles/meat_dishes.json
@@ -548,8 +548,7 @@
   {
     "type": "COMESTIBLE",
     "id": "chili",
-    "name": "chili con carne",
-    "name_plural": "chilis con carne",
+    "name": { "str": "chili con carne", "str_pl": "chilis con carne" },
     "conditional_names": [
       { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "chili con cabron", "str_pl": "chilis con cabron" } },
       {
diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json
index 4b2e4215335ca..fa97c88161adf 100644
--- a/data/json/items/comestibles/med.json
+++ b/data/json/items/comestibles/med.json
@@ -600,8 +600,7 @@
     "id": "gum",
     "type": "COMESTIBLE",
     "comestible_type": "MED",
-    "name": "chewing gum",
-    "name_plural": "chewing gum",
+    "name": { "str": "chewing gum", "str_pl": "chewing gum" },
     "description": "Bright pink chewing gum.  Sugary, sweet, and bad for your teeth.",
     "category": "food",
     "weight": "3 g",
diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
index f68cd53eaa241..7b67d87ef60d7 100644
--- a/data/json/items/comestibles/other.json
+++ b/data/json/items/comestibles/other.json
@@ -204,8 +204,7 @@
   {
     "type": "COMESTIBLE",
     "id": "meal_chitin_piece",
-    "name": "chitin powder",
-    "name_plural": "chitin powder",
+    "name": { "str": "chitin powder", "str_pl": "chitin powder" },
     "weight": "112 g",
     "color": "brown",
     "comestible_type": "FOOD",
diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json
index d11b987e65fb8..ae006afca7f4a 100644
--- a/data/json/items/comestibles/seed.json
+++ b/data/json/items/comestibles/seed.json
@@ -285,8 +285,7 @@
     "type": "COMESTIBLE",
     "id": "seed_chicory",
     "copy-from": "seed",
-    "name": "chicory seeds",
-    "name_plural": "chicory seeds",
+    "name": { "str": "chicory seeds", "str_pl": "chicory seeds" },
     "color": "green",
     "description": "Some chicory seeds.",
     "charges": 2,
@@ -366,8 +365,7 @@
     "id": "seed_chili_pepper",
     "copy-from": "seed",
     "price": 50,
-    "name": "chili pepper seeds",
-    "name_plural": "chili pepper seeds",
+    "name": { "str": "chili pepper seeds", "str_pl": "chili pepper seeds" },
     "color": "white",
     "description": "Some chili pepper seeds.",
     "seed_data": { "plant_name": "chili pepper", "fruit": "chili_pepper", "byproducts": [ "withered" ], "grow": "65 days" }
@@ -778,8 +776,7 @@
     "id": "seed_chamomile",
     "copy-from": "seed",
     "looks_like": "seed_raw_dandelion",
-    "name": "chamomile seeds",
-    "name_plural": "chamomile seeds",
+    "name": { "str": "chamomile seeds", "str_pl": "chamomile seeds" },
     "description": "Some chamomile seeds.",
     "seed_data": { "plant_name": "chamomile", "fruit": "chamomile", "byproducts": [ "withered" ], "grow": "91 days" }
   }