diff --git a/bobassembly/prototypes/assembly-electronics.lua b/bobassembly/prototypes/assembly-electronics.lua
index 4d6c3e177..edc29064d 100644
--- a/bobassembly/prototypes/assembly-electronics.lua
+++ b/bobassembly/prototypes/assembly-electronics.lua
@@ -333,7 +333,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
       prerequisites = {
         "electronics-machine-1",
         "steel-processing",
-        "advanced-electronics",
+        "advanced-circuit",
         "chemical-science-pack",
       },
       unit = {
@@ -509,7 +509,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
       },
       prerequisites = {
         "electronics-machine-2",
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
         "utility-science-pack",
       },
diff --git a/bobassembly/prototypes/assembly-updates.lua b/bobassembly/prototypes/assembly-updates.lua
index d0d24ae69..bd58eeffc 100644
--- a/bobassembly/prototypes/assembly-updates.lua
+++ b/bobassembly/prototypes/assembly-updates.lua
@@ -4,7 +4,7 @@ bobmods.lib.tech.add_prerequisite("automation-2", "logistic-science-pack")
 
 data.raw.technology["automation-3"].prerequisites = {
   "automation-2",
-  "advanced-electronics",
+  "advanced-circuit",
   "chemical-science-pack",
 }
 bobmods.lib.tech.set_science_pack_count("automation-3", 60)
