diff --git a/bobequipment/prototypes/recipe/updates.lua b/bobequipment/prototypes/recipe/updates.lua
index 6c613ed3a..70f3ffc97 100644
--- a/bobequipment/prototypes/recipe/updates.lua
+++ b/bobequipment/prototypes/recipe/updates.lua
@@ -172,7 +172,7 @@ then
 else
   if mods["bobplates"] then
     if combined_roboports == true then
-      bobmods.lib.recipe.replace_ingredient("bob-personal-roboport-mk3-equipment", "battery", "bob-lithium-ion-battery")
+      bobmods.lib.recipe.replace_ingredient("bob-personal-roboport-mk3-equipment", "battery", "bob-battery-2")
       bobmods.lib.recipe.add_ingredient(
         "bob-personal-roboport-mk3-equipment",
         { type = "item", name = "bob-titanium-bearing", amount = 5 }
@@ -186,7 +186,7 @@ else
     bobmods.lib.recipe.replace_ingredient(
       "bob-personal-roboport-chargepad-equipment-3",
       "battery",
-      "bob-lithium-ion-battery"
+      "bob-battery-2"
     )
     bobmods.lib.recipe.replace_ingredient(
       "bob-personal-roboport-antenna-equipment-3",
@@ -267,7 +267,7 @@ then
 else
   if mods["bobplates"] then
     if combined_roboports == true then
-      bobmods.lib.recipe.replace_ingredient("bob-personal-roboport-mk4-equipment", "battery", "bob-silver-zinc-battery")
+      bobmods.lib.recipe.replace_ingredient("bob-personal-roboport-mk4-equipment", "battery", "bob-battery-3")
       bobmods.lib.recipe.add_ingredient(
         "bob-personal-roboport-mk4-equipment",
         { type = "item", name = "bob-nitinol-bearing", amount = 5 }
@@ -286,7 +286,7 @@ else
     bobmods.lib.recipe.replace_ingredient(
       "bob-personal-roboport-chargepad-equipment-4",
       "battery",
-      "bob-silver-zinc-battery"
+      "bob-battery-3"
     )
     bobmods.lib.recipe.replace_ingredient(
       "bob-personal-roboport-chargepad-equipment-4",
@@ -449,14 +449,14 @@ if data.raw.item["bob-gilded-copper-cable"] then
   bobmods.lib.tech.add_prerequisite("bob-solar-panel-equipment-3", "bob-advanced-processing-unit")
 end
 
-if data.raw.item["bob-lithium-ion-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-battery-mk3-equipment", "battery", "bob-lithium-ion-battery")
+if data.raw.item["bob-battery-2"] then
+  bobmods.lib.recipe.replace_ingredient("battery-mk3-equipment", "battery", "bob-battery-2")
   bobmods.lib.tech.add_prerequisite("bob-battery-equipment-3", "bob-battery-2")
 
   bobmods.lib.recipe.remove_ingredient("bob-personal-laser-defense-equipment-3", "battery")
   bobmods.lib.recipe.add_ingredient(
     "bob-personal-laser-defense-equipment-3",
-    { type = "item", name = "bob-lithium-ion-battery", amount = 3 }
+    { type = "item", name = "bob-battery-2", amount = 3 }
   )
   bobmods.lib.tech.add_prerequisite("bob-personal-laser-defense-equipment-3", "bob-battery-2")
 end
@@ -591,21 +591,27 @@ if data.raw.item["bob-tungsten-carbide"] then
   bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-3", "bob-tungsten-alloy-processing")
 end
 
-if data.raw.item["bob-lithium"] then
+if mods["space-age"] then
+  bobmods.lib.recipe.add_ingredient(
+    "bob-fission-reactor-equipment-4",
+    { type = "item", name = "lithium-plate", amount = 40 }
+  )
+  bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-4", "cryogenic-science-pack")
+elseif data.raw.item["lithium"] then
   bobmods.lib.recipe.add_ingredient(
     "bob-fission-reactor-equipment-3",
-    { type = "item", name = "bob-lithium", amount = 40 }
+    { type = "item", name = "lithium", amount = 40 }
   )
   bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-3", "bob-lithium-processing")
 end
 
-if data.raw.item["bob-silver-zinc-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-battery-mk5-equipment", "battery", "bob-silver-zinc-battery")
+if data.raw.item["bob-battery-3"] then
+  bobmods.lib.recipe.replace_ingredient("bob-battery-mk5-equipment", "battery", "bob-battery-3")
   bobmods.lib.tech.add_prerequisite("bob-battery-equipment-5", "bob-battery-3")
   bobmods.lib.recipe.remove_ingredient("bob-personal-laser-defense-equipment-5", "battery")
   bobmods.lib.recipe.add_ingredient(
     "bob-personal-laser-defense-equipment-5",
-    { type = "item", name = "bob-silver-zinc-battery", amount = 3 }
+    { type = "item", name = "bob-battery-3", amount = 3 }
   )
   bobmods.lib.tech.add_prerequisite("bob-personal-laser-defense-equipment-5", "bob-battery-3")
 end
diff --git a/boblogistics/prototypes/recipe/roboport-recipe-updates.lua b/boblogistics/prototypes/recipe/roboport-recipe-updates.lua
index 741d36e4f..67d85bf0f 100644
--- a/boblogistics/prototypes/recipe/roboport-recipe-updates.lua
+++ b/boblogistics/prototypes/recipe/roboport-recipe-updates.lua
@@ -49,8 +49,8 @@ if data.raw.item["bob-insulated-cable"] then
   bobmods.lib.recipe.replace_ingredient("bob-roboport-antenna-3", "copper-cable", "bob-insulated-cable")
 end
 
-if data.raw.item["bob-lithium-ion-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-3", "battery", "bob-lithium-ion-battery")
+if data.raw.item["bob-battery-2"] then
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-3", "battery", "bob-battery-2")
   bobmods.lib.tech.add_prerequisite("bob-robo-modular-3", "bob-battery-2")
 end
 
@@ -101,12 +101,12 @@ if data.raw.item["bob-advanced-processing-unit"] then
   bobmods.lib.tech.add_prerequisite("bob-robo-modular-4", "bob-advanced-processing-unit")
 end
 
-if data.raw.item["bob-silver-zinc-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-4", "battery", "bob-silver-zinc-battery")
+if data.raw.item["bob-battery-3"] then
+  bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-4", "battery", "bob-battery-3")
   bobmods.lib.tech.add_prerequisite("bob-robo-modular-4", "bob-battery-3")
 else
-  if data.raw.item["bob-lithium-ion-battery"] then
-    bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-4", "battery", "bob-lithium-ion-battery")
+  if data.raw.item["bob-battery-2"] then
+    bobmods.lib.recipe.replace_ingredient("bob-roboport-chargepad-4", "battery", "bob-battery-2")
   end
 end
 
diff --git a/boblogistics/prototypes/recipe/robots-recipe-updates.lua b/boblogistics/prototypes/recipe/robots-recipe-updates.lua
index aafe64b10..d2352f2c1 100644
--- a/boblogistics/prototypes/recipe/robots-recipe-updates.lua
+++ b/boblogistics/prototypes/recipe/robots-recipe-updates.lua
@@ -310,8 +310,8 @@ else
 end
 
 if data.raw.item["bob-flying-robot-frame-3"] then
-  if data.raw.item["bob-lithium-ion-battery"] then
-    bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-3", "battery", "bob-lithium-ion-battery")
+  if data.raw.item["bob-battery-2"] then
+    bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-3", "battery", "bob-battery-2")
   end
 
   if data.raw.item["bob-titanium-plate"] then
@@ -334,8 +334,8 @@ else
       bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "electric-engine-unit", amount = 1 })
     end
 
-    if data.raw.item["bob-lithium-ion-battery"] then
-      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-lithium-ion-battery", amount = 2 })
+    if data.raw.item["bob-battery-2"] then
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-battery-2", amount = 2 })
     else
       bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "battery", amount = 2 })
     end
