diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json
index 6f2a097da1865..3694fd4cb6d30 100644
--- a/data/json/items/chemicals_and_resources.json
+++ b/data/json/items/chemicals_and_resources.json
@@ -596,8 +596,7 @@
     "id": "chem_muriatic_acid",
     "category": "chems",
     "price": 250,
-    "name": "hydrochloric acid",
-    "name_plural": "hydrochloric acid",
+    "name": { "str": "hydrochloric acid", "str_pl": "hydrochloric acid" },
     "symbol": "=",
     "color": "white",
     "flags": [ "DROP_ACTION_ONLY_IF_LIQUID" ],
@@ -688,8 +687,7 @@
     "id": "chem_hexamine",
     "category": "chems",
     "price": 900,
-    "name": "hexamine",
-    "name_plural": "hexamine",
+    "name": { "str": "hexamine", "str_pl": "hexamine" },
     "symbol": "=",
     "color": "red",
     "description": "A handful of waxy hexamine tablets.  This ubiquitous fuel was used to start up almost every garden grill and no 'real' camping trip could do its cooking without it, until the Cataclysm.  Nowadays, it is even more valuable then before, being the key component in the preparation of several military-grade explosives.",
@@ -706,8 +704,7 @@
     "id": "chem_hydrogen_peroxide_conc",
     "category": "chems",
     "price": 1000,
-    "name": "hydrogen peroxide (concentrated)",
-    "name_plural": "hydrogen peroxide (concentrated)",
+    "name": { "str": "hydrogen peroxide (concentrated)", "str_pl": "hydrogen peroxide (concentrated)" },
     "symbol": "~",
     "color": "white",
     "description": "Concentrated hydrogen peroxide is a powerful oxidant, violently decomposing in contact with most reducing agents.  Can be used as rocket fuel or to make high explosives.  Causes severe burns to any organic matter and may ignite it on contact.",
@@ -807,8 +804,7 @@
     "id": "chem_formaldehyde",
     "category": "chems",
     "price": 200,
-    "name": "formaldehyde",
-    "name_plural": "formaldehyde",
+    "name": { "str": "formaldehyde", "str_pl": "formaldehyde" },
     "symbol": "~",
     "color": "white",
     "description": "Formaldehyde, here dissolved in water, was widely used before the Cataclysm as a precursor to production of many chemicals and materials and as an embalming agent.  Easily identifiable by its pungent odor.  Terribly toxic, carcinogenic, and volatile.",
@@ -930,8 +926,7 @@
     "id": "chem_rocket_fuel",
     "category": "chems",
     "price": 500,
-    "name": "improvised rocket fuel",
-    "name_plural": "improvised rocket fuel",
+    "name": { "str": "improvised rocket fuel", "str_pl": "improvised rocket fuel" },
     "symbol": "=",
     "color": "white",
     "description": "A chunk of a zinc powder and sulfur mixture, bound together by superglue, that can be used as an impromptu rocket fuel.",
diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json
index 7095d0f214cbc..d11b987e65fb8 100644
--- a/data/json/items/comestibles/seed.json
+++ b/data/json/items/comestibles/seed.json
@@ -416,8 +416,7 @@
     "id": "fungal_seeds",
     "copy-from": "seed",
     "price": 100,
-    "name": "fungal seeds",
-    "name_plural": "fungal seeds",
+    "name": { "str": "fungal seeds", "str_pl": "fungal seeds" },
     "color": "dark_gray",
     "description": "Some fungal seeds.",
     "ammo_type": "NULL",