diff --git a/bobassembly/prototypes/assembly.lua b/bobassembly/prototypes/assembly.lua
index 1b847778e..b808f673e 100644
--- a/bobassembly/prototypes/assembly.lua
+++ b/bobassembly/prototypes/assembly.lua
@@ -137,7 +137,7 @@ data:extend({
     },
     prerequisites = {
       "automation-3",
-      "advanced-electronics-2",
+      "processing-unit",
       "production-science-pack",
     },
     unit = {
diff --git a/bobassembly/prototypes/centrifuge.lua b/bobassembly/prototypes/centrifuge.lua
index f98f93fc0..8d17f0410 100644
--- a/bobassembly/prototypes/centrifuge.lua
+++ b/bobassembly/prototypes/centrifuge.lua
@@ -99,7 +99,7 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then
       },
       prerequisites = {
         "production-science-pack",
-        "advanced-electronics-2",
+        "processing-unit",
         "uranium-processing",
       },
       unit = {
diff --git a/bobassembly/prototypes/chemical-mixing-furnace.lua b/bobassembly/prototypes/chemical-mixing-furnace.lua
index 49d571f5c..d1125d70f 100644
--- a/bobassembly/prototypes/chemical-mixing-furnace.lua
+++ b/bobassembly/prototypes/chemical-mixing-furnace.lua
@@ -273,7 +273,7 @@ then
       },
       order = "c-c-b-1",
       prerequisites = {
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
       },
       unit = {
diff --git a/bobassembly/prototypes/chemical-plant.lua b/bobassembly/prototypes/chemical-plant.lua
index 4f278abea..08b9f9c70 100644
--- a/bobassembly/prototypes/chemical-plant.lua
+++ b/bobassembly/prototypes/chemical-plant.lua
@@ -329,7 +329,7 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
       icon = "__bobassembly__/graphics/icons/technology/chemical-plant-2.png",
       icon_size = 128,
       prerequisites = {
-        "advanced-electronics",
+        "advanced-circuit",
         "chemical-science-pack",
       },
       effects = {
@@ -357,7 +357,7 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then
       icon_size = 128,
       prerequisites = {
         "chemical-plant-2",
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
       },
       effects = {
diff --git a/bobassembly/prototypes/electric-furnace.lua b/bobassembly/prototypes/electric-furnace.lua
index 623a85901..111f18bcc 100644
--- a/bobassembly/prototypes/electric-furnace.lua
+++ b/bobassembly/prototypes/electric-furnace.lua
@@ -255,7 +255,7 @@ if settings.startup["bobmods-assembly-furnaces"].value == true and data.raw.furn
       order = "c-c-c",
       prerequisites = {
         "advanced-material-processing-2",
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
       },
       unit = {
diff --git a/bobassembly/prototypes/electrolyser.lua b/bobassembly/prototypes/electrolyser.lua
index 9e1f60c1b..34693be2c 100644
--- a/bobassembly/prototypes/electrolyser.lua
+++ b/bobassembly/prototypes/electrolyser.lua
@@ -461,7 +461,7 @@ then
       icon_size = 128,
       prerequisites = {
         "electrolyser-3",
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
       },
       effects = {
diff --git a/bobassembly/prototypes/oil-refinery.lua b/bobassembly/prototypes/oil-refinery.lua
index 52430f803..42abd76a4 100644
--- a/bobassembly/prototypes/oil-refinery.lua
+++ b/bobassembly/prototypes/oil-refinery.lua
@@ -63,7 +63,7 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then
       icon_size = 256,
       prerequisites = {
         "oil-processing",
-        "advanced-electronics",
+        "advanced-circuit",
         "chemical-science-pack",
       },
       order = "d-a2",
@@ -136,7 +136,7 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then
       icon_size = 256,
       prerequisites = {
         "oil-processing-2",
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
       },
       order = "d-a3",
diff --git a/bobclasses/prototypes/bodies.lua b/bobclasses/prototypes/bodies.lua
index 082c3892f..a280267f4 100644
--- a/bobclasses/prototypes/bodies.lua
+++ b/bobclasses/prototypes/bodies.lua
@@ -380,7 +380,7 @@ data:extend({
     },
     prerequisites = {
       "robotics",
-      "advanced-electronics",
+      "advanced-circuit",
       "automation-2",
     },
     unit = {
@@ -540,7 +540,7 @@ data:extend({
     prerequisites = {
       "bodies",
       "production-science-pack",
-      "advanced-electronics-2",
+      "processing-unit",
     },
     unit = {
       count = 250,
diff --git a/bobelectronics/migrations/bobelectronics_0.15.0.lua b/bobelectronics/migrations/bobelectronics_0.15.0.lua
index 06253af6a..e4fdb96f1 100644
--- a/bobelectronics/migrations/bobelectronics_0.15.0.lua
+++ b/bobelectronics/migrations/bobelectronics_0.15.0.lua
@@ -45,14 +45,14 @@ for index, force in pairs(game.forces) do
     end
   end
 
-  if force.technologies["advanced-electronics"].researched then
+  if force.technologies["advanced-circuit"].researched then
     force.recipes["electronic-components"].enabled = true
     force.recipes["phenolic-board"].enabled = true
     force.recipes["circuit-board"].enabled = true
     force.recipes["advanced-circuit"].enabled = true
   end
 
-  if force.technologies["advanced-electronics-2"].researched then
+  if force.technologies["processing-unit"].researched then
     force.recipes["intergrated-electronics"].enabled = true
     force.recipes["fibreglass-board"].enabled = true
     force.recipes["superior-circuit-board"].enabled = true
diff --git a/bobelectronics/prototypes/technology-updates.lua b/bobelectronics/prototypes/technology-updates.lua
index abe97499e..be66b17cd 100644
--- a/bobelectronics/prototypes/technology-updates.lua
+++ b/bobelectronics/prototypes/technology-updates.lua
@@ -4,7 +4,7 @@ bobmods.lib.tech.remove_prerequisite("circuit-network", "electronics")
 bobmods.lib.tech.remove_prerequisite("solar-energy", "electronics")
 bobmods.lib.tech.remove_prerequisite("electric-energy-distribution-1", "electronics")
 
-bobmods.lib.tech.add_prerequisite("advanced-electronics", "plastics")
+bobmods.lib.tech.add_prerequisite("advanced-circuit", "plastics")
 
 bobmods.lib.tech.add_recipe_unlock("oil-processing", "bob-resin-oil")
 
@@ -15,10 +15,10 @@ bobmods.lib.tech.add_recipe_unlock("plastics", "synthetic-wood")
 
 if data.raw.technology["chemical-processing-2"] then
   bobmods.lib.tech.add_recipe_unlock("chemical-processing-2", "ferric-chloride-solution")
-  bobmods.lib.tech.add_prerequisite("advanced-electronics", "chemical-processing-2")
+  bobmods.lib.tech.add_prerequisite("advanced-circuit", "chemical-processing-2")
 else
   bobmods.lib.tech.add_recipe_unlock("oil-processing", "ferric-chloride-solution")
-  bobmods.lib.tech.add_prerequisite("advanced-electronics", "oil-processing")
+  bobmods.lib.tech.add_prerequisite("advanced-circuit", "oil-processing")
 end
 
 if data.raw.recipe["silicon-wafer"] then
@@ -53,20 +53,20 @@ if data.raw.technology["chemical-processing-1"] and data.raw.technology["alloy-p
   bobmods.lib.tech.add_prerequisite("electronics", "alloy-processing")
 end
 
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics", "electronic-components")
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics", "phenolic-board")
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics", "circuit-board")
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics", "advanced-circuit") --to re-add if it was removed in previous mod
+bobmods.lib.tech.add_recipe_unlock("advanced-circuit", "electronic-components")
+bobmods.lib.tech.add_recipe_unlock("advanced-circuit", "phenolic-board")
+bobmods.lib.tech.add_recipe_unlock("advanced-circuit", "circuit-board")
+bobmods.lib.tech.add_recipe_unlock("advanced-circuit", "advanced-circuit") --to re-add if it was removed in previous mod
 if data.raw.technology["silicon-processing"] then
-  bobmods.lib.tech.add_prerequisite("advanced-electronics", "silicon-processing")
+  bobmods.lib.tech.add_prerequisite("advanced-circuit", "silicon-processing")
 end
 
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics-2", "intergrated-electronics")
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics-2", "fibreglass-board")
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics-2", "superior-circuit-board")
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics-2", "processing-unit")
+bobmods.lib.tech.add_recipe_unlock("processing-unit", "intergrated-electronics")
+bobmods.lib.tech.add_recipe_unlock("processing-unit", "fibreglass-board")
+bobmods.lib.tech.add_recipe_unlock("processing-unit", "superior-circuit-board")
+bobmods.lib.tech.add_recipe_unlock("processing-unit", "processing-unit")
 if data.raw.technology["gold-processing"] then
-  bobmods.lib.tech.add_prerequisite("advanced-electronics-2", "gold-processing")
+  bobmods.lib.tech.add_prerequisite("processing-unit", "gold-processing")
 end
 
 if data.raw.recipe["gilded-copper-cable"] then
@@ -81,14 +81,14 @@ if data.raw.technology["ceramics"] then
 end
 
 data.raw.technology["electronics"].icon = "__bobelectronics__/graphics/icons/technology/electronics.png"
-data.raw.technology["advanced-electronics"].icon =
+data.raw.technology["advanced-circuit"].icon =
   "__bobelectronics__/graphics/icons/technology/advanced-electronics.png"
-data.raw.technology["advanced-electronics-2"].icon =
+data.raw.technology["processing-unit"].icon =
   "__bobelectronics__/graphics/icons/technology/advanced-electronics-2.png"
 
 data.raw.technology["electronics"].icon_size = 128
-data.raw.technology["advanced-electronics"].icon_size = 128
-data.raw.technology["advanced-electronics-2"].icon_size = 128
+data.raw.technology["advanced-circuit"].icon_size = 128
+data.raw.technology["processing-unit"].icon_size = 128
 
 bobmods.lib.tech.remove_recipe_unlock("oil-processing", "solid-fuel-from-petroleum-gas")
 bobmods.lib.tech.remove_recipe_unlock("advanced-oil-processing", "solid-fuel-from-light-oil")
diff --git a/bobelectronics/prototypes/technology.lua b/bobelectronics/prototypes/technology.lua
index 9dae2bb75..69c64ef15 100644
--- a/bobelectronics/prototypes/technology.lua
+++ b/bobelectronics/prototypes/technology.lua
@@ -5,7 +5,7 @@ data:extend({
     icon = "__bobelectronics__/graphics/icons/technology/advanced-electronics-3.png",
     icon_size = 128,
     prerequisites = {
-      "advanced-electronics-2",
+      "processing-unit",
       "production-science-pack",
     },
     effects = {
diff --git a/bobequipment/prototypes/personal-roboport.lua b/bobequipment/prototypes/personal-roboport.lua
index 64d023470..2d42b8bc4 100644
--- a/bobequipment/prototypes/personal-roboport.lua
+++ b/bobequipment/prototypes/personal-roboport.lua
@@ -182,7 +182,7 @@ data:extend({
     },
     prerequisites = {
       "personal-roboport-mk2-equipment",
-      "advanced-electronics-2",
+      "processing-unit",
       "utility-science-pack",
     },
     unit = {
diff --git a/bobequipment/prototypes/technology/equipment.lua b/bobequipment/prototypes/technology/equipment.lua
index 3c4ecff5f..243c90872 100644
--- a/bobequipment/prototypes/technology/equipment.lua
+++ b/bobequipment/prototypes/technology/equipment.lua
@@ -15,7 +15,7 @@ data:extend({
     }),
     order = "g-e-c",
     prerequisites = {
-      "advanced-electronics-2",
+      "processing-unit",
       "energy-shield-mk2-equipment",
       "productivity-module-2",
       "production-science-pack",
@@ -181,7 +181,7 @@ data:extend({
     }),
     order = "g-i-d",
     prerequisites = {
-      "advanced-electronics-2",
+      "processing-unit",
       "bob-battery-equipment-3",
       "production-science-pack",
     },
@@ -405,7 +405,7 @@ data:extend({
     }),
     order = "g-g-c",
     prerequisites = {
-      "advanced-electronics-2",
+      "processing-unit",
       "night-vision-equipment-2",
       "production-science-pack",
     },
@@ -468,7 +468,7 @@ data:extend({
     order = "g-k-c",
     prerequisites = {
       "solar-panel-equipment-2",
-      "advanced-electronics-2",
+      "processing-unit",
       "production-science-pack",
     },
     effects = {
@@ -570,7 +570,7 @@ data:extend({
     }),
     order = "g-m-c",
     prerequisites = {
-      "advanced-electronics-2",
+      "processing-unit",
       "personal-laser-defense-equipment-2",
       "production-science-pack",
     },
@@ -687,8 +687,8 @@ data:extend({
   },
 })
 
-bobmods.lib.tech.remove_prerequisite("exoskeleton-equipment", "advanced-electronics-2")
-bobmods.lib.tech.add_prerequisite("exoskeleton-equipment", "advanced-electronics")
+bobmods.lib.tech.remove_prerequisite("exoskeleton-equipment", "processing-unit")
+bobmods.lib.tech.add_prerequisite("exoskeleton-equipment", "advanced-circuit")
 
 data:extend({
   {
@@ -701,7 +701,7 @@ data:extend({
     order = "g-h-b",
     prerequisites = {
       "exoskeleton-equipment",
-      "advanced-electronics-2",
+      "processing-unit",
     },
     effects = {
       {
diff --git a/bobequipment/prototypes/technology/technology-updates.lua b/bobequipment/prototypes/technology/technology-updates.lua
index 38df3dfd5..a167fd2e3 100644
--- a/bobequipment/prototypes/technology/technology-updates.lua
+++ b/bobequipment/prototypes/technology/technology-updates.lua
@@ -2,7 +2,7 @@ if mods["boblogistics"] or mods["bobplates"] then
   -- Bob's Logistics mod and Bob's MCI mod remove blue science from Electric engine and Robotics
 
   bobmods.lib.tech.remove_science_pack("exoskeleton-equipment", "chemical-science-pack")
-  bobmods.lib.tech.remove_prerequisite("exoskeleton-equipment", "advanced-electronics-2")
+  bobmods.lib.tech.remove_prerequisite("exoskeleton-equipment", "processing-unit")
 end
 
 if mods["boblogistics"] then
diff --git a/boblogistics/prototypes/repair-pack.lua b/boblogistics/prototypes/repair-pack.lua
index 882d5f107..8cefb6245 100644
--- a/boblogistics/prototypes/repair-pack.lua
+++ b/boblogistics/prototypes/repair-pack.lua
@@ -127,7 +127,7 @@ data:extend({
     icon_size = 32,
     prerequisites = {
       "bob-repair-pack-2",
-      "advanced-electronics",
+      "advanced-circuit",
     },
     effects = {
       {
@@ -152,7 +152,7 @@ data:extend({
     icon_size = 32,
     prerequisites = {
       "bob-repair-pack-3",
-      "advanced-electronics-2",
+      "processing-unit",
     },
     effects = {
       {
diff --git a/boblogistics/prototypes/technology-inserter.lua b/boblogistics/prototypes/technology-inserter.lua
index c3ff538de..80e048e52 100644
--- a/boblogistics/prototypes/technology-inserter.lua
+++ b/boblogistics/prototypes/technology-inserter.lua
@@ -52,7 +52,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then
 
   bobmods.lib.tech.remove_prerequisite("fast-inserter", "electronics")
   bobmods.lib.tech.add_prerequisite("fast-inserter", "logistics-2")
-  bobmods.lib.tech.remove_prerequisite("stack-inserter", "advanced-electronics")
+  bobmods.lib.tech.remove_prerequisite("stack-inserter", "advanced-circuit")
 
   bobmods.lib.tech.add_recipe_unlock("stack-inserter-2", "stack-inserter")
   bobmods.lib.tech.add_recipe_unlock("stack-inserter-2", "stack-filter-inserter")
@@ -193,7 +193,7 @@ else
 
   bobmods.lib.tech.add_recipe_unlock("express-inserters", "express-inserter")
   bobmods.lib.tech.add_recipe_unlock("express-inserters", "express-filter-inserter")
-  bobmods.lib.tech.add_prerequisite("express-inserters", "advanced-electronics")
+  bobmods.lib.tech.add_prerequisite("express-inserters", "advanced-circuit")
 end
 
 data:extend({
diff --git a/boblogistics/prototypes/technology-updates.lua b/boblogistics/prototypes/technology-updates.lua
index 044be7159..0414bab82 100644
--- a/boblogistics/prototypes/technology-updates.lua
+++ b/boblogistics/prototypes/technology-updates.lua
@@ -214,18 +214,18 @@ end
 
 if data.raw.technology["bob-robotics-3"] then
   bobmods.lib.tech.add_prerequisite("bob-robots-2", "bob-robotics-3")
-  bobmods.lib.tech.add_prerequisite("bob-robotics-3", "advanced-electronics-2")
+  bobmods.lib.tech.add_prerequisite("bob-robotics-3", "processing-unit")
   if data.raw.technology["titanium-processing"] then
     bobmods.lib.tech.add_prerequisite("bob-robotics-3", "titanium-processing")
   end
 else
-  bobmods.lib.tech.add_prerequisite("bob-robots-2", "advanced-electronics-2")
+  bobmods.lib.tech.add_prerequisite("bob-robots-2", "processing-unit")
   if data.raw.technology["titanium-processing"] then
     bobmods.lib.tech.add_prerequisite("bob-robots-2", "titanium-processing")
   end
 end
 
-bobmods.lib.tech.add_prerequisite("bob-robo-modular-3", "advanced-electronics-2")
+bobmods.lib.tech.add_prerequisite("bob-robo-modular-3", "processing-unit")
 
 if data.raw.item["lithium-ion-battery"] and data.raw.technology["battery-2"] then
   if data.raw.technology["bob-robotics-3"] then
diff --git a/boblogistics/prototypes/technology.lua b/boblogistics/prototypes/technology.lua
index ceedba695..3ffa53195 100644
--- a/boblogistics/prototypes/technology.lua
+++ b/boblogistics/prototypes/technology.lua
@@ -122,7 +122,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then
         },
       },
       prerequisites = {
-        "advanced-electronics",
+        "advanced-circuit",
         "automated-rail-transportation",
       },
       unit = {
@@ -153,7 +153,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       },
       prerequisites = {
         "bob-railway-2",
-        "advanced-electronics-2",
+        "processing-unit",
       },
       unit = {
         count = 100,
@@ -215,7 +215,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then
       },
       prerequisites = {
         "bob-armoured-railway",
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
       },
       unit = {
@@ -732,7 +732,7 @@ data:extend({
     },
     prerequisites = {
       "logistic-system",
-      "advanced-electronics-2",
+      "processing-unit",
       "utility-science-pack",
     },
     unit = {
@@ -846,7 +846,7 @@ data:extend({
     },
     prerequisites = {
       "logistics-3",
-      "advanced-electronics-2",
+      "processing-unit",
       "production-science-pack",
     },
     unit = {
diff --git a/bobmining/prototypes/areadrills.lua b/bobmining/prototypes/areadrills.lua
index b13a1d1b8..6375fa7e4 100644
--- a/bobmining/prototypes/areadrills.lua
+++ b/bobmining/prototypes/areadrills.lua
@@ -188,7 +188,7 @@ if settings.startup["bobmods-mining-areadrills"].value == true then
       order = "d-a-b-2",
       prerequisites = {
         "bob-area-drills-1",
-        "advanced-electronics",
+        "advanced-circuit",
       },
       unit = {
         count = 75,
@@ -213,7 +213,7 @@ if settings.startup["bobmods-mining-areadrills"].value == true then
       order = "d-a-b-3",
       prerequisites = {
         "bob-area-drills-2",
-        "advanced-electronics-2",
+        "processing-unit",
       },
       unit = {
         count = 100,
diff --git a/bobmining/prototypes/drills.lua b/bobmining/prototypes/drills.lua
index f89d8bbc7..16c5383c7 100644
--- a/bobmining/prototypes/drills.lua
+++ b/bobmining/prototypes/drills.lua
@@ -188,7 +188,7 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then
       order = "d-a-a-2",
       prerequisites = {
         "bob-drills-1",
-        "advanced-electronics",
+        "advanced-circuit",
       },
       unit = {
         count = 75,
@@ -213,7 +213,7 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then
       order = "d-a-a-3",
       prerequisites = {
         "bob-drills-2",
-        "advanced-electronics-2",
+        "processing-unit",
       },
       unit = {
         count = 100,
diff --git a/bobmining/prototypes/pumpjacks.lua b/bobmining/prototypes/pumpjacks.lua
index 99d2f3c4b..ab2cbdfbc 100644
--- a/bobmining/prototypes/pumpjacks.lua
+++ b/bobmining/prototypes/pumpjacks.lua
@@ -712,7 +712,7 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then
       order = "d-a-c-2",
       prerequisites = {
         "bob-pumpjacks-1",
-        "advanced-electronics",
+        "advanced-circuit",
       },
       unit = {
         count = 75,
@@ -737,7 +737,7 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then
       order = "d-a-c-3",
       prerequisites = {
         "bob-pumpjacks-2",
-        "advanced-electronics-2",
+        "processing-unit",
       },
       unit = {
         count = 100,
diff --git a/bobmining/prototypes/water-miner.lua b/bobmining/prototypes/water-miner.lua
index 3de1e5726..0368091b6 100644
--- a/bobmining/prototypes/water-miner.lua
+++ b/bobmining/prototypes/water-miner.lua
@@ -535,7 +535,7 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re
       order = "d-a-d-3",
       prerequisites = {
         "water-miner-2",
-        "advanced-electronics",
+        "advanced-circuit",
       },
       unit = {
         count = 50,
@@ -560,7 +560,7 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re
       order = "d-a-d-4",
       prerequisites = {
         "water-miner-3",
-        "advanced-electronics-2",
+        "processing-unit",
       },
       unit = {
         count = 75,
diff --git a/bobmodules/data-updates.lua b/bobmodules/data-updates.lua
index f3a41b62d..e57d6422e 100644
--- a/bobmodules/data-updates.lua
+++ b/bobmodules/data-updates.lua
@@ -17,9 +17,9 @@ bobmods.lib.tech.remove_prerequisite("effect-transmission", "production-science-
 bobmods.lib.tech.add_prerequisite("effect-transmission", "modules")
 bobmods.lib.tech.add_prerequisite("effect-transmission", "chemical-science-pack")
 
-bobmods.lib.tech.remove_prerequisite("speed-module-2", "advanced-electronics-2")
-bobmods.lib.tech.remove_prerequisite("productivity-module-2", "advanced-electronics-2")
-bobmods.lib.tech.remove_prerequisite("efficiency-module-2", "advanced-electronics-2")
+bobmods.lib.tech.remove_prerequisite("speed-module-2", "processing-unit")
+bobmods.lib.tech.remove_prerequisite("productivity-module-2", "processing-unit")
+bobmods.lib.tech.remove_prerequisite("efficiency-module-2", "processing-unit")
 bobmods.lib.tech.remove_prerequisite("speed-module-3", "production-science-pack")
 bobmods.lib.tech.remove_prerequisite("productivity-module-3", "production-science-pack")
 bobmods.lib.tech.remove_prerequisite("efficiency-module-3", "production-science-pack")
diff --git a/bobmodules/prototypes/beacon.lua b/bobmodules/prototypes/beacon.lua
index 82c497255..1da4bf69e 100644
--- a/bobmodules/prototypes/beacon.lua
+++ b/bobmodules/prototypes/beacon.lua
@@ -96,7 +96,7 @@ data:extend({
     },
     prerequisites = {
       "effect-transmission",
-      "advanced-electronics-2",
+      "processing-unit",
       "production-science-pack",
     },
     unit = {
diff --git a/bobmodules/prototypes/recipe/beacon-updates.lua b/bobmodules/prototypes/recipe/beacon-updates.lua
index 2bcdec630..9a414fab9 100644
--- a/bobmodules/prototypes/recipe/beacon-updates.lua
+++ b/bobmodules/prototypes/recipe/beacon-updates.lua
@@ -1,4 +1,4 @@
-bobmods.lib.tech.remove_prerequisite("effect-transmission", "advanced-electronics-2")
+bobmods.lib.tech.remove_prerequisite("effect-transmission", "processing-unit")
 
 if data.raw.item["aluminium-plate"] then
   bobmods.lib.recipe.replace_ingredient("beacon-2", "steel-plate", "aluminium-plate")
diff --git a/bobmodules/prototypes/recipe/electronics-updates.lua b/bobmodules/prototypes/recipe/electronics-updates.lua
index 5c6f811b0..968df70d7 100644
--- a/bobmodules/prototypes/recipe/electronics-updates.lua
+++ b/bobmodules/prototypes/recipe/electronics-updates.lua
@@ -167,10 +167,10 @@ bobmods.lib.tech.add_recipe_unlock("efficiency-module", "efficiency-processor")
 bobmods.lib.tech.add_recipe_unlock("productivity-module", "productivity-processor")
 bobmods.lib.tech.add_recipe_unlock("pollution-clean-module-1", "pollution-clean-processor")
 bobmods.lib.tech.add_recipe_unlock("pollution-create-module-1", "pollution-create-processor")
-bobmods.lib.tech.add_recipe_unlock("advanced-electronics-2", "module-processor-board-2")
+bobmods.lib.tech.add_recipe_unlock("processing-unit", "module-processor-board-2")
 
 if data.raw.technology["advanced-electronics-3"] then
   bobmods.lib.tech.add_recipe_unlock("advanced-electronics-3", "module-processor-board-3")
 else
-  bobmods.lib.tech.add_recipe_unlock("advanced-electronics-2", "module-processor-board-3")
+  bobmods.lib.tech.add_recipe_unlock("processing-unit", "module-processor-board-3")
 end
diff --git a/bobmodules/prototypes/technology/module.lua b/bobmodules/prototypes/technology/module.lua
index 3d22dfcab..a009a176a 100644
--- a/bobmodules/prototypes/technology/module.lua
+++ b/bobmodules/prototypes/technology/module.lua
@@ -823,11 +823,11 @@ table.insert(
   { type = "unlock-recipe", recipe = "pollution-create-processor-3" }
 )
 
-table.insert(data.raw.technology["speed-module-3"].prerequisites, "advanced-electronics-2")
-table.insert(data.raw.technology["efficiency-module-3"].prerequisites, "advanced-electronics-2")
-table.insert(data.raw.technology["productivity-module-3"].prerequisites, "advanced-electronics-2")
-table.insert(data.raw.technology["pollution-clean-module-3"].prerequisites, "advanced-electronics-2")
-table.insert(data.raw.technology["pollution-create-module-3"].prerequisites, "advanced-electronics-2")
+table.insert(data.raw.technology["speed-module-3"].prerequisites, "processing-unit")
+table.insert(data.raw.technology["efficiency-module-3"].prerequisites, "processing-unit")
+table.insert(data.raw.technology["productivity-module-3"].prerequisites, "processing-unit")
+table.insert(data.raw.technology["pollution-clean-module-3"].prerequisites, "processing-unit")
+table.insert(data.raw.technology["pollution-create-module-3"].prerequisites, "processing-unit")
 
 if data.raw.technology["advanced-electronics-3"] then
   table.insert(data.raw.technology["speed-module-6"].prerequisites, "advanced-electronics-3")
diff --git a/bobplates/prototypes/technology.lua b/bobplates/prototypes/technology.lua
index 7ff52a6a1..3a9fe105f 100644
--- a/bobplates/prototypes/technology.lua
+++ b/bobplates/prototypes/technology.lua
@@ -411,7 +411,7 @@ data:extend({
       "air-compressor-1",
       "steel-processing",
       "alloy-processing",
-      "advanced-electronics",
+      "advanced-circuit",
     },
     effects = {
       {
@@ -439,7 +439,7 @@ data:extend({
       "air-compressor-2",
       "zinc-processing",
       "titanium-processing",
-      "advanced-electronics-2",
+      "processing-unit",
     },
     effects = {
       {
@@ -520,7 +520,7 @@ data:extend({
       "water-bore-1",
       "steel-processing",
       "alloy-processing",
-      "advanced-electronics",
+      "advanced-circuit",
     },
     effects = {
       {
@@ -548,7 +548,7 @@ data:extend({
       "water-bore-2",
       "zinc-processing",
       "titanium-processing",
-      "advanced-electronics-2",
+      "processing-unit",
     },
     effects = {
       {
@@ -907,7 +907,7 @@ data:extend({
     icon = "__bobplates__/graphics/icons/technology/advanced-electronics-3.png",
     icon_size = 128,
     prerequisites = {
-      "advanced-electronics-2",
+      "processing-unit",
       "production-science-pack",
     },
     effects = {
diff --git a/bobpower/prototypes/recipe/fluid-generator-updates.lua b/bobpower/prototypes/recipe/fluid-generator-updates.lua
index f714212a1..6bd4e6d7a 100644
--- a/bobpower/prototypes/recipe/fluid-generator-updates.lua
+++ b/bobpower/prototypes/recipe/fluid-generator-updates.lua
@@ -61,7 +61,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
 
   if data.raw.item["advanced-processing-unit"] then
     bobmods.lib.recipe.replace_ingredient("fluid-generator-2", "electronic-circuit", "advanced-circuit")
-    bobmods.lib.tech.add_prerequisite("fluid-generator-2", "advanced-electronics")
+    bobmods.lib.tech.add_prerequisite("fluid-generator-2", "advanced-circuit")
   end
 
   if data.raw.item["titanium-bearing"] then
@@ -95,7 +95,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
 
   if data.raw.item["advanced-processing-unit"] then
     bobmods.lib.recipe.replace_ingredient("fluid-generator-3", "advanced-circuit", "processing-unit")
-    bobmods.lib.tech.add_prerequisite("fluid-generator-3", "advanced-electronics-2")
+    bobmods.lib.tech.add_prerequisite("fluid-generator-3", "processing-unit")
   end
 
   if mods["bobrevamp"] and data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen then
@@ -134,7 +134,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
       bobmods.lib.recipe.replace_ingredient("hydrazine-generator", "processing-unit", "advanced-processing-unit")
       bobmods.lib.tech.add_prerequisite("hydrazine-generator", "advanced-electronics-3")
     else
-      bobmods.lib.tech.add_prerequisite("hydrazine-generator", "advanced-electronics-2")
+      bobmods.lib.tech.add_prerequisite("hydrazine-generator", "processing-unit")
     end
   end
 end
diff --git a/bobpower/prototypes/recipe/steam-turbines-updates.lua b/bobpower/prototypes/recipe/steam-turbines-updates.lua
index dcf9acc22..5b08e1a3f 100644
--- a/bobpower/prototypes/recipe/steam-turbines-updates.lua
+++ b/bobpower/prototypes/recipe/steam-turbines-updates.lua
@@ -34,7 +34,7 @@ if settings.startup["bobmods-power-steam"].value == true then
 
   if data.raw.item["advanced-processing-unit"] then
     bobmods.lib.recipe.replace_ingredient("steam-turbine", "electronic-circuit", "advanced-circuit")
-    bobmods.lib.tech.add_prerequisite("bob-steam-turbine-1", "advanced-electronics")
+    bobmods.lib.tech.add_prerequisite("bob-steam-turbine-1", "advanced-circuit")
   end
 
   if data.raw.item["titanium-bearing"] then
@@ -77,7 +77,7 @@ if settings.startup["bobmods-power-steam"].value == true then
 
   if data.raw.item["advanced-processing-unit"] then
     bobmods.lib.recipe.replace_ingredient("steam-turbine-2", "advanced-circuit", "processing-unit")
-    bobmods.lib.tech.add_prerequisite("bob-steam-turbine-2", "advanced-electronics-2")
+    bobmods.lib.tech.add_prerequisite("bob-steam-turbine-2", "processing-unit")
   end
 
   if data.raw.item["nitinol-bearing"] then
@@ -124,6 +124,6 @@ if settings.startup["bobmods-power-steam"].value == true then
     bobmods.lib.recipe.replace_ingredient("steam-turbine-3", "processing-unit", "advanced-processing-unit")
     bobmods.lib.tech.add_prerequisite("bob-steam-turbine-3", "advanced-electronics-3")
   else
-    bobmods.lib.tech.add_prerequisite("bob-steam-turbine-3", "advanced-electronics-2")
+    bobmods.lib.tech.add_prerequisite("bob-steam-turbine-3", "processing-unit")
   end
 end
diff --git a/bobpower/prototypes/technology/accumulators.lua b/bobpower/prototypes/technology/accumulators.lua
index c2c4382a3..5047873d7 100644
--- a/bobpower/prototypes/technology/accumulators.lua
+++ b/bobpower/prototypes/technology/accumulators.lua
@@ -23,7 +23,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       },
       prerequisites = {
         "electric-energy-accumulators",
-        "advanced-electronics",
+        "advanced-circuit",
         "chemical-science-pack",
       },
       unit = {
@@ -61,7 +61,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       },
       prerequisites = {
         "bob-electric-energy-accumulators-2",
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
       },
       unit = {
diff --git a/bobpower/prototypes/technology/fluid-generator.lua b/bobpower/prototypes/technology/fluid-generator.lua
index 68d63021a..9e02e2668 100644
--- a/bobpower/prototypes/technology/fluid-generator.lua
+++ b/bobpower/prototypes/technology/fluid-generator.lua
@@ -91,7 +91,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
         prerequisites = {
           "fluid-generator-3",
           "hydrazine",
-          "advanced-electronics-2",
+          "processing-unit",
           "utility-science-pack",
         },
         icon = "__bobpower__/graphics/icons/technology/fluid-generator.png",
diff --git a/bobpower/prototypes/technology/nuclear.lua b/bobpower/prototypes/technology/nuclear.lua
index 0852eadc3..092010180 100644
--- a/bobpower/prototypes/technology/nuclear.lua
+++ b/bobpower/prototypes/technology/nuclear.lua
@@ -16,7 +16,7 @@ if settings.startup["bobmods-power-nuclear"].value == true then
       },
       prerequisites = {
         "nuclear-power",
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
         "bob-heat-pipe-3",
       },
diff --git a/bobpower/prototypes/technology/poles.lua b/bobpower/prototypes/technology/poles.lua
index 8d111a11e..f361ed51a 100644
--- a/bobpower/prototypes/technology/poles.lua
+++ b/bobpower/prototypes/technology/poles.lua
@@ -105,7 +105,7 @@ if settings.startup["bobmods-power-poles"].value == true then
       },
       prerequisites = {
         "electric-energy-distribution-2",
-        "advanced-electronics",
+        "advanced-circuit",
       },
       unit = {
         count = 300,
@@ -132,7 +132,7 @@ if settings.startup["bobmods-power-poles"].value == true then
       },
       prerequisites = {
         "electric-substation-2",
-        "advanced-electronics-2",
+        "processing-unit",
       },
       unit = {
         count = 350,
diff --git a/bobpower/prototypes/technology/solar-panels.lua b/bobpower/prototypes/technology/solar-panels.lua
index c962277d0..01d951621 100644
--- a/bobpower/prototypes/technology/solar-panels.lua
+++ b/bobpower/prototypes/technology/solar-panels.lua
@@ -23,7 +23,7 @@ if settings.startup["bobmods-power-solar"].value == true then
       },
       prerequisites = {
         "solar-energy",
-        "advanced-electronics",
+        "advanced-circuit",
         "chemical-science-pack",
       },
       unit = {
@@ -61,7 +61,7 @@ if settings.startup["bobmods-power-solar"].value == true then
       },
       prerequisites = {
         "bob-solar-energy-2",
-        "advanced-electronics-2",
+        "processing-unit",
         "production-science-pack",
       },
       unit = {
diff --git a/bobrevamp/prototypes/rocket-parts-updates.lua b/bobrevamp/prototypes/rocket-parts-updates.lua
index cbcf1f4a8..24636ca1e 100644
--- a/bobrevamp/prototypes/rocket-parts-updates.lua
+++ b/bobrevamp/prototypes/rocket-parts-updates.lua
@@ -28,7 +28,7 @@ bobmods.lib.tech.remove_prerequisite("low-density-structure", "advanced-material
 
 bobmods.lib.tech.remove_prerequisite("rocket-silo", "productivity-module-3")
 if data.raw.technology["advanced-electronics-3"] then
-  bobmods.lib.tech.replace_prerequisite("rocket-silo", "advanced-electronics-2", "advanced-electronics-3")
+  bobmods.lib.tech.replace_prerequisite("rocket-silo", "processing-unit", "advanced-electronics-3")
   bobmods.lib.tech.remove_prerequisite("rocket-silo", "speed-module-3")
 end
 
diff --git a/bobtech/prototypes/technology/technology-updates.lua b/bobtech/prototypes/technology/technology-updates.lua
index bc094883b..0b84843c3 100644
--- a/bobtech/prototypes/technology/technology-updates.lua
+++ b/bobtech/prototypes/technology/technology-updates.lua
@@ -121,7 +121,7 @@ if bobmods.tech.advanced_logistic_science then
       "utility-science-pack",
       "advanced-logistic-science-pack"
     )
-    bobmods.lib.tech.add_prerequisite("personal-roboport-mk2-equipment", "advanced-electronics-2")
+    bobmods.lib.tech.add_prerequisite("personal-roboport-mk2-equipment", "processing-unit")
     bobmods.lib.tech.add_prerequisite("personal-roboport-mk2-equipment", "low-density-structure")
   end
   if mods["bobvehicleequipment"] then
@@ -197,14 +197,14 @@ if settings.startup["bobmods-burnerphase"].value == true then
   bobmods.lib.tech.add_recipe_unlock("lab", "lab")
   bobmods.lib.tech.add_prerequisite("logistics", "automation-science-pack")
   bobmods.lib.tech.add_prerequisite("automation", "automation-science-pack")
-  bobmods.lib.tech.add_prerequisite("optics", "automation-science-pack")
+  bobmods.lib.tech.add_prerequisite("lamp", "automation-science-pack")
   bobmods.lib.tech.add_prerequisite("gun-turret", "automation-science-pack")
   bobmods.lib.tech.add_prerequisite("stone-wall", "automation-science-pack")
   bobmods.lib.tech.add_prerequisite("military", "automation-science-pack")
   bobmods.lib.tech.add_prerequisite("steel-processing", "automation-science-pack")
 
   bobmods.lib.tech.add_prerequisite("automation", "electricity")
-  bobmods.lib.tech.add_prerequisite("optics", "electricity")
+  bobmods.lib.tech.add_prerequisite("lamp", "electricity")
   if data.raw.technology["radars-1"] then
     bobmods.lib.tech.add_prerequisite("radars-1", "electricity")
   end
diff --git a/bobtech/prototypes/technology/technology.lua b/bobtech/prototypes/technology/technology.lua
index 1312d986a..8d3de5449 100644
--- a/bobtech/prototypes/technology/technology.lua
+++ b/bobtech/prototypes/technology/technology.lua
@@ -6,7 +6,7 @@ data:extend({
     icon_size = 128,
     order = "c-k-m-a",
     prerequisites = {
-      "advanced-electronics",
+      "advanced-circuit",
       "logistics-3",
     },
     effects = {
diff --git a/bobvehicleequipment/prototypes/battery.lua b/bobvehicleequipment/prototypes/battery.lua
index fab31ee8d..587085d17 100644
--- a/bobvehicleequipment/prototypes/battery.lua
+++ b/bobvehicleequipment/prototypes/battery.lua
@@ -135,7 +135,7 @@ data:extend({
     order = "v-g-i-b",
     prerequisites = {
       "vehicle-battery-equipment-1",
-      "advanced-electronics-2",
+      "processing-unit",
     },
     unit = {
       count = 100,
diff --git a/bobvehicleequipment/prototypes/belt-immunity.lua b/bobvehicleequipment/prototypes/belt-immunity.lua
index 8705ccea1..a8dcc7781 100644
--- a/bobvehicleequipment/prototypes/belt-immunity.lua
+++ b/bobvehicleequipment/prototypes/belt-immunity.lua
@@ -63,7 +63,7 @@ data:extend({
     order = "g-g-g",
     prerequisites = {
       "vehicle-solar-panel-equipment-1",
-      "advanced-electronics",
+      "advanced-circuit",
     },
     effects = {
       {
diff --git a/bobvehicleequipment/prototypes/fusion-cell.lua b/bobvehicleequipment/prototypes/fusion-cell.lua
index 14bb247ee..dbc67fd0b 100644
--- a/bobvehicleequipment/prototypes/fusion-cell.lua
+++ b/bobvehicleequipment/prototypes/fusion-cell.lua
@@ -54,7 +54,7 @@ data:extend({
     order = "v-g-l-a",
     prerequisites = {
       "vehicle-solar-panel-equipment-1",
-      "advanced-electronics-2",
+      "processing-unit",
     },
     unit = {
       count = 100,
diff --git a/bobvehicleequipment/prototypes/generator.lua b/bobvehicleequipment/prototypes/generator.lua
index aa84b7064..17c8297f9 100644
--- a/bobvehicleequipment/prototypes/generator.lua
+++ b/bobvehicleequipment/prototypes/generator.lua
@@ -54,7 +54,7 @@ data:extend({
     order = "v-g-l-a",
     prerequisites = {
       "vehicle-solar-panel-equipment-1",
-      "advanced-electronics-2",
+      "processing-unit",
     },
     unit = {
       count = 200,
diff --git a/bobvehicleequipment/prototypes/laser-defense.lua b/bobvehicleequipment/prototypes/laser-defense.lua
index 27ac852b4..9082212ef 100644
--- a/bobvehicleequipment/prototypes/laser-defense.lua
+++ b/bobvehicleequipment/prototypes/laser-defense.lua
@@ -170,7 +170,7 @@ data:extend({
     order = "v-g-m-b",
     prerequisites = {
       "vehicle-laser-defense-equipment-1",
-      "advanced-electronics",
+      "advanced-circuit",
     },
     unit = {
       count = 150,
@@ -317,7 +317,7 @@ data:extend({
     order = "v-g-m-d",
     prerequisites = {
       "vehicle-laser-defense-equipment-3",
-      "advanced-electronics-2",
+      "processing-unit",
     },
     unit = {
       count = 300,
diff --git a/bobvehicleequipment/prototypes/roboport.lua b/bobvehicleequipment/prototypes/roboport.lua
index 446f3daac..be21f059b 100644
--- a/bobvehicleequipment/prototypes/roboport.lua
+++ b/bobvehicleequipment/prototypes/roboport.lua
@@ -355,7 +355,7 @@ data:extend({
     },
     prerequisites = {
       "vehicle-roboport-equipment-2",
-      "advanced-electronics-2",
+      "processing-unit",
       "utility-science-pack",
     },
     unit = {
diff --git a/bobvehicleequipment/prototypes/shield.lua b/bobvehicleequipment/prototypes/shield.lua
index e6dbdb990..dce25d093 100644
--- a/bobvehicleequipment/prototypes/shield.lua
+++ b/bobvehicleequipment/prototypes/shield.lua
@@ -59,7 +59,7 @@ data:extend({
     prerequisites = {
       "vehicle-solar-panel-equipment-1",
       "military-science-pack",
-      "advanced-electronics",
+      "advanced-circuit",
     },
     unit = {
       count = 150,
@@ -139,7 +139,7 @@ data:extend({
     order = "v-g-e-b",
     prerequisites = {
       "vehicle-energy-shield-equipment-1",
-      "advanced-electronics-2",
+      "processing-unit",
       "military-3",
     },
     unit = {
diff --git a/bobvehicleequipment/prototypes/solar-panel.lua b/bobvehicleequipment/prototypes/solar-panel.lua
index 0cec3036e..6bc226416 100644
--- a/bobvehicleequipment/prototypes/solar-panel.lua
+++ b/bobvehicleequipment/prototypes/solar-panel.lua
@@ -57,7 +57,7 @@ data:extend({
     prerequisites = {
       "logistics-2",
       "engine",
-      "optics",
+      "lamp",
       "electronics",
     },
     unit = {
@@ -136,7 +136,7 @@ data:extend({
     order = "v-g-k-b",
     prerequisites = {
       "vehicle-solar-panel-equipment-1",
-      "advanced-electronics",
+      "advanced-circuit",
     },
     unit = {
       count = 75,
@@ -214,7 +214,7 @@ data:extend({
     order = "v-g-k-c",
     prerequisites = {
       "vehicle-solar-panel-equipment-2",
-      "advanced-electronics-2",
+      "processing-unit",
     },
     unit = {
       count = 90,
diff --git a/bobvehicleequipment/prototypes/speed.lua b/bobvehicleequipment/prototypes/speed.lua
index bc99315cd..bf33dafeb 100644
--- a/bobvehicleequipment/prototypes/speed.lua
+++ b/bobvehicleequipment/prototypes/speed.lua
@@ -60,7 +60,7 @@ data:extend({
     prerequisites = {
       "vehicle-solar-panel-equipment-1",
       "electric-engine",
-      "advanced-electronics-2",
+      "processing-unit",
     },
     unit = {
       count = 50,
diff --git a/bobwarfare/prototypes/robots-updates.lua b/bobwarfare/prototypes/robots-updates.lua
index 63c812c97..307be6847 100644
--- a/bobwarfare/prototypes/robots-updates.lua
+++ b/bobwarfare/prototypes/robots-updates.lua
@@ -68,7 +68,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then
       bobmods.lib.recipe.add_ingredient("destroyer-robot", { type = "item", name = "steel-plate", amount = 1 })
     end
     bobmods.lib.recipe.add_ingredient("destroyer-robot", { type = "item", name = "processing-unit", amount = 1 })
-    bobmods.lib.tech.add_prerequisite("destroyer", "advanced-electronics-2")
+    bobmods.lib.tech.add_prerequisite("destroyer", "processing-unit")
     if data.raw.item["titanium-gear-wheel"] then
       bobmods.lib.recipe.add_ingredient("destroyer-robot", { type = "item", name = "titanium-gear-wheel", amount = 3 })
     else
diff --git a/bobwarfare/prototypes/technology/ammo.lua b/bobwarfare/prototypes/technology/ammo.lua
index 26e38fdf3..9b66e1c55 100644
--- a/bobwarfare/prototypes/technology/ammo.lua
+++ b/bobwarfare/prototypes/technology/ammo.lua
@@ -631,7 +631,7 @@ data:extend({
     prerequisites = {
       "oil-processing",
       "rocketry",
-      "advanced-electronics-2",
+      "processing-unit",
       "military-3",
     },
     effects = {
diff --git a/bobwarfare/prototypes/technology/gun.lua b/bobwarfare/prototypes/technology/gun.lua
index 6d0fffbf1..89284d5e7 100644
--- a/bobwarfare/prototypes/technology/gun.lua
+++ b/bobwarfare/prototypes/technology/gun.lua
@@ -5,7 +5,7 @@ data:extend({
     icon = "__bobwarfare__/graphics/icons/technology/laser-rifle.png",
     icon_size = 64,
     prerequisites = {
-      "advanced-electronics",
+      "advanced-circuit",
       "military-science-pack",
       "laser",
       "battery",
diff --git a/bobwarfare/prototypes/technology/radar.lua b/bobwarfare/prototypes/technology/radar.lua
index ec5fade86..578935cd3 100644
--- a/bobwarfare/prototypes/technology/radar.lua
+++ b/bobwarfare/prototypes/technology/radar.lua
@@ -62,7 +62,7 @@ data:extend({
     prerequisites = {
       "radars-2",
       "military-3",
-      "advanced-electronics",
+      "advanced-circuit",
     },
     effects = {
       {
@@ -90,7 +90,7 @@ data:extend({
     prerequisites = {
       "radars-3",
       "production-science-pack",
-      "advanced-electronics-2",
+      "processing-unit",
     },
     effects = {
       {
diff --git a/bobwarfare/prototypes/technology/tank.lua b/bobwarfare/prototypes/technology/tank.lua
index 8200500b6..7e0678ac3 100644
--- a/bobwarfare/prototypes/technology/tank.lua
+++ b/bobwarfare/prototypes/technology/tank.lua
@@ -7,7 +7,7 @@ data:extend({
     prerequisites = {
       "tank",
       "artillery",
-      "advanced-electronics-2",
+      "processing-unit",
       "production-science-pack",
     },
     effects = {
diff --git a/bobwarfare/prototypes/technology/technology-updates.lua b/bobwarfare/prototypes/technology/technology-updates.lua
index c619e625c..afaeda91e 100644
--- a/bobwarfare/prototypes/technology/technology-updates.lua
+++ b/bobwarfare/prototypes/technology/technology-updates.lua
@@ -2,7 +2,7 @@ bobmods.lib.tech.remove_science_pack("follower-robot-count-7", "production-scien
 
 bobmods.lib.tech.remove_science_pack("artillery", "utility-science-pack")
 bobmods.lib.tech.remove_prerequisite("artillery", "military-4")
-bobmods.lib.tech.add_prerequisite("artillery", "advanced-electronics-2")
+bobmods.lib.tech.add_prerequisite("artillery", "processing-unit")
 bobmods.lib.tech.add_prerequisite("artillery", "concrete")
 bobmods.lib.tech.add_prerequisite("bob-artillery-turret-2", "military-4")
 bobmods.lib.tech.add_prerequisite("bob-artillery-wagon-2", "military-4")
@@ -462,31 +462,31 @@ table.insert(
 )
 
 table.insert(
-  data.raw.technology["energy-weapons-damage-1"].effects,
+  data.raw.technology["laser-weapons-damage-1"].effects,
   { type = "ammo-damage", ammo_category = "laser-rifle", modifier = 0.2 }
 )
 table.insert(
-  data.raw.technology["energy-weapons-damage-2"].effects,
+  data.raw.technology["laser-weapons-damage-2"].effects,
   { type = "ammo-damage", ammo_category = "laser-rifle", modifier = 0.2 }
 )
 table.insert(
-  data.raw.technology["energy-weapons-damage-3"].effects,
+  data.raw.technology["laser-weapons-damage-3"].effects,
   { type = "ammo-damage", ammo_category = "laser-rifle", modifier = 0.3 }
 )
 table.insert(
-  data.raw.technology["energy-weapons-damage-4"].effects,
+  data.raw.technology["laser-weapons-damage-4"].effects,
   { type = "ammo-damage", ammo_category = "laser-rifle", modifier = 0.4 }
 )
 table.insert(
-  data.raw.technology["energy-weapons-damage-5"].effects,
+  data.raw.technology["laser-weapons-damage-5"].effects,
   { type = "ammo-damage", ammo_category = "laser-rifle", modifier = 0.5 }
 )
 table.insert(
-  data.raw.technology["energy-weapons-damage-6"].effects,
+  data.raw.technology["laser-weapons-damage-6"].effects,
   { type = "ammo-damage", ammo_category = "laser-rifle", modifier = 0.7 }
 )
 table.insert(
-  data.raw.technology["energy-weapons-damage-7"].effects,
+  data.raw.technology["laser-weapons-damage-7"].effects,
   { type = "ammo-damage", ammo_category = "laser-rifle", modifier = 0.7 }
 )
 
@@ -512,9 +512,9 @@ table.insert(
 )
 
 --0.17.60
-bobmods.lib.tech.remove_science_pack("energy-weapons-damage-1", "chemical-science-pack")
-bobmods.lib.tech.remove_science_pack("energy-weapons-damage-2", "chemical-science-pack")
-bobmods.lib.tech.remove_science_pack("energy-weapons-damage-3", "chemical-science-pack")
+bobmods.lib.tech.remove_science_pack("laser-weapons-damage-1", "chemical-science-pack")
+bobmods.lib.tech.remove_science_pack("laser-weapons-damage-2", "chemical-science-pack")
+bobmods.lib.tech.remove_science_pack("laser-weapons-damage-3", "chemical-science-pack")
 bobmods.lib.tech.remove_science_pack("laser-shooting-speed-1", "chemical-science-pack")
 bobmods.lib.tech.remove_science_pack("laser-shooting-speed-2", "chemical-science-pack")
 bobmods.lib.tech.remove_science_pack("laser", "chemical-science-pack")
@@ -573,14 +573,14 @@ end
 
 -- Armor
 
-bobmods.lib.tech.remove_prerequisite("modular-armor", "advanced-electronics")
+bobmods.lib.tech.remove_prerequisite("modular-armor", "advanced-circuit")
 bobmods.lib.tech.add_prerequisite("modular-armor", "logistic-science-pack")
 
 bobmods.lib.tech.remove_science_pack("power-armor", "chemical-science-pack")
 bobmods.lib.tech.add_science_pack("power-armor", "military-science-pack", 1)
-bobmods.lib.tech.remove_prerequisite("power-armor", "advanced-electronics-2")
+bobmods.lib.tech.remove_prerequisite("power-armor", "processing-unit")
 bobmods.lib.tech.add_prerequisite("power-armor", "military-science-pack")
-bobmods.lib.tech.add_prerequisite("power-armor", "advanced-electronics")
+bobmods.lib.tech.add_prerequisite("power-armor", "advanced-circuit")
 -- By default, electric engines are Blue Science
 if (not mods["bobplates"]) and not mods["boblogistics"] then
   bobmods.lib.tech.remove_prerequisite("power-armor", "electric-engine")
@@ -593,4 +593,4 @@ bobmods.lib.tech.add_prerequisite("power-armor-mk2", "military-3")
 bobmods.lib.tech.add_prerequisite("power-armor-mk2", "low-density-structure")
 
 bobmods.lib.tech.replace_prerequisite("battery-mk2-equipment", "power-armor", "chemical-science-pack")
-bobmods.lib.tech.replace_prerequisite("discharge-defense-equipment", "power-armor", "advanced-electronics-2")
+bobmods.lib.tech.replace_prerequisite("discharge-defense-equipment", "power-armor", "processing-unit")
diff --git a/bobwarfare/prototypes/technology/turrets.lua b/bobwarfare/prototypes/technology/turrets.lua
index 254449d57..7e622b46f 100644
--- a/bobwarfare/prototypes/technology/turrets.lua
+++ b/bobwarfare/prototypes/technology/turrets.lua
@@ -117,7 +117,7 @@ data:extend({
     order = "a-j-b-2",
     prerequisites = {
       "laser-turret",
-      "advanced-electronics",
+      "advanced-circuit",
     },
     effects = {
       {
@@ -172,7 +172,7 @@ data:extend({
     order = "a-j-b-4",
     prerequisites = {
       "bob-laser-turrets-3",
-      "advanced-electronics-2",
+      "processing-unit",
       "production-science-pack",
     },
     unit = {
@@ -344,7 +344,7 @@ data:extend({
     order = "a-j-c-2",
     prerequisites = {
       "bob-plasma-turrets-1",
-      "advanced-electronics",
+      "advanced-circuit",
     },
     effects = {
       {
@@ -399,7 +399,7 @@ data:extend({
     order = "a-j-c-4",
     prerequisites = {
       "bob-plasma-turrets-3",
-      "advanced-electronics-2",
+      "processing-unit",
       "production-science-pack",
     },
     unit = {