diff --git a/data/mods/Generic_Guns/ammo/pistol.json b/data/mods/Generic_Guns/ammo/pistol.json
index 7dc22261f71cf..fe0101db6c408 100644
--- a/data/mods/Generic_Guns/ammo/pistol.json
+++ b/data/mods/Generic_Guns/ammo/pistol.json
@@ -4,7 +4,7 @@
     "type": "AMMO",
     "copy-from": "40fmj",
     "name": "pistol ammo, ball",
-    "name-plural": "pistol ammo, ball",
+    "name_plural": "pistol ammo, ball",
     "ammo_type": "ammo_pistol",
     "casing": "pistol_casing",
     "description": "Modern ubiquitous medium pistol ammo, popularized by usage in two wars and almost a century of post-war defensive and duty usage.  'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead."
@@ -14,7 +14,7 @@
     "type": "AMMO",
     "copy-from": "pistol_ball",
     "name": "pistol ammo, JHP",
-    "name-plural": "pistol ammo, JHP",
+    "name_plural": "pistol ammo, JHP",
     "description": "Modern ubiquitous medium pistol ammo, popularized by usage in two wars and almost a century of post-war defensive and duty usage.  Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.",
     "relative": { "damage": 3, "pierce": -6 }
   },
@@ -23,7 +23,7 @@
     "type": "AMMO",
     "copy-from": "pistol_ball",
     "name": "pistol ammo, ball (reloaded)",
-    "name-plural": "pistol ammo, ball (reloaded)",
+    "name_plural": "pistol ammo, ball (reloaded)",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] }
   },
@@ -32,7 +32,7 @@
     "type": "AMMO",
     "copy-from": "pistol_jhp",
     "name": "pistol ammo, JHP (reloaded)",
-    "name-plural": "pistol ammo, JHP (reloaded)",
+    "name_plural": "pistol ammo, JHP (reloaded)",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] }
   },
@@ -41,7 +41,7 @@
     "copy-from": "pistol_ball",
     "type": "AMMO",
     "name": "pistol ammo, ball (black powder)",
-    "name-plural": "pistol ammo, ball (black powder)",
+    "name_plural": "pistol ammo, ball (black powder)",
     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -51,7 +51,7 @@
     "copy-from": "pistol_jhp",
     "type": "AMMO",
     "name": "pistol ammo, JHP (black powder)",
-    "name-plural": "pistol ammo, JHP (black powder)",
+    "name_plural": "pistol ammo, JHP (black powder)",
     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
diff --git a/data/mods/Generic_Guns/ammo/pistol_magnum.json b/data/mods/Generic_Guns/ammo/pistol_magnum.json
index 551162c6eb9d8..be85bcf3f2481 100644
--- a/data/mods/Generic_Guns/ammo/pistol_magnum.json
+++ b/data/mods/Generic_Guns/ammo/pistol_magnum.json
@@ -14,7 +14,7 @@
     "type": "AMMO",
     "copy-from": "pistol_magnum_ball",
     "name": "magnum ammo, JHP",
-    "name-plural": "magnum ammo, JHP",
+    "name_plural": "magnum ammo, JHP",
     "description": "Magnum ammunition, developed from early handgun hunting efforts and popularized by law enforcement usage.  It is more powerful than common pistol ammo.  Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.",
     "relative": { "damage": 3, "pierce": -6 }
   },
@@ -23,7 +23,7 @@
     "type": "AMMO",
     "copy-from": "pistol_magnum_ball",
     "name": "magnum ammo, ball (reloaded)",
-    "name-plural": "magnum ammo, ball (reloaded)",
+    "name_plural": "magnum ammo, ball (reloaded)",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] }
   },
@@ -32,7 +32,7 @@
     "type": "AMMO",
     "copy-from": "pistol_magnum_jhp",
     "name": "magnum ammo, JHP (reloaded)",
-    "name-plural": "magnum ammo, JHP (reloaded)",
+    "name_plural": "magnum ammo, JHP (reloaded)",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] }
   },
