diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json
index fd7fd8fc26f73..b71f8e8e22096 100644
--- a/data/json/itemgroups/guns.json
+++ b/data/json/itemgroups/guns.json
@@ -35,6 +35,8 @@
       { "item": "l_lookout_9mm", "prob": 20, "charges-min": 0, "charges-max": 7 },
       { "item": "l_sp_45", "prob": 35, "charges-min": 0, "charges-max": 12 },
       { "item": "l_sp_9mm", "prob": 60, "charges-min": 0, "charges-max": 21 },
+      { "item": "l_mp_45", "prob": 25, "charges-min": 0, "charges-max": 12 },
+      { "item": "l_mp_9mm", "prob": 25, "charges-min": 0, "charges-max": 21 },
       { "item": "ruger_lcr_22", "prob": 35, "charges-min": 0, "charges-max": 8 },
       { "item": "ruger_redhawk", "prob": 25, "charges-min": 0, "charges-max": 6 },
       { "item": "sig_40", "prob": 35, "charges-min": 0, "charges-max": 12 },
@@ -53,8 +55,6 @@
     "items": [
       { "item": "m17", "prob": 100, "charges-min": 0, "charges-max": 17 },
       { "item": "glock_18c", "prob": 70, "charges-min": 0, "charges-max": 17 },
-      { "item": "l_mp_45", "prob": 70, "charges-min": 0, "charges-max": 12 },
-      { "item": "l_mp_9mm", "prob": 100, "charges-min": 0, "charges-max": 21 },
       { "item": "needlepistol", "prob": 45, "charges-min": 0, "charges-max": 50 },
       { "item": "rm103a_pistol", "prob": 35, "charges-min": 0, "charges-max": 10 }
     ]
@@ -177,6 +177,8 @@
       { "item": "l_base_223", "prob": 40, "charges-min": 0, "charges-max": 32 },
       { "item": "l_car_223", "prob": 10, "charges-min": 0, "charges-max": 32 },
       { "item": "l_dsr_223", "prob": 5, "charges-min": 0, "charges-max": 32 },
+      { "item": "l_lmg_223", "prob": 5, "charges-min": 0, "charges-max": 32 },
+      { "item": "l_mbr_223", "prob": 10, "charges-min": 0, "charges-max": 32 },
       { "item": "l_long_45", "prob": 30, "charges-min": 0, "charges-max": 12 },
       { "item": "m14ebr", "prob": 15, "charges-min": 0, "charges-max": 20 },
       { "item": "M24", "prob": 15, "charges-min": 0, "charges-max": 20 },
@@ -198,8 +200,6 @@
     "//": "Military specification rifles only ever found at military sites.",
     "items": [
       { "item": "h&k416a5", "prob": 50, "charges-min": 0, "charges-max": 30 },
-      { "item": "l_lmg_223", "prob": 30, "charges-min": 0, "charges-max": 32 },
-      { "item": "l_mbr_223", "prob": 100, "charges-min": 0, "charges-max": 32 },
       { "item": "m107a1", "prob": 30, "charges-min": 0, "charges-max": 10 },
       { "item": "m134", "prob": 10, "charges-min": 0, "charges-max": 100 },
       { "item": "m14ebr", "prob": 10, "charges-min": 0, "charges-max": 20 },
@@ -277,6 +277,7 @@
       { "item": "m1014", "prob": 80, "charges-min": 0, "charges-max": 8 },
       { "item": "rm120c", "prob": 30, "charges-min": 0, "charges-max": 5 },
       { "item": "rm228", "prob": 30, "charges-min": 0, "charges-max": 10 },
+      { "item": "l_def_12", "prob": 20, "charges-min": 0, "charges-max": 8 },
       { "item": "saiga_12", "prob": 50, "charges-min": 0, "charges-max": 10 },
       { "item": "saiga_410", "prob": 40, "charges-min": 0, "charges-max": 10 }
     ]
@@ -286,7 +287,6 @@
     "id": "guns_shotgun_milspec",
     "//": "Military specification shotguns only ever found at military sites.",
     "items": [
-      { "item": "l_def_12", "prob": 100, "charges-min": 0, "charges-max": 8 },
       { "item": "rm20", "prob": 20, "charges-min": 0, "charges-max": 20 },
       { "item": "m1014", "prob": 100, "charges-min": 0, "charges-max": 8 }
     ]
diff --git a/data/json/itemgroups/magazines.json b/data/json/itemgroups/magazines.json
index 9d68f86fda35d..248885bd2b6cf 100644
--- a/data/json/itemgroups/magazines.json
+++ b/data/json/itemgroups/magazines.json
@@ -19,10 +19,6 @@
       [ "hk_g80mag", 40 ],
       [ "hk46mag", 15 ],
       [ "hk46bigmag", 5 ],
-      [ "lw12mag", 30 ],
-      [ "lw21mag", 60 ],
-      [ "lw223mag", 60 ],
-      [ "lw223bigmag", 20 ],
       [ "m107a1mag", 50 ],
       [ "m2010mag", 10 ],
       [ "scarhmag", 50 ],
@@ -147,7 +143,9 @@
       [ "kp32mag", 5 ],
       [ "fn1910mag", 2 ],
       [ "taurus38mag", 30 ],