@@ -351,11 +351,11 @@ else
 end
 
 if data.raw.item["bob-flying-robot-frame-4"] then
-  if data.raw.item["bob-silver-zinc-battery"] then
-    bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-4", "battery", "bob-silver-zinc-battery")
+  if data.raw.item["bob-battery-3"] then
+    bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-4", "battery", "bob-battery-3")
   else
-    if data.raw.item["bob-lithium-ion-battery"] then
-      bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-4", "battery", "bob-lithium-ion-battery")
+    if data.raw.item["bob-battery-2"] then
+      bobmods.lib.recipe.replace_ingredient("bob-flying-robot-frame-4", "battery", "bob-battery-2")
     end
   end
 
@@ -379,11 +379,11 @@ else
       bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "electric-engine-unit", amount = 1 })
     end
 
-    if data.raw.item["bob-silver-zinc-battery"] then
-      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-silver-zinc-battery", amount = 2 })
+    if data.raw.item["bob-battery-3"] then
+      bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-battery-3", amount = 2 })
     else
-      if data.raw.item["bob-lithium-ion-battery"] then
-        bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-lithium-ion-battery", amount = 2 })
+      if data.raw.item["bob-battery-2"] then
+        bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "bob-battery-2", amount = 2 })
       else
         bobmods.lib.recipe.add_ingredient(robot, { type = "item", name = "battery", amount = 2 })
       end
diff --git a/boblogistics/prototypes/technology-updates.lua b/boblogistics/prototypes/technology-updates.lua
index 23d7a8d3a..d761507cd 100644
--- a/boblogistics/prototypes/technology-updates.lua
+++ b/boblogistics/prototypes/technology-updates.lua
@@ -257,7 +257,7 @@ end
 
 bobmods.lib.tech.add_prerequisite("bob-robo-modular-3", "processing-unit")
 
-if data.raw.item["bob-lithium-ion-battery"] and data.raw.technology["bob-battery-2"] then
+if data.raw.item["bob-battery-2"] and data.raw.technology["bob-battery-2"] then
   if data.raw.technology["bob-robotics-3"] then
     bobmods.lib.tech.add_prerequisite("bob-robotics-3", "bob-battery-2")
   else
@@ -282,7 +282,7 @@ else
   end
 end
 
-if data.raw.item["bob-silver-zinc-battery"] and data.raw.technology["bob-battery-3"] then
+if data.raw.item["bob-battery-3"] and data.raw.technology["bob-battery-3"] then
   if data.raw.technology["bob-robotics-4"] then
     bobmods.lib.tech.add_prerequisite("bob-robotics-4", "bob-battery-3")
   else
diff --git a/bobplates/data-final-fixes.lua b/bobplates/data-final-fixes.lua
index ce7d20500..130c7f740 100644
--- a/bobplates/data-final-fixes.lua
+++ b/bobplates/data-final-fixes.lua
@@ -15,3 +15,7 @@ end
 if mods["aai-industry"] then
   bobmods.lib.tech.remove_recipe_unlock("glass-processing", "glass")
 end
+
+if mods["space-age"] then
+  bobmods.lib.tech.replace_prerequisite_in_all("bob-lithium-processing", "cryogenic-science-pack")
+end
diff --git a/bobplates/data-updates.lua b/bobplates/data-updates.lua
index d05c5bef9..74d512818 100644
--- a/bobplates/data-updates.lua
+++ b/bobplates/data-updates.lua
@@ -308,7 +308,9 @@ if settings.startup["bobmods-plates-purewater"].value == true then
 
   bobmods.lib.tech.add_recipe_unlock("bob-electrolysis-1", "bob-distillery")
   bobmods.lib.tech.add_recipe_unlock("bob-electrolysis-1", "bob-pure-water")
-  bobmods.lib.tech.add_recipe_unlock("bob-electrolysis-1", "bob-pure-water-from-lithia")
+  if not mods["space-age"] then
+    bobmods.lib.tech.add_recipe_unlock("bob-electrolysis-1", "bob-pure-water-from-lithia")
+  end
 end
 
 data.raw.fluid["petroleum-gas"].gas_temperature = -42
@@ -443,8 +445,8 @@ if mods["quality"] then
     "bob-steel-chemical-furnace",
     "bob-electric-chemical-furnace",
     "bob-polishing-wheel",
-    "bob-lithium-ion-battery",
-    "bob-silver-zinc-battery",
+    "bob-battery-2",
+    "bob-battery-3",
     "battery",
     "cargo-landing-pad",
     "rocket-silo",
@@ -457,6 +459,11 @@ if mods["quality"] then
 end
 
 if mods["space-age"] then
-  data.raw.recipe["bob-lithium-ion-battery"].category = "chemistry-or-cryogenics"
-  data.raw.recipe["bob-silver-zinc-battery"].category = "chemistry-or-cryogenics"
+  data.raw.fluid["bob-lithia-water"].hidden = true
+  data.raw.resource["bob-lithia-water"].hidden = true
+  data.raw.item["bob-lithia-water-barrel"].hidden = true
+  data.raw.recipe["bob-lithia-water-barrel"].hidden = true
+  data.raw.recipe["empty-bob-lithia-water-barrel"].hidden = true
+  bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "bob-lithia-water-barrel")
+  bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-bob-lithia-water-barrel")
 end