@@ -41,7 +41,7 @@
     "copy-from": "pistol_magnum_ball",
     "type": "AMMO",
     "name": "magnum ammo, ball (black powder)",
-    "name-plural": "magnum ammo, ball (black powder)",
+    "name_plural": "magnum ammo, ball (black powder)",
     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -51,7 +51,7 @@
     "copy-from": "pistol_magnum_jhp",
     "type": "AMMO",
     "name": "magnum ammo, JHP (black powder)",
-    "name-plural": "magnum ammo, JHP (black powder)",
+    "name_plural": "magnum ammo, JHP (black powder)",
     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
diff --git a/data/mods/Generic_Guns/ammo/pistol_tiny.json b/data/mods/Generic_Guns/ammo/pistol_tiny.json
index e50a778c40ede..61563cf7b3a4b 100644
--- a/data/mods/Generic_Guns/ammo/pistol_tiny.json
+++ b/data/mods/Generic_Guns/ammo/pistol_tiny.json
@@ -4,7 +4,7 @@
     "type": "AMMO",
     "copy-from": "32_acp",
     "name": "tiny pistol ammo, ball",
-    "name-plural": "tiny pistol ammo, ball",
+    "name_plural": "tiny pistol ammo, ball",
     "ammo_type": "ammo_pistol_tiny",
     "casing": "pistol_tiny_casing",
     "description": "Miniscule pistol and rifle ammunition, for target practice or turn of the century sidearms.  Sold in great quantities preceding the riots.  'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead.",
@@ -15,7 +15,7 @@
     "type": "AMMO",
     "copy-from": "tiny_pistol_ball",
     "name": "tiny pistol ammo, JHP",
-    "name-plural": "tiny pistol ammo, JHP",
+    "name_plural": "tiny pistol ammo, JHP",
     "description": "Miniscule pistol and rifle ammunition, for target practice or turn of the century sidearms.  Sold in great quantities preceding the riots.  Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.",
     "relative": { "damage": 2, "pierce": -3 }
   },
@@ -24,7 +24,7 @@
     "type": "AMMO",
     "copy-from": "tiny_pistol_ball",
     "name": "tiny pistol ammo, ball (reloaded)",
-    "name-plural": "tiny pistol ammo, ball (reloaded)",
+    "name_plural": "tiny pistol ammo, ball (reloaded)",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] }
   },
@@ -33,7 +33,7 @@
     "type": "AMMO",
     "copy-from": "tiny_pistol_jhp",
     "name": "tiny pistol ammo, JHP (reloaded)",
-    "name-plural": "tiny pistol ammo, JHP (reloaded)",
+    "name_plural": "tiny pistol ammo, JHP (reloaded)",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] }
   },
@@ -42,7 +42,7 @@
     "type": "AMMO",
     "copy-from": "tiny_pistol_ball",
     "name": "tiny pistol ammo, ball (black powder)",
-    "name-plural": "tiny pistol ammo, ball (black powder)",
+    "name_plural": "tiny pistol ammo, ball (black powder)",
     "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -52,7 +52,7 @@
     "type": "AMMO",
     "copy-from": "tiny_pistol_jhp",
     "name": "tiny pistol ammo, JHP (black powder)",
-    "name-plural": "tiny pistol ammo, JHP (black powder)",
+    "name_plural": "tiny pistol ammo, JHP (black powder)",
     "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
diff --git a/data/mods/Generic_Guns/ammo/rifle.json b/data/mods/Generic_Guns/ammo/rifle.json
index 6f9830c87b5a1..be95ddcf47e2b 100644
--- a/data/mods/Generic_Guns/ammo/rifle.json
+++ b/data/mods/Generic_Guns/ammo/rifle.json
@@ -4,7 +4,7 @@
     "type": "AMMO",
     "copy-from": "762_51",
     "name": "rifle ammo, ball",
-    "name-plural": "rifle ammo, ball",
+    "name_plural": "rifle ammo, ball",
     "ammo_type": "ammo_rifle",
     "casing": "rifle_casing",
     "description": "Modern rifle ammunition, ubiquitous and affordable.  It's suitable for international conflicts, hunting small to large game, home defense, and these days, zombies.  'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead."
