diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
index e6f4432b4b54f..72b9dc609e528 100644
--- a/data/json/items/ammo.json
+++ b/data/json/items/ammo.json
@@ -16,7 +16,7 @@
     "ammo_type": "battery",
     "count": 100,
     "//2": "1 battery is 1 kJ of energy. 40 batteries is an alkaline C-cell.",
-    "fuel": { "energy": 1.0 }
+    "fuel": { "energy": 1 }
   },
   {
     "type": "TOOL",
@@ -221,7 +221,7 @@
     "ammo_type": "plutonium",
     "count": 5,
     "effects": [ "COOKOFF", "NEVER_MISFIRES" ],
-    "fuel": { "energy": 10.0 }
+    "fuel": { "energy": 10 }
   },
   {
     "type": "AMMO",
@@ -472,8 +472,8 @@
     "flags": [ "UNRECOVERABLE" ],
     "fuel": {
       "//": "Compressed gaseous hydrogen has 9.2 MJ/L.  This stuff has a very high energy density but is also bulky and explosive.",
-      "energy": 4000.0,
-      "explosion_data": { "chance_hot": 2, "chance_cold": 2, "factor": 1.0, "fiery": true, "size_factor": 0.15 }
+      "energy": 4000,
+      "explosion_data": { "chance_hot": 2, "chance_cold": 2, "factor": 1, "fiery": true, "size_factor": 0.15 }
     }
   },
   {
@@ -856,7 +856,7 @@
     "ammo_type": "charcoal",
     "count": 250,
     "stack_size": 10,
-    "fuel": { "energy": 30.0 }
+    "fuel": { "energy": 30 }
   },
   {
     "type": "AMMO",
@@ -1001,8 +1001,7 @@
     "category": "spare_parts",
     "price": 12000,
     "//": "This seems like the larger medical tank, not an instant-use model with mask attached",
-    "name": "oxygen",
-    "name_plural": "oxygen",
+    "name": { "str": "oxygen", "str_pl": "oxygen" },
     "symbol": "=",
     "color": "light_gray",
     "description": "A canister of oxygen.",
@@ -1117,8 +1116,7 @@
     "id": "nitrox",
     "category": "chems",
     "price": 500,
-    "name": "nitrox",
-    "name_plural": "nitrox",
+    "name": { "str": "nitrox", "str_pl": "nitrox" },
     "symbol": "=",
     "color": "white",
     "container": "bottle_plastic",
@@ -1172,8 +1170,7 @@
     "type": "AMMO",
     "id": "metal_RPG_die",
     "price": 50,
-    "name": "metal RPG die",
-    "name_plural": "metal RPG dice",
+    "name": { "str": "metal RPG die", "str_pl": "metal RPG dice" },
     "symbol": "=",
     "color": "light_gray",
     "looks_like": "marble",
diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json
index 3694fd4cb6d30..2823331a9321e 100644
--- a/data/json/items/chemicals_and_resources.json
+++ b/data/json/items/chemicals_and_resources.json
@@ -72,8 +72,7 @@
     "id": "material_limestone",
     "category": "spare_parts",
     "price": 50,
-    "name": "limestone",
-    "name_plural": "limestone",
+    "name": { "str": "limestone", "str_pl": "limestone" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "A handful of small chunks of limestone.  Useful for experiments at science fairs, but pretty useless as ammo.  Maybe something could be crafted from this stuff…",
@@ -519,8 +518,7 @@
     "id": "chem_manganese_dioxide",
     "category": "chems",
     "price": 600,
-    "name": "manganese dioxide",
-    "name_plural": "manganese dioxide",
+    "name": { "str": "manganese dioxide", "str_pl": "manganese dioxide" },
     "symbol": "=",
     "color": "white",
     "description": "A handful of manganese dioxide powder.  Occurring naturally in the mineral pyrolusite, it is used commercially in the production of alkaline and zinc-carbon batteries.",
@@ -631,8 +629,7 @@
     "id": "chem_nitric_acid",
     "category": "chems",
     "price": 300,
-    "name": "nitric acid",
-    "name_plural": "nitric acid",
+    "name": { "str": "nitric acid", "str_pl": "nitric acid" },
     "symbol": "=",
     "color": "white",
     "flags": [ "DROP_ACTION_ONLY_IF_LIQUID" ],
@@ -755,8 +752,7 @@
     "id": "material_niter",
     "category": "spare_parts",
     "price": 75,
-    "name": "niter",
-    "name_plural": "niter",
+    "name": { "str": "niter", "str_pl": "niter" },
     "symbol": "*",
     "color": "white",
     "description": "A large crystal of niter, the mineral form of potassium nitrate.  It can be processed into saltpeter.",
@@ -873,8 +869,7 @@
     "id": "chem_match_head_powder",
     "category": "chems",
     "price": 50,
-    "name": "match head powder",
-    "name_plural": "match head powder",
+    "name": { "str": "match head powder", "str_pl": "match head powder" },
     "symbol": "=",
     "color": "light_red",
     "description": "Some match head powder from match heads, similar to black gunpowder but a bit weaker.  It can be used in crafting explosives and fuses when other more suitable candidates are less available.",
diff --git a/data/json/items/fuel.json b/data/json/items/fuel.json
index 536c0a15a423b..b53e971a1f1ea 100644
--- a/data/json/items/fuel.json
+++ b/data/json/items/fuel.json
@@ -112,8 +112,7 @@
   {
     "id": "lamp_oil",
     "type": "AMMO",
-    "name": "lamp oil",
-    "name_plural": "lamp oil",
+    "name": { "str": "lamp oil", "str_pl": "lamp oil" },
     "description": "A thin and clean-burning oil made for use in oil lamps.",
     "category": "fuel",
     "weight": "1 g",
@@ -141,8 +140,7 @@
   {
     "id": "motor_oil",
     "type": "AMMO",
-    "name": "motor oil",
-    "name_plural": "motor oil",
+    "name": { "str": "motor oil", "str_pl": "motor oil" },
     "description": "An oil made for use in car engines.",
     "category": "fuel",
     "weight": "1 g",
@@ -170,8 +168,7 @@
   {
     "id": "napalm",
     "type": "AMMO",
-    "name": "napalm",
-    "name_plural": "napalm",
+    "name": { "str": "napalm", "str_pl": "napalm" },
     "description": "This is gasoline mixed with some other components to make it stick to the surface and increase burning temperature, meant to be used with a flamethrower.",
     "category": "fuel",
     "weight": "1 g",
diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json
index fdb50482199d1..879b169ea73c4 100644
--- a/data/json/items/resources/metal.json
+++ b/data/json/items/resources/metal.json
@@ -161,8 +161,7 @@
     "id": "lead",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "lead",
-    "name_plural": "lead",
+    "name": { "str": "lead", "str_pl": "lead" },
     "description": "A soft dull metal known since ancient times.  Due to its malleability it has a wide variety of uses including the manufacture of ammunition.",
     "weight": "3 g",
     "//": "Density 11.34g/cm³ ~ 2.8kg/250ml @ stack 1000 = 3g/unit",
@@ -179,8 +178,7 @@
     "id": "magnesium",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "magnesium powder",
-    "name_plural": "magnesium powder",
+    "name": { "str": "magnesium powder", "str_pl": "magnesium powder" },
     "description": "A gray powder composed of the highly flammable alkaline earth metal magnesium.  Useful for constructing flares and similar items.",
     "weight": "1120 mg",
     "//": "Weight should be 1.12g because magnesium is 64% less dense than aluminum (1.74g/cm³ vs 2.70g/cm³), at 250ml aluminium powder has a weight of ~0.176kg at 250ml, assuming same particle size => magnesium powder has a weight of ~0.112kg at 250ml",
diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json
index 75ba44bd4590f..408f5d810e283 100644
--- a/data/json/items/resources/tailoring.json
+++ b/data/json/items/resources/tailoring.json
@@ -53,8 +53,7 @@
     "id": "scrap_leather",
     "copy-from": "scrap_cotton",
     "type": "AMMO",
-    "name": "leather scraps",
-    "name_plural": "leather scraps",
+    "name": { "str": "leather scraps", "str_pl": "leather scraps" },
     "description": "Oddly-shaped smallish bits of leather, waste material from tailoring projects.  Not useful for much and usually disposed of.",
     "price": 0,
     "material": "leather"
@@ -63,8 +62,7 @@
     "id": "scrap_lycra",
     "copy-from": "scrap_cotton",
     "type": "AMMO",
-    "name": "lycra scraps",
-    "name_plural": "lycra scraps",
+    "name": { "str": "lycra scraps", "str_pl": "lycra scraps" },
     "description": "Oddly-shaped smallish bits of lycra, waste material from tailoring projects.  Not useful for much and usually disposed of.",
     "price": 0,
     "material": "lycra"
@@ -73,8 +71,7 @@
     "id": "scrap_neoprene",
     "copy-from": "scrap_cotton",
     "type": "AMMO",
-    "name": "neoprene scraps",
-    "name_plural": "neoprene scraps",
+    "name": { "str": "neoprene scraps", "str_pl": "neoprene scraps" },
     "description": "Oddly-shaped smallish bits of neoprene, waste material from tailoring projects.  Not useful for much and usually disposed of.",
     "price": 0,
     "material": "neoprene"