diff --git a/data/json/items/tool/explosives.json b/data/json/items/tool/explosives.json
index d79ea3450a013..28d9288f8979a 100644
--- a/data/json/items/tool/explosives.json
+++ b/data/json/items/tool/explosives.json
@@ -820,8 +820,7 @@
     "id": "LAW_Packed",
     "type": "TOOL",
     "category": "guns",
-    "name": "packed M72 LAW",
-    "name_plural": "packed M72 LAWs",
+    "name": { "str": "packed M72 LAW", "str_pl": "packed M72 LAWs" },
     "description": "This is a M72 LAW, packed in its storage form.  Use it to pop it out and make it ready to fire.  Once it is activated, it cannot be repacked.",
     "weight": "2500 g",
     "volume": "1500 ml",
diff --git a/data/json/items/tool/musical_instruments.json b/data/json/items/tool/musical_instruments.json
index 0b6536bf51eba..7af512de92728 100644
--- a/data/json/items/tool/musical_instruments.json
+++ b/data/json/items/tool/musical_instruments.json
@@ -3,8 +3,7 @@
     "id": "banjo",
     "type": "TOOL",
     "category": "tools",
-    "name": "banjo",
-    "name_plural": "banjos",
+    "name": { "str": "banjo" },
     "description": "A standard factory-made banjo.  Looks to be in working condition.",
     "weight": "2000 g",
     "volume": "3 L",
@@ -34,8 +33,7 @@
     "id": "bone_flute",
     "type": "TOOL",
     "category": "tools",
-    "name": "bone flute",
-    "name_plural": "bone flutes",
+    "name": { "str": "bone flute" },
     "description": "A polished bone flute with five finger holes.",
     "weight": "250 g",
     "volume": "500 ml",
@@ -65,8 +63,7 @@
     "id": "clarinet",
     "type": "TOOL",
     "category": "tools",
-    "name": "clarinet",
-    "name_plural": "clarinets",
+    "name": { "str": "clarinet" },
     "description": "An ornate clarinet made from wood.",
     "weight": "550 g",
     "volume": "1500 ml",
@@ -96,8 +93,7 @@
     "id": "flute",
     "type": "TOOL",
     "category": "tools",
-    "name": "flute",
-    "name_plural": "flutes",
+    "name": { "str": "flute" },
     "description": "A simple silver-plated flute.",
     "weight": "250 g",
     "volume": "500 ml",
@@ -126,8 +122,7 @@
     "id": "trumpet",
     "type": "TOOL",
     "category": "tools",
-    "name": "trumpet",
-    "name_plural": "trumpets",
+    "name": { "str": "trumpet", "str_pl": "trumpets" },
     "description": "A brass trumpet with only a few dents here and there.",
     "weight": "1500 g",
     "volume": "2500 ml",
@@ -157,8 +152,7 @@
     "id": "ukulele",
     "type": "TOOL",
     "category": "tools",
-    "name": "ukulele",
-    "name_plural": "ukuleles",
+    "name": { "str": "ukulele" },
     "description": "A small factory made ukulele.  Looks to be in working condition.",
     "weight": "2000 g",
     "volume": "2500 ml",
@@ -188,8 +182,7 @@
     "id": "violin",
     "type": "TOOL",
     "category": "tools",
-    "name": "violin",
-    "name_plural": "violins",
+    "name": { "str": "violin" },
     "description": "A cheap, factory-made violin with a built-in holder for a bow.  Still produces a nice sound.",
     "weight": "1300 g",
     "volume": "2500 ml",
@@ -219,8 +212,7 @@
     "id": "violin_golden",
     "type": "TOOL",
     "category": "tools",
-    "name": "golden fiddle",
-    "name_plural": "golden fiddles",
+    "name": { "str": "golden fiddle", "str_pl": "golden fiddles" },
     "description": "A shiny golden fiddle, with a strange aura around it.  You feel like it once belonged to the best there's ever been.",
     "weight": "13000 g",
     "volume": "2500 ml",
diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json
index 3b245466fcb86..fd27d200689b0 100644
--- a/data/json/items/tool/science.json
+++ b/data/json/items/tool/science.json
@@ -334,8 +334,7 @@
     "id": "cuvettes",
     "type": "TOOL",
     "category": "tools",
-    "name": "set of spectrometry cuvettes",
-    "name_plural": "sets of spectrometry cuvettes",
+    "name": { "str": "set of spectrometry cuvettes", "str_pl": "sets of spectrometry cuvettes" },
     "description": "This is a small box filled with precisely calibrated square plastic tubes for laboratory spectrometer use.",
     "weight": "500 g",
     "volume": "250 ml",
@@ -412,8 +411,7 @@
     "id": "melting_point",
     "type": "TOOL",
     "category": "tools",
-    "name": "melting point apparatus",
-    "name_plural": "units of melting point apparatus",
+    "name": { "str": "melting point apparatus", "str_pl": "units of melting point apparatus" },
     "description": "This is basically a hot plate, with a metal housing attached.  The metal housing has a magnification viewport and a slot into which a capillary tube containing a crystallized sample is inserted.  The device lets you precisely measure the melting point of a crystal, a property very useful in identifying what it is and how pure it is.",
     "weight": "5000 g",
     "volume": "1500 ml",
diff --git a/data/json/items/vehicle_parts.json b/data/json/items/vehicle_parts.json
index 781f5cf511b21..b5f1ee8ebdd38 100644
--- a/data/json/items/vehicle_parts.json
+++ b/data/json/items/vehicle_parts.json
@@ -19,8 +19,7 @@
     "type": "TOOL",
     "id": "black_box",
     "category": "other",
-    "name": "military black box",
-    "name_plural": "military black boxes",
+    "name": { "str": "military black box", "str_pl": "military black boxes" },
     "description": "This is a black box, seemingly pulled from some sort of military vehicle wreckage.  If you can find a system to analyze this you may find something of interest.",
     "weight": "4535 g",
     "volume": "2 L",