@@ -14,7 +14,7 @@
     "type": "AMMO",
     "copy-from": "rifle_ball",
     "name": "rifle ammo, AP",
-    "name-plural": "rifle ammo, AP",
+    "name_plural": "rifle ammo, AP",
     "description": "Modern rifle ammunition, ubiquitous and affordable.  It's suitable for international conflicts, hunting small to large game, home defense, and these days, zombies.  This 'armor piercing' variant features a mild steel penetrator for environmental friendliness, improved barrier penetration, and enhanced effect on armor.",
     "relative": { "damage": -2, "pierce": 4 }
   },
@@ -23,7 +23,7 @@
     "type": "AMMO",
     "copy-from": "rifle_ball",
     "name": "rifle ammo, ball (reloaded)",
-    "name-plural": "rifle ammo, ball (reloaded)",
+    "name_plural": "rifle ammo, ball (reloaded)",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] }
   },
@@ -32,7 +32,7 @@
     "type": "AMMO",
     "copy-from": "rifle_AP",
     "name": "rifle ammo, AP (reloaded)",
-    "name-plural": "rifle ammo, AP (reloaded)",
+    "name_plural": "rifle ammo, AP (reloaded)",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] }
   },
@@ -41,7 +41,7 @@
     "copy-from": "rifle_ball",
     "type": "AMMO",
     "name": "rifle ammo, ball (black powder)",
-    "name-plural": "rifle ammo, ball (black powder)",
+    "name_plural": "rifle ammo, ball (black powder)",
     "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -51,7 +51,7 @@
     "copy-from": "rifle_AP",
     "type": "AMMO",
     "name": "rifle ammo, AP (black powder)",
-    "name-plural": "rifle ammo, A (black powder)P",
+    "name_plural": "rifle ammo, A (black powder)P",
     "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
diff --git a/data/mods/Generic_Guns/ammo/rifle_huge.json b/data/mods/Generic_Guns/ammo/rifle_huge.json
index b84f5b3ebd9f2..8c03042b8ef05 100644
--- a/data/mods/Generic_Guns/ammo/rifle_huge.json
+++ b/data/mods/Generic_Guns/ammo/rifle_huge.json
@@ -4,7 +4,7 @@
     "type": "AMMO",
     "copy-from": "50bmg",
     "name": "huge rifle ammo, ball",
-    "name-plural": "huge rifle ammo, ball",
+    "name_plural": "huge rifle ammo, ball",
     "ammo_type": "ammo_rifle_huge",
     "casing": "rifle_huge_casing",
     "description": "Huge rifle ammunition like this bridges the gap between light cannons and big game rifles.  It's suitable for taking on light vehicles and other materiel, or hunting extremely large game.  'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead."
@@ -14,7 +14,7 @@
     "type": "AMMO",
     "copy-from": "rifle_huge_ball",
     "name": "huge rifle ammo, AP",
-    "name-plural": "huge rifle ammo, AP",
+    "name_plural": "huge rifle ammo, AP",
     "description": "Huge rifle ammunition like this bridges the gap between light cannons and big game rifles.  It's suitable for taking on light vehicles and other materiel, or hunting extremely large game.  These armor piercing munitions feature tungsten steel penetrators for use against light-skinned vehicles.",
     "relative": { "damage": -10, "pierce": 20 }
   },
@@ -23,7 +23,7 @@
     "type": "AMMO",
     "copy-from": "rifle_huge_ball",
     "name": "huge rifle ammo, ball (reloaded)",
-    "name-plural": "huge rifle ammo, ball (reloaded)",
+    "name_plural": "huge rifle ammo, ball (reloaded)",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] }
   },
@@ -32,7 +32,7 @@
     "type": "AMMO",
     "copy-from": "rifle_huge_AP",
     "name": "huge rifle ammo, AP (reloaded)",
-    "name-plural": "huge rifle ammo, AP (reloaded)",
+    "name_plural": "huge rifle ammo, AP (reloaded)",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] }
   },
