diff --git a/data/json/ascii_art/battery.json b/data/json/ascii_art/battery.json
index aa9569b49b33d..b3415b8f5f636 100644
--- a/data/json/ascii_art/battery.json
+++ b/data/json/ascii_art/battery.json
@@ -4,11 +4,6 @@
     "id": "light_minus_battery_cell",
     "picture": [ "<color_yellow>()" ]
   },
-  {
-    "type": "ascii_art",
-    "id": "light_minus_atomic_battery_cell",
-    "picture": [ "<color_light_green>()" ]
-  },
   {
     "type": "ascii_art",
     "id": "light_minus_disposable_cell",
@@ -23,42 +18,6 @@
       "<color_light_gray>└─┘"
     ]
   },
-  {
-    "type": "ascii_art",
-    "id": "light_plus_battery_cell",
-    "picture": [
-      "<color_yellow>╓<color_light_gray>▬</color>╖",
-      "╟<color_white>L</color>╢",
-      "<color_light_gray>╙─╜"
-    ]
-  },
-  {
-    "type": "ascii_art",
-    "id": "light_atomic_battery_cell",
-    "picture": [
-      "<color_light_green>╓<color_light_gray>▬</color>╖",
-      "╠<color_white>L</color>╣",
-      "<color_light_gray>╙─╜"
-    ]
-  },
-  {
-    "type": "ascii_art",
-    "id": "light_disposable_cell",
-    "picture": [
-      "<color_yellow>╓<color_light_gray>▬</color>╖",
-      "║<color_white>L</color>║",
-      "<color_light_gray>╙─╜"
-    ]
-  },
-  {
-    "type": "ascii_art",
-    "id": "light_dry_cell",
-    "picture": [
-      "<color_light_gray>┌▬┐",
-      "[=]",
-      "└─┘"
-    ]
-  },
   {
     "type": "ascii_art",
     "id": "medium_battery_cell",
@@ -68,42 +27,6 @@
       "'─────'"
     ]
   },
-  {
-    "type": "ascii_art",
-    "id": "medium_plus_battery_cell",
-    "picture": [
-      "<color_red>,<color_dark_gray>/]===__",
-      "|<color_yellow>< M+  ></color>|",
-      "'───────'"
-    ]
-  },
-  {
-    "type": "ascii_art",
-    "id": "medium_atomic_battery_cell",
-    "picture": [
-      "<color_red>,<color_dark_gray>/]===__",
-      "|<color_light_green>< MP  ></color>|",
-      "'───────'"
-    ]
-  },
-  {
-    "type": "ascii_art",
-    "id": "medium_disposable_cell",
-    "picture": [
-      "<color_red>,<color_dark_gray>/]===__",
-      "|<color_yellow>< MD  ></color>|",
-      "'───────'"
-    ]
-  },
-  {
-    "type": "ascii_art",
-    "id": "medium_dry_cell",
-    "picture": [
-      "<color_light_gray>┌─┐===__",
-      "[≡≡≡≡≡≡≡]",
-      "└───────┘"
-    ]
-  },
   {
     "type": "ascii_art",
     "id": "heavy_battery_cell",
@@ -133,25 +56,5 @@
       "|<color_dark_gray>_|_<color_light_green>HP</color>_____,~<color_light_gray>:</color>",
       "└────────────┘"
     ]
-  },
-  {
-    "type": "ascii_art",
-    "id": "heavy_disposable_cell",
-    "picture": [
-      "   <color_yellow>_<color_dark_gray>_</color>_______",
-      " ,'<color_dark_gray>,└───────┤</color>",
-      "|<color_dark_gray>_|_<color_yellow>HD</color>_____,~<color_light_gray>:</color>",
-      "└────────────┘"
-    ]
-  },
-  {
-    "type": "ascii_art",
-    "id": "heavy_dry_cell",
-    "picture": [
-      "<color_light_gray>____________",
-      "[==║====║==]",
-      "|__║____║__|~:",
-      "└────────────┘"
-    ]
   }
 ]
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
index f3db327a07bbf..0003398bc20f8 100644
--- a/data/json/itemgroups/Clothing_Gear/clothing.json
+++ b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -406,7 +406,7 @@
     "//": "Standard set of clothes worn by a military helicopter pilot.",
     "items": [
       { "item": "chestrig", "prob": 40 },
-      { "item": "flight_helmet", "ammo-item": "light_plus_battery_cell", "charges": [ 0, 150 ] },
+      { "item": "flight_helmet", "ammo-item": "light_battery_cell", "charges": [ 0, 150 ] },
       { "item": "mil_flight_suit", "prob": 80 },
       { "item": "nomex_gloves" },
       { "group": "loaded_webbing_belt" },
@@ -430,7 +430,7 @@
     "//": "todo: when #57228 would be closed, change this one to copy-from `clothing_military`",
     "items": [
       { "item": "chestrig", "prob": 40 },
-      { "item": "flight_helmet", "ammo-item": "light_plus_battery_cell", "charges": [ 0, 150 ] },
+      { "item": "flight_helmet", "ammo-item": "light_battery_cell", "charges": [ 0, 150 ] },
       { "item": "mil_flight_suit", "prob": 80 },
       { "item": "nomex_gloves" },
       { "group": "loaded_webbing_belt" },
diff --git a/data/json/itemgroups/Clothing_Gear/gear.json b/data/json/itemgroups/Clothing_Gear/gear.json
index 36f6dda016066..c8a1abbaeef63 100644
--- a/data/json/itemgroups/Clothing_Gear/gear.json
+++ b/data/json/itemgroups/Clothing_Gear/gear.json
@@ -186,7 +186,7 @@
     "items": [
       { "item": "EOD_hotstick", "prob": 50 },
       { "item": "multitool", "container-item": "sheath", "prob": 30 },
-      { "item": "light_disposable_cell", "prob": 30, "count": [ 1, 8 ] },
+      { "item": "light_battery_cell", "prob": 30, "count": [ 1, 8 ] },
       { "item": "light_minus_disposable_cell", "prob": 20, "count": [ 1, 6 ] },
       { "item": "cordless_drill", "prob": 30 },
       { "item": "rope_30", "prob": 50 },
diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json
index 833732ded1bde..18e1fc11a7d46 100644
--- a/data/json/itemgroups/SUS/domestic.json
+++ b/data/json/itemgroups/SUS/domestic.json
@@ -181,7 +181,7 @@
       { "item": "flyer", "prob": 70 },
       { "item": "feces_roach", "prob": 70, "count": 4 },
       { "item": "lighter", "prob": 65, "charges": [ 0, 9 ] },
-      { "item": "light_disposable_cell", "count": [ 1, 7 ], "prob": 60, "charges": 0 },
+      { "item": "light_battery_cell", "count": [ 1, 7 ], "prob": 60, "charges": 0 },
       { "item": "bag_plastic", "prob": 60, "count": [ 1, 5 ] },
       { "item": "corkscrew", "prob": 60 },
       { "item": "stapler", "prob": 45 },
@@ -332,7 +332,7 @@
       { "group": "superglue", "prob": 90 },
       { "item": "boxcutter", "prob": 85 },
       { "item": "duct_tape", "prob": 85, "charges": [ 5, 200 ] },
-      { "item": "flashlight", "prob": 80, "ammo-item": "light_disposable_cell", "charges": [ 100, 300 ] },
+      { "item": "flashlight", "prob": 80, "ammo-item": "light_battery_cell", "charges": [ 100, 300 ] },
       { "item": "toothbrush_plain", "custom-flags": [ "FILTHY" ], "prob": 80 },
       { "item": "bottle_opener", "prob": 75 },
       { "item": "pockknife", "prob": 75 },
@@ -360,7 +360,7 @@
       { "item": "kevlar_shears", "prob": 10 },
       { "item": "tin_snips", "prob": 10 },
       { "item": "wristwatch", "prob": 25 },
-      { "item": "light_disposable_cell", "count": 4, "prob": 25, "charges": 300 },
+      { "item": "light_battery_cell", "count": 4, "prob": 25, "charges": 300 },
       { "item": "old_key", "prob": 20, "count": [ 1, 6 ] },
       { "item": "office_letter_opener", "prob": 15 },
       { "item": "razor_blade", "count": [ 1, 3 ], "prob": 15 },
@@ -399,6 +399,7 @@
       { "item": "duct_tape", "prob": 40, "charges": [ 100, 400 ] },
       { "group": "superglue", "prob": 30 },
       { "item": "light_battery_cell", "count": 4, "prob": 50, "charges": 100 },
+      { "group": "batteries", "prob": 50 },
       { "item": "deck_of_cards", "prob": 50 },
       { "item": "teleumbrella", "prob": 50 },
       { "prob": 50, "group": "bottle_otc_painkiller_20" },
@@ -413,7 +414,7 @@
       { "item": "gold_hairpin", "prob": 25 },
       { "item": "magnifying_glass", "prob": 25 },
       { "item": "bandana", "prob": 25 },
-      { "item": "light_disposable_cell", "count": 4, "prob": 25, "charges": 300 },
+      { "item": "light_battery_cell", "count": 4, "prob": 25, "charges": 300 },
       { "item": "fitness_band", "prob": 15 },
       { "item": "gloves_light", "prob": 10 },
       { "item": "gloves_golf", "prob": 10 },
diff --git a/data/json/itemgroups/SUS/evac_shelter.json b/data/json/itemgroups/SUS/evac_shelter.json
index a8a3a156783a3..f8c6e549d2d6a 100644
--- a/data/json/itemgroups/SUS/evac_shelter.json
+++ b/data/json/itemgroups/SUS/evac_shelter.json
@@ -11,7 +11,7 @@
       { "item": "emer_blanket", "prob": 75 },
       { "group": "gasmask_bag_full", "prob": 2 },
       { "item": "flashlight", "prob": 50 },
-      { "item": "light_disposable_cell", "prob": 10 },
+      { "item": "light_battery_cell", "prob": 10 },
       { "item": "lighter", "prob": 20, "charges": [ 60, 100 ] },
       { "item": "whistle", "prob": 70 },
       { "item": "water_clean", "count": [ 1, 2 ], "prob": 80 },
@@ -84,7 +84,7 @@
               { "item": "extinguisher", "prob": 70, "charges": 100 },
               { "group": "full_1st_aid", "count": [ 1, 3 ], "prob": 65 },
               { "item": "two_way_radio", "prob": 65 },
-              { "item": "light_disposable_cell", "count": [ 2, 4 ], "prob": 65 },
+              { "item": "light_battery_cell", "count": [ 2, 4 ], "prob": 65 },
               { "item": "electric_lantern", "prob": 35 },
               { "item": "barometer", "prob": 8 }
             ],
@@ -229,7 +229,7 @@
       { "item": "two_way_radio", "prob": 25 },
       { "item": "electric_lantern", "prob": 5 },
       { "item": "flashlight", "prob": 50 },
-      { "item": "light_disposable_cell", "prob": 10 },
+      { "item": "light_battery_cell", "prob": 10 },
       { "item": "jacket_evac", "prob": 75 },
       { "item": "emer_blanket", "prob": 75 }
     ]
@@ -246,7 +246,7 @@
       { "item": "two_way_radio", "prob": 10 },
       { "item": "electric_lantern", "prob": 2 },
       { "item": "flashlight", "prob": 25 },
-      { "item": "light_disposable_cell", "prob": 5 },
+      { "item": "light_battery_cell", "prob": 5 },
       { "item": "jacket_evac", "prob": 30 },
       { "item": "emer_blanket", "prob": 30 }
     ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json
index a657248840818..30c33a773d5b3 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json
@@ -870,8 +870,8 @@
     "entries": [
       { "item": "light_battery_cell", "prob": 25, "charges": [ 0, 100 ] },
       { "item": "light_minus_battery_cell", "prob": 12, "charges": [ 0, 50 ] },
-      { "item": "light_plus_battery_cell", "prob": 9, "charges": [ 0, 150 ] },
-      { "item": "light_disposable_cell", "prob": 50, "charges": [ 0, 300 ] }
+      { "item": "light_battery_cell", "prob": 9, "charges": [ 0, 150 ] },
+      { "item": "light_battery_cell", "prob": 50, "charges": [ 0, 300 ] }
     ]
   },
   {
@@ -880,29 +880,21 @@
     "items": [
       { "item": "light_battery_cell", "prob": 25, "charges": 100 },
       { "item": "light_minus_battery_cell", "prob": 12, "charges": 50 },
-      { "item": "light_plus_battery_cell", "prob": 9, "charges": 150 },
-      { "item": "light_disposable_cell", "prob": 50, "charges": 300 }
+      { "item": "light_battery_cell", "prob": 9, "charges": 150 },
+      { "item": "light_battery_cell", "prob": 50, "charges": 300 }
     ]
   },
   {
     "type": "item_group",
     "id": "ammo_medium_batteries",
     "subtype": "distribution",
-    "entries": [
-      { "item": "medium_battery_cell", "prob": 40, "charges": [ 0, 500 ] },
-      { "item": "medium_plus_battery_cell", "prob": 10, "charges": [ 0, 600 ] },
-      { "item": "medium_disposable_cell", "prob": 80, "charges": [ 0, 1200 ] }
-    ]
+    "entries": [ { "item": "medium_battery_cell", "prob": 40, "charges": [ 0, 500 ] } ]
   },
   {
     "type": "item_group",
     "id": "ammo_medium_batteries_full",
     "subtype": "distribution",
-    "entries": [
-      { "item": "medium_battery_cell", "prob": 40, "charges": 500 },
-      { "item": "medium_plus_battery_cell", "prob": 10, "charges": 600 },
-      { "item": "medium_disposable_cell", "prob": 80, "charges": 1200 }
-    ]
+    "entries": [ { "item": "medium_battery_cell", "prob": 40, "charges": 500 } ]
   },
   {
     "type": "item_group",
@@ -910,8 +902,7 @@
     "subtype": "distribution",
     "entries": [
       { "item": "heavy_battery_cell", "prob": 40, "charges": [ 0, 1000 ] },
-      { "item": "heavy_plus_battery_cell", "prob": 10, "charges": [ 0, 1250 ] },
-      { "item": "heavy_disposable_cell", "prob": 80, "charges": [ 0, 2500 ] }
+      { "item": "heavy_plus_battery_cell", "prob": 80, "charges": [ 0, -1 ] }
     ]
   },
   {
@@ -920,8 +911,7 @@
     "subtype": "distribution",
     "entries": [
       { "item": "heavy_battery_cell", "prob": 40, "charges": 1000 },
-      { "item": "heavy_plus_battery_cell", "prob": 10, "charges": 1250 },
-      { "item": "heavy_disposable_cell", "prob": 80, "charges": 2500 }
+      { "item": "heavy_plus_battery_cell", "prob": 80, "charges": 2500 }
     ]
   },
   {
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/mics.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/mics.json
index 977373ccf98b6..eaaaaeee2da0f 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/mics.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/mics.json
@@ -20,7 +20,7 @@
       { "item": "binoculars" },
       { "item": "two_way_radio", "count": 2 },
       { "item": "flashlight" },
-      { "item": "light_disposable_cell", "count": [ 1, 3 ] },
+      { "item": "light_battery_cell", "count": [ 1, 3 ] },
       { "item": "mask_gas" },
       { "item": "gasfilter_med", "count": [ 1, 3 ] }
     ]
diff --git a/data/json/itemgroups/electronics.json b/data/json/itemgroups/electronics.json
index 8611d361ac296..1111fbe4eb570 100644
--- a/data/json/itemgroups/electronics.json
+++ b/data/json/itemgroups/electronics.json
@@ -151,23 +151,16 @@
   {
     "id": "batteries",
     "type": "item_group",
-    "subtype": "collection",
+    "subtype": "distribution",
+    "container-item": "box_paper_small",
     "items": [
-      { "item": "light_minus_battery_cell", "prob": 30, "count": [ 2, 6 ] },
-      { "item": "light_minus_atomic_battery_cell", "prob": 5, "count": [ 1, 3 ] },
-      { "item": "light_minus_disposable_cell", "prob": 40, "count": [ 1, 3 ] },
-      { "item": "light_battery_cell", "prob": 30, "count": [ 1, 3 ] },
-      { "item": "light_plus_battery_cell", "prob": 15, "count": [ 1, 3 ] },
-      { "item": "light_atomic_battery_cell", "prob": 3, "count": [ 1, 3 ] },
-      { "item": "light_disposable_cell", "prob": 40, "count": [ 1, 3 ] },
-      { "item": "medium_battery_cell", "prob": 10, "count": [ 1, 3 ] },
-      { "item": "medium_plus_battery_cell", "prob": 5, "count": [ 1, 6 ] },
-      { "item": "medium_atomic_battery_cell", "prob": 3, "count": [ 1, 6 ] },
-      { "item": "medium_disposable_cell", "prob": 15, "count": [ 1, 3 ] },
-      { "item": "heavy_battery_cell", "prob": 10, "count": [ 1, 3 ] },
-      { "item": "heavy_plus_battery_cell", "prob": 5, "count": [ 1, 6 ] },
-      { "item": "heavy_atomic_battery_cell", "prob": 3, "count": [ 1, 6 ] },
-      { "item": "heavy_disposable_cell", "prob": 15, "count": [ 1, 3 ] }
+      { "item": "light_minus_battery_cell", "charges": 1000, "prob": 3, "count": [ 2, 8 ] },
+      { "item": "light_minus_disposable_cell", "charges": 1000, "prob": 30, "count": [ 2, 8 ] },
+      { "item": "light_battery_cell", "charges": 1000, "prob": 160, "count": [ 0, 8 ] },
+      { "item": "light_battery_cell", "charges": 1000, "prob": 16, "count": [ 0, 16 ] },
+      { "item": "light_cell_rechargeable", "charges": 1000, "prob": 16, "count": [ 0, 8 ] },
+      { "item": "light_cell_rechargeable", "charges": 1000, "prob": 1, "count": [ 0, 16 ] },
+      { "item": "medium_battery_cell", "charges": 1000, "prob": 15, "count": [ 0, 4 ] }
     ]
   }
 ]
diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json
index 0d2eb629d7a52..6630cb1ed7177 100644
--- a/data/json/itemgroups/military.json
+++ b/data/json/itemgroups/military.json
@@ -961,7 +961,7 @@
       { "item": "survnote", "prob": 2 },
       { "item": "robot_controls", "prob": 3 },
       { "item": "solarpack", "prob": 1 },
-      { "item": "flight_helmet", "prob": 20, "ammo-item": "light_plus_battery_cell", "charges": [ 0, 150 ] },
+      { "item": "flight_helmet", "prob": 20, "ammo-item": "light_battery_cell", "charges": [ 0, 150 ] },
       { "item": "mil_flight_suit", "prob": 20 }
     ]
   },
diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json
index 390ddfcd7b748..3c654a9370d23 100644
--- a/data/json/itemgroups/misc.json
+++ b/data/json/itemgroups/misc.json
@@ -225,9 +225,9 @@
       { "item": "boots_combat" },
       { "item": "socks", "count": 3 },
       { "item": "gloves_tactical" },
-      { "item": "light_plus_battery_cell", "charges": 150 },
-      { "item": "light_plus_battery_cell", "charges": 150, "container-item": "flashlight" },
-      { "item": "light_plus_battery_cell", "charges": 150, "container-item": "radio" },
+      { "group": "batteries" },
+      { "item": "light_battery_cell", "charges": 150, "container-item": "flashlight" },
+      { "item": "light_battery_cell", "charges": 150, "container-item": "radio" },
       { "item": "lighter", "charges": 100 },
       { "item": "pockknife" },
       { "item": "multitool" },
@@ -249,7 +249,7 @@
       { "item": "flint_steel" },
       { "item": "whistle_multitool" },
       { "item": "bottle_folding" },
-      { "item": "light_plus_battery_cell", "charges": 150, "container-item": "flashlight" },
+      { "item": "light_battery_cell", "charges": 150, "container-item": "flashlight" },
       { "item": "picklocks" },
       { "item": "lifestraw" },
       { "item": "pocket_survival" },
diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json
index 87285c555d719..d7092aab8bd81 100644
--- a/data/json/itemgroups/supplies.json
+++ b/data/json/itemgroups/supplies.json
@@ -14,6 +14,7 @@
       [ "antenna", 40 ],
       [ "nuts_bolts", 15 ],
       { "group": "ammo_any_batteries_full", "prob": 100 },
+      { "group": "batteries", "prob": 60 },
       [ "cable", 60 ],
       [ "power_supply", 20 ],
       [ "processor", 20 ],
diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
index c97776ac16184..af5cc7c0e2112 100644
--- a/data/json/itemgroups/tools.json
+++ b/data/json/itemgroups/tools.json
@@ -854,7 +854,7 @@
       { "item": "camera_pro", "prob": 1, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "container-item": "camera_bag", "prob": 1, "charges": [ 0, 150 ] },
       [ "element", 5 ],
-      [ "light_battery_cell", 10 ],
+      { "group": "batteries" },
       [ "goggles_welding", 20 ],
       { "item": "sm_extinguisher", "prob": 10, "charges": 10 },
       { "group": "tools_toolbox", "prob": 5 },
diff --git a/data/json/items/armor/head_attachments.json b/data/json/items/armor/head_attachments.json
index c118b3fddea7c..bc5db320d6062 100644
--- a/data/json/items/armor/head_attachments.json
+++ b/data/json/items/armor/head_attachments.json
@@ -236,7 +236,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "relic_data": { "passive_effects": [ { "id": "nvg_normal" } ] },
@@ -295,7 +295,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_MEDIUM" ],
-        "default_magazine": "medium_plus_battery_cell"
+        "default_magazine": "medium_battery_cell"
       }
     ],
     "relic_data": { "passive_effects": [ { "id": "nvg_good" } ] },
@@ -362,7 +362,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_MEDIUM" ],
-        "default_magazine": "medium_plus_battery_cell"
+        "default_magazine": "medium_battery_cell"
       }
     ],
     "relic_data": { "passive_effects": [ { "id": "nvg_good" } ] },
diff --git a/data/json/items/armor/robofac_armor.json b/data/json/items/armor/robofac_armor.json
index 6adc44724c425..b95deb404b059 100644
--- a/data/json/items/armor/robofac_armor.json
+++ b/data/json/items/armor/robofac_armor.json
@@ -202,7 +202,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_MEDIUM" ],
-        "default_magazine": "medium_atomic_battery_cell"
+        "default_magazine": "medimedium_battery_cellum_atomic_battery_cell"
       }
     ],
     "ammo": "battery",
@@ -308,7 +308,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       },
       {
         "pocket_type": "CONTAINER",
diff --git a/data/json/items/battery.json b/data/json/items/battery.json
index 2f21e3284052b..fadc0a80e68c4 100644
--- a/data/json/items/battery.json
+++ b/data/json/items/battery.json
@@ -3,62 +3,33 @@
     "id": "light_minus_battery_cell",
     "type": "MAGAZINE",
     "category": "tool_magazine",
-    "name": { "str": "ultra-light battery", "str_pl": "ultra-light batteries" },
-    "description": "A light battery cell designed for small size over everything else.  It retains its universal compatibility, though.",
+    "name": { "str": "ultra-light battery (rechargeable)", "str_pl": "ultra-light batteries (rechargeable)" },
+    "description": "A light, coin-like battery cell designed for small size over everything else.  Used for watches, calculators, toys or similar low-power electronics.",
+    "//": "LIR2032, Li-Ion, DURACELL DL2032",
     "ascii_picture": "light_minus_battery_cell",
-    "weight": "5 g",
+    "weight": "3 g",
     "volume": "1 ml",
-    "price": "15 USD",
-    "price_postapoc": "50 cent",
-    "material": [ "iron", "plastic" ],
+    "longest_side": "1 mm",
+    "price": "32 cent",
+    "price_postapoc": "1 cent",
+    "material": [ { "type": "budget_steel", "portion": 99 }, { "type": "plastic", "portion": 1 } ],
     "symbol": "=",
     "color": "yellow",
     "ammo_type": [ "battery" ],
-    "capacity": 3,
+    "capacity": 2,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE", "BATTERY_ULTRA_LIGHT" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 3 } } ]
-  },
-  {
-    "id": "light_minus_atomic_battery_cell",
-    "type": "MAGAZINE",
-    "category": "tool_magazine",
-    "name": { "str": "ultra-light plutonium fuel battery", "str_pl": "ultra-light plutonium fuel batteries" },
-    "description": "A battery that uses a thin plutonium-244 rod to stabilize an exotic nanocompound, designed for small size over everything else.",
-    "ascii_picture": "light_minus_atomic_battery_cell",
-    "weight": "5 g",
-    "volume": "1 ml",
-    "price": "150 USD",
-    "price_postapoc": "2 USD",
-    "material": [ "iron", "plastic" ],
-    "symbol": "=",
-    "color": "green",
-    "ammo_type": [ "battery" ],
-    "count": 5,
-    "capacity": 5,
-    "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "LEAK_DAM", "RADIOACTIVE", "BATTERY_ULTRA_LIGHT" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 5 } } ]
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 2 } } ]
   },
   {
     "id": "light_minus_disposable_cell",
+    "copy-from": "light_minus_battery_cell",
     "type": "MAGAZINE",
-    "category": "tool_magazine",
-    "name": { "str": "ultra-light disposable battery", "str_pl": "ultra-light disposable batteries" },
-    "description": "A light battery cell designed for small size over everything else.  It retains its universal compatibility, though.  The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
+    "name": { "str": "ultra-light battery", "str_pl": "ultra-light batteries" },
+    "description": "A light coin-like battery cell designed for small size over everything else.  Used for watches, calculators, toys or similar low-power electronics.  This one can't be recharged.",
+    "//": "cr2032, Lithium-Manganese, duracell CR2032 but they all pretty equal in their range",
     "ascii_picture": "light_minus_disposable_cell",
-    "weight": "3 g",
-    "volume": "1 ml",
-    "price": "30 USD",
-    "price_postapoc": "1 USD",
-    "material": [ "iron", "plastic" ],
-    "symbol": "=",
-    "color": "yellow",
-    "ammo_type": [ "battery" ],
-    "count": 2,
-    "capacity": 2,
-    "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "BATTERY_ULTRA_LIGHT" ],
+    "delete": { "flags": [ "RECHARGE" ] },
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 2 } } ]
   },
   {
@@ -66,244 +37,96 @@
     "type": "MAGAZINE",
     "category": "tool_magazine",
     "name": { "str": "light battery", "str_pl": "light batteries" },
-    "description": "A light battery cell, universally compatible with all kinds of small devices.",
+    "description": "A light battery cell, popular for any consumer-grade electronic: from remotes to mouses, from clocks to thermometers.",
+    "//": "AA, Lithium/Iron Disulfide, ENERGIZER L91",
     "ascii_picture": "light_battery_cell",
-    "weight": "30 g",
-    "volume": "25 ml",
-    "price": "35 USD",
-    "price_postapoc": "1 USD",
-    "material": [ "iron", "plastic" ],
+    "weight": "15 g",
+    "volume": "8 ml",
+    "longest_side": "50 mm",
+    "price": "31 cent",
+    "price_postapoc": "3 cent",
+    "material": [ { "type": "budget_steel", "portion": 99 }, { "type": "plastic", "portion": 1 } ],
     "symbol": "=",
     "color": "yellow",
     "ammo_type": [ "battery" ],
-    "capacity": 22,
-    "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE", "BATTERY_LIGHT" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 22 } } ]
-  },
-  {
-    "id": "light_plus_battery_cell",
-    "type": "MAGAZINE",
-    "category": "tool_magazine",
-    "name": { "str": "light battery (high-capacity)", "str_pl": "light batteries (high-capacity)" },
-    "description": "A high-capacity light battery cell, universally compatible with all kinds of small devices.",
-    "ascii_picture": "light_plus_battery_cell",
-    "weight": "45 g",
-    "volume": "35 ml",
-    "price": "50 USD",
-    "price_postapoc": "1 USD 50 cent",
-    "material": [ "iron", "plastic" ],
-    "symbol": "=",
-    "color": "yellow",
-    "ammo_type": [ "battery" ],
-    "capacity": 33,
-    "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE", "BATTERY_LIGHT" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 33 } } ]
-  },
-  {
-    "id": "light_atomic_battery_cell",
-    "type": "MAGAZINE",
-    "category": "tool_magazine",
-    "name": { "str": "light plutonium fuel battery", "str_pl": "light plutonium fuel batteries" },
-    "description": "A battery that uses a thin plutonium-244 rod to stabilize an exotic nanocompound.  It is universally compatible with all kinds of small devices.  Although it stores a huge amount of power, it cannot be recharged.",
-    "ascii_picture": "light_atomic_battery_cell",
-    "weight": "160 g",
-    "volume": "35 ml",
-    "price": "500 USD",
-    "price_postapoc": "4 USD",
-    "material": [ "iron", "plastic" ],
-    "symbol": "=",
-    "color": "green",
-    "ammo_type": [ "battery" ],
-    "count": 175,
-    "capacity": 175,
-    "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "LEAK_DAM", "RADIOACTIVE", "BATTERY_LIGHT" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 175 } } ]
-  },
-  {
-    "id": "light_disposable_cell",
-    "type": "MAGAZINE",
-    "category": "tool_magazine",
-    "name": { "str": "light disposable battery", "str_pl": "light disposable batteries" },
-    "description": "A light battery cell, universally compatible with all kinds of small devices.  The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
-    "ascii_picture": "light_disposable_cell",
-    "weight": "45 g",
-    "volume": "35 ml",
-    "price": "100 USD",
-    "price_postapoc": "2 USD",
-    "material": [ "iron", "plastic" ],
-    "symbol": "=",
-    "color": "yellow",
-    "ammo_type": [ "battery" ],
-    "count": 45,
-    "capacity": 45,
+    "capacity": 16,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "BATTERY_LIGHT" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 45 } } ]
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 16 } } ]
   },
   {
-    "id": "light_dry_cell",
+    "id": "light_cell_rechargeable",
+    "copy-from": "light_battery_cell",
     "type": "MAGAZINE",
-    "category": "tool_magazine",
-    "name": { "str": "light dry battery", "str_pl": "light dry batteries" },
-    "description": "A light battery cell, universally compatible with all kinds of small devices.  The battery's chemistry doesn't provide high energy capacity, and it cannot be recharged.",
-    "ascii_picture": "light_dry_cell",
-    "weight": "40 g",
-    "volume": "35 ml",
-    "price_postapoc": "1 USD",
-    "material": [ "iron", "charcoal" ],
-    "symbol": "=",
-    "color": "yellow",
-    "ammo_type": [ "battery" ],
-    "count": 5,
-    "capacity": 5,
-    "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "BATTERY_LIGHT" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 5 } } ]
+    "name": { "str": "light battery (rechargeable)", "str_pl": "light batteries (rechargeable)" },
+    "description": "A light battery cell, popular for any consumer-grade electronic: from remotes to mouses, from clocks to thermometers.",
+    "//": "AA, Nickel-Metal Hydride, ENERGIZER NH15-2300",
+    "weight": "27 g",
+    "ascii_picture": "light_battery_cell",
+    "extend": { "flags": [ "RECHARGE" ] },
+    "capacity": 10,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 10 } } ]
   },
   {
     "id": "medium_battery_cell",
     "type": "MAGAZINE",
     "category": "tool_magazine",
     "name": { "str": "medium battery", "str_pl": "medium batteries" },
-    "description": "A medium battery cell, universally compatible with all kinds of appliances and power tools.",
+    "description": "A medium battery cell, wildly used in modern tools: heavy flashlights, two-way radios, security cameras, multiple of them make a tool battery, and some older generation of EV use thousands of this as the power storage.",
+    "//": "18650, Li-ion, https://cdn-shop.adafruit.com/datasheets/18650%204400mAh.pdf",
     "ascii_picture": "medium_battery_cell",
-    "weight": "600 g",
-    "volume": "450 ml",
-    "price": "100 USD",
-    "price_postapoc": "3 USD",
-    "material": [ "iron", "plastic" ],
+    "weight": "85 g",
+    "volume": "17 ml",
+    "longest_side": "65 mm",
+    "price": "101 cent",
+    "price_postapoc": "6 cent",
+    "material": [ { "type": "budget_steel", "portion": 99 }, { "type": "plastic", "portion": 1 } ],
     "symbol": "=",
     "color": "yellow",
     "ammo_type": [ "battery" ],
-    "capacity": 444,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE", "BATTERY_MEDIUM" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 444 } } ]
-  },
-  {
-    "id": "medium_plus_battery_cell",
-    "type": "MAGAZINE",
-    "category": "tool_magazine",
-    "name": { "str": "medium battery (high-capacity)", "str_pl": "medium batteries (high-capacity)" },
-    "description": "A high-capacity medium battery cell, universally compatible with all kinds of appliances and power tools.",
-    "ascii_picture": "medium_plus_battery_cell",
-    "weight": "725 g",
-    "volume": "525 ml",
-    "price": "125 USD",
-    "price_postapoc": "4 USD",
-    "material": [ "iron", "plastic" ],
-    "symbol": "=",
-    "color": "yellow",
-    "ammo_type": [ "battery" ],
-    "capacity": 536,
-    "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE", "BATTERY_MEDIUM" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 536 } } ]
-  },
-  {
-    "id": "medium_atomic_battery_cell",
-    "type": "MAGAZINE",
-    "category": "tool_magazine",
-    "name": { "str": "medium plutonium fuel battery", "str_pl": "medium plutonium fuel batteries" },
-    "description": "A battery that uses a thin plutonium-244 rod to stabilize an exotic nanocompound.  It is universally compatible with all kinds of appliances and power tools.  Although it stores a huge amount of power, it cannot be recharged.",
-    "ascii_picture": "medium_atomic_battery_cell",
-    "weight": "1000 g",
-    "volume": "525 ml",
-    "price": "1 kUSD",
-    "price_postapoc": "10 USD",
-    "material": [ "iron", "plastic" ],
-    "symbol": "=",
-    "color": "green",
-    "ammo_type": [ "battery" ],
-    "count": 2625,
-    "capacity": 2625,
-    "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "LEAK_DAM", "RADIOACTIVE", "BATTERY_MEDIUM" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 2625 } } ]
-  },
-  {
-    "id": "medium_disposable_cell",
-    "type": "MAGAZINE",
-    "category": "tool_magazine",
-    "name": { "str": "medium disposable battery", "str_pl": "medium disposable batteries" },
-    "description": "A medium battery cell, universally compatible with all kinds of appliances and power tools.  The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
-    "ascii_picture": "medium_disposable_cell",
-    "weight": "725 g",
-    "volume": "525 ml",
-    "price": "100 USD",
-    "price_postapoc": "5 USD",
-    "material": [ "iron", "plastic" ],
-    "symbol": "=",
-    "color": "yellow",
-    "ammo_type": [ "battery" ],
-    "count": 732,
-    "capacity": 732,
-    "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "BATTERY_MEDIUM" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 732 } } ]
-  },
-  {
-    "id": "medium_dry_cell",
-    "type": "MAGAZINE",
-    "category": "tool_magazine",
-    "name": { "str": "medium dry battery", "str_pl": "medium dry batteries" },
-    "description": "A medium battery cell, universally compatible with all kinds of appliances and power tools.  The battery's chemistry doesn't provide high energy capacity, and it cannot be recharged.",
-    "ascii_picture": "medium_dry_cell",
-    "weight": "350 g",
-    "volume": "525 ml",
-    "price_postapoc": "2 USD 50 cent",
-    "material": [ "iron", "charcoal" ],
-    "symbol": "=",
-    "color": "yellow",
-    "ammo_type": [ "battery" ],
-    "count": 45,
-    "capacity": 45,
-    "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "BATTERY_MEDIUM" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 45 } } ]
+    "capacity": 56,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 56 } } ]
   },
   {
     "id": "heavy_battery_cell",
+    "copy-from": "heavy_plus_battery_cell",
     "type": "MAGAZINE",
-    "category": "tool_magazine",
-    "name": { "str": "heavy battery", "str_pl": "heavy batteries" },
-    "description": "A heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.",
+    "name": { "str": "small tool battery", "str_pl": "small tool batteries" },
+    "description": "A light battery cell, universally compatible with all kinds of industrial-grade equipment and portable tools - drills, angle grinders, chainsaws.",
+    "//": "Li-ion 18V LXT BL1815N",
     "ascii_picture": "heavy_battery_cell",
-    "weight": "1000 g",
-    "volume": "1225 ml",
-    "price": "100 USD",
-    "price_postapoc": "5 USD",
-    "material": [ "iron", "plastic" ],
-    "symbol": "=",
-    "color": "yellow",
-    "ammo_type": [ "battery" ],
-    "capacity": 740,
-    "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE", "BATTERY_HEAVY" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 740 } } ]
+    "weight": "350 g",
+    "volume": "382 ml",
+    "longest_side": "113 mm",
+    "price": "22 USD",
+    "price_postapoc": "35 cent",
+    "capacity": 259,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 259 } } ]
   },
   {
     "id": "heavy_plus_battery_cell",
     "type": "MAGAZINE",
     "category": "tool_magazine",
-    "name": { "str": "heavy battery (high-capacity)", "str_pl": "heavy batteries (high-capacity)" },
-    "description": "A high-capacity heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.",
+    "name": { "str": "big tool battery", "str_pl": "big tool batteries" },
+    "description": "A heavy battery cell, universally compatible with all kinds of industrial-grade equipment and portable tools - drills, angle grinders, chainsaws.",
+    "//": "Li-ion 18V LXT BL1850B by Makita, because, you guess it, there is no single standard for this type of batteries irl",
     "ascii_picture": "heavy_plus_battery_cell",
-    "weight": "1250 g",
-    "volume": "1500 ml",
-    "price": "125 USD",
-    "price_postapoc": "6 USD",
-    "material": [ "iron", "plastic" ],
+    "weight": "680 g",
+    "volume": "525 ml",
+    "longest_side": "113 mm",
+    "//2": "113 * 75 * 62 mm",
+    "price": "192 USD",
+    "price_postapoc": "35 cent",
+    "material": [ { "type": "budget_steel", "portion": 99 }, { "type": "plastic", "portion": 1 } ],
     "symbol": "=",
     "color": "yellow",
     "ammo_type": [ "battery" ],
-    "capacity": 925,
+    "capacity": 503,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE", "BATTERY_HEAVY" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 925 } } ]
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 503 } } ]
   },
   {
     "id": "heavy_atomic_battery_cell",
@@ -345,46 +168,5 @@
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "MECH_BAT", "LEAK_DAM", "RADIOACTIVE" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 100000 } } ]
-  },
-  {
-    "id": "heavy_disposable_cell",
-    "type": "MAGAZINE",
-    "category": "tool_magazine",
-    "name": { "str": "heavy disposable battery", "str_pl": "heavy disposable batteries" },
-    "description": "A heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.  The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
-    "ascii_picture": "heavy_disposable_cell",
-    "weight": "1250 g",
-    "volume": "1500 ml",
-    "price": "100 USD",
-    "price_postapoc": "7 USD 50 cent",
-    "material": [ "iron", "plastic" ],
-    "symbol": "=",
-    "color": "yellow",
-    "ammo_type": [ "battery" ],
-    "count": 1262,
-    "capacity": 1262,
-    "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "BATTERY_HEAVY" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 1262 } } ]
-  },
-  {
-    "id": "heavy_dry_cell",
-    "type": "MAGAZINE",
-    "category": "tool_magazine",
-    "name": { "str": "heavy dry battery", "str_pl": "heavy dry batteries" },
-    "description": "A heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.  The battery's chemistry doesn't provide high energy capacity, and it cannot be recharged.",
-    "ascii_picture": "heavy_dry_cell",
-    "weight": "900 g",
-    "volume": "1500 ml",
-    "price_postapoc": "3 USD 75 cent",
-    "material": [ "iron", "charcoal" ],
-    "symbol": "=",
-    "color": "yellow",
-    "ammo_type": [ "battery" ],
-    "count": 117,
-    "capacity": 117,
-    "looks_like": "battery",
-    "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "BATTERY_HEAVY" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 117 } } ]
   }
 ]
diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json
index 20a0a8199e307..9628e89f263e8 100644
--- a/data/json/items/melee/bludgeons.json
+++ b/data/json/items/melee/bludgeons.json
@@ -518,7 +518,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_disposable_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "melee_damage": { "bash": 2 }
@@ -569,7 +569,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_disposable_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "melee_damage": { "bash": 8 }
diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json
index 901cd2acf6037..bd3bf64844271 100644
--- a/data/json/items/tool/electronics.json
+++ b/data/json/items/tool/electronics.json
@@ -20,7 +20,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "melee_damage": { "bash": 1 }
@@ -46,7 +46,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "melee_damage": { "bash": 1 }
@@ -79,7 +79,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ]
   },
@@ -174,7 +174,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       },
       {
         "pocket_type": "EBOOK",
@@ -305,7 +305,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_MEDIUM", "BATTERY_HEAVY" ],
-        "default_magazine": "medium_atomic_battery_cell"
+        "default_magazine": "medium_battery_cell"
       }
     ],
     "melee_damage": { "bash": 2 }
diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json
index 30baa2743e57e..0478ed6b8eaeb 100644
--- a/data/json/items/tool/lighting.json
+++ b/data/json/items/tool/lighting.json
@@ -213,7 +213,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_disposable_cell"
+        "default_magazine": "light_battery_cell"
       }
     ]
   },
@@ -264,7 +264,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_disposable_cell"
+        "default_magazine": "light_battery_cell"
       }
     ]
   },
@@ -316,7 +316,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_disposable_cell"
+        "default_magazine": "light_battery_cell"
       }
     ]
   },
@@ -648,7 +648,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_disposable_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "melee_damage": { "bash": 8 }
diff --git a/data/json/items/tool/radio_tools.json b/data/json/items/tool/radio_tools.json
index 94c2aeefef018..45532c22863d6 100644
--- a/data/json/items/tool/radio_tools.json
+++ b/data/json/items/tool/radio_tools.json
@@ -22,7 +22,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_disposable_cell"
+        "default_magazine": "light_battery_cell"
       }
     ]
   },
@@ -115,7 +115,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_disposable_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "melee_damage": { "bash": 4 }
@@ -157,7 +157,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_disposable_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "melee_damage": { "bash": 6 }
diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json
index fc6e822b1a22f..95fb14260070f 100644
--- a/data/json/items/tool/science.json
+++ b/data/json/items/tool/science.json
@@ -389,12 +389,8 @@
         "magazine_well": "500 ml",
         "item_restriction": [
           "medium_battery_cell",
-          "medium_plus_battery_cell",
-          "medium_disposable_cell",
-          "medium_atomic_battery_cell",
           "heavy_battery_cell",
           "heavy_plus_battery_cell",
-          "heavy_disposable_cell",
           "heavy_atomic_battery_cell",
           "small_storage_battery",
           "medium_storage_battery",
diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json
index a7224ca2c93e3..6e9eca85b6897 100644
--- a/data/json/items/tool/workshop.json
+++ b/data/json/items/tool/workshop.json
@@ -1224,7 +1224,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_disposable_cell"
+        "default_magazine": "light_battery_cell"
       }
     ]
   },
@@ -1281,7 +1281,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_disposable_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "to_hit": { "grip": "solid", "length": "hand", "surface": "point", "balance": "neutral" },
diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
index 083d6516dd2c4..002af39381a74 100644
--- a/data/json/items/tool_armor.json
+++ b/data/json/items/tool_armor.json
@@ -588,7 +588,7 @@
     "material": [ "superalloy" ],
     "symbol": "[",
     "color": "light_gray",
-    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "rigid": true, "item_restriction": [ "light_atomic_battery_cell" ] } ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "rigid": true, "item_restriction": [ "light_battery_cell" ] } ],
     "ammo": "battery",
     "charges_per_use": 25,
     "warmth": 10,