diff --git a/bobplates/data.lua b/bobplates/data.lua
index 1e9f3549d..85c4556e4 100644
--- a/bobplates/data.lua
+++ b/bobplates/data.lua
@@ -23,7 +23,9 @@ if bobmods.ores.bauxite.create_autoplace then
   end
   if settings.startup["bobmods-plates-groundwater"].value == false then
     bobmods.ores.water.create_autoplace()
-    bobmods.ores.lithia_water.create_autoplace()
+    if not mods["space-age"] then
+      bobmods.ores.lithia_water.create_autoplace()
+    end
   end
   bobmods.ores.thorium.create_autoplace()
 end
diff --git a/bobplates/migrations/bobplates_2.0.0.json b/bobplates/migrations/bobplates_2.0.0.json
index 9be430568..affbf3f2f 100644
--- a/bobplates/migrations/bobplates_2.0.0.json
+++ b/bobplates/migrations/bobplates_2.0.0.json
@@ -121,10 +121,8 @@
     ["lead-plate", "bob-lead-plate"],
     ["liquid-fuel-barrel", "bob-liquid-fuel-barrel"],
     ["lithia-water-barrel", "bob-lithia-water-barrel"],
-    ["lithium", "bob-lithium"],
     ["lithium-chloride", "bob-lithium-chloride"],
     ["lithium-cobalt-oxide", "bob-lithium-cobalt-oxide"],
-    ["lithium-ion-battery", "bob-lithium-ion-battery"],
     ["lithium-perchlorate", "bob-lithium-perchlorate"],
     ["nickel-ore", "bob-nickel-ore"],
     ["nickel-plate", "bob-nickel-plate"],
@@ -165,7 +163,6 @@
     ["silver-ore", "bob-silver-ore"],
     ["silver-oxide", "bob-silver-oxide"],
     ["silver-plate", "bob-silver-plate"],
-    ["silver-zinc-battery", "bob-silver-zinc-battery"],
     ["sodium-hydroxide", "bob-sodium-hydroxide"],
     ["steel-bearing", "bob-steel-bearing"],
     ["steel-bearing-ball", "bob-steel-bearing-ball"],
@@ -317,10 +314,8 @@
     ["liquid-air", "bob-liquid-air"],
     ["liquid-fuel", "bob-liquid-fuel"],
     ["lithia-water", "bob-lithia-water"],
-    ["lithium", "bob-lithium"],
     ["lithium-chloride", "bob-lithium-chloride"],
     ["lithium-cobalt-oxide", "bob-lithium-cobalt-oxide"],
-    ["lithium-ion-battery", "bob-lithium-ion-battery"],
     ["lithium-water-electrolysis", "bob-lithium-perchlorate"],
     ["nickel-plate", "bob-nickel-plate"],
     ["nitinol-alloy", "bob-nitinol-alloy"],
@@ -358,7 +353,6 @@
     ["silver-nitrate", "bob-silver-nitrate"],
     ["silver-oxide", "bob-silver-oxide"],
     ["silver-plate", "bob-silver-plate"],
-    ["silver-zinc-battery", "bob-silver-zinc-battery"],
     ["solid-fuel-from-hydrogen", "bob-solid-fuel-from-hydrogen"],
     ["steel-bearing", "bob-steel-bearing"],
     ["steel-bearing-ball", "bob-steel-bearing-ball"],
diff --git a/bobplates/migrations/bobplates_2.0.6.json b/bobplates/migrations/bobplates_2.0.6.json
index fc3848149..d5ca38e52 100644
--- a/bobplates/migrations/bobplates_2.0.6.json
+++ b/bobplates/migrations/bobplates_2.0.6.json
@@ -1,6 +1,19 @@
 {
+  "item":
+  [
+    ["bob-lithium", "lithium"],
+    ["bob-lithium-ion-battery", "bob-battery-2"],
+    ["lithium-ion-battery", "bob-battery-2"],
+    ["bob-silver-zinc-battery", "bob-battery-3"],
+    ["silver-zinc-battery", "bob-battery-3"]
+  ],
   "recipe":
   [
-    ["bob-heavy-water-electrolysis", "bob-deuterium"]
+    ["bob-heavy-water-electrolysis", "bob-deuterium"],
+    ["bob-lithium", "lithium"],
+    ["bob-lithium-ion-battery", "bob-battery-2"],
+    ["lithium-ion-battery", "bob-battery-2"],
+    ["bob-silver-zinc-battery", "bob-battery-3"],
+    ["silver-zinc-battery", "bob-battery-3"]
   ]
 }