@@ -41,7 +41,7 @@
     "copy-from": "rifle_huge_ball",
     "type": "AMMO",
     "name": "rifle ammo, ball (black powder)",
-    "name-plural": "rifle ammo, ball (black powder)",
+    "name_plural": "rifle ammo, ball (black powder)",
     "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
@@ -51,7 +51,7 @@
     "copy-from": "rifle_huge_AP",
     "type": "AMMO",
     "name": "rifle ammo, AP (black powder)",
-    "name-plural": "rifle ammo, AP (black powder)",
+    "name_plural": "rifle ammo, AP (black powder)",
     "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
diff --git a/data/mods/Generic_Guns/ammo/rocket.json b/data/mods/Generic_Guns/ammo/rocket.json
index 476e83efa728f..eb348887e2bfc 100644
--- a/data/mods/Generic_Guns/ammo/rocket.json
+++ b/data/mods/Generic_Guns/ammo/rocket.json
@@ -4,7 +4,7 @@
     "type": "AMMO",
     "copy-from": "84x246mm_he",
     "name": "rocket, antipersonnel",
-    "name-plural": "rocket, antipersonnel",
+    "name_plural": "rocket, antipersonnel",
     "description": "A large anti-personnel rocket for a military rocket launcher.  Designed to be highly effective against personnel.",
     "material": [ "steel", "powder" ],
     "volume": "1250 ml",
@@ -16,7 +16,7 @@
     "type": "AMMO",
     "copy-from": "84x246mm_hedp",
     "name": "rocket, multipurpose",
-    "name-plural": "rocket, multipurpose",
+    "name_plural": "rocket, multipurpose",
     "description": "An anti-tank rocket with a high explosive dual purpose warhead for a military rocket launcher.  Designed to be highly effective against vehicles and structures, and retains some effectiveness against personnel."
   },
   {
@@ -24,7 +24,7 @@
     "type": "AMMO",
     "copy-from": "84x246mm_smoke",
     "name": "rocket, smoke",
-    "name-plural": "rocket, smoke",
+    "name_plural": "rocket, smoke",
     "description": "A rocket loaded with a smoke warhead for a military rocket launcher.  Commonly used for signaling, target designation, and for screening troop movements."
   }
 ]
diff --git a/data/mods/Generic_Guns/ammo/shot.json b/data/mods/Generic_Guns/ammo/shot.json
index 9b4c4e8429cdb..d68f166c0f36b 100644
--- a/data/mods/Generic_Guns/ammo/shot.json
+++ b/data/mods/Generic_Guns/ammo/shot.json
@@ -4,7 +4,7 @@
     "copy-from": "shot_00",
     "type": "AMMO",
     "name": "shotshell, buckshot",
