diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
index e41b84c8d3bb4..61530e9bdeaf9 100644
--- a/data/json/items/comestibles/carnivore.json
+++ b/data/json/items/comestibles/carnivore.json
@@ -187,8 +187,7 @@
     "id": "ruined_chunks",
     "//": "This item should not get any use whatsoever, it is merely conservation of mass and an attractor for carrion.",
     "symbol": "¨",
-    "name": "butchery refuse",
-    "name_plural": "butchery refuse",
+    "name": { "str": "butchery refuse", "str_pl": "butchery refuse" },
     "charges": 15,
     "volume": "2500 ml",
     "weight": "250 g",
diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json
index a24db5f2fbef9..b2afb6722bf6b 100644
--- a/data/json/items/comestibles/dairy.json
+++ b/data/json/items/comestibles/dairy.json
@@ -47,8 +47,7 @@
   {
     "type": "COMESTIBLE",
     "id": "buttermilk",
-    "name": "buttermilk",
-    "name_plural": "buttermilk",
+    "name": { "str": "buttermilk", "str_pl": "buttermilk" },
     "weight": "258 g",
     "color": "white",
     "spoils_in": "2 d",
diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
index 17323078eb506..1752c243ecfd4 100644
--- a/data/json/items/comestibles/egg.json
+++ b/data/json/items/comestibles/egg.json
@@ -126,7 +126,7 @@
     "material": "egg",
     "volume": "600 ml",
     "fun": -10,
-    "proportional": { "weight": 12, "calories": 12 },
+    "proportional": { "weight": 12.0, "calories": 12.0 },
     "vitamins": [ [ "vitA", 108 ], [ "calcium", 36 ], [ "iron", 48 ], [ "vitB", 252 ] ],
     "rot_spawn": "GROUP_EGG_ANT",
     "rot_spawn_chance": 60
@@ -266,8 +266,7 @@
   {
     "type": "COMESTIBLE",
     "id": "boiled_egg",
-    "name": "boiled egg",
-    "name_plural": "boiled eggs",
+    "name": { "str": "boiled egg" },
     "copy-from": "egg_chicken",
     "color": "white",
     "symbol": "o",
diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json
index c4728ff71fc89..02b9488e63b9c 100644
--- a/data/json/items/comestibles/junkfood.json
+++ b/data/json/items/comestibles/junkfood.json
@@ -144,8 +144,7 @@
   {
     "type": "COMESTIBLE",
     "id": "popcorn3",
-    "name": "buttered popcorn",
-    "name_plural": "buttered popcorn",
+    "name": { "str": "buttered popcorn", "str_pl": "buttered popcorn" },
     "copy-from": "popcorn",
     "healthy": -1,
     "description": "Popcorn with a light covering of butter for extra flavor.",
diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json
index f5c6460e435f8..e2407d3cf80de 100644
--- a/data/json/items/comestibles/meat_dishes.json
+++ b/data/json/items/comestibles/meat_dishes.json
@@ -80,8 +80,7 @@
   {
     "type": "COMESTIBLE",
     "id": "bratwurst_sausage",
-    "name": "bratwurst",
-    "name_plural": "bratwursts",
+    "name": { "str": "bratwurst" },
     "conditional_names": [
       { "type": "FLAG", "condition": "CANNIBALISM", "name": "Mannbrat" },
       { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "baleful %s", "str_pl": "baleful %s" } }
diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
index 177bf015b1f12..c16183f84fb80 100644
--- a/data/json/items/comestibles/other.json
+++ b/data/json/items/comestibles/other.json
@@ -578,8 +578,7 @@
     "id": "birdfood",
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
-    "name": "bird food",
-    "name_plural": "bird food",
+    "name": { "str": "bird food", "str_pl": "bird food" },
     "description": "What birds eat.  Mainly made of seeds, silage or legumes.  It's perfect for small birds.",
     "weight": "60 g",
     "volume": "250 ml",
diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json
index 47c380b373db0..26fe206a35de8 100644
--- a/data/json/items/comestibles/raw_veggy.json
+++ b/data/json/items/comestibles/raw_veggy.json
@@ -38,8 +38,7 @@
   {
     "type": "COMESTIBLE",
     "id": "broccoli",
-    "name": "broccoli",
-    "name_plural": "broccoli",
+    "name": { "str": "broccoli", "str_pl": "broccoli" },
     "weight": "96 g",
     "color": "green",
     "spoils_in": "6 days 16 hours",
@@ -58,8 +57,7 @@
   {
     "type": "COMESTIBLE",
     "id": "buckwheat",
-    "name": "buckwheat",
-    "name_plural": "buckwheat",
+    "name": { "str": "buckwheat", "str_pl": "buckwheat" },
     "weight": "180 g",
     "color": "brown",
     "comestible_type": "FOOD",
diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json
index d0b5a065566a2..479895b359cc8 100644
--- a/data/json/items/comestibles/sandwich.json
+++ b/data/json/items/comestibles/sandwich.json
@@ -154,8 +154,7 @@
   {
     "type": "COMESTIBLE",
     "id": "sandwich_sauce",
-    "name": "boring sandwich",
-    "name_plural": "boring sandwiches",
+    "name": { "str": "boring sandwich", "str_pl": "boring sandwiches" },
     "copy-from": "bread",
     "proportional": { "weight": 2.0, "calories": 2.0, "volume": 2.0 },
     "color": "brown",
diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json
index 5cc1a7de3f3ee..e77089ffc7935 100644
--- a/data/json/items/comestibles/seed.json
+++ b/data/json/items/comestibles/seed.json
@@ -51,8 +51,7 @@
     "id": "seed_blackberries",
     "copy-from": "seed_fruit",
     "type": "COMESTIBLE",
-    "name": "blackberry seeds",
-    "name_plural": "blackberry seeds",
+    "name": { "str": "blackberry seeds", "str_pl": "blackberry seeds" },
     "description": "Some blackberry seeds.",
     "seed_data": { "plant_name": "blackberry", "fruit": "blackberries", "byproducts": [ "withered" ], "grow": "91 days" }
   },
@@ -60,8 +59,7 @@
     "id": "seed_blueberries",
     "copy-from": "seed_fruit",
     "type": "COMESTIBLE",
-    "name": "blueberry seeds",
-    "name_plural": "blueberry seeds",
+    "name": { "str": "blueberry seeds", "str_pl": "blueberry seeds" },
     "description": "Some blueberry seeds.",
     "seed_data": { "plant_name": "blueberry", "fruit": "blueberries", "byproducts": [ "withered" ], "grow": "91 days" }
   },
@@ -220,8 +218,7 @@
     "id": "seed_broccoli",
     "copy-from": "seed",
     "price": 50,
-    "name": "broccoli seeds",
-    "name_plural": "broccoli seeds",
+    "name": { "str": "broccoli seeds", "str_pl": "broccoli seeds" },
     "description": "Some broccoli seeds.",
     "seed_data": { "plant_name": "broccoli", "fruit": "broccoli", "byproducts": [ "withered" ], "grow": "75 days" }
   },
@@ -583,8 +580,7 @@
     "type": "COMESTIBLE",
     "id": "seed_buckwheat",
     "copy-from": "seed",
-    "name": "buckwheat seeds",
-    "name_plural": "buckwheat seeds",
+    "name": { "str": "buckwheat seeds", "str_pl": "buckwheat seeds" },
     "color": "green",
     "description": "Some buckwheat seeds.",
     "charges": 2,
diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json
index 50e37cfe2818c..c778888dc5926 100644
--- a/data/json/items/comestibles/veggy_dishes.json
+++ b/data/json/items/comestibles/veggy_dishes.json
@@ -737,8 +737,7 @@
   {
     "type": "COMESTIBLE",
     "id": "fiddlehead_boiled",
-    "name": "boiled fiddleheads",
-    "name_plural": "boiled fiddleheads",
+    "name": { "str": "boiled fiddleheads", "str_pl": "boiled fiddleheads" },
     "weight": "50 g",
     "flags": [ "FREEZERBURN", "EATEN_HOT" ],
     "color": "light_green",
diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json
index 19252300e9a1e..8ba55e33e8906 100644
--- a/data/json/items/comestibles/wheat.json
+++ b/data/json/items/comestibles/wheat.json
@@ -84,8 +84,7 @@
   {
     "type": "COMESTIBLE",
     "id": "spaghetti_cooked",
-    "name": "boiled noodles",
-    "name_plural": "boiled noodles",
+    "name": { "str": "boiled noodles", "str_pl": "boiled noodles" },
     "weight": "148 g",
     "color": "yellow",
     "spoils_in": "20 hours",