@@ -718,7 +718,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "armor": [ { "coverage": 100, "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ] } ]
@@ -772,7 +772,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "armor": [ { "coverage": 100, "covers": [ "hand_l", "hand_r" ] } ]
@@ -826,7 +826,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "armor": [ { "coverage": 100, "covers": [ "head", "mouth" ] } ]
@@ -901,7 +901,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "armor": [ { "coverage": 45, "covers": [ "head" ], "specifically_covers": [ "head_crown", "head_forehead" ] } ],
@@ -929,7 +929,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "armor": [ { "encumbrance": 2, "coverage": 15, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_front" ] } ],
@@ -957,7 +957,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "armor": [ { "encumbrance": 2, "coverage": 15, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_front" ] } ],
@@ -1027,7 +1027,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "armor": [ { "encumbrance": 5, "coverage": 50, "covers": [ "head" ], "specifically_covers": [ "head_crown", "head_forehead" ] } ],
@@ -1107,7 +1107,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "armor": [ { "encumbrance": 5, "coverage": 95, "covers": [ "eyes" ] } ],
@@ -1138,7 +1138,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       },
       {
         "pocket_type": "EBOOK",
@@ -1452,7 +1452,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_MEDIUM" ],
-        "default_magazine": "medium_atomic_battery_cell"
+        "default_magazine": "medium_battery_cell"
       }
     ],
     "ammo": "battery",
@@ -2411,7 +2411,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "relic_data": { "passive_effects": [ { "id": "nvg_bad" } ] },
@@ -2465,7 +2465,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "armor": [ { "encumbrance": 40, "coverage": 100, "covers": [ "eyes" ], "rigid_layer_only": true } ]
@@ -3087,7 +3087,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "armor": [ { "encumbrance": 5, "coverage": 100, "covers": [ "head" ], "specifically_covers": [ "head_ear_r", "head_ear_l" ] } ]
@@ -3125,7 +3125,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "armor": [ { "encumbrance": 5, "coverage": 100, "covers": [ "head" ], "specifically_covers": [ "head_ear_r", "head_ear_l" ] } ]
@@ -3769,7 +3769,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "melee_damage": { "bash": 10 }
@@ -3814,7 +3814,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "melee_damage": { "bash": 10 }
diff --git a/data/json/mapgen/military/mil_base/mil_base_z0.json b/data/json/mapgen/military/mil_base/mil_base_z0.json
index 60252726963dc..3984da5b656a2 100644
--- a/data/json/mapgen/military/mil_base/mil_base_z0.json
+++ b/data/json/mapgen/military/mil_base/mil_base_z0.json
@@ -490,9 +490,9 @@
         },
         { "item": "elbow_pads", "x": 37, "y": 65, "chance": 75, "repeat": [ 50, 150 ] },
         { "item": "knee_pads", "x": 36, "y": 65, "chance": 75, "repeat": [ 50, 150 ] },
-        { "item": "light_disposable_cell", "x": 46, "y": 60, "chance": 75, "repeat": [ 50, 150 ] },
+        { "item": "light_battery_cell", "x": 46, "y": 60, "chance": 75, "repeat": [ 50, 150 ] },
         { "item": "light_battery_cell", "x": 45, "y": 60, "chance": 75, "repeat": [ 50, 150 ] },
-        { "item": "light_plus_battery_cell", "x": 44, "y": 60, "chance": 75, "repeat": [ 50, 150 ] },
+        { "item": "light_battery_cell", "x": 44, "y": 60, "chance": 75, "repeat": [ 50, 150 ] },
         { "item": "hand_crank_charger", "x": 43, "y": 60, "chance": 75, "repeat": [ 25, 50 ] },
         { "item": "flashlight", "x": 42, "y": 60, "chance": 75, "repeat": [ 50, 200 ] },
         { "item": "heavy_flashlight", "x": 41, "y": 60, "chance": 75, "repeat": [ 25, 50 ] },
diff --git a/data/json/mapgen/restaurant.json b/data/json/mapgen/restaurant.json
index 512a4a4e80574..fda1d5379861e 100644
--- a/data/json/mapgen/restaurant.json
+++ b/data/json/mapgen/restaurant.json
@@ -382,7 +382,7 @@
     "type": "item_group",
     "subtype": "collection",
     "container-item": "foodperson_mask",
-    "entries": [ { "item": "medium_disposable_cell" } ]
+    "entries": [ { "item": "medium_battery_cell" } ]
   },
   {
     "id": "foodperson_outfit",
@@ -461,7 +461,7 @@
         "E": "f_entertainment_center",
         "H": "f_rack_coat"
       },
-      "item": { "L": { "item": "medium_disposable_cell", "chance": 100, "repeat": [ 1, 2 ] } },
+      "item": { "L": { "item": "medium_battery_cell", "chance": 100, "repeat": [ 1, 2 ] } },
       "items": {
         "F": { "item": "SUS_fridge_breakroom", "chance": 100 },
         "x": { "item": "trash", "chance": 100, "repeat": [ 2, 4 ] },
diff --git a/data/json/mapgen/tutorial.json b/data/json/mapgen/tutorial.json
index de430224b2849..2085950ad0acb 100644
--- a/data/json/mapgen/tutorial.json
+++ b/data/json/mapgen/tutorial.json
@@ -89,7 +89,7 @@
         "Ŗ": { "item": "uzimag", "chance": 100 },
         "Ř": { "item": "9mm", "chance": 100 },
         "$": { "item": "backpack", "chance": 100 },
-        "@": [ { "item": "light_disposable_cell", "chance": 100 }, { "item": "flashlight", "chance": 100 } ],
+        "@": [ { "item": "light_battery_cell", "chance": 100 }, { "item": "flashlight", "chance": 100 } ],
         "%": { "item": "helmet_ball", "chance": 100 },
         "^": { "item": "mask_dust", "chance": 100 },
         "*": { "item": "paint_brush", "chance": 100 },
diff --git a/data/json/npcs/NC_TRUE_FOODPERSON.json b/data/json/npcs/NC_TRUE_FOODPERSON.json
index 44084fd92de7b..fa527d93ba4ee 100644
--- a/data/json/npcs/NC_TRUE_FOODPERSON.json
+++ b/data/json/npcs/NC_TRUE_FOODPERSON.json
@@ -29,7 +29,7 @@
     "id": "NC_TRUE_FOODPERSON_misc",
     "subtype": "collection",
     "entries": [
-      { "item": "medium_disposable_cell", "prob": 90 },
+      { "item": "medium_battery_cell", "prob": 90 },
       { "item": "foodplace_snack_bar", "container-item": "fanny" },
       { "item": "foodplace_snack_bar" },
       { "item": "foodplace_zero_drink" }
diff --git a/data/json/obsoletion_and_migration_0.I/migrated_vehicleparts.json b/data/json/obsoletion_and_migration_0.I/migrated_vehicleparts.json
index 9e7f65b35d334..68496bfb9d0ef 100644
--- a/data/json/obsoletion_and_migration_0.I/migrated_vehicleparts.json
+++ b/data/json/obsoletion_and_migration_0.I/migrated_vehicleparts.json
@@ -10,5 +10,17 @@
     "//": "Remove after 0.I release",
     "from": "ap_freezer",
     "to": "ap_chest_freezer"
+  },
+  {
+    "type": "vehicle_part_migration",
+    "//": "Remove after 0.I release",
+    "from": "car_light_plus_battery_cell",
+    "to": "battery_car"
+  },
+  {
+    "type": "vehicle_part_migration",
+    "//": "Remove after 0.I release",
+    "from": "car_medium_plus_battery_cell",
+    "to": "battery_car"
   }
 ]
diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json
index ed9a59ee1d3fb..48fa7e43f0ab0 100644
--- a/data/json/obsoletion_and_migration_0.I/migration_items.json
+++ b/data/json/obsoletion_and_migration_0.I/migration_items.json
@@ -992,6 +992,61 @@
     "type": "MIGRATION",
     "replace": "bread"
   },
+  {
+    "id": "light_minus_atomic_battery_cell",
+    "type": "MIGRATION",
+    "replace": "light_minus_disposable_cell"
+  },
+  {
+    "id": "light_plus_battery_cell",
+    "type": "MIGRATION",
+    "replace": "light_battery_cell"
+  },
+  {
+    "id": "light_atomic_battery_cell",
+    "type": "MIGRATION",
+    "replace": "light_battery_cell"
+  },
+  {
+    "id": "light_disposable_cell",
+    "type": "MIGRATION",
+    "replace": "light_battery_cell"
+  },
+  {
+    "id": "light_dry_cell",
+    "type": "MIGRATION",
+    "replace": "light_battery_cell"
+  },
+  {
+    "id": "medium_disposable_cell",
+    "type": "MIGRATION",
+    "replace": "medium_battery_cell"
+  },
+  {
+    "id": "medium_plus_battery_cell",
+    "type": "MIGRATION",
+    "replace": "medium_battery_cell"
+  },
+  {
+    "id": "medium_atomic_battery_cell",
+    "type": "MIGRATION",
+    "replace": "medium_battery_cell"
+  },
+  {
+    "id": "medium_dry_cell",
+    "type": "MIGRATION",
+    "replace": "medium_battery_cell"
+  },
+  {
+    "id": "heavy_disposable_cell",
+    "type": "MIGRATION",
+    "replace": "heavy_plus_battery_cell"
+  },
+  {
+    "id": "heavy_dry_cell",
+    "type": "MIGRATION",
+    "replace": "heavy_plus_battery_cell"
+  },
   {
     "id": "scrap_cap1",
     "type": "MIGRATION",
diff --git a/data/json/professions.json b/data/json/professions.json
index 0b661e875db10..50bebec3c64bf 100644
--- a/data/json/professions.json
+++ b/data/json/professions.json
@@ -96,25 +96,20 @@
     "type": "item_group",
     "subtype": "collection",
     "id": "charged_cell_phone",
-    "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "cell_phone" } ]
+    "entries": [ { "item": "light_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "cell_phone" } ]
   },
   {
     "type": "item_group",
     "subtype": "collection",
     "id": "charged_laptop",
-    "entries": [ { "item": "medium_plus_battery_cell", "ammo-item": "battery", "charges": 600, "container-item": "laptop" } ]
+    "entries": [ { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 600, "container-item": "laptop" } ]
   },
   {
     "type": "item_group",
     "subtype": "collection",
     "id": "charged_soldering_iron",
     "entries": [
-      {
-        "item": "light_plus_battery_cell",
-        "ammo-item": "battery",
-        "charges": 150,
-        "container-item": "soldering_iron_portable"
-      }
+      { "item": "light_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "soldering_iron_portable" }
     ]
   },
   {
@@ -136,25 +131,25 @@
     "type": "item_group",
     "subtype": "collection",
     "id": "charged_flashlight",
-    "entries": [ { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "flashlight" } ]
+    "entries": [ { "item": "light_battery_cell", "ammo-item": "battery", "charges": 300, "container-item": "flashlight" } ]
   },
   {
     "type": "item_group",
     "subtype": "collection",
     "id": "charged_heavy_flashlight",
-    "entries": [ { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "heavy_flashlight" } ]
+    "entries": [ { "item": "light_battery_cell", "ammo-item": "battery", "charges": 300, "container-item": "heavy_flashlight" } ]
   },
   {
     "type": "item_group",
     "subtype": "collection",
     "id": "charged_mp3",
-    "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "mp3" } ]
+    "entries": [ { "item": "light_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "mp3" } ]
   },
   {
     "type": "item_group",
     "subtype": "collection",
     "id": "charged_two_way_radio",
-    "entries": [ { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "two_way_radio" } ]
+    "entries": [ { "item": "light_battery_cell", "ammo-item": "battery", "charges": 300, "container-item": "two_way_radio" } ]
   },
   {
     "type": "item_group",
@@ -166,7 +161,7 @@
     "type": "item_group",
     "subtype": "collection",
     "id": "charged_tazer",
-    "entries": [ { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "tazer" } ]
+    "entries": [ { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 1200, "container-item": "tazer" } ]
   },
   {
     "type": "item_group",
@@ -1220,7 +1215,7 @@
           { "item": "chestguard_hard" },
           { "item": "boots_rubber" },
           {
-            "item": "medium_disposable_cell",
+            "item": "medium_battery_cell",
             "ammo-item": "battery",
             "charges": 1200,
             "container-item": "foodperson_mask"
@@ -3751,12 +3746,7 @@
           { "item": "caff_gum", "count": 3 },
           { "item": "memory_card" },
           { "item": "usb_drive" },
-          {
-            "item": "light_plus_battery_cell",
-            "ammo-item": "battery",
-            "charges": 150,
-            "container-item": "portable_game"
-          },
+          { "item": "light_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "portable_game" },
           { "item": "pants", "variant": "pants_stone" },
           { "group": "charged_smart_phone" },
           { "group": "starter_wallet_full" },
@@ -4152,12 +4142,7 @@
           { "item": "cheeseburger" },
           { "group": "charged_smart_phone" },
           { "group": "starter_wallet_full" },
-          {
-            "item": "light_plus_battery_cell",
-            "ammo-item": "battery",
-            "charges": 150,
-            "container-item": "eink_tablet_pc"
-          },
+          { "item": "light_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "eink_tablet_pc" },
           {
             "item": "light_minus_battery_cell",
             "ammo-item": "battery",
@@ -5655,7 +5640,7 @@
           { "item": "camera_bag" },
           { "group": "charged_smart_phone" },
           { "group": "starter_wallet_full" },
-          { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "camera_pro" },
+          { "item": "light_battery_cell", "ammo-item": "battery", "charges": 300, "container-item": "camera_pro" },
           { "item": "pants", "variant": "pants_black" }
         ]
       },
@@ -5812,7 +5797,7 @@
           { "item": "wristwatch" },
           { "group": "charged_smart_phone" },
           { "group": "starter_rich_wallet_full" },
-          { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "camera" },
+          { "item": "light_battery_cell", "ammo-item": "battery", "charges": 300, "container-item": "camera" },
           { "item": "tshirt", "variant": "generic_tshirt" },
           { "item": "tshirt_cropped" },
           { "item": "pants", "variant": "pants_black" }
@@ -6608,7 +6593,7 @@
           { "item": "boots_combat" },
           { "item": "wristwatch" },
           { "item": "gloves_tactical" },
-          { "item": "flight_helmet", "ammo-item": "light_plus_battery_cell", "charges": 150 },
+          { "item": "flight_helmet", "ammo-item": "light_battery_cell", "charges": 150 },
           { "item": "mil_flight_suit" },
           { "item": "chestrig" },
           { "group": "loaded_webbing_belt" },
@@ -7031,7 +7016,7 @@
             "container-item": "rad_monitor"
           },
           {
-            "item": "medium_atomic_battery_cell",
+            "item": "medium_battery_cell",
             "ammo-item": "battery",
             "charges": 20,
             "container-item": "broken_dimensional_anchor"
@@ -7554,13 +7539,8 @@
           { "group": "charged_smart_phone" },
           { "group": "starter_wallet_full" },
           { "item": "pants", "variant": "pants_black" },
-          { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "camera_pro" },
-          {
-            "item": "light_disposable_cell",
-            "ammo-item": "battery",
-            "charges": 300,
-            "container-item": "wearable_light"
-          }
+          { "item": "light_battery_cell", "ammo-item": "battery", "charges": 300, "container-item": "camera_pro" },
+          { "item": "light_battery_cell", "ammo-item": "battery", "charges": 300, "container-item": "wearable_light" }
         ]
       },
       "male": { "entries": [ { "item": "briefs" } ] },
diff --git a/data/json/recipes/ammo/weldgas.json b/data/json/recipes/ammo/weldgas.json
index d84e0faf1d3ba..b3938193d82dc 100644
--- a/data/json/recipes/ammo/weldgas.json
+++ b/data/json/recipes/ammo/weldgas.json
@@ -81,7 +81,7 @@
     "components": [
       [ [ "scrap", 1 ] ],
       [ [ "flour_any", 1, "LIST" ], [ "paper", 3 ] ],
-      [ [ "material_limestone", 1 ], [ "chem_manganese_dioxide", 1 ], [ "light_disposable_cell", 1 ] ],
+      [ [ "material_limestone", 1 ], [ "chem_manganese_dioxide", 1 ], [ "light_battery_cell", 1 ] ],
       [
         [ "rosin", 5 ],
         [ "bone_glue", 1 ],
diff --git a/data/json/recipes/electronics/parts.json b/data/json/recipes/electronics/parts.json
index ddcac1312a7ff..593636d528368 100644
--- a/data/json/recipes/electronics/parts.json
+++ b/data/json/recipes/electronics/parts.json
@@ -33,60 +33,12 @@
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [ [ [ "scrap", 1 ] ], [ [ "lead", 360 ] ], [ [ "chem_sulphuric_acid", 3 ] ] ]
   },
-  {
-    "result": "light_minus_atomic_battery_cell",
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_*",
-    "subcategory": "CSC_*_NESTED",
-    "skill_used": "electronics",
-    "difficulty": 6,
-    "skills_required": [ "fabrication", 6 ],
-    "time": "60 m",
-    "decomp_learn": 4,
-    "book_learn": [ [ "recipe_atomic_battery", 6 ] ],
-    "using": [ [ "soldering_standard", 10 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [ [ [ "scrap", 6 ] ], [ [ "cable", 4 ] ], [ [ "plut_cell", 1 ] ] ]
-  },
-  {
-    "result": "light_atomic_battery_cell",
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_*",
-    "subcategory": "CSC_*_NESTED",
-    "skill_used": "electronics",
-    "difficulty": 6,
-    "skills_required": [ "fabrication", 6 ],
-    "time": "60 m",
-    "decomp_learn": 4,
-    "book_learn": [ [ "recipe_atomic_battery", 6 ] ],
-    "using": [ [ "soldering_standard", 10 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [ [ [ "scrap", 6 ] ], [ [ "cable", 4 ] ], [ [ "plut_cell", 2 ] ] ]
-  },
-  {
-    "result": "medium_atomic_battery_cell",
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_*",
-    "subcategory": "CSC_*_NESTED",
-    "skill_used": "electronics",
-    "difficulty": 6,
-    "skills_required": [ "fabrication", 6 ],
-    "time": "60 m",
-    "decomp_learn": 4,
-    "book_learn": [ [ "recipe_atomic_battery", 6 ] ],
-    "using": [ [ "soldering_standard", 10 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [ [ [ "scrap", 6 ] ], [ [ "cable", 4 ] ], [ [ "plut_cell", 10 ] ] ]
-  },
   {
     "result": "heavy_atomic_battery_cell",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_*",
-    "subcategory": "CSC_*_NESTED",
+    "category": "CC_ELECTRONIC",
+    "subcategory": "CSC_ELECTRONIC_PARTS",
     "skill_used": "electronics",
     "difficulty": 6,
     "skills_required": [ "fabrication", 6 ],
diff --git a/data/json/recipes/electronics/toolmod.json b/data/json/recipes/electronics/toolmod.json
index 16a4522ec7553..416b6dce522fc 100644
--- a/data/json/recipes/electronics/toolmod.json
+++ b/data/json/recipes/electronics/toolmod.json
@@ -160,24 +160,6 @@
     "proficiencies": [ { "proficiency": "prof_elec_soldering" }, { "proficiency": "prof_elec_circuits" } ],
     "components": [ [ [ "medium_battery_cell", 2 ] ], [ [ "scrap", 4 ] ], [ [ "cable", 5 ] ] ]
   },
-  {
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "result": "medium_plus_battery_cell",
-    "category": "CC_*",
-    "subcategory": "CSC_*_NESTED",
-    "skill_used": "electronics",
-    "skills_required": [ "fabrication", 1 ],
-    "difficulty": 3,
-    "time": "15 m",
-    "reversible": true,
-    "decomp_learn": 3,
-    "book_learn": [ [ "manual_electronics", 2 ], [ "mag_electronics", 2 ] ],
-    "using": [ [ "soldering_standard", 10 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "proficiencies": [ { "proficiency": "prof_elec_soldering" }, { "proficiency": "prof_elec_circuits" } ],
-    "components": [ [ [ "light_plus_battery_cell", 5 ] ], [ [ "scrap", 4 ] ], [ [ "cable", 5 ] ] ]
-  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
@@ -194,6 +176,6 @@
     "using": [ [ "soldering_standard", 10 ] ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_elec_soldering" }, { "proficiency": "prof_elec_circuits" } ],
-    "components": [ [ [ "medium_plus_battery_cell", 2 ] ], [ [ "scrap", 4 ] ], [ [ "cable", 5 ] ] ]
+    "components": [ [ [ "medium_battery_cell", 2 ] ], [ [ "scrap", 4 ] ], [ [ "cable", 5 ] ] ]
   }
 ]
diff --git a/data/json/recipes/nested.json b/data/json/recipes/nested.json
index 821be6b5c034c..f36b966606890 100644
--- a/data/json/recipes/nested.json
+++ b/data/json/recipes/nested.json
@@ -173,23 +173,6 @@
     "nested_category_data": [ "battery_car", "battery_motorbike" ],
     "difficulty": 3
   },
-  {
-    "id": "nested_atomic_battery",
-    "type": "nested_category",
-    "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_*",
-    "subcategory": "CSC_*_NESTED",
-    "name": "atomic batteries",
-    "description": "Recipes related to constructing complex atomic battery cells.",
-    "skill_used": "electronics",
-    "nested_category_data": [
-      "light_minus_atomic_battery_cell",
-      "light_atomic_battery_cell",
-      "medium_atomic_battery_cell",
-      "heavy_atomic_battery_cell"
-    ],
-    "difficulty": 6
-  },
   {
     "id": "nested_standard_battery",
     "type": "nested_category",
@@ -199,7 +182,7 @@
     "name": "standard batteries",
     "description": "Recipes related to constructing standard rechargeable batteries.",
     "skill_used": "electronics",
-    "nested_category_data": [ "UPS_OFF", "medium_battery_cell", "medium_plus_battery_cell", "heavy_battery_cell", "heavy_plus_battery_cell" ],
+    "nested_category_data": [ "UPS_OFF", "medium_battery_cell", "heavy_battery_cell", "heavy_plus_battery_cell" ],
     "difficulty": 3
   },
   {
@@ -214,30 +197,6 @@
     "nested_category_data": [ "storage_battery", "storage_battery_from_medium", "medium_storage_battery", "large_storage_battery" ],
     "difficulty": 3
   },
-  {
-    "id": "nested_dry_battery",
-    "type": "nested_category",
-    "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_*",
-    "subcategory": "CSC_*_NESTED",
-    "name": "dry batteries",
-    "description": "Recipes related to constructing basic dry-cell batteries.",
-    "skill_used": "electronics",
-    "nested_category_data": [ "light_dry_cell", "medium_dry_cell", "heavy_dry_cell" ],
-    "difficulty": 3
-  },
-  {
-    "id": "nested_disposable_battery",
-    "type": "nested_category",
-    "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_*",
-    "subcategory": "CSC_*_NESTED",
-    "name": "standard disposable batteries",
-    "description": "Recipes related to constructing standard disposable batteries.",
-    "skill_used": "electronics",
-    "nested_category_data": [ "light_minus_disposable_cell", "light_disposable_cell", "medium_disposable_cell", "heavy_disposable_cell" ],
-    "difficulty": 4
-  },
   {
     "id": "nested_all_battery",
     "type": "nested_category",
@@ -249,7 +208,6 @@
     "skill_used": "electronics",
     "nested_category_data": [
       "nested_atomic_battery",
-      "nested_disposable_battery",
       "nested_dry_battery",
       "nested_standard_battery",
       "nested_storage_battery",
diff --git a/data/json/recipes/other/parts.json b/data/json/recipes/other/parts.json
index 9194c1cf90864..7107ca1f094be 100644
--- a/data/json/recipes/other/parts.json
+++ b/data/json/recipes/other/parts.json
@@ -891,13 +891,7 @@
     "components": [
       [ [ "antenna", 1 ] ],
       [ [ "pilot_light", 1 ] ],
-      [
-        [ "light_minus_battery_cell", 1 ],
-        [ "light_minus_disposable_cell", 1 ],
-        [ "light_battery_cell", 1 ],
-        [ "light_disposable_cell", 1 ],
-        [ "light_plus_battery_cell", 1 ]
-      ],
+      [ [ "light_minus_battery_cell", 1 ], [ "light_minus_disposable_cell", 1 ], [ "light_battery_cell", 1 ] ],
       [ [ "amplifier", 1 ] ],
       [ [ "cable", 2 ] ]
     ]
diff --git a/data/json/recipes/other/power_supplies.json b/data/json/recipes/other/power_supplies.json
index 80122923cdf29..7f012c712aa31 100644
--- a/data/json/recipes/other/power_supplies.json
+++ b/data/json/recipes/other/power_supplies.json
@@ -622,8 +622,8 @@
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",
     "result": "light_minus_disposable_cell",
-    "category": "CC_*",
-    "subcategory": "CSC_*_NESTED",
+    "category": "CC_ELECTRONIC",
+    "subcategory": "CSC_ELECTRONIC_COMPONENTS",
     "skill_used": "chemistry",
     "skills_required": [ "electronics", 5 ],
     "difficulty": 4,
@@ -641,141 +641,6 @@
       [ [ "steel_chunk", 1 ], [ "scrap", 2 ] ]
     ]
   },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "light_disposable_cell",
-    "category": "CC_*",
-    "subcategory": "CSC_*_NESTED",
-    "skill_used": "chemistry",
-    "skills_required": [ "electronics", 5 ],
-    "difficulty": 4,
-    "time": "1 h",
-    "book_learn": [ [ "adv_chemistry", 4 ] ],
-    "proficiencies": [ { "proficiency": "prof_intro_chemistry" }, { "proficiency": "prof_inorganic_chemistry" } ],
-    "using": [ [ "blacksmithing_standard", 12 ] ],
-    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
-    "components": [
-      [ [ "chem_manganese_dioxide", 87 ] ],
-      [ [ "zinc_metal", 24 ] ],
-      [ [ "chem_potassium_hydroxide", 20 ], [ "lye_powder", 4 ] ],
-      [ [ "duct_tape", 5 ] ],
-      [ [ "water_clean", 3 ] ],
-      [ [ "steel_chunk", 3 ], [ "scrap", 6 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "light_dry_cell",
-    "category": "CC_*",
-    "subcategory": "CSC_*_NESTED",
-    "skill_used": "chemistry",
-    "skills_required": [ "electronics", 2 ],
-    "difficulty": 3,
-    "time": "1 h",
-    "autolearn": true,
-    "proficiencies": [ { "proficiency": "prof_intro_chemistry" }, { "proficiency": "prof_inorganic_chemistry" } ],
-    "using": [ [ "blacksmithing_standard", 12 ] ],
-    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
-    "components": [
-      [ [ "cathod_mix", 166 ] ],
-      [ [ "zinc_metal", 24 ] ],
-      [ [ "carbon_electrode", 1 ] ],
-      [ [ "duct_tape", 5 ] ],
-      [ [ "steel_chunk", 3 ], [ "scrap", 6 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "medium_disposable_cell",
-    "category": "CC_*",
-    "subcategory": "CSC_*_NESTED",
-    "skill_used": "chemistry",
-    "skills_required": [ "electronics", 5 ],
-    "difficulty": 4,
-    "time": "1 h 20 m",
-    "book_learn": [ [ "adv_chemistry", 4 ] ],
-    "proficiencies": [ { "proficiency": "prof_intro_chemistry" }, { "proficiency": "prof_inorganic_chemistry" } ],
-    "using": [ [ "blacksmithing_standard", 48 ] ],
-    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
-    "components": [
-      [ [ "chem_manganese_dioxide", 348 ] ],
-      [ [ "zinc_metal", 96 ] ],
-      [ [ "chem_potassium_hydroxide", 82 ], [ "lye_powder", 22 ] ],
-      [ [ "duct_tape", 20 ] ],
-      [ [ "water_clean", 12 ] ],
-      [ [ "steel_chunk", 12 ], [ "scrap", 24 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "medium_dry_cell",
-    "category": "CC_*",
-    "subcategory": "CSC_*_NESTED",
-    "skill_used": "chemistry",
-    "skills_required": [ "electronics", 2 ],
-    "difficulty": 3,
-    "time": "1 h 20 m",
-    "autolearn": true,
-    "proficiencies": [ { "proficiency": "prof_intro_chemistry" }, { "proficiency": "prof_inorganic_chemistry" } ],
-    "using": [ [ "blacksmithing_standard", 48 ] ],
-    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
-    "components": [
-      [ [ "cathod_mix", 664 ] ],
-      [ [ "zinc_metal", 96 ] ],
-      [ [ "carbon_electrode", 4 ] ],
-      [ [ "duct_tape", 20 ] ],
-      [ [ "steel_chunk", 12 ], [ "scrap", 24 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "heavy_disposable_cell",
-    "category": "CC_*",
-    "subcategory": "CSC_*_NESTED",
-    "skill_used": "chemistry",
-    "skills_required": [ "electronics", 5 ],
-    "difficulty": 4,
-    "time": "1 h 45 m",
-    "book_learn": [ [ "adv_chemistry", 4 ] ],
-    "proficiencies": [ { "proficiency": "prof_intro_chemistry" }, { "proficiency": "prof_inorganic_chemistry" } ],
-    "using": [ [ "blacksmithing_standard", 100 ] ],
-    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
-    "components": [
-      [ [ "chem_manganese_dioxide", 725 ] ],
-      [ [ "zinc_metal", 200 ] ],
-      [ [ "chem_potassium_hydroxide", 170 ], [ "lye_powder", 34 ] ],
-      [ [ "duct_tape", 40 ] ],
-      [ [ "water_clean", 25 ] ],
-      [ [ "steel_chunk", 25 ], [ "scrap", 50 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "heavy_dry_cell",
-    "category": "CC_*",
-    "subcategory": "CSC_*_NESTED",
-    "skill_used": "chemistry",
-    "skills_required": [ "electronics", 2 ],
-    "difficulty": 3,
-    "time": "1 h 45 m",
-    "autolearn": true,
-    "proficiencies": [ { "proficiency": "prof_intro_chemistry" }, { "proficiency": "prof_inorganic_chemistry" } ],
-    "using": [ [ "blacksmithing_standard", 100 ] ],
-    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
-    "components": [
-      [ [ "cathod_mix", 1328 ] ],
-      [ [ "zinc_metal", 200 ] ],
-      [ [ "carbon_electrode", 8 ] ],
-      [ [ "duct_tape", 40 ] ],
-      [ [ "steel_chunk", 25 ], [ "scrap", 50 ] ]
-    ]
-  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
diff --git a/data/json/uncraft/cbm/cbm.json b/data/json/uncraft/cbm/cbm.json
index 2cb1dffc5b15e..4016f7c7be5f3 100644
--- a/data/json/uncraft/cbm/cbm.json
+++ b/data/json/uncraft/cbm/cbm.json
@@ -22,7 +22,7 @@
     "components": [
       [ [ "power_supply", 10 ] ],
       [ [ "amplifier", 6 ] ],
-      [ [ "light_plus_battery_cell", 1 ] ],
+      [ [ "light_battery_cell", 1 ] ],
       [ [ "light_battery_cell", 1 ] ],
       [ [ "burnt_out_bionic", 1 ] ]
     ]
diff --git a/data/json/uncraft/recipe_deconstruction.json b/data/json/uncraft/recipe_deconstruction.json
index 466e366f0d9b6..de4741d1ababf 100644
--- a/data/json/uncraft/recipe_deconstruction.json
+++ b/data/json/uncraft/recipe_deconstruction.json
@@ -2079,7 +2079,7 @@
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [
       [ [ "scrap_aluminum", 1 ] ],
-      [ [ "light_plus_battery_cell", 1 ] ],
+      [ [ "light_battery_cell", 1 ] ],
       [ [ "small_lcd_screen", 1 ] ],
       [ [ "memory_card", 1 ] ],
       [ [ "processor", 1 ] ]
diff --git a/data/json/vehicleparts/battery.json b/data/json/vehicleparts/battery.json
index b7128dc51a31f..6e11ae137aa02 100644
--- a/data/json/vehicleparts/battery.json
+++ b/data/json/vehicleparts/battery.json
@@ -181,22 +181,6 @@
     "breaks_into": [ { "item": "e_scrap", "prob": 10 } ],
     "flags": [ "BATTERY", "NEEDS_HANDHELD_BATTERY_MOUNT", "NO_REPAIR" ]
   },
-  {
-    "id": "car_light_plus_battery_cell",
-    "copy-from": "battery_car",
-    "type": "vehicle_part",
-    "name": { "str": "light battery (high-capacity)" },
-    "item": "light_plus_battery_cell",
-    "location": "on_battery_mount",
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 0 ] ], "time": "50 s", "using": [  ] },
-      "removal": { "skills": [ [ "mechanics", 0 ] ], "time": "50 s", "using": [  ] }
-    },
-    "durability": 20,
-    "folded_volume": "35 ml",
-    "breaks_into": [ { "item": "e_scrap", "prob": 10 } ],
-    "flags": [ "BATTERY", "NEEDS_HANDHELD_BATTERY_MOUNT", "NO_REPAIR" ]
-  },
   {
     "id": "car_medium_battery_cell",
     "copy-from": "battery_car",
@@ -213,22 +197,6 @@
     "breaks_into": [ { "item": "light_battery_cell", "count": [ 0, 3 ] }, { "item": "scrap", "count": [ 1, 4 ] } ],
     "flags": [ "BATTERY", "NEEDS_HANDHELD_BATTERY_MOUNT", "NO_REPAIR" ]
   },
-  {
-    "id": "car_medium_plus_battery_cell",
-    "copy-from": "battery_car",
-    "type": "vehicle_part",
-    "name": { "str": "medium battery (high-capacity)" },
-    "item": "medium_plus_battery_cell",
-    "location": "on_battery_mount",
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 0 ] ], "time": "50 s", "using": [  ] },
-      "removal": { "skills": [ [ "mechanics", 0 ] ], "time": "50 s", "using": [  ] }
-    },
-    "durability": 30,
-    "folded_volume": "525 ml",
-    "breaks_into": [ { "item": "light_plus_battery_cell", "count": [ 0, 3 ] }, { "item": "scrap", "count": [ 1, 4 ] } ],
-    "flags": [ "BATTERY", "NEEDS_HANDHELD_BATTERY_MOUNT", "NO_REPAIR" ]
-  },
   {
     "id": "car_heavy_battery_cell",
     "copy-from": "battery_car",
diff --git a/data/json/vehicles/helicopters.json b/data/json/vehicles/helicopters.json
index 0e5a0eb919e0e..e702d0f2f96b1 100644
--- a/data/json/vehicles/helicopters.json
+++ b/data/json/vehicles/helicopters.json
@@ -675,7 +675,7 @@
       { "x": -1, "y": -1, "chance": 5, "item_groups": [ "MRE" ] },
       { "x": -1, "y": -1, "chance": 5, "item_groups": [ "MRE" ] },
       { "x": -1, "y": -1, "chance": 10, "items": [ "canteen" ] },
-      { "x": -1, "y": -1, "chance": 10, "items": [ "light_plus_battery_cell" ] },
+      { "x": -1, "y": -1, "chance": 10, "items": [ "light_battery_cell" ] },
       { "x": -1, "y": -1, "chance": 10, "item_groups": [ "full_ifak" ] },
       { "x": -1, "y": -1, "chance": 10, "items": [ "mag_fieldrepair" ] },
       { "x": -1, "y": -1, "chance": 15, "items": [ "e_scrap" ] },
@@ -763,7 +763,7 @@
       { "x": -1, "y": -1, "chance": 7, "item_groups": [ "MRE" ] },
       { "x": -1, "y": -1, "chance": 7, "item_groups": [ "MRE" ] },
       { "x": -1, "y": -1, "chance": 10, "items": [ "canteen" ] },
-      { "x": -1, "y": -1, "chance": 10, "items": [ "light_plus_battery_cell" ] },
+      { "x": -1, "y": -1, "chance": 10, "items": [ "light_battery_cell" ] },
       { "x": -1, "y": -1, "chance": 10, "item_groups": [ "full_ifak" ] },
       { "x": -1, "y": -1, "chance": 7, "items": [ "mag_fieldrepair" ] },
       { "x": -1, "y": -1, "chance": 15, "items": [ "e_scrap" ] },
@@ -850,7 +850,7 @@
       { "x": -1, "y": 1, "chance": 7, "item_groups": [ "MRE" ] },
       { "x": -1, "y": 1, "chance": 7, "item_groups": [ "MRE" ] },
       { "x": -1, "y": 1, "chance": 10, "items": [ "canteen" ] },
-      { "x": -1, "y": 1, "chance": 10, "items": [ "light_plus_battery_cell" ] },
+      { "x": -1, "y": 1, "chance": 10, "items": [ "light_battery_cell" ] },
       { "x": -1, "y": 1, "chance": 10, "item_groups": [ "full_ifak" ] },
       { "x": -1, "y": 1, "chance": 7, "items": [ "mag_fieldrepair" ] },
       { "x": -1, "y": 1, "chance": 15, "items": [ "e_scrap" ] },
diff --git a/data/json/vehicles/vans_busses.json b/data/json/vehicles/vans_busses.json
index daf593458b78a..88b756d498053 100644
--- a/data/json/vehicles/vans_busses.json
+++ b/data/json/vehicles/vans_busses.json
@@ -1210,7 +1210,7 @@
       { "x": -3, "y": 2, "chance": 20, "items": [ "armguard_hard" ] },
       { "x": -3, "y": 2, "chance": 20, "items": [ "gloves_rubber" ] },
       { "x": -3, "y": 2, "chance": 20, "items": [ "boots_rubber" ] },
-      { "x": -3, "y": 2, "chance": 20, "items": [ "medium_disposable_cell" ] }
+      { "x": -3, "y": 2, "chance": 20, "items": [ "medium_battery_cell" ] }
     ]
   },
   {
@@ -1331,7 +1331,7 @@
       { "x": -3, "y": 2, "chance": 100, "items": [ "armguard_hard" ] },
       { "x": -3, "y": 2, "chance": 100, "items": [ "gloves_rubber" ] },
       { "x": -3, "y": 2, "chance": 100, "items": [ "boots_rubber" ] },
-      { "x": -3, "y": 2, "chance": 100, "items": [ "medium_disposable_cell" ] }
+      { "x": -3, "y": 2, "chance": 100, "items": [ "medium_battery_cell" ] }
     ]
   },
   {
diff --git a/data/mods/Aftershock/itemgroups/spaceship_groups.json b/data/mods/Aftershock/itemgroups/spaceship_groups.json
index 89ab0eeff8401..0ebf968b54bb9 100644
--- a/data/mods/Aftershock/itemgroups/spaceship_groups.json
+++ b/data/mods/Aftershock/itemgroups/spaceship_groups.json
@@ -13,9 +13,9 @@
       { "item": "water_clean", "container-item": "bottle_twoliter", "count": 3 },
       { "count": 3, "group": "afs_escapepod_ration_bag_plastic_4" },
       { "item": "cream_prot_cold", "count": 3 },
-      { "item": "light_plus_battery_cell", "charges": 150, "container-item": "flashlight" },
-      { "item": "light_plus_battery_cell", "charges": 150, "container-item": "water_purifier" },
-      { "item": "medium_plus_battery_cell", "ammo-item": "battery", "charges": 600, "container-item": "multi_cooker" },
+      { "item": "light_battery_cell", "charges": 150, "container-item": "flashlight" },
+      { "item": "light_battery_cell", "charges": 150, "container-item": "water_purifier" },
+      { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 600, "container-item": "multi_cooker" },
       { "item": "rope_6" },
       { "item": "emer_blanket", "count": 2 },
       { "item": "afs_radiobeacon" },
diff --git a/data/mods/Aftershock/items/tools.json b/data/mods/Aftershock/items/tools.json
index a0d832ae0ea0f..f315aa1239efe 100644
--- a/data/mods/Aftershock/items/tools.json
+++ b/data/mods/Aftershock/items/tools.json
@@ -765,7 +765,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_MEDIUM" ],
-        "default_magazine": "medium_plus_battery_cell"
+        "default_magazine": "medium_battery_cell"
       }
     ],
     "melee_damage": { "bash": 4 }
diff --git a/data/mods/Aftershock/items/weapons.json b/data/mods/Aftershock/items/weapons.json
index 19a473897cd0e..b4778e74f4e8b 100644
--- a/data/mods/Aftershock/items/weapons.json
+++ b/data/mods/Aftershock/items/weapons.json
@@ -33,15 +33,7 @@
         "holster": true,
         "max_contains_volume": "20 L",
         "max_contains_weight": "20 kg",
-        "item_restriction": [
-          "light_battery_cell",
-          "light_minus_battery_cell",
-          "light_plus_battery_cell",
-          "light_minus_atomic_battery_cell",
-          "light_atomic_battery_cell",
-          "light_minus_disposable_cell",
-          "light_disposable_cell"
-        ]
+        "item_restriction": [ "light_battery_cell", "light_minus_battery_cell", "light_minus_disposable_cell" ]
       }
     ],
     "melee_damage": { "bash": 22 }
diff --git a/data/mods/Aftershock/npcs/Augustmoon_Salvors/augustmoon_tool_trader.json b/data/mods/Aftershock/npcs/Augustmoon_Salvors/augustmoon_tool_trader.json
index f4af3eeaf3851..9bc7868a31f73 100644
--- a/data/mods/Aftershock/npcs/Augustmoon_Salvors/augustmoon_tool_trader.json
+++ b/data/mods/Aftershock/npcs/Augustmoon_Salvors/augustmoon_tool_trader.json
@@ -59,12 +59,7 @@
     "subtype": "distribution",
     "ammo": 100,
     "magazine": 100,
-    "items": [
-      [ "heavy_disposable_cell", 1 ],
-      [ "medium_disposable_cell", 2 ],
-      [ "light_disposable_cell", 4 ],
-      [ "light_minus_disposable_cell", 1 ]
-    ]
+    "items": [ [ "light_battery_cell", 4 ], [ "light_minus_disposable_cell", 1 ] ]
   },
   {
     "id": "afs_augustmoon_batteries_rechargeable",
diff --git a/data/mods/Aftershock/player/professions.json b/data/mods/Aftershock/player/professions.json
index fa71357683738..3c43066ba93f2 100644
--- a/data/mods/Aftershock/player/professions.json
+++ b/data/mods/Aftershock/player/professions.json
@@ -165,9 +165,7 @@
     "description": "A sudden power failure woke you from the cryosleep sarcophagus in which you had entombed yourself lifetimes ago.  It seems the emergency reanimation procedure has damaged your memory, and now, bearing almost no knowledge of your past life, you must find a way to survive in a ruined and alien world.",
     "points": 2,
     "traits": [ "AFS_CRYOADAPTATION" ],
-    "items": {
-      "both": { "entries": [ { "item": "afs_cryopod_bodyglove", "ammo-item": "medium_atomic_battery_cell", "charges": 5000 } ] }
-    }
+    "items": { "both": { "entries": [ { "item": "afs_cryopod_bodyglove", "ammo-item": "medium_battery_cell", "charges": 5000 } ] } }
   },
   {
     "type": "profession",
@@ -213,7 +211,7 @@
           { "item": "water_clean", "container-item": "camelbak" },
           { "item": "crowbar", "custom-flags": [ "auto_wield" ] },
           { "item": "phase_immersion_suit" },
-          { "item": "dimensional_anchor", "ammo-item": "medium_atomic_battery_cell", "charges": 5000 }
+          { "item": "dimensional_anchor", "ammo-item": "medium_battery_cell", "charges": 5000 }
         ]
       },
       "male": { "entries": [ { "item": "briefs" } ] },
@@ -332,8 +330,8 @@
           { "item": "afs_holo_cloak_mk2" },
           { "item": "kukri", "container-item": "sheath" },
           { "item": "cash_card", "charges": 2600000 },
-          { "item": "afs_cam_spy", "ammo-item": "light_minus_atomic_battery_cell", "charges": 500 },
-          { "item": "radiocontrol", "ammo-item": "light_atomic_battery_cell", "charges": 1000 },
+          { "item": "afs_cam_spy", "ammo-item": "light_minus_disposable_cell", "charges": 500 },
+          { "item": "radiocontrol", "ammo-item": "light_battery_cell", "charges": 1000 },
           { "item": "afs_eidolon_derringer", "ammo-item": "afs_5x50heavy", "charges": 4, "container-item": "holster" },
           { "item": "afs_5x50heavy" }
         ]
diff --git a/data/mods/Isolation-Protocol/Player/profession.json b/data/mods/Isolation-Protocol/Player/profession.json
index b8d993c111edb..c16f8548dd6cb 100644
--- a/data/mods/Isolation-Protocol/Player/profession.json
+++ b/data/mods/Isolation-Protocol/Player/profession.json
@@ -89,19 +89,9 @@
           { "item": "caff_gum" },
           { "item": "memory_card" },
           { "item": "usb_drive" },
-          {
-            "item": "light_plus_battery_cell",
-            "ammo-item": "battery",
-            "charges": 150,
-            "container-item": "electrohack"
-          },
-          {
-            "item": "light_plus_battery_cell",
-            "ammo-item": "battery",
-            "charges": 150,
-            "container-item": "noise_emitter"
-          },
-          { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "camera" },
+          { "item": "light_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "electrohack" },
+          { "item": "light_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "noise_emitter" },
+          { "item": "light_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "camera" },
           { "group": "charged_smart_phone" },
           { "group": "charged_laptop" }
         ]
diff --git a/data/mods/MindOverMatter/items/tools/lighting.json b/data/mods/MindOverMatter/items/tools/lighting.json
index 24ffecd91f32c..53bfabf97ffad 100644
--- a/data/mods/MindOverMatter/items/tools/lighting.json
+++ b/data/mods/MindOverMatter/items/tools/lighting.json
@@ -28,7 +28,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_disposable_cell"
+        "default_magazine": "light_battery_cell"
       }
     ]
   },
@@ -75,7 +75,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_disposable_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "flags": [ "LEAK_DAM", "ALLOWS_REMOTE_USE", "WATER_BREAK_ACTIVE" ]
diff --git a/data/mods/MindOverMatter/items/tools/travel.json b/data/mods/MindOverMatter/items/tools/travel.json
index 8897a8da85d34..ca74beb943156 100644
--- a/data/mods/MindOverMatter/items/tools/travel.json
+++ b/data/mods/MindOverMatter/items/tools/travel.json
@@ -50,7 +50,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ]
   },
@@ -91,7 +91,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_plus_battery_cell"
+        "default_magazine": "light_battery_cell"
       }
     ],
     "copy-from": "psionic_transporter_remote",
diff --git a/data/mods/MindOverMatter/recipes/research.json b/data/mods/MindOverMatter/recipes/research.json
index ecffd830c4c21..0fd38d063d3bd 100644
--- a/data/mods/MindOverMatter/recipes/research.json
+++ b/data/mods/MindOverMatter/recipes/research.json
@@ -57,10 +57,7 @@
         [ "atomic_light_off", -1 ],
         [ "betavoltaic", -1 ],
         [ "atomic_coffeepot", -1 ],
-        [ "huge_atomic_battery_cell", -1 ],
-        [ "light_atomic_battery_cell", -1 ],
-        [ "medium_atomic_battery_cell", -1 ],
-        [ "light_minus_atomic_battery_cell", -1 ]
+        [ "huge_atomic_battery_cell", -1 ]
       ]
     ],
     "proficiencies": [
@@ -127,10 +124,7 @@
         [ "atomic_light_off", -1 ],
         [ "betavoltaic", -1 ],
         [ "atomic_coffeepot", -1 ],
-        [ "huge_atomic_battery_cell", -1 ],
-        [ "light_atomic_battery_cell", -1 ],
-        [ "medium_atomic_battery_cell", -1 ],
-        [ "light_minus_atomic_battery_cell", -1 ]
+        [ "huge_atomic_battery_cell", -1 ]
       ]
     ],
     "proficiencies": [
diff --git a/data/mods/Sky_Island/upgrade_missions.json b/data/mods/Sky_Island/upgrade_missions.json
index 50fc84bf11f09..ebcdd8024955a 100644
--- a/data/mods/Sky_Island/upgrade_missions.json
+++ b/data/mods/Sky_Island/upgrade_missions.json
@@ -131,7 +131,7 @@
       [ [ "warptoken", 2 ] ],
       [ [ "cu_pipe", 5 ] ],
       [ [ "duct_tape", 20 ] ],
-      [ [ "light_plus_battery_cell", 5 ], [ "light_battery_cell", 10 ], [ "light_disposable_cell", 15 ] ],
+      [ [ "light_battery_cell", 5 ], [ "light_battery_cell", 10 ], [ "light_battery_cell", 15 ] ],
       [ [ "cordage", 1, "LIST" ] ]
     ]
   },
@@ -196,7 +196,7 @@
       [ [ "warptoken", 5 ] ],
       [ [ "scrap_aluminum", 12 ] ],
       [ [ "super_glue", 10 ], [ "bone_glue", 1 ] ],
-      [ [ "medium_battery_cell", 2 ], [ "medium_plus_battery_cell", 4 ], [ "medium_disposable_cell", 6 ] ],
+      [ [ "medium_battery_cell", 6 ] ],
       [ [ "extension_cable", 1 ], [ "long_extension_cable", 1 ], [ "jumper_cable", 1 ] ]
     ]
   },
@@ -262,7 +262,7 @@
       [ [ "microscope", 1 ] ],
       [ [ "silver_small", 20 ] ],
       [ [ "brazing_rod_bronze", 5 ], [ "brazing_rod_alloy", 5 ] ],
-      [ [ "heavy_plus_battery_cell", 1 ], [ "heavy_battery_cell", 2 ], [ "heavy_disposable_cell", 4 ] ],
+      [ [ "heavy_plus_battery_cell", 1 ], [ "heavy_battery_cell", 2 ] ],
       [ [ "rope_30", 1 ] ]
     ]
   },
diff --git a/data/mods/TEST_DATA/EOC.json b/data/mods/TEST_DATA/EOC.json
index cd91429316827..3261927fb2783 100644
--- a/data/mods/TEST_DATA/EOC.json
+++ b/data/mods/TEST_DATA/EOC.json
@@ -340,7 +340,7 @@
     "type": "effect_on_condition",
     "id": "EOC_math_item_count",
     "effect": [
-      { "set_string_var": "light_plus_battery_cell", "target_var": { "global_val": "item_id" } },
+      { "set_string_var": "light_battery_cell", "target_var": { "global_val": "item_id" } },
       { "u_spawn_item": "backpack", "force_equip": true },
       { "u_spawn_item": { "global_val": "item_id" } },
       { "u_spawn_item": { "global_val": "item_id" } },
diff --git a/data/mods/TEST_DATA/items.json b/data/mods/TEST_DATA/items.json
index 64e08b583aa32..13302291080ad 100644
--- a/data/mods/TEST_DATA/items.json
+++ b/data/mods/TEST_DATA/items.json
@@ -722,7 +722,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_disposable_cell"
+        "default_magazine": "light_battery_cell"
       }
     ]
   },
diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json
index 88596ae5897dc..67228093c4b87 100644
--- a/data/mods/TEST_DATA/known_bad_density.json
+++ b/data/mods/TEST_DATA/known_bad_density.json
@@ -7,7 +7,6 @@
       "coffee_raw_kentucky",
       "marloss_berry",
       "bot_lab_security_drone_YM",
-      "light_minus_battery_cell",
       "extinguishing_agent",
       "dayquil",
       "pine_tea",
@@ -68,7 +67,6 @@
       "tailor_japanese",
       "dandelionburdock_tea",
       "craft",
-      "light_atomic_battery_cell",
       "frozen_lemonade",
       "glowstick_dead",
       "rmi2_corpse",
@@ -228,7 +226,6 @@
       "belt40mm",
       "broken_lab_security_drone_BS",
       "alien_pod_resin",
-      "light_minus_atomic_battery_cell",
       "engineering_robotics_kit",
       "bot_grenade_hack",
       "human_cracklins",
diff --git a/data/mods/Xedra_Evolved/items/inventor/mics.json b/data/mods/Xedra_Evolved/items/inventor/mics.json
index 5e30d0d89e6ad..ece563ae904e5 100644
--- a/data/mods/Xedra_Evolved/items/inventor/mics.json
+++ b/data/mods/Xedra_Evolved/items/inventor/mics.json
@@ -13,7 +13,7 @@
   },
   {
     "id": "inventor_light_cell",
-    "copy-from": "light_disposable_cell",
+    "copy-from": "light_battery_cell",
     "type": "MAGAZINE",
     "category": "tool_magazine",
     "name": { "str": "light modified battery", "str_pl": "light modified batteries" },
@@ -25,7 +25,7 @@
   },
   {
     "id": "inventor_medium_cell",
-    "copy-from": "medium_disposable_cell",
+    "copy-from": "medium_battery_cell",
     "type": "MAGAZINE",
     "category": "tool_magazine",
     "name": { "str": "medium modified battery", "str_pl": "medium modified batteries" },
@@ -37,7 +37,7 @@
   },
   {
     "id": "inventor_heavy_cell",
-    "copy-from": "heavy_disposable_cell",
+    "copy-from": "heavy_plus_battery_cell",
     "type": "MAGAZINE",
     "category": "tool_magazine",
     "name": { "str": "heavy modified battery", "str_pl": "heavy modified batteries" },
@@ -94,7 +94,7 @@
         "pocket_type": "MAGAZINE_WELL",
         "rigid": true,
         "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_MEDIUM", "BATTERY_HEAVY" ],
