diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json
index bb477ae37b1be..a01bafc2a9e81 100644
--- a/data/json/ammo_effects.json
+++ b/data/json/ammo_effects.json
@@ -128,77 +128,77 @@
     "explosion": { "power": 185, "shrapnel": { "casing_mass": 212, "fragment_mass": 0.05 } }
   },
   {
-    "id": "20x66_FRAG",
+    "id": "FRAG_20x66",
     "type": "ammo_effect",
     "explosion": { "power": 40, "shrapnel": { "casing_mass": 15, "fragment_mass": 0.15 } }
   },
   {
-    "id": "20x66_EXPLOSIVE",
+    "id": "EXPLOSIVE_20x66",
     "type": "ammo_effect",
     "explosion": { "power": 60 }
   },
   {
-    "id": "HESHOT_EXPLOSIVE",
+    "id": "EXPLOSIVE_HESHOT",
     "type": "ammo_effect",
     "explosion": { "power": 60 }
   },
   {
-    "id": "m430a1_EXPLOSIVE",
+    "id": "EXPLOSIVE_m430a1",
     "type": "ammo_effect",
     "explosion": { "power": 72, "shrapnel": { "casing_mass": 250, "fragment_mass": 0.15 } }
   },
   {
-    "id": "m433_EXPLOSIVE",
+    "id": "EXPLOSIVE_m433",
     "type": "ammo_effect",
     "explosion": { "power": 42, "shrapnel": { "casing_mass": 198, "fragment_mass": 0.15 } }
   },
   {
-    "id": "HOMEMADE_EXPLOSIVE",
+    "id": "EXPLOSIVE_HOMEMADE",
     "type": "ammo_effect",
     "explosion": { "power": 400, "shrapnel": { "casing_mass": 680, "fragment_mass": 0.3 } }
   },
   {
-    "id": "66mmHEAT_EXPLOSIVE",
+    "id": "EXPLOSIVE_66mmHEAT",
     "type": "ammo_effect",
     "explosion": { "power": 400, "shrapnel": { "casing_mass": 680, "fragment_mass": 0.3 } }
   },
   {
-    "id": "OG7V_EXPLOSIVE",
+    "id": "EXPLOSIVE_OG7V",
     "type": "ammo_effect",
     "explosion": { "power": 266, "shrapnel": { "casing_mass": 1500, "fragment_mass": 0.15 } }
   },
   {
-    "id": "PG7VL_EXPLOSIVE",
+    "id": "EXPLOSIVE_PG7VL",
     "type": "ammo_effect",
     "explosion": { "power": 598, "shrapnel": { "casing_mass": 1500, "fragment_mass": 0.3 } }
   },
   {
-    "id": "PG7VR_EXPLOSIVE",
+    "id": "EXPLOSIVE_PG7VR",
     "type": "ammo_effect",
     "explosion": { "power": 1995, "shrapnel": { "casing_mass": 2500, "fragment_mass": 0.3 } }
   },
   {
-    "id": "TBG7V_EXPLOSIVE",
+    "id": "EXPLOSIVE_TBG7V",
     "type": "ammo_effect",
     "explosion": { "power": 66, "shrapnel": { "casing_mass": 2500, "fragment_mass": 0.3 } }
   },
   {
-    "id": "84x246HE_EXPLOSIVE",
+    "id": "EXPLOSIVE_84x246HE",
     "type": "ammo_effect",
     "explosion": { "power": 665, "shrapnel": { "casing_mass": 1500, "fragment_mass": 0.15 } }
   },
   {
-    "id": "84x246HEDP_EXPLOSIVE",
+    "id": "EXPLOSIVE_84x246HEDP",
     "type": "ammo_effect",
     "explosion": { "power": 798, "shrapnel": { "casing_mass": 1500, "fragment_mass": 0.3 } }
   },
   {
-    "id": "ATGMHEAT_EXPLOSIVE",
+    "id": "EXPLOSIVE_ATGMHEAT",
     "type": "ammo_effect",
     "explosion": { "power": 5985, "shrapnel": { "casing_mass": 18000, "fragment_mass": 1.0 } }
   },
   {
-    "id": "120mmHEAT_EXPLOSIVE",
+    "id": "EXPLOSIVE_120mmHEAT",
     "type": "ammo_effect",
     "explosion": { "power": 7980, "shrapnel": { "casing_mass": 8725, "fragment_mass": 1.0 } }
   },
diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
index ed53866293a05..d135ac0fdbea1 100644
--- a/data/json/items/ammo.json
+++ b/data/json/items/ammo.json
@@ -428,7 +428,7 @@
     "range": 80,
     "dispersion": 5,
     "recoil": 30,
-    "effects": [ "120mmHEAT_EXPLOSIVE", "TRAIL" ]
+    "effects": [ "EXPLOSIVE_120mmHEAT", "TRAIL" ]
   },
   {
     "type": "AMMO",
diff --git a/data/json/items/ammo/20x66mm.json b/data/json/items/ammo/20x66mm.json
index 74163c9abd103..744052c252310 100644
--- a/data/json/items/ammo/20x66mm.json
+++ b/data/json/items/ammo/20x66mm.json
@@ -54,7 +54,7 @@
     "range": 20,
     "damage": { "damage_type": "stab", "amount": 16, "armor_penetration": 4 },
     "dispersion": 120,
-    "effects": [ "COOKOFF", "20x66_EXPLOSIVE", "NEVER_MISFIRES" ]
+    "effects": [ "COOKOFF", "EXPLOSIVE_20x66", "NEVER_MISFIRES" ]
   },
   {
     "id": "20x66_flare",
@@ -96,7 +96,7 @@
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 5,
     "proportional": { "damage": { "damage_type": "stab", "amount": 0.25, "armor_penetration": 0.25 } },
-    "extend": { "effects": [ "20x66_FRAG" ] }
+    "extend": { "effects": [ "FRAG_20x66" ] }
   },
   {
     "id": "20x66_inc",
diff --git a/data/json/items/ammo/40x46mm.json b/data/json/items/ammo/40x46mm.json
index d3b8aa5ac59a5..c502d3953e35b 100644
--- a/data/json/items/ammo/40x46mm.json
+++ b/data/json/items/ammo/40x46mm.json
@@ -38,7 +38,7 @@
     "weight": "230 g",
     "damage": { "damage_type": "stab", "amount": 200, "armor_penetration": 30 },
     "casing": "40x46mm_m118_casing",
-    "extend": { "effects": [ "m433_EXPLOSIVE" ] }
+    "extend": { "effects": [ "EXPLOSIVE_m433" ] }
   },
   {
     "id": "40x46mm_m576",
diff --git a/data/json/items/ammo/40x53mm.json b/data/json/items/ammo/40x53mm.json
index 64ffb37f69ef1..2337a7af3b365 100644
--- a/data/json/items/ammo/40x53mm.json
+++ b/data/json/items/ammo/40x53mm.json
@@ -42,7 +42,7 @@
     "volume": "132 ml",
     "damage": { "damage_type": "stab", "amount": 250, "armor_penetration": 45 },
     "casing": "40x53mm_m169_casing",
-    "extend": { "effects": [ "m430a1_EXPLOSIVE" ] }
+    "extend": { "effects": [ "EXPLOSIVE_m430a1" ] }
   },
   {
     "id": "40x53mm_buckshot_m169",
diff --git a/data/json/items/ammo/66mm.json b/data/json/items/ammo/66mm.json
index da729d8a34d95..a2f91bdfe47a4 100644
--- a/data/json/items/ammo/66mm.json
+++ b/data/json/items/ammo/66mm.json
@@ -39,6 +39,6 @@
     "range": 80,
     "dispersion": 30,
     "recoil": 225,
-    "effects": [ "COOKOFF", "66mmHEAT_EXPLOSIVE", "TRAIL" ]
+    "effects": [ "COOKOFF", "EXPLOSIVE_66mmHEAT", "TRAIL" ]
   }
 ]
diff --git a/data/json/items/ammo/84x246mm.json b/data/json/items/ammo/84x246mm.json
index 92dd4df0345d1..6eeb0618637ac 100644
--- a/data/json/items/ammo/84x246mm.json
+++ b/data/json/items/ammo/84x246mm.json
@@ -20,7 +20,7 @@
     "recoil": 45,
     "count": 4,
     "stack_size": 1,
