diff --git a/bobequipment/data-updates.lua b/bobequipment/data-updates.lua
index db738a899..b99bbd445 100644
--- a/bobequipment/data-updates.lua
+++ b/bobequipment/data-updates.lua
@@ -11,7 +11,7 @@ if mods["quality"] then
     "bob-energy-shield-mk6-equipment",
     "battery-equipment",
     "battery-mk2-equipment",
-    "bob-battery-mk3-equipment",
+    "battery-mk3-equipment",
     "bob-battery-mk4-equipment",
     "bob-battery-mk5-equipment",
     "bob-battery-mk6-equipment",
diff --git a/bobequipment/info.json b/bobequipment/info.json
index 1ec0520c0..e63aef078 100644
--- a/bobequipment/info.json
+++ b/bobequipment/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobequipment",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "factorio_version": "2.0",
   "title": "Bob's Personal Equipment mod",
   "author": "Bobingabout",
@@ -8,7 +8,7 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
     "base >= 2.0.33",
-    "boblibrary >= 2.0.0",
+    "boblibrary >= 2.0.4",
     "? bobenemies >= 2.0.0",
     "? bobplates >= 2.0.0",
     "? boblogistics >= 2.0.0"
diff --git a/bobequipment/migrations/bobequipment_2.0.0.json b/bobequipment/migrations/bobequipment_2.0.0.json
index d69cce2e2..5b85261e0 100644
--- a/bobequipment/migrations/bobequipment_2.0.0.json
+++ b/bobequipment/migrations/bobequipment_2.0.0.json
@@ -1,7 +1,6 @@
 {
   "item":
   [
-    ["battery-mk3-equipment", "bob-battery-mk3-equipment"],
     ["battery-mk4-equipment", "bob-battery-mk4-equipment"],
     ["battery-mk5-equipment", "bob-battery-mk5-equipment"],
     ["battery-mk6-equipment", "bob-battery-mk6-equipment"],
@@ -41,7 +40,6 @@
   ],
   "equipment":
   [
-    ["battery-mk3-equipment", "bob-battery-mk3-equipment"],
     ["battery-mk4-equipment", "bob-battery-mk4-equipment"],
     ["battery-mk5-equipment", "bob-battery-mk5-equipment"],
     ["battery-mk6-equipment", "bob-battery-mk6-equipment"],
@@ -81,7 +79,6 @@
  ],
   "recipe":
   [
-    ["battery-mk3-equipment", "bob-battery-mk3-equipment"],
     ["battery-mk4-equipment", "bob-battery-mk4-equipment"],
     ["battery-mk5-equipment", "bob-battery-mk5-equipment"],
     ["battery-mk6-equipment", "bob-battery-mk6-equipment"],
diff --git a/bobequipment/migrations/bobequipment_2.0.4.json b/bobequipment/migrations/bobequipment_2.0.4.json
new file mode 100644
index 000000000..e600f6c12
--- /dev/null
+++ b/bobequipment/migrations/bobequipment_2.0.4.json
@@ -0,0 +1,14 @@
+{
+  "item":
+  [
+    ["bob-battery-mk3-equipment", "battery-mk3-equipment"]
+  ],
+  "equipment":
+  [
+    ["bob-battery-mk3-equipment", "battery-mk3-equipment"]
+  ],
+  "recipe":
+  [
+    ["bob-battery-mk3-equipment", "battery-mk3-equipment"]
+  ]
+}
\ No newline at end of file
diff --git a/bobequipment/prototypes/equipment/equipment.lua b/bobequipment/prototypes/equipment/equipment.lua
index d41ebc93b..90bd048d2 100644
--- a/bobequipment/prototypes/equipment/equipment.lua
+++ b/bobequipment/prototypes/equipment/equipment.lua
@@ -211,7 +211,8 @@ data.raw["battery-equipment"]["battery-mk2-equipment"].energy_source.buffer_capa
 data:extend({
   {
     type = "battery-equipment",
-    name = "bob-battery-mk3-equipment",
+    name = "battery-mk3-equipment",
+    localised_name = { "equipment-name.bob-battery-mk3-equipment" },
     sprite = {
       filename = "__bobequipment__/graphics/equipment/battery-mk3-equipment.png",
       width = 32,
diff --git a/bobequipment/prototypes/item/equipment.lua b/bobequipment/prototypes/item/equipment.lua
index 4d10e2abf..774656bc4 100644
--- a/bobequipment/prototypes/item/equipment.lua
+++ b/bobequipment/prototypes/item/equipment.lua
@@ -120,10 +120,11 @@ data.raw.item["battery-mk2-equipment"].icon_size = 64
 data:extend({
   {
     type = "item",
-    name = "bob-battery-mk3-equipment",
+    name = "battery-mk3-equipment",
+    localised_name = { "item-name.bob-battery-mk3-equipment" },
     icon = "__bobequipment__/graphics/icons/technology/battery-mk3-equipment.png",
     icon_size = 64,
-    place_as_equipment_result = "bob-battery-mk3-equipment",
+    place_as_equipment_result = "battery-mk3-equipment",
     subgroup = "equipment",
     order = "c[battery]-c[battery-mk3-equipment]",
     stack_size = 50,
diff --git a/bobequipment/prototypes/recipe/equipment.lua b/bobequipment/prototypes/recipe/equipment.lua
index ed4666b35..0db99e965 100644
--- a/bobequipment/prototypes/recipe/equipment.lua
+++ b/bobequipment/prototypes/recipe/equipment.lua
@@ -67,14 +67,14 @@ data.raw.recipe["battery-mk2-equipment"].ingredients = {
 data:extend({
   {
     type = "recipe",
-    name = "bob-battery-mk3-equipment",
+    name = "battery-mk3-equipment",
     enabled = false,
     energy_required = 10,
     ingredients = {
       { type = "item", name = "battery-mk2-equipment", amount = 2 },
       { type = "item", name = "battery", amount = 10 },
     },
-    results = { { type = "item", name = "bob-battery-mk3-equipment", amount = 1 } },
+    results = { { type = "item", name = "battery-mk3-equipment", amount = 1 } },
   },
   {
     type = "recipe",
@@ -82,7 +82,7 @@ data:extend({
     enabled = false,
     energy_required = 10,
     ingredients = {
-      { type = "item", name = "bob-battery-mk3-equipment", amount = 2 },
+      { type = "item", name = "battery-mk3-equipment", amount = 2 },
       { type = "item", name = "processing-unit", amount = 5 },
     },
     results = { { type = "item", name = "bob-battery-mk4-equipment", amount = 1 } },
diff --git a/bobequipment/prototypes/recipe/updates.lua b/bobequipment/prototypes/recipe/updates.lua
index 6c613ed3a..8159deb4d 100644
--- a/bobequipment/prototypes/recipe/updates.lua
+++ b/bobequipment/prototypes/recipe/updates.lua
@@ -450,7 +450,7 @@ if data.raw.item["bob-gilded-copper-cable"] then
 end
 
 if data.raw.item["bob-lithium-ion-battery"] then
-  bobmods.lib.recipe.replace_ingredient("bob-battery-mk3-equipment", "battery", "bob-lithium-ion-battery")
+  bobmods.lib.recipe.replace_ingredient("battery-mk3-equipment", "battery", "bob-lithium-ion-battery")
   bobmods.lib.tech.add_prerequisite("bob-battery-equipment-3", "bob-battery-2")
 
   bobmods.lib.recipe.remove_ingredient("bob-personal-laser-defense-equipment-3", "battery")
diff --git a/bobequipment/prototypes/technology/equipment.lua b/bobequipment/prototypes/technology/equipment.lua
index 181162d91..6289d08e0 100644
--- a/bobequipment/prototypes/technology/equipment.lua
+++ b/bobequipment/prototypes/technology/equipment.lua
@@ -166,7 +166,7 @@ data:extend({
     effects = {
       {
         type = "unlock-recipe",
-        recipe = "bob-battery-mk3-equipment",
+        recipe = "battery-mk3-equipment",
       },
     },
   },
diff --git a/bobequipment/prototypes/technology/technology-updates.lua b/bobequipment/prototypes/technology/technology-updates.lua
index 8986d8d6d..cf1c69afb 100644
--- a/bobequipment/prototypes/technology/technology-updates.lua
+++ b/bobequipment/prototypes/technology/technology-updates.lua
@@ -109,3 +109,9 @@ end
 if data.raw.technology["bob-productivity-module-5"] then
   bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-6", "bob-productivity-module-5")
 end
+
+if mods["space-age"] then
+  bobmods.lib.tech.hide("battery-mk3-equipment")
+  data.raw.technology["battery-mk3-equipment"].effects = nil
+  bobmods.lib.tech.replace_prerequisite_in_all("battery-mk3-equipment", "bob-battery-equipment-3")
+end