-    "name-plural": "shotshell, buckshot",
+    "name_plural": "shotshell, buckshot",
     "ammo_type": "ammo_shot"
   },
   {
@@ -12,7 +12,7 @@
     "copy-from": "shot_buck",
     "type": "AMMO",
     "name": "shotshell, beanbag",
-    "name-plural": "shotshell, beanbag",
+    "name_plural": "shotshell, beanbag",
     "description": "A beanbag round for shotguns, not deadly but designed to disable.",
     "proportional": { "price": 0.5, "price_postapoc": 0.5, "count": 0.5, "damage": 0.1, "recoil": 0.4, "loudness": 0.6 },
     "extend": { "effects": [ "BEANBAG", "NOGIB" ] }
@@ -22,7 +22,7 @@
     "copy-from": "shot_buck",
     "type": "AMMO",
     "name": "shotshell, birdshot",
-    "name-plural": "shotshell, birdshot",
+    "name_plural": "shotshell, birdshot",
     "description": "A shotshell filled with numerous small pellets.  Designed for hunting birds and other small game, its applications in combat are very limited.",
     "price_postapoc": 2400,
     "proportional": { "price": 0.2, "damage": 0.3, "recoil": 0.6, "loudness": 0.8 },
@@ -33,7 +33,7 @@
     "copy-from": "shot_buck",
     "type": "AMMO",
     "name": "shotshell, slug",
-    "name-plural": "shotshell, slug",
+    "name_plural": "shotshell, slug",
     "description": "A shotshell with a single projectile, shaped somewhat like a shuttlecock.  Slugs are used with shotguns to give them extra range, allowing them to stand in for a rifle.  Extremely damaging but rather inaccurate.",
     "dispersion": 100,
     "relative": { "range": 12, "pierce": 6 },
@@ -45,7 +45,7 @@
     "copy-from": "shot_buck",
     "type": "AMMO",
     "name": "shotshell, pyrotechnical",
-    "name-plural": "shotshell, pyrotechnical",
+    "name_plural": "shotshell, pyrotechnical",
     "description": "A novelty shotgun shell filled with a simple pyrotechnical charge.  The payload is light and won't wound very well, but the flash and sparks will certainly be impressive, in addition to being an extreme fire hazard.",
     "proportional": { "price": 2, "price_postapoc": 2, "damage": 0.2, "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2, "range": 0.5 },
     "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
@@ -55,7 +55,7 @@
     "copy-from": "shot_buck",
     "type": "AMMO",
     "name": "shotshell, junk",
-    "name-plural": "shotshell, junk",
+    "name_plural": "shotshell, junk",
     "description": "A shotgun shell filled with whatever was lying around.  They are more damaging than birdshot, but fairly inaccurate.",
     "proportional": { "price": 0.4, "damage": 0.6, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -65,7 +65,7 @@
     "id": "reloaded_shot_buck",
     "copy-from": "shot_buck",
     "name": "shotshell, buckshot (reloaded)",
-    "name-plural": "shotshell, buckshot (reloaded)",
+    "name_plural": "shotshell, buckshot (reloaded)",
     "type": "AMMO",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -75,7 +75,7 @@
     "id": "reloaded_shot_fowl",
     "copy-from": "shot_fowl",
     "name": "shotshell, birdshot (reloaded)",
-    "name-plural": "shotshell, birdshot (reloaded)",
+    "name_plural": "shotshell, birdshot (reloaded)",
     "type": "AMMO",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -85,7 +85,7 @@
     "id": "reloaded_shot_foster",
     "copy-from": "shot_foster",
     "name": "shotshell, slug (reloaded)",
-    "name-plural": "shotshell, slug (reloaded)",
+    "name_plural": "shotshell, slug (reloaded)",
     "type": "AMMO",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -95,7 +95,7 @@
     "id": "reloaded_shot_pyro",
     "copy-from": "shot_pyro",
     "name": "shotshell, pyrotechnical (reloaded)",
-    "name-plural": "shotshell, pyrotechnical (reloaded)",
+    "name_plural": "shotshell, pyrotechnical (reloaded)",
     "type": "AMMO",
     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -105,7 +105,7 @@
     "id": "reloaded_shot_dart",
     "copy-from": "shot_buck",
     "name": "shotshell, flechette (reloaded)",
-    "name-plural": "shotshell, flechette (reloaded)",
+    "name_plural": "shotshell, flechette (reloaded)",
     "//": "intentionally reload only",
     "type": "AMMO",
     "description": "A shotgun shell filled with tiny steel darts, definitely not a factory loading.  Flechettes won't pattern as well as normal shot, and they'll likely do less damage.  However, they may fare better against armor than other shotgun loads.",
@@ -117,7 +117,7 @@
     "id": "bp_shot_buck",
     "copy-from": "shot_buck",
     "name": "shotshell, buckshot (black powder)",
-    "name-plural": "shotshell, buckshot (black powder)",
+    "name_plural": "shotshell, buckshot (black powder)",
     "type": "AMMO",
     "proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
@@ -127,7 +127,7 @@
     "id": "bp_shot_fowl",
     "copy-from": "shot_fowl",
     "name": "shotshell, birdshot (black powder)",
-    "name-plural": "shotshell, birdshot (black powder)",
+    "name_plural": "shotshell, birdshot (black powder)",
     "type": "AMMO",
     "proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
@@ -137,7 +137,7 @@
     "id": "bp_shot_foster",
     "copy-from": "shot_foster",
     "name": "shotshell, slug (black powder)",
-    "name-plural": "shotshell, slug (black powder)",
+    "name_plural": "shotshell, slug (black powder)",
     "type": "AMMO",
     "proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
@@ -147,7 +147,7 @@
     "id": "bp_shot_pyro",
     "copy-from": "shot_pyro",
     "name": "shotshell, pyrotechnical (black powder)",
-    "name-plural": "shotshell, pyrotechnical (black powder)",
+    "name_plural": "shotshell, pyrotechnical (black powder)",
     "type": "AMMO",
     "proportional": { "price": 0.6, "damage": 0.8, "dispersion": 1.2 },
     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
@@ -157,7 +157,7 @@
     "id": "bp_shot_dart",
     "copy-from": "reloaded_shot_dart",
     "name": "shotshell, flechette (black powder)",
-    "name-plural": "shotshell, flechette (black powder)",
+    "name_plural": "shotshell, flechette (black powder)",
     "type": "AMMO",
     "proportional": { "price": 0.86, "damage": 0.88, "dispersion": 1.09 },
     "extend": { "effects": [ "MUZZLE_SMOKE", "BLACKPOWDER" ] }
@@ -167,7 +167,7 @@
     "copy-from": "reloaded_shot_junk",
     "type": "AMMO",
     "name": "shotshell, junk (black powder)",
-    "name-plural": "shotshell, junk (black powder)",
+    "name_plural": "shotshell, junk (black powder)",
     "proportional": { "price": 0.6, "damage": 0.8 },
     "extend": { "effects": [ "MUZZLE_SMOKE" ] }
   }
diff --git a/data/mods/Generic_Guns/gunmods/gunmods.json b/data/mods/Generic_Guns/gunmods/gunmods.json
index 96f271ad96845..404fbe7b09774 100644
--- a/data/mods/Generic_Guns/gunmods/gunmods.json
+++ b/data/mods/Generic_Guns/gunmods/gunmods.json
@@ -18,7 +18,7 @@
     "copy-from": "m320_mod_mod",
     "type": "GUNMOD",
     "name": "underbarrel launcher (modified)",
-    "name-plural": "underbarrel launcher (modified)",
+    "name_plural": "underbarrel launcher (modified)",
     "description": "A stubby single shot launcher for launching grenades or flares.  This launcher can be attached to a rifle or other suitable platform, and includes its own set of sights.  In more recent years, variants were sold commercially to ostensibly launch flares.  With the right cartridges, this would be devastating against hard or soft targets. A crude homemade bracket has been attached, allowing a wider variety of hosts.",
     "gun_data": { "ammo": "ammo_grenade", "skill": "launcher", "dispersion": 270, "durability": 10, "clip_size": 1 },
     "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ]
diff --git a/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_ammo_redefine_hack.json b/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_ammo_redefine_hack.json
index 5a0f3fbe023fc..6ec594b61acf1 100644
--- a/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_ammo_redefine_hack.json
+++ b/data/mods/Generic_Guns/vehicles/ammo_redefine_hacks/temp_ammo_redefine_hack.json
@@ -3,21 +3,21 @@
     "id": "308",
     "type": "AMMO",
     "name": "rifle ammo, ball",
-    "name-plural": "rifle ammo, ball",
+    "name_plural": "rifle ammo, ball",
     "copy-from": "rifle_ball"
   },
   {
     "id": "762_51",
     "type": "AMMO",
     "name": "rifle ammo, ball",
-    "name-plural": "rifle ammo, ball",
+    "name_plural": "rifle ammo, ball",
     "copy-from": "rifle_ball"
   },
   {
     "id": "556",
     "type": "AMMO",
     "name": "rifle ammo, ball",
-    "name-plural": "rifle ammo, ball",
+    "name_plural": "rifle ammo, ball",
     "copy-from": "rifle_ball"
   },
   {