diff --git a/bobplates/migrations/bobplates_2.0.6.lua b/bobplates/migrations/bobplates_2.0.6.lua
new file mode 100644
index 000000000..8bafe7aaa
--- /dev/null
+++ b/bobplates/migrations/bobplates_2.0.6.lua
@@ -0,0 +1,5 @@
+for index, force in pairs(game.forces) do
+  if force.technologies["bob-lithium-processing"].researched and prototypes.technology["lithium-processing"] then
+    force.technologies["lithium-processing"].researched = true
+  end
+end
\ No newline at end of file
diff --git a/bobplates/prototypes/item/parts.lua b/bobplates/prototypes/item/parts.lua
index 9a38033cf..3b52f5db4 100644
--- a/bobplates/prototypes/item/parts.lua
+++ b/bobplates/prototypes/item/parts.lua
@@ -238,7 +238,8 @@ data:extend({
 
   {
     type = "item",
-    name = "bob-lithium-ion-battery",
+    name = "bob-battery-2",
+    localised_name = { "item-name.bob-lithium-ion-battery" },
     icon = "__bobplates__/graphics/icons/lithium-ion-battery.png",
     icon_size = 64,
     subgroup = "intermediate-product",
@@ -260,7 +261,8 @@ data:extend({
 
   {
     type = "item",
-    name = "bob-silver-zinc-battery",
+    name = "bob-battery-3",
+    localised_name = { "item-name.bob-silver-zinc-battery" },
     icon = "__bobplates__/graphics/icons/silver-zinc-battery.png",
     icon_size = 64,
     subgroup = "intermediate-product",
@@ -328,3 +330,11 @@ data:extend({
     },
   },
 })
+
+if mods["space-age"] then
+  data.raw.item["bob-battery-2"].localised_name = { "item-name.bob-silver-zinc-battery" }
+  data.raw.item["bob-battery-3"].localised_name = { "item-name.bob-lithium-ion-battery" }
+  data.raw.item["bob-battery-2"].icon = "__bobplates__/graphics/icons/silver-zinc-battery.png"
+  data.raw.item["bob-battery-3"].icon = "__bobplates__/graphics/icons/lithium-ion-battery.png"
+end
+
diff --git a/bobplates/prototypes/item/plates.lua b/bobplates/prototypes/item/plates.lua
index 7f5e0246f..a576a3348 100644
--- a/bobplates/prototypes/item/plates.lua
+++ b/bobplates/prototypes/item/plates.lua
@@ -128,18 +128,6 @@ data:extend({
       volume = 0.6,
     },
   },
-  {
-    type = "item",
-    name = "bob-lithium",
-    icon = "__bobplates__/graphics/icons/plate/lithium-plate.png",
-    icon_size = 64,
-    subgroup = "bob-material",
-    order = "c-a-e[bob-lithium-plate]",
-    stack_size = 200,
-    drop_sound = plate_drop_move,
-    inventory_move_sound = plate_drop_move,
-    pick_sound = plate_pick,
-  },
   {
     type = "item",
     name = "bob-cobalt-plate",
@@ -153,3 +141,22 @@ data:extend({
     pick_sound = plate_pick,
   },
 })
+
+if not data.raw.item.lithium then
+  data:extend({
+    {
+      type = "item",
+      name = "lithium",
+      localised_name = { "item-name.bob-lithium" },
+      icon = "__bobplates__/graphics/icons/plate/lithium-plate.png",
+      icon_size = 64,
+      subgroup = "bob-material",
+      order = "c-a-e[bob-lithium-plate]",
+      stack_size = 200,
+      drop_sound = plate_drop_move,
+      inventory_move_sound = plate_drop_move,
+      pick_sound = plate_pick,
+      weight = 500,
+    },
+  })
+end
diff --git a/bobplates/prototypes/recipe/chemistry-recipe.lua b/bobplates/prototypes/recipe/chemistry-recipe.lua
index b87a3d09a..ae7526df7 100644
--- a/bobplates/prototypes/recipe/chemistry-recipe.lua
+++ b/bobplates/prototypes/recipe/chemistry-recipe.lua
@@ -949,3 +949,8 @@ data:extend({
 if mods["bobpower"] then
   data.raw.recipe["bob-sodium-hydroxide-sink"].results[1].temperature = 465
 end
+
+if mods["space-age"] then
+  bobmods.lib.recipe.replace_ingredient("bob-lithium-chloride", "bob-lithia-water", "lithium-brine")
+  bobmods.lib.recipe.hide("bob-pure-water-from-lithia")
+end
diff --git a/bobplates/prototypes/recipe/nuclear-recipe.lua b/bobplates/prototypes/recipe/nuclear-recipe.lua
index 446320da0..1484e997e 100644
--- a/bobplates/prototypes/recipe/nuclear-recipe.lua
+++ b/bobplates/prototypes/recipe/nuclear-recipe.lua
@@ -249,7 +249,7 @@ data:extend({
         ignored_by_productivity = 10,
         ignored_by_stats = 10,
       },
-      { type = "item", name = "bob-lithium", amount = 1, probability = 0.1 },
+      { type = "item", name = "lithium", amount = 1, probability = 0.1 },
       { type = "item", name = "bob-fusion-catalyst", amount = 1 },
     },
     crafting_machine_tint = {
diff --git a/bobplates/prototypes/recipe/parts-recipe.lua b/bobplates/prototypes/recipe/parts-recipe.lua
index d403aa409..c241b97ff 100644
--- a/bobplates/prototypes/recipe/parts-recipe.lua
+++ b/bobplates/prototypes/recipe/parts-recipe.lua
@@ -188,7 +188,7 @@ data:extend({
 
   {
     type = "recipe",
-    name = "bob-lithium-ion-battery",
+    name = "bob-battery-2",
     category = "chemistry",
     energy_required = 5,
     enabled = false,
@@ -198,7 +198,7 @@ data:extend({
       { type = "item", name = "bob-carbon", amount = 1 },
       { type = "item", name = "plastic-bar", amount = 1 },
     },
-    results = { { type = "item", name = "bob-lithium-ion-battery", amount = 1 } },
+    results = { { type = "item", name = "bob-battery-2", amount = 1 } },
     crafting_machine_tint = {
       primary = { r = 0.1, g = 1.0, b = 0.8, a = 1.000 },
       secondary = { r = 0.2, g = 0.6, b = 0.9, a = 1.000 },
@@ -210,7 +210,7 @@ data:extend({
 
   {
     type = "recipe",
-    name = "bob-silver-zinc-battery",
+    name = "bob-battery-3",
     category = "chemistry",
     energy_required = 5,
     enabled = false,
@@ -220,7 +220,7 @@ data:extend({
       { type = "item", name = "bob-zinc-plate", amount = 1 },
       { type = "item", name = "plastic-bar", amount = 1 },
     },
-    results = { { type = "item", name = "bob-silver-zinc-battery", amount = 1 } },
+    results = { { type = "item", name = "bob-battery-3", amount = 1 } },
     crafting_machine_tint = {
       primary = { r = 0.1, g = 1.0, b = 0.1, a = 1.000 },
       secondary = { r = 0.8, g = 0.8, b = 0.8, a = 1.000 },
@@ -258,3 +258,20 @@ data:extend({
     allow_productivity = true,
   },
 })
+
+if mods["space-age"] then
+  data.raw.recipe["bob-battery-2"].category = "chemistry-or-cryogenics"
+  data.raw.recipe["bob-battery-3"].category = "chemistry-or-cryogenics"
+  data.raw.recipe["bob-battery-2"].ingredients = {
+    { type = "item", name = "bob-sodium-hydroxide", amount = 2 },
+    { type = "item", name = "bob-silver-oxide", amount = 1 },
+    { type = "item", name = "bob-zinc-plate", amount = 1 },
+    { type = "item", name = "plastic-bar", amount = 1 },
+  }
+  data.raw.recipe["bob-battery-3"].ingredients = {
+    { type = "item", name = "bob-lithium-perchlorate", amount = 2 },
+    { type = "item", name = "bob-lithium-cobalt-oxide", amount = 1 },
+    { type = "item", name = "carbon", amount = 1 },
+    { type = "item", name = "plastic-bar", amount = 1 },
+  }
+end
diff --git a/bobplates/prototypes/recipe/plates-recipe.lua b/bobplates/prototypes/recipe/plates-recipe.lua
index 7b1cbdf13..e3d53f9df 100644
--- a/bobplates/prototypes/recipe/plates-recipe.lua
+++ b/bobplates/prototypes/recipe/plates-recipe.lua
@@ -201,20 +201,28 @@ data:extend({
     allow_decomposition = false,
     allow_productivity = true,
   },
+})
 
-  {
-    type = "recipe",
-    name = "bob-lithium",
-    category = "bob-electrolysis",
-    subgroup = "bob-material-electrolysis",
-    energy_required = 3.2,
-    enabled = false,
-    auto_recycle = false,
-    ingredients = {
-      { type = "item", name = "bob-lithium-chloride", amount = 1 },
+if not mods["space-age"] then
+  data:extend({
+    {
+      type = "recipe",
+      name = "lithium",
+      localised_name = { "item-name.bob-lithium" },
+      category = "bob-electrolysis",
+      subgroup = "bob-material-electrolysis",
+      energy_required = 3.2,
+      enabled = false,
+      auto_recycle = false,
+      ingredients = {
+        { type = "item", name = "bob-lithium-chloride", amount = 1 },
+      },
+      results = { { type = "item", name = "lithium", amount = 1 } },
+      allow_decomposition = false,
+      allow_productivity = true,
     },
-    results = { { type = "item", name = "bob-lithium", amount = 1 } },
-    allow_decomposition = false,
-    allow_productivity = true,
-  },
-})
+  })
+else
+  bobmods.lib.recipe.remove_ingredient("lithium", "lithium-brine")
+  bobmods.lib.recipe.add_ingredient("lithium", { type = "item", name = "bob-lithium-chloride", amount = 5 })
+end
diff --git a/bobplates/prototypes/recipe/resource-recipe.lua b/bobplates/prototypes/recipe/resource-recipe.lua
index c3c89b377..b1f489041 100644
--- a/bobplates/prototypes/recipe/resource-recipe.lua
+++ b/bobplates/prototypes/recipe/resource-recipe.lua
@@ -142,7 +142,7 @@ data:extend({
     enabled = false,
     auto_recycle = false,
     ingredients = {
-      { type = "item", name = "bob-lithium", amount = 1 },
+      { type = "item", name = "lithium", amount = 1 },
       { type = "item", name = "bob-cobalt-oxide", amount = 1 },
     },
     results = { { type = "item", name = "bob-lithium-cobalt-oxide", amount = 2 } },
diff --git a/bobplates/prototypes/technology-updates.lua b/bobplates/prototypes/technology-updates.lua
index 4f4e51f90..b83b991be 100644
--- a/bobplates/prototypes/technology-updates.lua
+++ b/bobplates/prototypes/technology-updates.lua
@@ -95,9 +95,41 @@ bobmods.lib.tech.add_recipe_unlock("bob-cobalt-processing", "bob-cobalt-steel-ge
 bobmods.lib.tech.add_recipe_unlock("bob-cobalt-processing", "bob-cobalt-steel-bearing-ball")
 bobmods.lib.tech.add_recipe_unlock("bob-cobalt-processing", "bob-cobalt-steel-bearing")
 
-bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-lithium")
-bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-lithium-chloride")
-bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-lithium-perchlorate")
+if not mods["space-age"] then
+  bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "lithium")
+  bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-lithium-chloride")
+  bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-lithium-perchlorate")
+else
+  data.raw.technology["bob-battery-2"].prerequisites = {}
+  bobmods.lib.tech.add_prerequisite("bob-battery-2", "battery")
+  bobmods.lib.tech.add_prerequisite("bob-battery-2", "bob-nitrogen-processing")
+  bobmods.lib.tech.add_prerequisite("bob-battery-2", "bob-electrolysis-2")
+  bobmods.lib.tech.add_prerequisite("bob-battery-2", "bob-zinc-processing")
+  bobmods.lib.tech.add_prerequisite("bob-battery-2", "chemical-science-pack")
+  data.raw.technology["bob-battery-3"].prerequisites = {}
+  bobmods.lib.tech.add_prerequisite("bob-battery-3", "bob-battery-2")
+  bobmods.lib.tech.add_prerequisite("bob-battery-3", "cryogenic-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-battery-3", "bob-cobalt-processing")
+  bobmods.lib.tech.set_science_packs("bob-battery-3",
+    {
+      { "automation-science-pack", 1 },
+      { "logistic-science-pack", 1 },
+      { "chemical-science-pack", 1 },
+      { "production-science-pack", 1 },
+      { "cryogenic-science-pack", 1 },
+    }
+  )
+  data.raw.technology["bob-battery-2"].effects = {}
+  bobmods.lib.tech.add_recipe_unlock("bob-battery-2", "bob-silver-oxide")
+  bobmods.lib.tech.add_recipe_unlock("bob-battery-2", "bob-silver-nitrate")
+  bobmods.lib.tech.add_recipe_unlock("bob-battery-2", "bob-battery-2")
+  data.raw.technology["bob-battery-3"].effects = {}
+  bobmods.lib.tech.add_recipe_unlock("bob-battery-3", "bob-lithium-cobalt-oxide")
+  bobmods.lib.tech.add_recipe_unlock("bob-battery-3", "bob-battery-3")
+  bobmods.lib.tech.hide("bob-lithium-processing")
+  bobmods.lib.tech.add_recipe_unlock("lithium-processing", "bob-lithium-chloride")
+  bobmods.lib.tech.add_recipe_unlock("lithium-processing", "bob-lithium-perchlorate")
+end
 
 bobmods.lib.tech.add_recipe_unlock("bob-titanium-processing", "bob-titanium-gear-wheel")
 bobmods.lib.tech.add_recipe_unlock("bob-titanium-processing", "bob-titanium-bearing-ball")
diff --git a/bobplates/prototypes/technology.lua b/bobplates/prototypes/technology.lua
index 45b86dde6..c3aaf1c86 100644
--- a/bobplates/prototypes/technology.lua
+++ b/bobplates/prototypes/technology.lua
@@ -967,7 +967,7 @@ data:extend({
       },
       {
         type = "unlock-recipe",
-        recipe = "bob-lithium-ion-battery",
+        recipe = "bob-battery-2",
       },
     },
     order = "b-c-a",
@@ -1007,7 +1007,7 @@ data:extend({
       },
       {
         type = "unlock-recipe",
-        recipe = "bob-silver-zinc-battery",
+        recipe = "bob-battery-3",
       },
     },
     order = "b-c-b",
diff --git a/bobpower/prototypes/recipe/accumulators-updates.lua b/bobpower/prototypes/recipe/accumulators-updates.lua
index 6daa442bd..7e77deeb4 100644
--- a/bobpower/prototypes/recipe/accumulators-updates.lua
+++ b/bobpower/prototypes/recipe/accumulators-updates.lua
@@ -1,8 +1,8 @@
 if settings.startup["bobmods-power-accumulators"].value == true then
-  if data.raw.item["bob-lithium-ion-battery"] then
-    bobmods.lib.recipe.replace_ingredient("bob-large-accumulator-2", "battery", "bob-lithium-ion-battery")
-    bobmods.lib.recipe.replace_ingredient("bob-fast-accumulator-2", "battery", "bob-lithium-ion-battery")
-    bobmods.lib.recipe.replace_ingredient("bob-slow-accumulator-2", "battery", "bob-lithium-ion-battery")
+  if data.raw.item["bob-battery-2"] then
+    bobmods.lib.recipe.replace_ingredient("bob-large-accumulator-2", "battery", "bob-battery-2")
+    bobmods.lib.recipe.replace_ingredient("bob-fast-accumulator-2", "battery", "bob-battery-2")
+    bobmods.lib.recipe.replace_ingredient("bob-slow-accumulator-2", "battery", "bob-battery-2")
     bobmods.lib.tech.add_prerequisite("bob-electric-energy-accumulators-2", "bob-battery-2")
   end
 
@@ -20,16 +20,16 @@ if settings.startup["bobmods-power-accumulators"].value == true then
     end
   end
 
-  if data.raw.item["bob-silver-zinc-battery"] then
-    bobmods.lib.recipe.replace_ingredient("bob-large-accumulator-3", "battery", "bob-silver-zinc-battery")
-    bobmods.lib.recipe.replace_ingredient("bob-fast-accumulator-3", "battery", "bob-silver-zinc-battery")
-    bobmods.lib.recipe.replace_ingredient("bob-slow-accumulator-3", "battery", "bob-silver-zinc-battery")
+  if data.raw.item["bob-battery-3"] then
+    bobmods.lib.recipe.replace_ingredient("bob-large-accumulator-3", "battery", "bob-battery-3")
+    bobmods.lib.recipe.replace_ingredient("bob-fast-accumulator-3", "battery", "bob-battery-3")
+    bobmods.lib.recipe.replace_ingredient("bob-slow-accumulator-3", "battery", "bob-battery-3")
     bobmods.lib.tech.add_prerequisite("bob-electric-energy-accumulators-3", "bob-battery-3")
   else
-    if data.raw.item["bob-lithium-ion-battery"] then
-      bobmods.lib.recipe.replace_ingredient("bob-large-accumulator-3", "battery", "bob-lithium-ion-battery")
-      bobmods.lib.recipe.replace_ingredient("bob-fast-accumulator-3", "battery", "bob-lithium-ion-battery")
-      bobmods.lib.recipe.replace_ingredient("bob-slow-accumulator-3", "battery", "bob-lithium-ion-battery")
+    if data.raw.item["bob-battery-2"] then
+      bobmods.lib.recipe.replace_ingredient("bob-large-accumulator-3", "battery", "bob-battery-2")
+      bobmods.lib.recipe.replace_ingredient("bob-fast-accumulator-3", "battery", "bob-battery-2")
+      bobmods.lib.recipe.replace_ingredient("bob-slow-accumulator-3", "battery", "bob-battery-2")
     end
   end
 
diff --git a/bobpower/prototypes/technology/technology-updates.lua b/bobpower/prototypes/technology/technology-updates.lua
index 82e6c782d..aa47efde5 100644
--- a/bobpower/prototypes/technology/technology-updates.lua
+++ b/bobpower/prototypes/technology/technology-updates.lua
@@ -1,9 +1,9 @@
 if settings.startup["bobmods-power-accumulators"].value == true then
-  if data.raw.item["bob-lithium-ion-battery"] and data.raw.technology["bob-battery-2"] then
+  if data.raw.item["bob-battery-2"] and data.raw.technology["bob-battery-2"] then
     bobmods.lib.tech.add_prerequisite("bob-electric-energy-accumulators-2", "bob-battery-2")
   end
 
-  if data.raw.item["bob-silver-zinc-battery"] and data.raw.technology["bob-battery-3"] then
+  if data.raw.item["bob-battery-3"] and data.raw.technology["bob-battery-3"] then
     bobmods.lib.tech.add_prerequisite("bob-electric-energy-accumulators-3", "bob-battery-3")
   end
 end
diff --git a/bobrevamp/prototypes/hard-mode-updates.lua b/bobrevamp/prototypes/hard-mode-updates.lua
index 4b70a7de3..04ef6a352 100644
--- a/bobrevamp/prototypes/hard-mode-updates.lua
+++ b/bobrevamp/prototypes/hard-mode-updates.lua
@@ -18,8 +18,13 @@ if bobmods.plates and settings.startup["bobmods-revamp-hardmode"].value == true
 
   bobmods.lib.tech.add_recipe_unlock("bob-chemical-processing-2", "bob-limestone")
 
-  bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-sodium-chlorate")
-  bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-sodium-perchlorate")
+  if not mods["space-age"] then
+    bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-sodium-chlorate")
+    bobmods.lib.tech.add_recipe_unlock("bob-lithium-processing", "bob-sodium-perchlorate")
+  else
+    bobmods.lib.tech.add_recipe_unlock("lithium-processing", "bob-sodium-chlorate")
+    bobmods.lib.tech.add_recipe_unlock("lithium-processing", "bob-sodium-perchlorate")
+  end
   if data.raw.fluid["bob-pure-water"] then
     bobmods.lib.recipe.replace_ingredient("bob-sodium-chlorate", "water", "bob-pure-water")
     bobmods.lib.recipe.replace_ingredient("bob-sodium-perchlorate", "water", "bob-pure-water")
diff --git a/bobrevamp/prototypes/rocket-parts-updates.lua b/bobrevamp/prototypes/rocket-parts-updates.lua
index eb90ba5b9..ee25c5f31 100644
--- a/bobrevamp/prototypes/rocket-parts-updates.lua
+++ b/bobrevamp/prototypes/rocket-parts-updates.lua
@@ -69,8 +69,8 @@ if data.raw.recipe["satellite"] then
     bobmods.lib.tech.remove_prerequisite("rocket-silo", "solar-energy")
   end
 
-  if data.raw.item["bob-silver-zinc-battery"] then
-    bobmods.lib.recipe.replace_ingredient("satellite", "accumulator", "bob-silver-zinc-battery")
+  if data.raw.item["bob-battery-3"] then
+    bobmods.lib.recipe.replace_ingredient("satellite", "accumulator", "bob-battery-3")
     bobmods.lib.tech.add_prerequisite("rocket-silo", "bob-battery-3")
     bobmods.lib.tech.remove_prerequisite("rocket-silo", "electric-energy-accumulators")
   end
diff --git a/bobtech/prototypes/recipe/recipe-updates.lua b/bobtech/prototypes/recipe/recipe-updates.lua
index 2300e7a2d..f910b8084 100644
--- a/bobtech/prototypes/recipe/recipe-updates.lua
+++ b/bobtech/prototypes/recipe/recipe-updates.lua
@@ -73,10 +73,10 @@ else
   bobmods.lib.recipe.add_ingredient("utility-science-pack", { type = "item", name = "solar-panel", amount = 1 })
 end
 bobmods.lib.tech.add_prerequisite("utility-science-pack", "solar-energy")
-if data.raw.item["bob-lithium-ion-battery"] then
+if data.raw.item["bob-battery-2"] then
   bobmods.lib.recipe.add_ingredient(
     "utility-science-pack",
-    { type = "item", name = "bob-lithium-ion-battery", amount = 5 }
+    { type = "item", name = "bob-battery-2", amount = 5 }
   )
 else
   bobmods.lib.recipe.add_ingredient("utility-science-pack", { type = "item", name = "battery", amount = 7 })
diff --git a/bobtech/prototypes/technology/technology-updates.lua b/bobtech/prototypes/technology/technology-updates.lua
index c76e707e6..4b0890d23 100644
--- a/bobtech/prototypes/technology/technology-updates.lua
+++ b/bobtech/prototypes/technology/technology-updates.lua
@@ -251,7 +251,7 @@ elseif data.raw.technology["bob-chemical-plant-2"] then
 end
 
 bobmods.lib.tech.replace_prerequisite("utility-science-pack", "robotics", "electric-engine")
-if data.raw.item["bob-lithium-ion-battery"] then
+if data.raw.item["bob-battery-2"] then
   bobmods.lib.tech.add_prerequisite("utility-science-pack", "bob-battery-2")
 else
   bobmods.lib.tech.add_prerequisite("utility-science-pack", "battery")
diff --git a/bobvehicleequipment/prototypes/recipe-updates.lua b/bobvehicleequipment/prototypes/recipe-updates.lua
index d21d108b4..267479db5 100644
--- a/bobvehicleequipment/prototypes/recipe-updates.lua
+++ b/bobvehicleequipment/prototypes/recipe-updates.lua
@@ -179,7 +179,7 @@ then
 else
   if mods["bobplates"] then
     if combined_roboports == true then
-      bobmods.lib.recipe.replace_ingredient("bob-vehicle-roboport-equipment-3", "battery", "bob-lithium-ion-battery")
+      bobmods.lib.recipe.replace_ingredient("bob-vehicle-roboport-equipment-3", "battery", "bob-battery-2")
       bobmods.lib.recipe.add_ingredient(
         "bob-vehicle-roboport-equipment-3",
         { type = "item", name = "bob-titanium-bearing", amount = 10 }
@@ -193,7 +193,7 @@ else
     bobmods.lib.recipe.replace_ingredient(
       "bob-vehicle-roboport-chargepad-equipment-3",
       "battery",
-      "bob-lithium-ion-battery"
+      "bob-battery-2"
     )
     bobmods.lib.recipe.replace_ingredient(
       "bob-vehicle-roboport-antenna-equipment-3",
@@ -290,7 +290,7 @@ else
 
   if mods["bobplates"] then
     if combined_roboports == true then
-      bobmods.lib.recipe.replace_ingredient("bob-vehicle-roboport-equipment-4", "battery", "bob-silver-zinc-battery")
+      bobmods.lib.recipe.replace_ingredient("bob-vehicle-roboport-equipment-4", "battery", "bob-battery-3")
       bobmods.lib.recipe.add_ingredient(
         "bob-vehicle-roboport-equipment-4",
         { type = "item", name = "bob-nitinol-bearing", amount = 5 }
@@ -304,7 +304,7 @@ else
     bobmods.lib.recipe.replace_ingredient(
       "bob-vehicle-roboport-chargepad-equipment-4",
       "battery",
-      "bob-silver-zinc-battery"
+      "bob-battery-3"
     )
     bobmods.lib.recipe.replace_ingredient(
       "bob-vehicle-roboport-antenna-equipment-4",
@@ -481,18 +481,18 @@ if data.raw.item["bob-gilded-copper-cable"] then
   bobmods.lib.tech.add_prerequisite("bob-vehicle-solar-panel-equipment-3", "bob-advanced-processing-unit")
 end
 
-if data.raw.item["bob-lithium-ion-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-vehicle-battery-equipment-3", "battery", "bob-lithium-ion-battery")
+if data.raw.item["bob-battery-2"] then
+  bobmods.lib.recipe.replace_ingredient("bob-vehicle-battery-equipment-3", "battery", "bob-battery-2")
   bobmods.lib.tech.add_prerequisite("bob-vehicle-battery-equipment-3", "bob-battery-2")
 
   bobmods.lib.recipe.remove_ingredient("bob-vehicle-laser-defense-equipment-3", "battery")
   bobmods.lib.recipe.add_ingredient(
     "bob-vehicle-laser-defense-equipment-3",
-    { type = "item", name = "bob-lithium-ion-battery", amount = 6 }
+    { type = "item", name = "bob-battery-2", amount = 6 }
   )
   bobmods.lib.tech.add_prerequisite("bob-vehicle-laser-defense-equipment-3", "bob-battery-2")
 
-  bobmods.lib.recipe.replace_ingredient("bob-vehicle-big-turret-equipment-2", "battery", "bob-lithium-ion-battery")
+  bobmods.lib.recipe.replace_ingredient("bob-vehicle-big-turret-equipment-2", "battery", "bob-battery-2")
   bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-2", "bob-battery-2")
 end
 
@@ -649,17 +649,17 @@ if data.raw.item["bob-titanium-plate"] then
   bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-2", "bob-titanium-processing")
 end
 
-if data.raw.item["bob-silver-zinc-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-vehicle-battery-equipment-5", "battery", "bob-silver-zinc-battery")
+if data.raw.item["bob-battery-3"] then
+  bobmods.lib.recipe.replace_ingredient("bob-vehicle-battery-equipment-5", "battery", "bob-battery-3")
   bobmods.lib.tech.add_prerequisite("bob-vehicle-battery-equipment-5", "bob-battery-3")
 
   bobmods.lib.recipe.remove_ingredient("bob-vehicle-laser-defense-equipment-5", "battery")
   bobmods.lib.recipe.add_ingredient(
     "bob-vehicle-laser-defense-equipment-5",
-    { type = "item", name = "bob-silver-zinc-battery", amount = 6 }
+    { type = "item", name = "bob-battery-3", amount = 6 }
   )
   bobmods.lib.tech.add_prerequisite("bob-vehicle-laser-defense-equipment-5", "bob-battery-3")
-  bobmods.lib.recipe.replace_ingredient("bob-vehicle-big-turret-equipment-3", "battery", "bob-silver-zinc-battery")
+  bobmods.lib.recipe.replace_ingredient("bob-vehicle-big-turret-equipment-3", "battery", "bob-battery-3")
   bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-3", "bob-battery-3")
 end
 
@@ -803,14 +803,25 @@ if data.raw.item["bob-heat-shield-tile"] then
   )
 end
 
-if data.raw.item["bob-lithium"] then
+if mods["space-age"] then
+  bobmods.lib.recipe.add_ingredient(
+    "bob-vehicle-fission-reactor-equipment-6",
+    { type = "item", name = "lithium-plate", amount = 40 }
+  )
+  bobmods.lib.recipe.add_ingredient(
+    "bob-vehicle-fission-cell-equipment-6",
+    { type = "item", name = "lithium-plate", amount = 20 }
+  )
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-6", "cryogenic-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-6", "cryogenic-science-pack")
+elseif data.raw.item["lithium"] then
   bobmods.lib.recipe.add_ingredient(
     "bob-vehicle-fission-reactor-equipment-4",
-    { type = "item", name = "bob-lithium", amount = 40 }
+    { type = "item", name = "lithium", amount = 40 }
   )
   bobmods.lib.recipe.add_ingredient(
     "bob-vehicle-fission-cell-equipment-4",
-    { type = "item", name = "bob-lithium", amount = 20 }
+    { type = "item", name = "lithium", amount = 20 }
   )
   bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-4", "bob-lithium-processing")
   bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-4", "bob-lithium-processing")
diff --git a/bobwarfare/prototypes/recipe/recipe-updates.lua b/bobwarfare/prototypes/recipe/recipe-updates.lua
index 9ab9a90ab..e59109720 100644
--- a/bobwarfare/prototypes/recipe/recipe-updates.lua
+++ b/bobwarfare/prototypes/recipe/recipe-updates.lua
@@ -129,15 +129,15 @@ if data.raw.item["bob-aluminium-plate"] then
   bobmods.lib.tech.add_prerequisite("military-3", "bob-aluminium-processing")
 end
 
-if data.raw.item["bob-lithium-ion-battery"] then
+if data.raw.item["bob-battery-2"] then
   bobmods.lib.tech.add_prerequisite("bob-laser-rifle-ammo-3", "bob-battery-2")
-  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-emerald", "battery", "bob-lithium-ion-battery")
-  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-amethyst", "battery", "bob-lithium-ion-battery")
-  bobmods.lib.recipe.replace_ingredient("bob-laser-turret-3", "battery", "bob-lithium-ion-battery")
+  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-emerald", "battery", "bob-battery-2")
+  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-amethyst", "battery", "bob-battery-2")
+  bobmods.lib.recipe.replace_ingredient("bob-laser-turret-3", "battery", "bob-battery-2")
   bobmods.lib.tech.add_prerequisite("bob-laser-turrets-3", "bob-battery-2")
-  bobmods.lib.recipe.replace_ingredient("bob-laser-turret-4", "battery", "bob-lithium-ion-battery")
+  bobmods.lib.recipe.replace_ingredient("bob-laser-turret-4", "battery", "bob-battery-2")
 
-  bobmods.lib.recipe.replace_ingredient("bob-plasma-turret-2", "battery", "bob-lithium-ion-battery")
+  bobmods.lib.recipe.replace_ingredient("bob-plasma-turret-2", "battery", "bob-battery-2")
   bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-2", "bob-battery-2")
 end
 
@@ -195,14 +195,14 @@ if data.raw.item["bob-silicon-nitride"] then
   bobmods.lib.tech.add_prerequisite("bob-artillery-turret-2", "bob-ceramics")
 end
 
-if data.raw.item["bob-silver-zinc-battery"] then
+if data.raw.item["bob-battery-3"] then
   bobmods.lib.tech.add_prerequisite("bob-laser-rifle-ammo-5", "bob-battery-3")
-  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-diamond", "battery", "bob-silver-zinc-battery")
-  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-topaz", "battery", "bob-silver-zinc-battery")
-  bobmods.lib.recipe.replace_ingredient("bob-laser-turret-5", "battery", "bob-silver-zinc-battery")
+  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-diamond", "battery", "bob-battery-3")
+  bobmods.lib.recipe.replace_ingredient("bob-laser-rifle-battery-topaz", "battery", "bob-battery-3")
+  bobmods.lib.recipe.replace_ingredient("bob-laser-turret-5", "battery", "bob-battery-3")
   bobmods.lib.tech.add_prerequisite("bob-laser-turrets-5", "bob-battery-3")
 
-  bobmods.lib.recipe.replace_ingredient("bob-plasma-turret-3", "battery", "bob-silver-zinc-battery")
+  bobmods.lib.recipe.replace_ingredient("bob-plasma-turret-3", "battery", "bob-battery-3")
   bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-3", "bob-battery-3")
 end
 
diff --git a/bobwarfare/prototypes/robots-updates.lua b/bobwarfare/prototypes/robots-updates.lua
index c1034f2fc..bd7e6e79c 100644
--- a/bobwarfare/prototypes/robots-updates.lua
+++ b/bobwarfare/prototypes/robots-updates.lua
@@ -278,10 +278,10 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then
         { type = "item", name = "iron-gear-wheel", amount = 2 }
       )
     end
-    if data.raw.item["bob-lithium-ion-battery"] then
+    if data.raw.item["bob-battery-2"] then
       bobmods.lib.recipe.add_ingredient(
         "bob-robot-tool-combat-3",
-        { type = "item", name = "bob-lithium-ion-battery", amount = 1 }
+        { type = "item", name = "bob-battery-2", amount = 1 }
       )
     else
       bobmods.lib.recipe.add_ingredient("bob-robot-tool-combat-3", { type = "item", name = "battery", amount = 1 })
@@ -317,10 +317,10 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then
         { type = "item", name = "iron-gear-wheel", amount = 2 }
       )
     end
-    if data.raw.item["bob-silver-zinc-battery"] then
+    if data.raw.item["bob-battery-3"] then
       bobmods.lib.recipe.add_ingredient(
         "bob-robot-tool-combat-4",
-        { type = "item", name = "bob-silver-zinc-battery", amount = 1 }
+        { type = "item", name = "bob-battery-3", amount = 1 }
       )
     else
       bobmods.lib.recipe.add_ingredient("bob-robot-tool-combat-4", { type = "item", name = "battery", amount = 1 })