-      [ "ppkmag", 15 ]
+      [ "ppkmag", 15 ],
+      [ "lw12mag", 5 ],
+      [ "lw21mag", 5 ]
     ]
   },
   {
@@ -222,7 +220,9 @@
       [ "g3mag", 80 ],
       [ "g3bigmag", 40 ],
       [ "m1918bigmag", 40 ],
-      [ "ruger1022bigmag", 70 ]
+      [ "ruger1022bigmag", 70 ],
+      [ "lw223mag", 20 ],
+      [ "lw223bigmag", 20 ]
     ]
   },
   {
diff --git a/data/json/professions.json b/data/json/professions.json
index 612082e124ee1..555844dc324b6 100644
--- a/data/json/professions.json
+++ b/data/json/professions.json
@@ -22,21 +22,12 @@
   {
     "type": "item_group",
     "subtype": "collection",
-    "id": "army_mags_rm51",
+    "id": "army_mags_m2010",
     "entries": [
-      { "item": "8x40_50_mag", "ammo-item": "8mm_fmj", "charges": 50 },
-      { "item": "8x40_50_mag", "ammo-item": "8mm_fmj", "charges": 50 }
-    ]
-  },
-  {
-    "type": "item_group",
-    "subtype": "collection",
-    "id": "army_mags_rm25",
-    "entries": [
-      { "item": "8x40_25_mag", "ammo-item": "8mm_fmj", "charges": 25 },
-      { "item": "8x40_25_mag", "ammo-item": "8mm_fmj", "charges": 25 },
-      { "item": "8x40_25_mag", "ammo-item": "8mm_fmj", "charges": 25 },
-      { "item": "8x40_25_mag", "ammo-item": "8mm_fmj", "charges": 25 }
+      { "item": "m2010mag", "ammo-item": "300_winmag", "charges": 5 },
+      { "item": "m2010mag", "ammo-item": "300_winmag", "charges": 5 },
+      { "item": "m2010mag", "ammo-item": "300_winmag", "charges": 5 },
+      { "item": "m2010mag", "ammo-item": "300_winmag", "charges": 5 }
     ]
   },
   {
@@ -69,10 +60,10 @@
   {
     "type": "item_group",
     "subtype": "collection",
-    "id": "army_mags_lw21",
+    "id": "army_mags_glock17",
     "entries": [
-      { "item": "lw21mag", "ammo-item": "9mmfmj", "charges": 21 },
-      { "item": "lw21mag", "ammo-item": "9mmfmj", "charges": 21 }
+      { "item": "glock17_22", "ammo-item": "9mmfmj", "charges": 22 },
+      { "item": "glock17_22", "ammo-item": "9mmfmj", "charges": 22 }
     ]
   },
   {
@@ -1030,8 +1021,8 @@
         ],
         "entries": [
           { "group": "charged_cell_phone" },
-          { "item": "l_enforcer_45", "ammo-item": "460_rowland", "charges": 6, "container-item": "sholster" },
-          { "item": "460_rowland", "charges": 24 }
+          { "item": "sw_619", "ammo-item": "357mag_fmj", "charges": 6, "container-item": "sholster" },
+          { "item": "357mag_fmj", "charges": 24 }
         ]
       },
       "male": [ "briefs" ],
@@ -1692,8 +1683,8 @@
           "two_way_radio"
         ],
         "entries": [
-          { "item": "l_mp_9mm", "ammo-item": "9mmP", "container-item": "holster" },
-          { "item": "chestrig", "container-group": "army_mags_lw21" }
+          { "item": "glock_18c", "ammo-item": "9mmP", "container-item": "holster" },
+          { "item": "chestrig", "container-group": "army_mags_glock17" }
         ]
       },
       "male": [ "boxer_shorts" ],
@@ -1788,12 +1779,8 @@
         "entries": [
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "sheath", "contents-item": "knife_combat" },
-          {
-            "item": "rm51_assault_rifle",
-            "ammo-item": "8mm_fmj",
-            "contents-item": [ "shoulder_strap", "acog_scope" ]
-          },
-          { "item": "modularvestceramic", "contents-group": "army_mags_rm51" }
+          { "item": "h&k416a5", "ammo-item": "556", "contents-item": [ "shoulder_strap", "acog_scope" ] },
+          { "item": "modularvestceramic", "contents-group": "army_mags_m4" }
         ]
       },
       "male": [ "boxer_shorts" ],
@@ -1851,11 +1838,15 @@
         "entries": [
           { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
           { "item": "hat_boonie", "custom-flags": [ "no_auto_equip" ] },
-          { "item": "rm11b_sniper_rifle", "ammo-item": "8mm_fmj", "contents-item": [ "shoulder_strap" ] },
+          {
+            "item": "m2010",
+            "ammo-item": "300_winmag",
+            "contents-item": [ "shoulder_strap", "rifle_scope", "bipod" ]
+          },
           { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" },
           { "item": "usp45mag", "ammo-item": "45_acp", "charges": 12 },
           { "item": "usp45mag", "ammo-item": "45_acp", "charges": 12 },
-          { "item": "chestrig", "contents-group": [ "army_mags_rm25" ] }
+          { "item": "chestrig", "contents-group": [ "army_mags_m2010" ] }
         ]
       },
       "male": [ "boxer_shorts" ],