diff --git a/data/json/items/fuel.json b/data/json/items/fuel.json
index 98e3a5ade1144..536c0a15a423b 100644
--- a/data/json/items/fuel.json
+++ b/data/json/items/fuel.json
@@ -84,8 +84,7 @@
   {
     "id": "gasoline",
     "type": "AMMO",
-    "name": "gasoline",
-    "name_plural": "gasoline",
+    "name": { "str": "gasoline", "str_pl": "gasoline" },
     "description": "Gasoline is a highly flammable liquid.  When under pressure, it has the potential for violent explosion.",
     "category": "fuel",
     "weight": "1 g",
@@ -107,7 +106,7 @@
     "fuel": {
       "energy": 34.2,
       "pump_terrain": "t_gas_pump",
-      "explosion_data": { "chance_hot": 2, "chance_cold": 5, "factor": 1.0, "fiery": true, "size_factor": 0.1 }
+      "explosion_data": { "chance_hot": 2, "chance_cold": 5, "factor": 1, "fiery": true, "size_factor": 0.1 }
     }
   },
   {
@@ -131,7 +130,7 @@
     "ammo_type": "lamp_oil",
     "fuel": {
       "//": "Roughly equivalent to LPG",
-      "energy": 26.0,
+      "energy": 26,
       "explosion_data": { "chance_hot": 5, "chance_cold": 10, "factor": 0.2, "fiery": true, "size_factor": 0.1 }
     },
     "range": 6,
@@ -160,7 +159,7 @@
     "ammo_type": "motor_oil",
     "fuel": {
       "//": "Roughly equivalent to LPG",
-      "energy": 26.0,
+      "energy": 26,
       "explosion_data": { "chance_hot": 5, "chance_cold": 10, "factor": 0.2, "fiery": true, "size_factor": 0.1 }
     },
     "range": 6,
@@ -194,8 +193,7 @@
   {
     "id": "gelled_gasoline",
     "type": "AMMO",
-    "name": "gelled gasoline",
-    "name_plural": "gelled gasoline",
+    "name": { "str": "gelled gasoline", "str_pl": "gelled gasoline" },
     "copy-from": "gasoline",
     "description": "A flammable gel composed of gasoline and dissolved shavings of polystyrene, roughly similar in properties to napalm b.  It's meant to be used with a flamethrower.",
     "price": 400,
@@ -207,8 +205,7 @@
   {
     "id": "flamethrower_fuel",
     "type": "AMMO",
-    "name": "flamethrower fuel",
-    "name_plural": "flamethrower fuel",
+    "name": { "str": "flamethrower fuel", "str_pl": "flamethrower fuel" },
     "copy-from": "gasoline",
     "description": "A mixture of gasoline and diesel oil in equal parts.  Its combustion properties make it unfit for applications where you would use any of them separately, but it can be used to feed a flamethrower.",
     "price": 400,
diff --git a/data/json/items/resources/home_improvement.json b/data/json/items/resources/home_improvement.json
index 679f76ce3aab4..8b0b8e07bcb56 100644
--- a/data/json/items/resources/home_improvement.json
+++ b/data/json/items/resources/home_improvement.json
@@ -51,8 +51,7 @@
     "id": "g_paint",
     "category": "other",
     "price": 120,
-    "name": "green paint",
-    "name_plural": "green paint",
+    "name": { "str": "green paint", "str_pl": "green paint" },
     "symbol": "o",
     "color": "green",
     "description": "A can of green paint.",
diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json
index 499d96bdbf4b7..fdb50482199d1 100644
--- a/data/json/items/resources/metal.json
+++ b/data/json/items/resources/metal.json
@@ -106,8 +106,7 @@
     "id": "gold_small",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "gold",
-    "name_plural": "gold",
+    "name": { "str": "gold", "str_pl": "gold" },
     "description": "A soft shiny metal.  Before the apocalypse this would've been worth a small fortune but now its value is greatly diminished.",
     "weight": "5 g",
     "//": "Density 19.32g/cm³ ~ 4.8kg/250ml @ stack 1000 = 5g/unit",
diff --git a/data/json/items/resources/misc.json b/data/json/items/resources/misc.json
index 6624a3e35589f..780e5afd207b3 100644
--- a/data/json/items/resources/misc.json
+++ b/data/json/items/resources/misc.json
@@ -65,8 +65,7 @@
     "id": "incendiary",
     "type": "AMMO",
     "category": "chems",
-    "name": "incendiary",
-    "name_plural": "incendiaries",
+    "name": { "str": "incendiary", "str_pl": "incendiaries" },
     "description": "Material from an incendiary round, useful in constructing incendiary ammunition.",
     "weight": "2 g",
     "volume": "500 ml",
@@ -114,8 +113,7 @@
     "id": "fuse",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "fuse",
-    "name_plural": "fuse",
+    "name": { "str": "fuse", "str_pl": "fuse" },
     "description": "A piece of fuse, long enough to give you enough time to get away from most explosions.",
     "weight": "6 g",
     "volume": "80 ml",
diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json
index 9e6d2b13d16c8..75ba44bd4590f 100644
--- a/data/json/items/resources/tailoring.json
+++ b/data/json/items/resources/tailoring.json
@@ -18,8 +18,7 @@
     "id": "scrap_faux_fur",
     "copy-from": "scrap_cotton",
     "type": "AMMO",
-    "name": "faux fur scraps",
-    "name_plural": "faux fur scraps",
+    "name": { "str": "faux fur scraps", "str_pl": "faux fur scraps" },
     "description": "Oddly-shaped smallish bits of faux fur, waste material from tailoring projects.  Not useful for much and usually disposed of.",
     "price": 0,
     "material": "faux_fur"
@@ -28,8 +27,7 @@
     "id": "scrap_felt",
     "copy-from": "scrap_cotton",
     "type": "AMMO",
-    "name": "felt scraps",
-    "name_plural": "felt scraps",
+    "name": { "str": "felt scraps", "str_pl": "felt scraps" },
     "description": "Oddly-shaped smallish bits of felt, waste material from tailoring projects.  Not useful for much and usually disposed of, but can be recycled into some wool fiber if you really want.",
     "material": "wool"
   },
@@ -37,8 +35,7 @@
     "id": "scrap_fur",
     "copy-from": "scrap_cotton",
     "type": "AMMO",
-    "name": "fur scraps",
-    "name_plural": "fur scraps",
+    "name": { "str": "fur scraps", "str_pl": "fur scraps" },
     "description": "Oddly-shaped smallish bits of fur, waste material from tailoring projects.  Not useful for much and usually disposed of.",
     "price": 0,
     "material": "fur"