diff --git a/data/json/items/generic.json b/data/json/items/generic.json
index a6b32f63dc3ae..1c4d929de8a44 100644
--- a/data/json/items/generic.json
+++ b/data/json/items/generic.json
@@ -19,11 +19,10 @@
     "id": "fire",
     "symbol": "$",
     "color": "red",
-    "name": "nearby fire",
-    "name_plural": "none",
+    "name": { "str": "nearby fire", "str_pl": "none" },
     "description": "seeing this is a bug",
     "price": 0,
-    "volume": 0,
+    "volume": "1 ml",
     "flags": [ "PSEUDO" ]
   },
   {
@@ -32,12 +31,11 @@
     "id": "muscle",
     "symbol": "?",
     "color": "white",
-    "name": "muscle",
-    "name_plural": "none",
+    "name": { "str": "muscle", "str_pl": "none" },
     "description": "seeing this is a bug",
     "stackable": true,
     "price": 0,
-    "volume": 0,
+    "volume": "0 ml",
     "flags": [ "PSEUDO", "PERPETUAL" ],
     "fuel": { "energy": 1 }
   },
@@ -102,11 +100,10 @@
     "id": "null",
     "symbol": "$",
     "color": "red",
-    "name": "none",
-    "name_plural": "none",
+    "name": { "str": "none", "str_pl": "none" },
     "description": "seeing this is a bug",
     "price": 0,
-    "volume": 0,
+    "volume": "0 ml",
     "flags": [ "PSEUDO", "UNARMED_WEAPON" ],
     "//": "Fist is internally represented as 'wielding a none as a weapon'"
   },
@@ -1885,8 +1882,7 @@
     "id": "mortar_build",
     "symbol": "%",
     "color": "light_gray",
-    "name": "mortar",
-    "name_plural": "mortar",
+    "name": { "str": "mortar", "str_pl": "mortar" },
     "description": "Some mortar, ready to be used in building projects.",
     "category": "spare_parts",
     "container": "bag_canvas",
diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json
index 40c9022788bba..2834cee72979b 100644
--- a/data/json/items/melee/spears_and_polearms.json
+++ b/data/json/items/melee/spears_and_polearms.json
@@ -313,8 +313,7 @@
   {
     "type": "GENERIC",
     "id": "naginata",
-    "name": "naginata",
-    "name_plural": "naginata",
+    "name": { "str": "naginata", "str_pl": "naginata" },
     "description": "A sturdy polearm with a curved blade, made in the same manner as the katana and other Japanese blades.  Occasionally used by samurai in early periods, or by their wives in defense of the household.",
     "weight": "1700 g",
     "to_hit": 2,
@@ -332,8 +331,7 @@
   {
     "type": "GENERIC",
     "id": "naginata_inferior",
-    "name": "naginata",
-    "name_plural": "naginata",
+    "name": { "str": "naginata", "str_pl": "naginata" },
     "description": "A sturdy polearm with a curved blade, made in the same manner as the katana and other Japanese blades.  This one has a bit of wiggle to its blade and feels a bit shoddily made.",
     "weight": "1700 g",
     "color": "light_gray",
@@ -351,8 +349,7 @@
   {
     "type": "GENERIC",
     "id": "naginata_fake",
-    "name": "naginata",
-    "name_plural": "naginata",
+    "name": { "str": "naginata", "str_pl": "naginata" },
     "description": "This is a dull, slightly floppy replica of a Japanese polearm with a curved blade.  With a little difficulty, you could use it administer a solid slap from a distance.",
     "weight": "1400 g",
     "color": "light_gray",
diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json
index be8cedf62a82e..d9439ae330a51 100644
--- a/data/json/items/melee/swords_and_blades.json
+++ b/data/json/items/melee/swords_and_blades.json
@@ -883,8 +883,7 @@
     "type": "GENERIC",
     "symbol": "/",
     "color": "light_gray",
-    "name": "nodachi",
-    "name_plural": "nodachi",
+    "name": { "str": "nodachi", "str_pl": "nodachi" },
     "description": "This is a dull, cheaply made replica of a huge, curved, two-handed sword from Japan.  It is surprisingly light for its size.",
     "price": 15000,
     "price_postapoc": 0,
@@ -903,8 +902,7 @@
     "type": "GENERIC",
     "symbol": "/",
     "color": "light_gray",
-    "name": "nodachi",
-    "name_plural": "nodachi",
+    "name": { "str": "nodachi", "str_pl": "nodachi" },
     "description": "This is a huge, curved, two-handed sword from Japan.  It is surprisingly light for its size, but also much bendier than a sword should be.",
     "price": 15000,
     "price_postapoc": 0,
diff --git a/data/json/items/newspaper.json b/data/json/items/newspaper.json
index c41cae8a18377..3403f2b5d0752 100644
--- a/data/json/items/newspaper.json
+++ b/data/json/items/newspaper.json
@@ -67,14 +67,13 @@
     "category": "books",
     "symbol": ",",
     "color": "white",
-    "name": "newspaper page",
-    "name_plural": "newspaper pages",
+    "name": { "str": "newspaper page" },
     "snippet_category": "newest_news",
     "description": "A single sheet of newspaper broadsheet.  It is possibly one of the last issues printed before New England was overwhelmed.  Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
     "price": 0,
     "material": "paper",
     "weight": "3 g",
-    "volume": 0
+    "volume": "1 ml"
   },
   {
     "type": "GENERIC",
@@ -82,14 +81,13 @@
     "category": "books",
     "symbol": ",",
     "color": "white",
-    "name": "newspaper page",
-    "name_plural": "newspaper pages",
+    "name": { "str": "newspaper page" },
     "snippet_category": "many_years_old_news",
     "description": "A single sheet of newspaper broadsheet.  It seems to date from several years ago, and you've NO idea how it lasted this long.  Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
     "price": 0,
     "material": "paper",
     "weight": "3 g",
-    "volume": 0
+    "volume": "1 ml"
   },
   {
     "type": "GENERIC",
@@ -97,14 +95,13 @@
     "category": "books",
     "symbol": ",",
     "color": "white",
-    "name": "newspaper page",
-    "name_plural": "newspaper pages",
+    "name": { "str": "newspaper page" },
     "snippet_category": "years_old_news",
     "description": "A single sheet of newspaper broadsheet.  It seems to date from a few years ago--amazing it has lasted this long.  Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
     "price": 0,
     "material": "paper",
     "weight": "3 g",
-    "volume": 0
+    "volume": "1 ml"
   },
   {
     "type": "GENERIC",
@@ -112,14 +109,13 @@
     "category": "books",
     "symbol": ",",
     "color": "white",
-    "name": "newspaper page",
-    "name_plural": "newspaper pages",
+    "name": { "str": "newspaper page" },
     "snippet_category": "one_year_old_news",
     "description": "A single sheet of newspaper broadsheet.  It was printed more than a year ago.  Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
     "price": 0,
     "material": "paper",
     "weight": "3 g",
-    "volume": 0
+    "volume": "1 ml"
   },
   {
     "type": "GENERIC",
@@ -127,14 +123,13 @@
     "category": "books",
     "symbol": ",",
     "color": "white",
-    "name": "newspaper page",
-    "name_plural": "newspaper pages",
+    "name": { "str": "newspaper page" },
     "snippet_category": "months_old_news",
     "description": "A single sheet of newspaper broadsheet.  It was printed in the months leading up to the Cataclysm.  Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
     "price": 0,
     "material": "paper",
     "weight": "3 g",
-    "volume": 0
+    "volume": "1 ml"
   },
   {
     "type": "GENERIC",
@@ -142,14 +137,13 @@
     "category": "books",
     "symbol": ",",
     "color": "white",
-    "name": "newspaper page",
-    "name_plural": "newspaper pages",
+    "name": { "str": "newspaper page" },
     "snippet_category": "weeks_old_news",
     "description": "A single sheet of newspaper broadsheet.  It was printed in the weeks leading up to the Cataclysm.  Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.",
     "price": 0,
     "material": "paper",
     "weight": "3 g",
-    "volume": 0
+    "volume": "1 ml"
   },
   {
     "type": "GENERIC",
diff --git a/data/json/items/software.json b/data/json/items/software.json
index 6f843132f35a9..429cf681d3710 100644
--- a/data/json/items/software.json
+++ b/data/json/items/software.json
@@ -12,8 +12,7 @@
     "id": "software_useless",
     "copy-from": "software",
     "type": "GENERIC",
-    "name": "misc software",
-    "name_plural": "misc software",
+    "name": { "str": "misc software", "str_pl": "misc software" },
     "description": "A miscellaneous piece of hobby software.  Probably useless.",
     "price": 300
   },
@@ -69,8 +68,7 @@
   {
     "id": "mind_scan_robofac",
     "type": "GENERIC",
-    "name": "neural data",
-    "name_plural": "neural data",
+    "name": { "str": "neural data", "str_pl": "neural data" },
     "symbol": "#",
     "container": "data_card",
     "description": "Data stolen from a dead scientist memory banks.  Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n\nWhatever the case, the idea of perpetually keeping a part of you within a metallic pill makes you feel uncomfortable.",
diff --git a/data/json/items/vehicle/boat.json b/data/json/items/vehicle/boat.json
index 377610a79b048..39a5b5e5d5cdd 100644
--- a/data/json/items/vehicle/boat.json
+++ b/data/json/items/vehicle/boat.json
@@ -51,8 +51,7 @@
   {
     "type": "GENERIC",
     "id": "hand_paddles",
-    "name": "oars",
-    "name_plural": "oars",
+    "name": { "str": "oars", "str_pl": "oars" },
     "description": "Oars for a boat.",
     "weight": "8 kg",
     "to_hit": -1,