-    "effects": [ "COOKOFF", "84x246HE_EXPLOSIVE", "NEVER_MISFIRES" ]
+    "effects": [ "COOKOFF", "EXPLOSIVE_84x246HE", "NEVER_MISFIRES" ]
   },
   {
     "type": "AMMO",
@@ -36,7 +36,7 @@
     "range": 100,
     "dispersion": 75,
     "recoil": 60,
-    "effects": [ "COOKOFF", "84x246HEDP_EXPLOSIVE", "NEVER_MISFIRES" ]
+    "effects": [ "COOKOFF", "EXPLOSIVE_84x246HEDP", "NEVER_MISFIRES" ]
   },
   {
     "type": "AMMO",
diff --git a/data/json/items/ammo/atgm.json b/data/json/items/ammo/atgm.json
index b1418924e9114..4142ced2ee53e 100644
--- a/data/json/items/ammo/atgm.json
+++ b/data/json/items/ammo/atgm.json
@@ -18,6 +18,6 @@
     "damage": { "damage_type": "stab", "amount": 2400, "armor_penetration": 600 },
     "range": 100,
     "recoil": 6000,
-    "effects": [ "ATGMHEAT_EXPLOSIVE", "NEVER_MISFIRES" ]
+    "effects": [ "EXPLOSIVE_ATGMHEAT", "NEVER_MISFIRES" ]
   }
 ]
diff --git a/data/json/items/ammo/rpg.json b/data/json/items/ammo/rpg.json
index 1e04977a626ee..b60a55102cd8e 100644
--- a/data/json/items/ammo/rpg.json
+++ b/data/json/items/ammo/rpg.json
@@ -17,7 +17,7 @@
     "range": 60,
     "dispersion": 75,
     "recoil": 450,
-    "effects": [ "COOKOFF", "PG7VL_EXPLOSIVE", "TRAIL", "NEVER_MISFIRES" ]
+    "effects": [ "COOKOFF", "EXPLOSIVE_PG7VL", "TRAIL", "NEVER_MISFIRES" ]
   },
   {
     "type": "AMMO",
@@ -37,7 +37,7 @@
     "range": 60,
     "dispersion": 75,
     "recoil": 450,
-    "effects": [ "COOKOFF", "PG7VR_EXPLOSIVE", "TRAIL", "NEVER_MISFIRES" ]
+    "effects": [ "COOKOFF", "EXPLOSIVE_PG7VR", "TRAIL", "NEVER_MISFIRES" ]
   },
   {
     "type": "AMMO",
@@ -57,7 +57,7 @@
     "range": 60,
     "dispersion": 50,
     "recoil": 450,
-    "effects": [ "COOKOFF", "TBG7V_EXPLOSIVE", "TRAIL", "NEVER_MISFIRES", "NAPALM_TBG7V" ]
+    "effects": [ "COOKOFF", "EXPLOSIVE_TBG7V", "TRAIL", "NEVER_MISFIRES", "NAPALM_TBG7V" ]
   },
   {
     "type": "AMMO",
@@ -77,6 +77,6 @@
     "range": 60,
     "dispersion": 50,
     "recoil": 350,
-    "effects": [ "COOKOFF", "NEVER_MISFIRES", "OG7V_EXPLOSIVE" ]
+    "effects": [ "COOKOFF", "NEVER_MISFIRES", "EXPLOSIVE_OG7V" ]
   }
 ]
diff --git a/data/json/items/ammo/shot.json b/data/json/items/ammo/shot.json
index 92326706b72fd..20feed0c42fa4 100644
--- a/data/json/items/ammo/shot.json
+++ b/data/json/items/ammo/shot.json
@@ -172,7 +172,7 @@
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
     "count": 5,
     "damage": { "damage_type": "stab", "amount": 10, "armor_penetration": 0 },
-    "extend": { "effects": [ "HESHOT_EXPLOSIVE" ] }
+    "extend": { "effects": [ "EXPLOSIVE_HESHOT" ] }
   },
   {
     "id": "shot_scrap",