-        "default_magazine": "medium_plus_battery_cell"
+        "default_magazine": "medium_battery_cell"
       },
       {
         "type": "link_up",
diff --git a/data/mods/Xedra_Evolved/player/professions.json b/data/mods/Xedra_Evolved/player/professions.json
index b9d50bc49933c..5cb0379de723b 100644
--- a/data/mods/Xedra_Evolved/player/professions.json
+++ b/data/mods/Xedra_Evolved/player/professions.json
@@ -128,7 +128,7 @@
           { "item": "pants_cargo" },
           { "group": "charged_smart_phone" },
           { "item": "tshirt", "variant": "generic_tshirt" },
-          { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "camera_pro" }
+          { "item": "light_battery_cell", "ammo-item": "battery", "charges": 300, "container-item": "camera_pro" }
         ]
       },
       "male": { "entries": [ { "item": "briefs" }, { "item": "socks" } ] },
diff --git a/data/mods/Xedra_Evolved/recipes/inventor/gun.json b/data/mods/Xedra_Evolved/recipes/inventor/gun.json
index bc6b5c8595900..1f5c605d126ae 100644
--- a/data/mods/Xedra_Evolved/recipes/inventor/gun.json
+++ b/data/mods/Xedra_Evolved/recipes/inventor/gun.json
@@ -608,7 +608,7 @@
       }
     ],
     "components": [
-      [ [ "heavy_disposable_cell", 1 ], [ "inventor_heavy_cell", 1 ] ],
+      [ [ "heavy_plus_battery_cell", 1 ], [ "inventor_heavy_cell", 1 ] ],
       [ [ "plastic_chunk", 25 ] ],
       [ [ "scrap", 20 ] ],
       [ [ "power_supply", 4 ] ],
@@ -652,7 +652,7 @@
       }
     ],
     "components": [
-      [ [ "heavy_disposable_cell", 1 ], [ "inventor_heavy_cell", 1 ] ],
+      [ [ "heavy_plus_battery_cell", 1 ], [ "inventor_heavy_cell", 1 ] ],
       [ [ "plastic_chunk", 25 ] ],
       [ [ "scrap", 20 ] ],
       [ [ "power_supply", 4 ] ],
@@ -696,7 +696,7 @@
       }
     ],
     "components": [
-      [ [ "heavy_disposable_cell", 1 ], [ "inventor_heavy_cell", 1 ] ],
+      [ [ "heavy_plus_battery_cell", 1 ], [ "inventor_heavy_cell", 1 ] ],
       [ [ "plastic_chunk", 25 ] ],
       [ [ "scrap", 20 ] ],
       [ [ "power_supply", 4 ] ],
diff --git a/data/mods/Xedra_Evolved/recipes/inventor/misc.json b/data/mods/Xedra_Evolved/recipes/inventor/misc.json
index 457dc93de599b..39c25f1680001 100644
--- a/data/mods/Xedra_Evolved/recipes/inventor/misc.json
+++ b/data/mods/Xedra_Evolved/recipes/inventor/misc.json
@@ -37,7 +37,7 @@
     "proficiencies": [ { "proficiency": "prof_plasticworking", "time_multiplier": 2, "skill_penalty": 0 } ],
     "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
     "components": [
-      [ [ "light_disposable_cell", 1 ] ],
+      [ [ "light_battery_cell", 1 ] ],
       [ [ "power_supply", 1 ] ],
       [ [ "scrap", 3 ] ],
       [ [ "cable", 40 ] ],
@@ -60,7 +60,7 @@
     "proficiencies": [ { "proficiency": "prof_plasticworking", "time_multiplier": 2, "skill_penalty": 0 } ],
     "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
     "components": [
-      [ [ "medium_disposable_cell", 1 ] ],
+      [ [ "medium_battery_cell", 1 ] ],
       [ [ "power_supply", 1 ] ],
       [ [ "scrap", 3 ] ],
       [ [ "cable", 60 ] ],
@@ -83,7 +83,7 @@
     "proficiencies": [ { "proficiency": "prof_plasticworking", "time_multiplier": 2, "skill_penalty": 0 } ],
     "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
     "components": [
-      [ [ "heavy_disposable_cell", 1 ] ],
+      [ [ "heavy_plus_battery_cell", 1 ] ],
       [ [ "power_supply", 1 ] ],
       [ [ "scrap", 3 ] ],
       [ [ "cable", 80 ] ],
@@ -159,7 +159,7 @@
     "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
     "tools": [ [ [ "paint_brush", -1 ] ], [ [ "paint", 1, "LIST" ] ] ],
     "components": [
-      [ [ "light_disposable_cell", 1 ] ],
+      [ [ "light_battery_cell", 1 ] ],
       [ [ "power_supply", 1 ] ],
       [ [ "scrap", 3 ] ],
       [ [ "cable", 4 ] ],
@@ -183,7 +183,7 @@
     "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
     "tools": [ [ [ "paint_brush", -1 ] ], [ [ "paint", 1, "LIST" ] ] ],
     "components": [
-      [ [ "light_disposable_cell", 1 ] ],
+      [ [ "light_battery_cell", 1 ] ],
       [ [ "power_supply", 1 ] ],
       [ [ "scrap", 3 ] ],
       [ [ "cable", 4 ] ],
diff --git a/data/mods/classic_zombies/items/blacklists.json b/data/mods/classic_zombies/items/blacklists.json
index 51ca01c9394ef..a986ff29592cc 100644
--- a/data/mods/classic_zombies/items/blacklists.json
+++ b/data/mods/classic_zombies/items/blacklists.json
@@ -251,8 +251,6 @@
       "ksub2000",
       "laser_rifle",
       "leg",
-      "light_atomic_battery_cell",
-      "light_minus_atomic_battery_cell",
       "m110a1",
       "m14ebr",
       "m2010",
@@ -264,7 +262,6 @@
       "marloss_gel",
       "marloss_scarf",
       "marloss_seed",
-      "medium_atomic_battery_cell",
       "mossberg_930",
       "mutagen",
       "mutagen_alpha",
diff --git a/data/mods/innawood/recipes/other/power_supplies.json b/data/mods/innawood/recipes/other/power_supplies.json
index 1f129aac4c904..804731b366a92 100644
--- a/data/mods/innawood/recipes/other/power_supplies.json
+++ b/data/mods/innawood/recipes/other/power_supplies.json
@@ -80,200 +80,5 @@
       [ [ "water_clean", 1 ] ],
       [ [ "steel_chunk", 1 ], [ "scrap", 2 ] ]
     ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "light_disposable_cell",
-    "category": "CC_ELECTRONIC",
-    "subcategory": "CSC_ELECTRONIC_TOOLS",
-    "skill_used": "chemistry",
-    "skills_required": [ "electronics", 5 ],
-    "difficulty": 4,
-    "time": "1 h",
-    "autolearn": true,
-    "using": [ [ "blacksmithing_standard", 1 ] ],
-    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
-    "components": [
-      [ [ "chem_manganese_dioxide", 87 ] ],
-      [ [ "zinc_metal", 24 ] ],
-      [ [ "chem_potassium_hydroxide", 20 ] ],
-      [ [ "duct_tape", 5 ] ],
-      [ [ "water_clean", 3 ] ],
-      [ [ "steel_chunk", 3 ], [ "scrap", 6 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "medium_disposable_cell",
-    "category": "CC_ELECTRONIC",
-    "subcategory": "CSC_ELECTRONIC_TOOLS",
-    "skill_used": "chemistry",
-    "skills_required": [ "electronics", 5 ],
-    "difficulty": 4,
-    "time": "1 h 20 m",
-    "autolearn": true,
-    "using": [ [ "blacksmithing_standard", 1 ] ],
-    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
-    "components": [
-      [ [ "chem_manganese_dioxide", 348 ] ],
-      [ [ "zinc_metal", 96 ] ],
-      [ [ "chem_potassium_hydroxide", 82 ] ],
-      [ [ "duct_tape", 20 ] ],
-      [ [ "water_clean", 12 ] ],
-      [ [ "steel_chunk", 12 ], [ "scrap", 24 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "heavy_disposable_cell",
-    "category": "CC_ELECTRONIC",
-    "subcategory": "CSC_ELECTRONIC_TOOLS",
-    "skill_used": "chemistry",
-    "skills_required": [ "electronics", 5 ],
-    "difficulty": 4,
-    "time": "1 h 45 m",
-    "autolearn": true,
-    "using": [ [ "blacksmithing_standard", 1 ] ],
-    "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
-    "components": [
-      [ [ "chem_manganese_dioxide", 725 ] ],
-      [ [ "zinc_metal", 200 ] ],
-      [ [ "chem_potassium_hydroxide", 170 ] ],
-      [ [ "duct_tape", 40 ] ],
-      [ [ "water_clean", 25 ] ],
-      [ [ "steel_chunk", 25 ], [ "scrap", 50 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "light_disposable_cell",
-    "id_suffix": "refill_shell",
-    "category": "CC_ELECTRONIC",
-    "subcategory": "CSC_ELECTRONIC_TOOLS",
-    "skill_used": "chemistry",
-    "skills_required": [ "electronics", 5 ],
-    "difficulty": 4,
-    "time": "20 m",
-    "autolearn": true,
-    "using": [ [ "blacksmithing_standard", 1 ] ],
-    "components": [
-      [ [ "chem_manganese_dioxide", 87 ] ],
-      [ [ "zinc_metal", 24 ] ],
-      [ [ "chem_potassium_hydroxide", 20 ] ],
-      [ [ "duct_tape", 5 ] ],
-      [ [ "water_clean", 3 ] ],
-      [ [ "light_battery_shell", 1 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "medium_disposable_cell",
-    "id_suffix": "refill_shell",
-    "category": "CC_ELECTRONIC",
-    "subcategory": "CSC_ELECTRONIC_TOOLS",
-    "skill_used": "chemistry",
-    "skills_required": [ "electronics", 5 ],
-    "difficulty": 4,
-    "time": "20 m",
-    "autolearn": true,
-    "using": [ [ "blacksmithing_standard", 1 ] ],
-    "components": [
-      [ [ "chem_manganese_dioxide", 348 ] ],
-      [ [ "zinc_metal", 96 ] ],
-      [ [ "chem_potassium_hydroxide", 82 ] ],
-      [ [ "duct_tape", 20 ] ],
-      [ [ "water_clean", 12 ] ],
-      [ [ "medium_battery_shell", 1 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "heavy_disposable_cell",
-    "id_suffix": "refill_shell",
-    "category": "CC_ELECTRONIC",
-    "subcategory": "CSC_ELECTRONIC_TOOLS",
-    "skill_used": "chemistry",
-    "skills_required": [ "electronics", 5 ],
-    "difficulty": 4,
-    "time": "20 m",
-    "autolearn": true,
-    "using": [ [ "blacksmithing_standard", 1 ] ],
-    "components": [
-      [ [ "chem_manganese_dioxide", 725 ] ],
-      [ [ "zinc_metal", 200 ] ],
-      [ [ "chem_potassium_hydroxide", 170 ] ],
-      [ [ "duct_tape", 40 ] ],
-      [ [ "water_clean", 25 ] ],
-      [ [ "heavy_battery_shell", 1 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "light_dry_cell",
-    "id_suffix": "refill_shell",
-    "category": "CC_ELECTRONIC",
-    "subcategory": "CSC_ELECTRONIC_TOOLS",
-    "skill_used": "chemistry",
-    "skills_required": [ "electronics", 2 ],
-    "difficulty": 3,
-    "time": "20 m",
-    "autolearn": true,
-    "using": [ [ "blacksmithing_standard", 1 ] ],
-    "components": [
-      [ [ "cathod_mix", 166 ] ],
-      [ [ "zinc_metal", 24 ] ],
-      [ [ "carbon_electrode", 1 ] ],
-      [ [ "duct_tape", 5 ] ],
-      [ [ "light_battery_shell", 1 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "medium_dry_cell",
-    "id_suffix": "refill_shell",
-    "category": "CC_ELECTRONIC",
-    "subcategory": "CSC_ELECTRONIC_TOOLS",
-    "skill_used": "chemistry",
-    "skills_required": [ "electronics", 2 ],
-    "difficulty": 3,
-    "time": "20 m",
-    "autolearn": true,
-    "using": [ [ "blacksmithing_standard", 1 ] ],
-    "components": [
-      [ [ "cathod_mix", 664 ] ],
-      [ [ "zinc_metal", 96 ] ],
-      [ [ "carbon_electrode", 4 ] ],
-      [ [ "duct_tape", 20 ] ],
-      [ [ "medium_battery_shell", 1 ] ]
-    ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "result": "heavy_dry_cell",
-    "id_suffix": "refill_shell",
-    "category": "CC_ELECTRONIC",
-    "subcategory": "CSC_ELECTRONIC_TOOLS",
-    "skill_used": "chemistry",
-    "skills_required": [ "electronics", 2 ],
-    "difficulty": 3,
-    "time": "20 m",
-    "autolearn": true,
-    "using": [ [ "blacksmithing_standard", 1 ] ],
-    "components": [
-      [ [ "cathod_mix", 1328 ] ],
-      [ [ "zinc_metal", 200 ] ],
-      [ [ "carbon_electrode", 8 ] ],
-      [ [ "duct_tape", 40 ] ],
-      [ [ "heavy_battery_shell", 1 ] ]
-    ]
   }
 ]
diff --git a/data/mods/innawood/recipes/recipe_deconstruction.json b/data/mods/innawood/recipes/recipe_deconstruction.json
index 4b0ea52dedeb5..9c2cb4066a790 100644
--- a/data/mods/innawood/recipes/recipe_deconstruction.json
+++ b/data/mods/innawood/recipes/recipe_deconstruction.json
@@ -17,47 +17,7 @@
     "components": [ [ [ "rock", 24 ] ] ]
   },
   {
-    "result": "heavy_dry_cell",
-    "type": "uncraft",
-    "activity_level": "LIGHT_EXERCISE",
-    "time": "5 m",
-    "qualities": [ { "id": "PRY", "level": 1 } ],
-    "components": [ [ [ "heavy_battery_shell", 1 ] ] ]
-  },
-  {
-    "result": "medium_dry_cell",
-    "type": "uncraft",
-    "activity_level": "LIGHT_EXERCISE",
-    "time": "5 m",
-    "qualities": [ { "id": "PRY", "level": 1 } ],
-    "components": [ [ [ "medium_battery_shell", 1 ] ] ]
-  },
-  {
-    "result": "light_dry_cell",
-    "type": "uncraft",
-    "activity_level": "LIGHT_EXERCISE",
-    "time": "5 m",
-    "qualities": [ { "id": "PRY", "level": 1 } ],
-    "components": [ [ [ "light_battery_shell", 1 ] ] ]
-  },
-  {
-    "result": "heavy_disposable_cell",
-    "type": "uncraft",
-    "activity_level": "LIGHT_EXERCISE",
-    "time": "5 m",
-    "qualities": [ { "id": "PRY", "level": 1 } ],
-    "components": [ [ [ "heavy_battery_shell", 1 ] ] ]
-  },
-  {
-    "result": "medium_disposable_cell",
-    "type": "uncraft",
-    "activity_level": "LIGHT_EXERCISE",
-    "time": "5 m",
-    "qualities": [ { "id": "PRY", "level": 1 } ],
-    "components": [ [ [ "medium_battery_shell", 1 ] ] ]
-  },
-  {
-    "result": "light_disposable_cell",
+    "result": "light_battery_cell",
     "type": "uncraft",
     "activity_level": "LIGHT_EXERCISE",
     "time": "5 m",
diff --git a/doc/ARMOR_BALANCE_AND_DESIGN.md b/doc/ARMOR_BALANCE_AND_DESIGN.md
index 5e1719ec757aa..c7871de3c5fe7 100644
--- a/doc/ARMOR_BALANCE_AND_DESIGN.md
+++ b/doc/ARMOR_BALANCE_AND_DESIGN.md
@@ -485,7 +485,7 @@ Items with actions can be worn as armor. Usually you need to swap the type to ``
       "pocket_type": "MAGAZINE_WELL",
       "rigid": true,
       "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-      "default_magazine": "light_plus_battery_cell"
+      "default_magazine": "light_battery_cell"
     }
   ],
   "armor": [ { "coverage": 20, "covers": [ "head" ] } ]
diff --git a/doc/NPCs.md b/doc/NPCs.md
index 409d35221216b..fcc3d3b1aa8be 100644
--- a/doc/NPCs.md
+++ b/doc/NPCs.md
@@ -1332,7 +1332,7 @@ _some functions support array arguments or kwargs, denoted with square brackets
 | addiction_intensity(`s`/`v`)    |  ✅   |   ❌  | u, n  | Return the characters current intensity of the given addiction.<br/>Argument is addiction type ID.<br/><br/>Example:<br/>`"condition": { "math": [ "u_addiction_intensity('caffeine')", ">=", "1"] }`|
 | addiction_turns(`s`/`v`)    |  ✅   |   ✅  | u, n  | Return the characters current duration left (in turns) for the given addiction.<br/>Argument is addiction type ID. <br/><br/>Example:<br/>`"condition": { "math": [ "u_addiction_turns('caffeine')", ">=", "3600"] }`|
 | characters_nearby()     |  ✅  |   ❌   | u, n, global  | Return the number of nearby characters (that is, the avatar and/or NPCs who are not hallucinations). <br/><br/>Optional kwargs:<br/>`radius`: `d`/`v` - limit to radius (rl_dist)<br/>`location`: `v` - center search on this location<br/>`attitude`: `s`/`v` - attitude filter. Must be one of `hostile`, `allies`, `not_allies`, `any`. Assumes `any` if not specified<br/><br/>The `location` kwarg is mandatory in the global scope.<br/>`allow_hallucinations`: `d`/`v` - False by default. If set to any non-zero number, all hallucinated NPCs in range will be counted as well.<br/><br/>Examples:<br/>`"condition": { "math": [ "u_characters_nearby('radius': u_search_radius * 3, 'attitude': 'not_allies' )", ">", "0" ] }`<br/><br/>`"condition": { "math": [ "characters_nearby( 'radius': u_search_radius * 3, 'location': u_search_loc)", ">", "5" ] }`|
-| charge_count(`s`/`v`)    |  ✅   |   ❌  | u, n  | Return the charges of a given item in the character's inventory.<br/>Argument is item ID.<br/><br/>Example:<br/>`"condition": { "math": [ "u_charge_count('light_plus_battery_cell')", ">=", "100"] }`|
+| charge_count(`s`/`v`)    |  ✅   |   ❌  | u, n  | Return the charges of a given item in the character's inventory.<br/>Argument is item ID.<br/><br/>Example:<br/>`"condition": { "math": [ "u_charge_count('light_battery_cell')", ">=", "100"] }`|
 | coverage(`s`/`v`)    |  ✅   |   ❌  | u, n  | Return the characters total coverage of a body part.<br/>Argument is bodypart ID. <br/>For items, returns typical coverage of the item. <br/><br/>Example:<br/>`"condition": { "math": [ "u_coverage('torso')", ">", "0"] }`|
 | distance(`s`/`v`,`s`/`v`)    |  ✅   |   ❌  | g  | Return distance between two targets.<br/>Arguments are location variables or special strings (`u`, `npc`). `u` means your location. `npc` means NPC's location.<br/><br/>Example:<br/>`"condition": { "math": [ "distance('u', loc)", "<=", "50"] }`|
 | effect_intensity(`s`/`v`)    |  ✅   |   ❌  | u, n  | Return the characters intensity of effect.<br/>Argument is effect ID.<br/><br/>Optional kwargs:<br/>`bodypart`: `s`/`v` - Specify the bodypart to get/set intensity of effect.<br/><br/> Example:<br/>`"condition": { "math": [ "u_effect_intensity('bite', 'bodypart': 'torso')", ">", "1"] }`|
diff --git a/tests/ammo_test.cpp b/tests/ammo_test.cpp
index ad6523a5bde9e..fd6dcb5008d22 100644
--- a/tests/ammo_test.cpp
+++ b/tests/ammo_test.cpp
@@ -56,9 +56,7 @@ TEST_CASE( "ammo_types", "[ammo][ammo_types]" )
         CHECK( has_ammo_types( item( "light_battery_cell" ) ) );
         CHECK( has_ammo_types( item( "medium_battery_cell" ) ) );
         CHECK( has_ammo_types( item( "heavy_battery_cell" ) ) );
-        CHECK( has_ammo_types( item( "light_disposable_cell" ) ) );
-        CHECK( has_ammo_types( item( "medium_disposable_cell" ) ) );
-        CHECK( has_ammo_types( item( "heavy_disposable_cell" ) ) );
+        CHECK( has_ammo_types( item( "heavy_plus_battery_cell" ) ) );
         // Vehicle batteries
         CHECK( has_ammo_types( item( "battery_car" ) ) );
         CHECK( has_ammo_types( item( "battery_motorbike" ) ) );
@@ -222,42 +220,42 @@ TEST_CASE( "barrel_test", "[ammo][weapon]" )
 TEST_CASE( "battery_energy_test", "[ammo][energy][item]" )
 {
     item test_battery( "medium_battery_cell" );
-    test_battery.ammo_set( test_battery.ammo_default(), 300 );
+    test_battery.ammo_set( test_battery.ammo_default(), 56 );
 
     SECTION( "Integer drain from battery" ) {
-        REQUIRE( test_battery.energy_remaining( nullptr ) == 300_kJ );
-        units::energy consumed = test_battery.energy_consume( 200_kJ, tripoint_zero, nullptr );
-        CHECK( test_battery.energy_remaining( nullptr ) == 100_kJ );
-        CHECK( consumed == 200_kJ );
+        REQUIRE( test_battery.energy_remaining( nullptr ) == 56_kJ );
+        units::energy consumed = test_battery.energy_consume( 40_kJ, tripoint_zero, nullptr );
+        CHECK( test_battery.energy_remaining( nullptr ) == 16_kJ );
+        CHECK( consumed == 40_kJ );
     }
 
     SECTION( "Integer over-drain from battery" ) {
-        REQUIRE( test_battery.energy_remaining( nullptr ) == 300_kJ );
+        REQUIRE( test_battery.energy_remaining( nullptr ) == 56_kJ );
         units::energy consumed = test_battery.energy_consume( 400_kJ, tripoint_zero, nullptr );
         CHECK( test_battery.energy_remaining( nullptr ) == 0_kJ );
-        CHECK( consumed == 300_kJ );
+        CHECK( consumed == 56_kJ );
     }
 
     SECTION( "Non-integer drain from battery" ) {
         // Battery charge is in chunks of kj. Non integer kj drain is rounded up.
         // 4.5 kJ drain becomes 5 kJ drain
-        REQUIRE( test_battery.energy_remaining( nullptr ) == 300_kJ );
+        REQUIRE( test_battery.energy_remaining( nullptr ) == 56_kJ );
         units::energy consumed = test_battery.energy_consume( 4500_J, tripoint_zero, nullptr );
-        CHECK( test_battery.energy_remaining( nullptr ) == 295_kJ );
+        CHECK( test_battery.energy_remaining( nullptr ) == 51_kJ );
         CHECK( consumed == 5_kJ );
     }
 
     SECTION( "Non-integer over-drain from battery" ) {
-        REQUIRE( test_battery.energy_remaining( nullptr ) == 300_kJ );
+        REQUIRE( test_battery.energy_remaining( nullptr ) == 56_kJ );
         units::energy consumed = test_battery.energy_consume( 500500_J, tripoint_zero, nullptr );
         CHECK( test_battery.energy_remaining( nullptr ) == 0_kJ );
-        CHECK( consumed == 300_kJ );
+        CHECK( consumed == 56_kJ );
     }
 
     SECTION( "zero drain from battery" ) {
-        REQUIRE( test_battery.energy_remaining( nullptr ) == 300_kJ );
+        REQUIRE( test_battery.energy_remaining( nullptr ) == 56_kJ );
         units::energy consumed = test_battery.energy_consume( 0_J, tripoint_zero, nullptr );
-        CHECK( test_battery.energy_remaining( nullptr ) == 300_kJ );
+        CHECK( test_battery.energy_remaining( nullptr ) == 56_kJ );
         CHECK( consumed == 0_kJ );
     }
 
diff --git a/tests/battery_density_test.cpp b/tests/battery_density_test.cpp
index 5318fc698d226..0db45fbebe7af 100644
--- a/tests/battery_density_test.cpp
+++ b/tests/battery_density_test.cpp
@@ -13,29 +13,20 @@ struct battery_chemistry_family {
 // NOLINTBEGIN(cata-static-string_id-constants)
 static const std::map<itype_id, std::string> battery_to_chemistry = {
     {itype_id( "light_minus_battery_cell" ), "LiON"},
-    {itype_id( "light_battery_cell" ), "LiON"},
-    {itype_id( "light_plus_battery_cell" ), "LiON"},
     {itype_id( "medium_battery_cell" ), "LiON"},
-    {itype_id( "medium_plus_battery_cell" ), "LiON"},
     {itype_id( "heavy_battery_cell" ), "LiON"},
     {itype_id( "heavy_plus_battery_cell" ), "LiON"},
     {itype_id( "folding_solar_panel_deployed" ), "LiON"},
     {itype_id( "folding_solar_panel_v2_deployed" ), "LiON"},
 
-    {itype_id( "light_minus_atomic_battery_cell" ), "atomic"},
-    {itype_id( "light_atomic_battery_cell" ), "atomic"},
-    {itype_id( "medium_atomic_battery_cell" ), "atomic"},
+    {itype_id( "light_cell_rechargeable" ), "Nickel-Metal Hydride"},
+
+    {itype_id( "light_battery_cell" ), "Lithium/Iron Disulfide"},
+
     {itype_id( "heavy_atomic_battery_cell" ), "atomic"},
     {itype_id( "huge_atomic_battery_cell" ), "atomic"},
 
     {itype_id( "light_minus_disposable_cell" ), "Lithium-Manganese"},
-    {itype_id( "light_disposable_cell" ), "Lithium-Manganese"},
-    {itype_id( "medium_disposable_cell" ), "Lithium-Manganese"},
-    {itype_id( "heavy_disposable_cell" ), "Lithium-Manganese"},
-
-    {itype_id( "light_dry_cell" ), "Zinc-Carbon"},
-    {itype_id( "medium_dry_cell" ), "Zinc-Carbon"},
-    {itype_id( "heavy_dry_cell" ), "Zinc-Carbon"},
 
     {itype_id( "battery_car" ), "Lead-acid"},
     {itype_id( "battery_motorbike" ), "Lead-acid"},
@@ -74,6 +65,17 @@ static const std::map<itype_id, std::string> battery_to_chemistry = {
 // Zinc-Carbon, which I'm using for "player craftable disposable battery" based on
 // https://en.wikipedia.org/wiki/Energy_density_Extended_Reference_Table
 
+// Nickel-Metal Hydride
+// https://en.wikipedia.org/wiki/Energy_density_Extended_Reference_Table
+
+// Zinc-Manganese Dioxide
+// https://en.wikipedia.org/wiki/Energy_density_Extended_Reference_Table
+
+// Lithium/Iron Disulfide gravimetric energy density is picked from enerizer documentation
+// https://data.energizer.com/pdfs/lithiuml91l92_appman.pdf
+// Volumetric is a lower bound from this article (560 Wh/L), rounded up to 600
+// https://www.sciencedirect.com/science/article/abs/pii/S2590116819300104
+
 // Lead-acid specific Energy and specific density calculated from a typical exemplar at
 // https://www.amazon.com/ACDelco-48AGM-Professional-Automotive-Battery/dp/B008FWCLHU/
 // With primary statistics of:
@@ -87,6 +89,9 @@ static const std::map<std::string, battery_chemistry_family> chemistries = {
     {std::string( "Lithium-Manganese" ), { 1010.0, 2090.0}},
     {std::string( "Alkaline" ), { 600.0, 1430.0}},
     {std::string( "Zinc-Carbon" ), { 130.0, 331.0}},
+    {std::string( "Nickel-Metal Hydride" ), { 400.0, 1550.0}},
+    {std::string( "Zinc-Manganese Dioxide" ), { 590.0, 1430.0}},
+    {std::string( "Lithium/Iron Disulfide" ), { 1069.0, 2160.0}},
     {std::string( "Lead-acid" ), { 180, 360 }}
 };
 
diff --git a/tests/battery_mod_test.cpp b/tests/battery_mod_test.cpp
index 737cb1323e8fc..b339ad139513b 100644
--- a/tests/battery_mod_test.cpp
+++ b/tests/battery_mod_test.cpp
@@ -24,14 +24,8 @@
 static const ammotype ammo_battery( "battery" );
 static const itype_id itype_battery( "battery" );
 static const itype_id itype_heavy_plus_battery_cell( "heavy_plus_battery_cell" );
-static const itype_id itype_light_atomic_battery_cell( "light_atomic_battery_cell" );
 static const itype_id itype_light_battery_cell( "light_battery_cell" );
-static const itype_id itype_light_disposable_cell( "light_disposable_cell" );
-static const itype_id itype_light_plus_battery_cell( "light_plus_battery_cell" );
-static const itype_id itype_medium_atomic_battery_cell( "medium_atomic_battery_cell" );
 static const itype_id itype_medium_battery_cell( "medium_battery_cell" );
-static const itype_id itype_medium_disposable_cell( "medium_disposable_cell" );
-static const itype_id itype_medium_plus_battery_cell( "medium_plus_battery_cell" );
 
 // Includes functions:
 // item::magazine_compatible
@@ -130,10 +124,6 @@ TEST_CASE( "battery_tool_mod_test", "[battery][mod]" )
             THEN( "medium batteries can be installed" ) {
                 CHECK( flashlight.is_reloadable() );
                 CHECK( flashlight.can_reload_with( item( itype_medium_battery_cell ), true ) );
-                CHECK( flashlight.can_reload_with( item( itype_medium_battery_cell ), true ) );
-                CHECK( flashlight.can_reload_with( item( itype_medium_plus_battery_cell ), true ) );
-                CHECK( flashlight.can_reload_with( item( itype_medium_atomic_battery_cell ), true ) );
-                CHECK( flashlight.can_reload_with( item( itype_medium_disposable_cell ), true ) );
                 CHECK( flashlight.has_pocket_type( pocket_type::MAGAZINE_WELL ) );
             }
 
@@ -275,14 +265,10 @@ TEST_CASE( "battery_and_tool_properties", "[battery][tool][properties]" )
         SECTION( "is reloadable with a magazine" ) {
             CHECK( flashlight.is_reloadable() );
             CHECK( flashlight.can_reload_with( item( itype_light_battery_cell ), true ) );
-            CHECK( flashlight.can_reload_with( item( itype_light_disposable_cell ), true ) );
         }
 
         SECTION( "has compatible magazines" ) {
             CHECK( flashlight.can_contain( *itype_light_battery_cell ).success() );
-            CHECK( flashlight.can_contain( *itype_light_disposable_cell ).success() );
-            CHECK( flashlight.can_contain( *itype_light_plus_battery_cell ).success() );
-            CHECK( flashlight.can_contain( *itype_light_atomic_battery_cell ).success() );
         }
 
         SECTION( "Does not fit medium or large magazines" ) {
@@ -293,7 +279,7 @@ TEST_CASE( "battery_and_tool_properties", "[battery][tool][properties]" )
         SECTION( "has a default magazine" ) {
             itype_id mag_default = flashlight.magazine_default( false );
             CHECK_FALSE( mag_default.is_null() );
-            CHECK( mag_default.str() == "light_disposable_cell" );
+            CHECK( mag_default.str() == "light_battery_cell" );
         }
 
         SECTION( "can use battery ammo" ) {
diff --git a/tests/crafting_test.cpp b/tests/crafting_test.cpp
index e242d05ca9e3c..f6445d5aaf241 100644
--- a/tests/crafting_test.cpp
+++ b/tests/crafting_test.cpp
@@ -766,18 +766,18 @@ TEST_CASE( "UPS_shows_as_a_crafting_component", "[crafting][ups]" )
     dummy.worn.wear_item( dummy, item( "backpack" ), false, false );
     item_location ups = dummy.i_add( item( "UPS_ON" ) );
     item ups_mag( ups->magazine_default() );
-    ups_mag.ammo_set( ups_mag.ammo_default(), 500 );
+    ups_mag.ammo_set( ups_mag.ammo_default(), 259 );
     ret_val<void> result = ups->put_in( ups_mag, pocket_type::MAGAZINE_WELL );
     INFO( result.c_str() );
     REQUIRE( result.success() );
     REQUIRE( dummy.has_item( *ups ) );
-    REQUIRE( ups->ammo_remaining() == 500 );
-    REQUIRE( units::to_kilojoule( dummy.available_ups() ) == 500 );
+    REQUIRE( ups->ammo_remaining() == 259 );
+    REQUIRE( units::to_kilojoule( dummy.available_ups() ) == 259 );
 }
 
 TEST_CASE( "UPS_modded_tools", "[crafting][ups]" )
 {
-    constexpr int ammo_count = 500;
+    constexpr int ammo_count = 259;
     bool const ups_on_ground = GENERATE( true, false );
     CAPTURE( ups_on_ground );
     avatar dummy;
@@ -856,8 +856,8 @@ TEST_CASE( "tools_use_charge_to_craft", "[crafting][charge]" )
             item popcan_stove = tool_with_ammo( "popcan_stove", 60 );
             REQUIRE( popcan_stove.ammo_remaining() == 60 );
             tools.push_back( popcan_stove );
-            item soldering = tool_with_ammo( "soldering_iron_portable", 20 );
-            REQUIRE( soldering.ammo_remaining() == 20 );
+            item soldering = tool_with_ammo( "soldering_iron_portable", 16 );
+            REQUIRE( soldering.ammo_remaining() == 16 );
             tools.push_back( soldering );
 
             THEN( "crafting succeeds, and uses charges from each tool" ) {
@@ -865,7 +865,7 @@ TEST_CASE( "tools_use_charge_to_craft", "[crafting][charge]" )
                 int turns = actually_test_craft( recipe_carver_off, INT_MAX );
                 CAPTURE( turns );
                 CHECK( get_remaining_charges( "popcan_stove" ) == 0 );
-                CHECK( get_remaining_charges( "soldering_iron_portable" ) == 10 );
+                CHECK( get_remaining_charges( "soldering_iron_portable" ) == 6 );
             }
         }
 
@@ -893,7 +893,7 @@ TEST_CASE( "tools_use_charge_to_craft", "[crafting][charge]" )
             tools.push_back( plastic_molding );
 
             item UPS( "UPS_off" );
-            item UPS_mag( UPS.magazine_default() );
+            item UPS_mag( "heavy_atomic_battery_cell" );
             UPS_mag.ammo_set( UPS_mag.ammo_default(), 1000 );
             UPS.put_in( UPS_mag, pocket_type::MAGAZINE_WELL );
             tools.emplace_back( UPS );
@@ -905,7 +905,7 @@ TEST_CASE( "tools_use_charge_to_craft", "[crafting][charge]" )
                 CHECK( get_remaining_charges( "hotplate" ) == 0 );
                 CHECK( get_remaining_charges( "soldering_iron_portable" ) == 0 );
                 // vacuum molding takes 4 charges
-                CHECK( get_remaining_charges( "UPS_off" ) == 207 );
+                CHECK( get_remaining_charges( "UPS_off" ) == 282 );
             }
         }
 
diff --git a/tests/eoc_test.cpp b/tests/eoc_test.cpp
index 0a4b1f5a3e14a..100664fd4c007 100644
--- a/tests/eoc_test.cpp
+++ b/tests/eoc_test.cpp
@@ -512,7 +512,7 @@ TEST_CASE( "EOC_math_item", "[eoc][math_parser]" )
     REQUIRE( globvars.get_global_value( "npctalk_var_key_charge_count" ).empty() );
     CHECK( effect_on_condition_EOC_math_item_count->activate( d ) );
     CHECK( globvars.get_global_value( "npctalk_var_key_item_count" ) == "2" );
-    CHECK( globvars.get_global_value( "npctalk_var_key_charge_count" ) == "66" );
+    CHECK( globvars.get_global_value( "npctalk_var_key_charge_count" ) == "32" );
 }
 
 TEST_CASE( "EOC_math_proficiency", "[eoc][math_parser]" )