diff --git a/SeaBlock/changelog.txt b/SeaBlock/changelog.txt
index 29a7db1b..729638b0 100644
--- a/SeaBlock/changelog.txt
+++ b/SeaBlock/changelog.txt
@@ -1,4 +1,11 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.6.0
+Date: ??.??.??
+  Changes:
+    - Factorio 2.0 update
+    - Added "angels-" prefix to all AngelsMods related prototypes
+    - Added "bob-" prefix to all BobsMods related prototypes
+---------------------------------------------------------------------------------------------------
 Version: 0.5.17
 Date: ??.??.??
   Changes:
diff --git a/SeaBlock/control.lua b/SeaBlock/control.lua
index 53a43e5a..49bae988 100644
--- a/SeaBlock/control.lua
+++ b/SeaBlock/control.lua
@@ -12,8 +12,8 @@ end
 function seablock.create_rock_chest(surface, pos)
   local has_items = false
 
-  if global.starting_items and (not game.is_multiplayer()) then
-    for item, quantity in pairs(global.starting_items) do
+  if storage.starting_items and (not game.is_multiplayer()) then
+    for item, quantity in pairs(storage.starting_items) do
       if quantity > 0 then
         has_items = true
         break
@@ -22,8 +22,13 @@ function seablock.create_rock_chest(surface, pos)
   end
 
   if has_items then
-    local chest = surface.create_entity({ name = "rock-chest", position = pos, force = game.forces.neutral })
-    for item, quantity in pairs(global.starting_items) do
+    local chest = surface.create_entity({
+      name = "sb-rock-chest",
+      position = pos,
+      force = game.forces.neutral,
+      move_stuck_players = true,
+    })
+    for item, quantity in pairs(storage.starting_items) do
       if quantity > 0 then
         chest.insert({ name = item, count = quantity })
       end
@@ -32,9 +37,9 @@ function seablock.create_rock_chest(surface, pos)
 end
 
 function seablock.have_item(player, itemname, crafted)
-  local unlock = global.unlocks[itemname]
+  local unlock = storage.unlocks[itemname]
   -- Special case for basic-circuit because it is part of starting equipment
-  if unlock and (itemname ~= "basic-circuit-board" or crafted) then
+  if unlock and (itemname ~= "bob-basic-circuit-board" or crafted) then
     for _, v in ipairs(unlock) do
       if player.force.technologies[v] then
         player.force.technologies[v].researched = true
@@ -51,20 +56,20 @@ end
 
 local function init()
   set_pvp()
-  global.starting_items = seablock.populate_starting_items(game.item_prototypes)
+  storage.starting_items = seablock.populate_starting_items(prototypes.item)
   if remote.interfaces.freeplay then
     if remote.interfaces.freeplay.set_disable_crashsite then
       remote.call("freeplay", "set_disable_crashsite", true)
     end
   end
-  global.unlocks = {
-    ["angels-ore3-crushed"] = { "sb-startup1", "bio-wood-processing" },
-    ["basic-circuit-board"] = { "sb-startup3", "sct-lab-t1" },
+  storage.unlocks = {
+    ["angels-ore3-crushed"] = { "sb-startup1", "angels-bio-wood-processing" },
+    ["bob-basic-circuit-board"] = { "sb-startup3", "sct-lab-t1" },
   }
-  if game.technology_prototypes["sct-automation-science-pack"] then
-    global.unlocks["lab"] = { "sct-automation-science-pack" }
+  if prototypes.technology["sct-automation-science-pack"] then
+    storage.unlocks["lab"] = { "sct-automation-science-pack" }
   else
-    global.unlocks["lab"] = { "sb-startup4" }
+    storage.unlocks["lab"] = { "sb-startup4" }
   end
 
   if remote.interfaces["freeplay"] then
@@ -130,7 +135,7 @@ script.on_event(defines.events.on_player_main_inventory_changed, function(e)
   if not inv then -- Compatibility with BlueprintLab_Bud17
     return
   end
-  for k, v in pairs(global.unlocks) do
+  for k, v in pairs(storage.unlocks) do
     for _, v2 in ipairs(v) do
       if
         player.force.technologies[v2]
@@ -153,13 +158,13 @@ script.on_configuration_changed(function(cfg)
     force.reset_recipes()
     for tech_name, tech in pairs(force.technologies) do
       if tech.researched then
-        for tech_name, effect in pairs(tech.effects) do
+        for tech_name, effect in pairs(tech.prototype.effects) do
           if effect.type == "unlock-recipe" then
             force.recipes[effect.recipe].enabled = true
           end
         end
       end
-      if game.technology_prototypes[tech_name].enabled then
+      if prototypes.technology[tech_name].enabled then
         force.technologies[tech_name].enabled = true
       end
     end
@@ -222,9 +227,9 @@ script.on_load(function()
 end)
 
 script.on_event(defines.events.on_player_created, function(e)
-  if global.starting_items and game.is_multiplayer() then
-    local inv = game.players[e.player_index].get_main_inventory()
-    for item, quantity in pairs(global.starting_items) do
+  if storage.starting_items and game.is_multiplayer() then
+    local inv = game.get_player(e.player_index).get_main_inventory()
+    for item, quantity in pairs(storage.starting_items) do
       if quantity > 0 then
         inv.insert({ name = item, count = quantity })
       end
diff --git a/SeaBlock/data-final-fixes.lua b/SeaBlock/data-final-fixes.lua
index d82a2944..c7952791 100644
--- a/SeaBlock/data-final-fixes.lua
+++ b/SeaBlock/data-final-fixes.lua
@@ -1,6 +1,6 @@
 -- Adjust rubber production amount to how it was in petrochem 0.7.9.
 -- TODO: Revisit this after Angel adds more liquid rubber recipes
-seablock.lib.substresult("liquid-rubber-1", "liquid-rubber", nil, 20)
+seablock.lib.substresult("angels-liquid-rubber", "angels-liquid-rubber", nil, 20)
 
 -- Reduce burner heat source neighbour bonus
 local reactors = {
@@ -31,12 +31,10 @@ require("data-final-fixes/mapgen")
 require("data-final-fixes/SpaceMod")
 
 data.raw.recipe["copper-cable"].allow_decomposition = true
-data.raw.recipe["paper-bleaching-1"].allow_decomposition = true
+data.raw.recipe["angels-solid-paper"].allow_decomposition = true
 
 for _, v in pairs(data.raw.character) do
   if v.crafting_categories then
-    table.insert(v.crafting_categories, "crafting-handonly")
+    table.insert(v.crafting_categories, "sb-crafting-handonly")
   end
 end
-
-bobmods.lib.tech.prerequisite_cleanup()
diff --git a/SeaBlock/data-final-fixes/SpaceMod.lua b/SeaBlock/data-final-fixes/SpaceMod.lua
index 14871647..7ffa90e4 100644
--- a/SeaBlock/data-final-fixes/SpaceMod.lua
+++ b/SeaBlock/data-final-fixes/SpaceMod.lua
@@ -133,7 +133,7 @@ if data.raw.technology["ftl-theory-D"] then
   end
 
   if mods["bobtech"] then
-    bobmods.lib.tech.add_science_pack("ftl-theory-D2", "advanced-logistic-science-pack", 1)
+    bobmods.lib.tech.add_science_pack("ftl-theory-D2", "bob-advanced-logistic-science-pack", 1)
     bobmods.lib.tech.remove_prerequisite("ftl-theory-D1", "ftl-theory-D")
     bobmods.lib.tech.add_prerequisite("ftl-theory-D1", "ftl-theory-C")
     bobmods.lib.tech.add_prerequisite("ftl-theory-D2", "ftl-theory-D")
diff --git a/SeaBlock/data-final-fixes/icons.lua b/SeaBlock/data-final-fixes/icons.lua
index 2bc55e44..8d3161ea 100644
--- a/SeaBlock/data-final-fixes/icons.lua
+++ b/SeaBlock/data-final-fixes/icons.lua
@@ -1,12 +1,12 @@
 -- Revert Artisanal Reskins recipe icons
 if mods["reskins-angels"] then
   local slag_processing_list = {
-    "slag-processing-1",
-    "slag-processing-2",
-    "slag-processing-3",
-    "slag-processing-4",
-    "slag-processing-5",
-    "slag-processing-6",
+    "angels-slag-processing-1",
+    "angels-slag-processing-2",
+    "angels-slag-processing-3",
+    "angels-slag-processing-4",
+    "angels-slag-processing-5",
+    "angels-slag-processing-6",
   }
   for _, name in pairs(slag_processing_list) do
     seablock.reskins.clear_icon_specification(name, "recipe")
@@ -15,5 +15,5 @@ end
 
 -- Remove I overlay from recipes
 seablock.reskins.clear_icon_specification("explosives", "recipe")
-seablock.reskins.clear_icon_specification("liquid-rubber-1", "recipe")
-seablock.reskins.clear_icon_specification("solid-rubber", "recipe")
+seablock.reskins.clear_icon_specification("angels-liquid-rubber", "recipe")
+seablock.reskins.clear_icon_specification("angels-solid-rubber", "recipe")
diff --git a/SeaBlock/data-final-fixes/logistics.lua b/SeaBlock/data-final-fixes/logistics.lua
index c8b5b5ed..939c055d 100644
--- a/SeaBlock/data-final-fixes/logistics.lua
+++ b/SeaBlock/data-final-fixes/logistics.lua
@@ -7,9 +7,9 @@ local function set_speed(type, name, speed)
   end
 end
 
-set_speed("transport-belt", "basic-transport-belt", 7.5)
-set_speed("underground-belt", "basic-underground-belt", 7.5)
-set_speed("splitter", "basic-splitter", 7.5)
+set_speed("transport-belt", "bob-basic-transport-belt", 7.5)
+set_speed("underground-belt", "bob-basic-underground-belt", 7.5)
+set_speed("splitter", "bob-basic-splitter", 7.5)
 
 set_speed("transport-belt", "transport-belt", 15)
 set_speed("underground-belt", "underground-belt", 15)
@@ -23,31 +23,35 @@ set_speed("transport-belt", "express-transport-belt", 45)
 set_speed("underground-belt", "express-underground-belt", 45)
 set_speed("splitter", "express-splitter", 45)
 
-set_speed("transport-belt", "turbo-transport-belt", 60)
-set_speed("underground-belt", "turbo-underground-belt", 60)
-set_speed("splitter", "turbo-splitter", 60)
+set_speed("transport-belt", "bob-turbo-transport-belt", 60)
+set_speed("underground-belt", "bob-turbo-underground-belt", 60)
+set_speed("splitter", "bob-turbo-splitter", 60)
 
-set_speed("transport-belt", "ultimate-transport-belt", 75)
-set_speed("underground-belt", "ultimate-underground-belt", 75)
-set_speed("splitter", "ultimate-splitter", 75)
+set_speed("transport-belt", "bob-ultimate-transport-belt", 75)
+set_speed("underground-belt", "bob-ultimate-underground-belt", 75)
+set_speed("splitter", "bob-ultimate-splitter", 75)
 
 -- Increase energy consumption of bob's extra beacons
 -- Also reduce module slots and effectivity
-if data.raw.beacon["beacon-2"] then
-  data.raw.beacon["beacon-2"].energy_usage = "960kW"
-  data.raw.beacon["beacon-2"].module_specification.module_slots = 2
-  data.raw.beacon["beacon-2"].distribution_effectivity = 0.5
+if data.raw.beacon["bob-beacon-2"] then
+  data.raw.beacon["bob-beacon-2"].energy_usage = "960kW"
+  data.raw.beacon["bob-beacon-2"].module_slots = 2
+  data.raw.beacon["bob-beacon-2"].distribution_effectivity = 1
+
+  --TODO this got changed with bobs 2.0 - this replicates 1.1 behavior
+  data.raw.beacon["bob-beacon-2"].supply_area_distance = 6
 end
-if data.raw.beacon["beacon-3"] then
-  data.raw.beacon["beacon-3"].energy_usage = "1920kW"
-  data.raw.beacon["beacon-3"].module_specification.module_slots = 2
-  data.raw.beacon["beacon-3"].distribution_effectivity = 0.5
+if data.raw.beacon["bob-beacon-3"] then
+  data.raw.beacon["bob-beacon-3"].energy_usage = "1920kW"
+  data.raw.beacon["bob-beacon-3"].module_slots = 2
+  data.raw.beacon["bob-beacon-3"].distribution_effectivity = 1
+  data.raw.beacon["bob-beacon-3"].supply_area_distance = 9
 end
 
 -- Undo boblogistcs changes to logistic system research
 bobmods.lib.tech.add_new_science_pack("logistic-system", "production-science-pack", 1)
-if data.raw.tool["advanced-logistic-science-pack"] then
-  bobmods.lib.tech.add_new_science_pack("logistic-system", "advanced-logistic-science-pack", 1)
+if data.raw.tool["bob-advanced-logistic-science-pack"] then
+  bobmods.lib.tech.add_new_science_pack("logistic-system", "bob-advanced-logistic-science-pack", 1)
 else
   bobmods.lib.tech.add_new_science_pack("logistic-system", "utility-science-pack", 1)
 end
@@ -58,7 +62,7 @@ local logisticstechs = {
   "logistic-system-2",
   "logistic-system-3",
   "angels-logistic-warehouses",
-  "logistic-silos",
+  "angels-logistic-silos",
 }
 
 for _, v in pairs(logisticstechs) do
@@ -66,32 +70,28 @@ for _, v in pairs(logisticstechs) do
     bobmods.lib.tech.add_new_science_pack(v, "production-science-pack", 1)
     bobmods.lib.tech.add_new_science_pack(v, "utility-science-pack", 1)
 
-    if data.raw.tool["advanced-logistic-science-pack"] then
-      bobmods.lib.tech.add_new_science_pack(v, "advanced-logistic-science-pack", 1)
+    if data.raw.tool["bob-advanced-logistic-science-pack"] then
+      bobmods.lib.tech.add_new_science_pack(v, "bob-advanced-logistic-science-pack", 1)
     end
   end
 end
 
 if mods["angelsaddons-storage"] then
-  bobmods.lib.tech.replace_prerequisite("logistic-silos", "logistic-system", "logistic-system-3")
-  bobmods.lib.tech.replace_prerequisite("angels-logistic-warehouses", "logistic-system", "logistic-silos")
+  bobmods.lib.tech.replace_prerequisite("angels-logistic-silos", "logistic-system", "logistic-system-3")
+  bobmods.lib.tech.replace_prerequisite("angels-logistic-warehouses", "logistic-system", "angels-logistic-silos")
 end
 bobmods.lib.tech.add_prerequisite("logistic-system-2", "utility-science-pack")
 
 -- No logistics chest at green science level.
 local function revertchests(tech)
   local neweffects = {
-    { type = "unlock-recipe", recipe = "logistic-chest-passive-provider" },
-    { type = "unlock-recipe", recipe = "logistic-chest-storage" },
+    { type = "unlock-recipe", recipe = "passive-provider-chest" },
+    { type = "unlock-recipe", recipe = "storage-chest" },
   }
   for k, v in pairs(tech.effects) do
     if
       v.type ~= "unlock-recipe"
-      or (
-        v.recipe ~= "logistic-chest-passive-provider"
-        and v.recipe ~= "logistic-chest-storage"
-        and v.recipe ~= "logistic-chest-requester"
-      )
+      or (v.recipe ~= "passive-provider-chest" and v.recipe ~= "storage-chest" and v.recipe ~= "requester-chest")
     then
       table.insert(neweffects, v)
     end
@@ -102,15 +102,12 @@ revertchests(data.raw.technology["logistic-robotics"])
 revertchests(data.raw.technology["construction-robotics"])
 local found = false
 for k, v in pairs(data.raw.technology["logistic-system"].effects) do
-  if v.type == "unlock-recipe" and v.recipe == "logistic-chest-requester" then
+  if v.type == "unlock-recipe" and v.recipe == "requester-chest" then
     found = true
   end
 end
 if not found then
-  table.insert(
-    data.raw.technology["logistic-system"].effects,
-    { type = "unlock-recipe", recipe = "logistic-chest-requester" }
-  )
+  table.insert(data.raw.technology["logistic-system"].effects, { type = "unlock-recipe", recipe = "requester-chest" })
 end
 
 if mods["angelsindustries"] then
diff --git a/SeaBlock/data-final-fixes/recipe.lua b/SeaBlock/data-final-fixes/recipe.lua
index a0834987..c4d8950f 100644
--- a/SeaBlock/data-final-fixes/recipe.lua
+++ b/SeaBlock/data-final-fixes/recipe.lua
@@ -1,8 +1,8 @@
 -- Revert massive buff of insulated wire recipe
-bobmods.lib.recipe.set_energy_required("insulated-cable", 2)
-seablock.lib.substingredient("insulated-cable", "tinned-copper-cable", nil, 8)
-seablock.lib.substingredient("insulated-cable", "rubber", nil, 8)
-bobmods.lib.recipe.set_result("insulated-cable", { "insulated-cable", 8 })
+bobmods.lib.recipe.set_energy_required("bob-insulated-cable", 2)
+seablock.lib.substingredient("bob-insulated-cable", "bob-tinned-copper-cable", nil, 8)
+seablock.lib.substingredient("bob-insulated-cable", "bob-rubber", nil, 8)
+bobmods.lib.recipe.set_result("bob-insulated-cable", { type = "item", name = "bob-insulated-cable", amount = 8 })
 
 -- Combine Stone and Crushed Stone
 local function replace_stone(recipe)
@@ -10,34 +10,21 @@ local function replace_stone(recipe)
     for _, ingredient in pairs(recipe.ingredients) do
       if ingredient.name == "stone" then
         ingredient.amount = ingredient.amount * 2
-      elseif ingredient.name == "stone-crushed" then
+      elseif ingredient.name == "angels-stone-crushed" then
         ingredient.name = "stone"
-      elseif ingredient[1] == "stone" then
-        ingredient[2] = ingredient[2] * 2
-      elseif ingredient[1] == "stone-crushed" then
-        ingredient[1] = "stone"
       end
     end
   end
-  if recipe.results then
+  if recipe.results then --needed for recipes parameter- which have no results
     for _, result in pairs(recipe.results) do
       if result.name == "stone" then
         result.amount = result.amount * 2
-      elseif result.name == "stone-crushed" then
+      elseif result.name == "angels-stone-crushed" then
         result.name = "stone"
-      elseif result[1] == "stone" then
-        result[2] = result[2] * 2
-      elseif result[1] == "stone-crushed" then
-        result[1] = "stone"
       end
     end
   end
-  if recipe.result == "stone" then
-    recipe.result_count = recipe.result_count or 1 * 2
-  elseif recipe.result == "stone-crushed" then
-    recipe.result = "stone"
-  end
-  if recipe.main_product == "stone-crushed" then
+  if recipe.main_product == "angels-stone-crushed" then
     recipe.main_product = "stone"
   end
 end
@@ -52,11 +39,11 @@ for _, recipe in pairs(data.raw.recipe) do
     replace_stone(recipe)
   end
 end
-bobmods.lib.recipe.hide("stone-crushed")
-seablock.lib.hide("item", "stone-crushed")
+bobmods.lib.recipe.hide("angels-stone-from-crushed-stone")
+seablock.lib.hide("item", "angels-stone-crushed")
 
-if data.raw.recipe["stone-crushed-dissolution"] then
-  data.raw.recipe["stone-crushed-dissolution"].icons = angelsmods.functions.create_liquid_recipe_icon(
+if data.raw.recipe["angels-stone-crushed-dissolution"] then
+  data.raw.recipe["angels-stone-crushed-dissolution"].icons = angelsmods.functions.create_liquid_recipe_icon(
     nil,
     { { 142, 079, 028 }, { 107, 062, 021 }, { 075, 040, 015 } },
     { "stone" }
diff --git a/SeaBlock/data-final-fixes/tech-tree.lua b/SeaBlock/data-final-fixes/tech-tree.lua
index e9987f57..ed11d03c 100644
--- a/SeaBlock/data-final-fixes/tech-tree.lua
+++ b/SeaBlock/data-final-fixes/tech-tree.lua
@@ -1,25 +1,29 @@
 -- Remove empty bob's techs
-bobmods.lib.tech.remove_prerequisite("cobalt-processing", "chemical-processing-1")
-bobmods.lib.tech.remove_prerequisite("grinding", "chemical-processing-1")
-bobmods.lib.tech.remove_prerequisite("lithium-processing", "chemical-processing-1")
+bobmods.lib.tech.remove_prerequisite("bob-cobalt-processing", "bob-chemical-processing-1")
+bobmods.lib.tech.remove_prerequisite("bob-grinding", "bob-chemical-processing-1")
+bobmods.lib.tech.remove_prerequisite("bob-lithium-processing", "bob-chemical-processing-1")
 
-bobmods.lib.tech.remove_prerequisite("cobalt-processing", "chemical-processing-2")
-bobmods.lib.tech.remove_prerequisite("silicon-processing", "chemical-processing-2")
-bobmods.lib.tech.remove_prerequisite("advanced-electronics", "chemical-processing-2")
-bobmods.lib.tech.remove_prerequisite("titanium-processing", "chemical-processing-2")
-bobmods.lib.tech.remove_prerequisite("tungsten-processing", "chemical-processing-2")
+bobmods.lib.tech.remove_prerequisite("bob-cobalt-processing", "bob-chemical-processing-2")
+bobmods.lib.tech.remove_prerequisite("bob-silicon-processing", "bob-chemical-processing-2")
+bobmods.lib.tech.remove_prerequisite("advanced-circuit", "bob-chemical-processing-2")
+bobmods.lib.tech.remove_prerequisite("bob-titanium-processing", "bob-chemical-processing-2")
+bobmods.lib.tech.remove_prerequisite("bob-tungsten-processing", "bob-chemical-processing-2")
 
-seablock.lib.hide_technology("electrolysis-1")
-seablock.lib.hide_technology("electrolysis-2")
-seablock.lib.hide_technology("chemical-processing-1")
-seablock.lib.hide_technology("chemical-processing-2")
+seablock.lib.hide_technology("bob-electrolysis-1")
+seablock.lib.hide_technology("bob-electrolysis-2")
+seablock.lib.hide_technology("bob-chemical-processing-1")
+seablock.lib.hide_technology("bob-chemical-processing-2")
 
-bobmods.lib.tech.remove_prerequisite("circuit-network", "bio-wood-processing-2")
-bobmods.lib.tech.add_prerequisite("circuit-network", "bio-paper-1")
-bobmods.lib.tech.remove_prerequisite("rubbers", "circuit-network")
+bobmods.lib.tech.remove_prerequisite("circuit-network", "angels-bio-wood-processing-2")
+bobmods.lib.tech.add_prerequisite("circuit-network", "angels-bio-paper-1")
+bobmods.lib.tech.remove_prerequisite("angels-rubbers", "circuit-network")
 
 -- Unhide solid fuel from hydrogen
-seablock.lib.unhide_recipe("solid-fuel-from-hydrogen")
-seablock.lib.add_recipe_unlock("flammables", "solid-fuel-from-hydrogen", 4)
+seablock.lib.unhide_recipe("bob-solid-fuel-from-hydrogen")
+seablock.lib.add_recipe_unlock("flammables", "bob-solid-fuel-from-hydrogen", 4)
 
-bobmods.lib.tech.replace_prerequisite("lithium-processing", "chlorine-processing-4", "chlorine-processing-2")
+bobmods.lib.tech.replace_prerequisite(
+  "bob-lithium-processing",
+  "angels-chlorine-processing-4",
+  "angels-chlorine-processing-2"
+)
diff --git a/SeaBlock/data-final-fixes/unobtainable_items.lua b/SeaBlock/data-final-fixes/unobtainable_items.lua
index 41cee794..e265d403 100644
--- a/SeaBlock/data-final-fixes/unobtainable_items.lua
+++ b/SeaBlock/data-final-fixes/unobtainable_items.lua
@@ -1,8 +1,8 @@
 -- Rename internal item names to keep mods like FNEI searching properly
 local itemrename = {
-  ["solid-coke"] = "wood-charcoal",
-  ["filter-coal"] = "filter-charcoal",
-  ["pellet-coke"] = "pellet-charcoal",
+  ["angels-solid-coke"] = "angels-wood-charcoal",
+  ["angels-filter-coal"] = "angels-filter-charcoal",
+  ["angels-pellet-coke"] = "angels-pellet-charcoal",
 }
 
 for k, v in pairs(itemrename) do
@@ -41,59 +41,53 @@ end
 -- Recipes to unconditionally remove
 local removerecipes = {}
 for _, v in ipairs({
-  "alien-artifact-blue-from-basic",
-  "alien-artifact-green-from-basic",
-  "alien-artifact-orange-from-basic",
-  "alien-artifact-purple-from-basic",
-  "alien-artifact-red-from-basic",
-  "alien-artifact-yellow-from-basic",
-  "angels-chemical-void-gas-natural-1",
-  "angels-chemical-void-liquid-condensates",
-  "angels-water-void-crystal-matrix",
-  "angels-water-void-lithia-water",
-  "angelsore1-crushed-hand",
-  "angelsore3-crushed-hand",
+  "bob-alien-artifact-blue",
+  "bob-alien-artifact-green",
+  "bob-alien-artifact-orange",
+  "bob-alien-artifact-purple",
+  "bob-alien-artifact-red",
+  "bob-alien-artifact-yellow",
+  "angels-chemical-void-angels-gas-natural-1",
+  "angels-chemical-void-angels-liquid-condensates",
+  "angels-ore1-crushed-hand",
+  "angels-ore3-crushed-hand",
   "big-burner-generator",
-  "bio-tile",
-  "bob-coal-from-wood",
+  "angels-bio-tile",
+  "bob-carbon-from-wood",
   "bob-resin-wood",
   "burner-generator",
   "burner-mining-drill",
-  "carbon-from-charcoal",
-  "coal-cracking-1",
-  "coal-cracking-2",
-  "coal-cracking-3",
-  "coal-crushed",
-  "condensates-oil-refining",
-  "condensates-refining",
+  "angels-carbon-from-charcoal",
+  "angels-coal-cracking-1",
+  "angels-coal-cracking-2",
+  "angels-coal-cracking-3",
+  "angels-coal-crushed",
+  "angels-condensates-oil-refining",
+  "angels-condensates-refining",
   "diesel-fuel",
   "electric-mining-drill",
-  "empty-crystal-matrix-barrel",
   "empty-diesel-fuel-barrel",
-  "empty-gas-natural-1-barrel",
-  "empty-liquid-condensates-barrel",
-  "empty-lithia-water-barrel",
-  "fill-crystal-matrix-barrel",
-  "fill-diesel-fuel-barrel",
-  "fill-gas-natural-1-barrel",
-  "fill-liquid-condensates-barrel",
-  "fill-lithia-water-barrel",
-  "gas-fractioning-condensates",
-  "gas-phosgene",
-  "gas-separation",
+  "empty-angels-gas-natural-1-barrel",
+  "empty-angels-liquid-condensates-barrel",
+  "empty-bob-lithia-water-barrel",
+  "diesel-fuel-barrel",
+  "angels-gas-natural-1-barrel",
+  "angels-liquid-condensates-barrel",
+  "bob-lithia-water-barrel",
+  "angels-gas-fractioning-condensates",
+  "angels-gas-separation",
   "oil-steam-boiler",
   "petroleum-generator",
-  "protection-field-goopless",
+  "protection-field-goopless", --comes from spacemod
   "pumpjack",
-  "slag-processing-7",
-  "slag-processing-8",
-  "slag-processing-9",
-  "solid-coke",
-  "solid-coke-sulfur",
-  "thermal-water-filtering-1",
-  "thermal-water-filtering-2",
-  "water-thermal-lithia",
-  "wood-charcoal",
+  "angels-slag-processing-7",
+  "angels-slag-processing-8",
+  "angels-slag-processing-9",
+  "angels-solid-coke",
+  "angels-solid-coke-sulfur",
+  "angels-thermal-water-filtering-1",
+  "angels-thermal-water-filtering-2",
+  "angels-wood-charcoal",
 }) do
   removerecipes[v] = true
 end
@@ -103,22 +97,20 @@ end
 local unobtainable = {}
 for _, v in ipairs({
   "big-burner-generator",
-  "bio-tile",
+  "angels-bio-tile",
   "burner-generator",
   "burner-mining-drill",
   "coal",
-  "coal-crushed",
+  "angels-coal-crushed",
   "diesel-fuel",
   "diesel-fuel-barrel",
   "electric-mining-drill",
-  "gas-natural-1",
-  "gas-natural-1-barrel",
-  "gas-phosgene",
-  "gas-phosgene-barrel",
-  "liquid-condensates",
-  "liquid-condensates-barrel",
-  "lithia-water",
-  "lithia-water-barrel",
+  "angels-gas-natural-1",
+  "angels-gas-natural-1-barrel",
+  "angels-liquid-condensates",
+  "angels-liquid-condensates-barrel",
+  "bob-lithia-water",
+  "bob-lithia-water-barrel",
   "oil-steam-boiler",
   "petroleum-generator",
   "pumpjack",
@@ -147,13 +139,7 @@ for k, v in pairs(data.raw.technology) do
 end
 
 for k, v in pairs(recipes) do
-  local iset = {}
-  if v.normal then
-    iset = { v.normal, v.expensive }
-  else
-    iset = { v }
-  end
-  for _, recipe in ipairs(iset) do
+  for _, recipe in pairs(v) do
     local items = {}
     if recipe.ingredients then
       for _, ingredient in pairs(recipe.ingredients) do
@@ -252,6 +238,6 @@ end
 
 -- Clear the list of science packs that alien lab can take
 -- This prevents YAFC warning
-if data.raw.lab["lab-alien"] then
-  data.raw.lab["lab-alien"].inputs = {}
+if data.raw.lab["bob-lab-alien"] then
+  data.raw.lab["bob-lab-alien"].inputs = {}
 end
diff --git a/SeaBlock/data-updates/Companion_Drones.lua b/SeaBlock/data-updates/Companion_Drones.lua
index 5757b072..e302d2ee 100644
--- a/SeaBlock/data-updates/Companion_Drones.lua
+++ b/SeaBlock/data-updates/Companion_Drones.lua
@@ -1,7 +1,7 @@
 if mods["Companion_Drones"] then
-  bobmods.lib.tech.add_recipe_unlock("electronics", "companion")
-  bobmods.lib.tech.add_recipe_unlock("electronics", "companion-roboport-equipment")
-  bobmods.lib.tech.add_recipe_unlock("electronics", "companion-reactor-equipment")
+  bobmods.lib.tech.add_recipe_unlock("bob-electronics", "companion")
+  bobmods.lib.tech.add_recipe_unlock("bob-electronics", "companion-roboport-equipment")
+  bobmods.lib.tech.add_recipe_unlock("bob-electronics", "companion-reactor-equipment")
   bobmods.lib.tech.add_recipe_unlock("energy-shield-mk2-equipment", "companion-shield-equipment")
 
   bobmods.lib.recipe.set_ingredient("companion-shield-equipment", { "energy-shield-mk2-equipment", 1 })
diff --git a/SeaBlock/data-updates/algae.lua b/SeaBlock/data-updates/algae.lua
index d4b843c8..3d6d0f07 100644
--- a/SeaBlock/data-updates/algae.lua
+++ b/SeaBlock/data-updates/algae.lua
@@ -1,93 +1,95 @@
 -- Speed up algae farm
-data.raw["assembling-machine"]["algae-farm"].crafting_speed = 0.75
+data.raw["assembling-machine"]["angels-algae-farm"].crafting_speed = 0.75
 
 -- Green algae
-bobmods.lib.recipe.set_category("algae-green", "bio-processing")
+bobmods.lib.recipe.set_category("angels-algae-green", "angels-bio-processing")
 
 -- Improved algae processing
-bobmods.lib.tech.remove_prerequisite("bio-processing-green", "water-treatment")
-bobmods.lib.tech.add_prerequisite("bio-processing-green", "bio-wood-processing-2")
-bobmods.lib.tech.add_prerequisite("bio-processing-green", "water-washing-1")
-data.raw.technology["bio-processing-green"].localised_name = { "technology-name.sb-bio-processing-green" }
+bobmods.lib.tech.remove_prerequisite("angels-bio-processing-green", "angels-water-treatment")
+bobmods.lib.tech.add_prerequisite("angels-bio-processing-green", "angels-bio-wood-processing-2")
+bobmods.lib.tech.add_prerequisite("angels-bio-processing-green", "angels-water-washing-1")
+data.raw.technology["angels-bio-processing-green"].localised_name = { "technology-name.sb-bio-processing-green" }
 
 -- Move Lithia Salt to Thermal Water Extraction
-seablock.lib.moveeffect("algae-brown-burning", "bio-processing-green", "thermal-water-extraction", 2)
-bobmods.lib.tech.add_prerequisite("lithium-processing", "thermal-water-extraction")
+seablock.lib.moveeffect(
+  "angels-algae-brown-burning",
+  "angels-bio-processing-green",
+  "angels-thermal-water-extraction",
+  2
+)
+bobmods.lib.tech.add_prerequisite("bob-lithium-processing", "angels-thermal-water-extraction")
 
 -- Change lithium crafting category
-bobmods.lib.recipe.set_category("lithium", "petrochem-electrolyser")
-bobmods.lib.recipe.set_category("lithium-water-electrolysis", "petrochem-electrolyser")
+bobmods.lib.recipe.set_category("bob-lithium", "angels-petrochem-electrolyser")
+bobmods.lib.recipe.set_category("bob-lithium-water-electrolysis", "angels-petrochem-electrolyser")
 
-bobmods.lib.tech.remove_recipe_unlock("water-treatment-3", "solid-lithium")
-bobmods.lib.recipe.hide("solid-lithium")
+bobmods.lib.tech.remove_recipe_unlock("angels-water-treatment-3", "angels-solid-lithium")
+bobmods.lib.recipe.hide("angels-solid-lithium") -- TODO: move angels-solid-lithium to the same group as the recipe or the other way around
 
 -- Move Sodium Carbonate from Brown Algae to Sodium processing 2
-seablock.lib.moveeffect("algae-brown-burning-wash", "bio-processing-green", "sodium-processing-2", nil)
+seablock.lib.moveeffect(
+  "angels-algae-brown-burning-wash",
+  "angels-bio-processing-green",
+  "angels-sodium-processing-2",
+  nil
+)
 
 -- Move Methanol from Cellulose Fibre to Advanced chemistry 1
-seablock.lib.moveeffect("gas-methanol-from-wood", "bio-processing-green", "angels-advanced-chemistry-1", 5)
+seablock.lib.moveeffect(
+  "angels-gas-methanol-from-wood",
+  "angels-bio-processing-green",
+  "angels-advanced-chemistry-1",
+  5
+)
 
 -- Make Red Algae depend on Blue Algae instead of Green Algae
-bobmods.lib.tech.remove_prerequisite("bio-processing-red", "bio-processing-green")
-bobmods.lib.tech.add_prerequisite("bio-processing-red", "bio-processing-blue")
+bobmods.lib.tech.remove_prerequisite("angels-bio-processing-red", "angels-bio-processing-green")
+bobmods.lib.tech.add_prerequisite("angels-bio-processing-red", "angels-bio-processing-blue")
 
 -- Blue algae
-bobmods.lib.tech.replace_prerequisite("bio-processing-blue", "bio-processing-red", "bio-processing-green")
-bobmods.lib.tech.remove_prerequisite("bio-processing-blue", "chemical-science-pack")
-bobmods.lib.tech.remove_science_pack("bio-processing-blue", "chemical-science-pack")
-bobmods.lib.tech.remove_recipe_unlock("bio-processing-blue", "algae-farm-4")
-bobmods.lib.recipe.set_category("algae-blue", "bio-processing-2")
+bobmods.lib.tech.replace_prerequisite(
+  "angels-bio-processing-blue",
+  "angels-bio-processing-red",
+  "angels-bio-processing-green"
+)
+bobmods.lib.tech.remove_prerequisite("angels-bio-processing-blue", "chemical-science-pack")
+bobmods.lib.tech.remove_science_pack("angels-bio-processing-blue", "chemical-science-pack")
+bobmods.lib.tech.remove_recipe_unlock("angels-bio-processing-blue", "angels-algae-farm-4")
+bobmods.lib.recipe.set_category("angels-algae-blue", "angels-bio-processing-2")
 
 -- Red algae. Make Calcium carbonate in an assembling machine, not a liquefier
-bobmods.lib.recipe.set_category("solid-calcium-carbonate", "advanced-crafting")
+bobmods.lib.recipe.set_category("angels-solid-calcium-carbonate", "advanced-crafting")
 
 -- Alien bacteria
-bobmods.lib.recipe.set_category("alien-bacteria", "bio-processing-3")
+bobmods.lib.recipe.set_category("angels-alien-bacteria", "angels-bio-processing-3")
 
 -- Make these craftable by hand
-bobmods.lib.recipe.set_category("solid-alginic-acid", "crafting")
+bobmods.lib.recipe.set_category("angels-solid-alginic-acid", "crafting")
 
 -- Fix handcrafting trying to use wrong crafting path
-data.raw.recipe["cellulose-fiber-raw-wood"].allow_as_intermediate = false
+data.raw.recipe["angels-cellulose-fiber-raw-wood"].allow_as_intermediate = false
 
 -- Speed up algae->cellulose fiber crafting
-data.raw.recipe["cellulose-fiber-algae"].energy_required = 2
+data.raw.recipe["angels-cellulose-fiber"].energy_required = 2
 
 -- Speed up cellulose->wood pellet crafting
-data.raw.recipe["wood-pellets"].energy_required = 3
+data.raw.recipe["angels-wood-pellets"].energy_required = 3
 
 -- Reduce cost of Algae farm 2
 
-local buildingmulti = angelsmods.marathon.buildingmulti
-local buildingtime = angelsmods.marathon.buildingtime
-
 angelsmods.functions.RB.build({
   {
     type = "recipe",
-    name = "algae-farm-2",
-    normal = {
-      energy_required = 5,
-      enabled = false,
-      ingredients = {
-        { type = "item", name = "algaefarm-2", amount = 1 },
-        { type = "item", name = "t0-plate", amount = 11 },
-        { type = "item", name = "t0-circuit", amount = 4 },
-        { type = "item", name = "t0-brick", amount = 11 },
-        { type = "item", name = "t0-pipe", amount = 18 },
-      },
-      result = "algae-farm-2",
-    },
-    expensive = {
-      energy_required = 5 * buildingtime,
-      enabled = false,
-      ingredients = {
-        { type = "item", name = "algaefarm-2", amount = 1 },
-        { type = "item", name = "t0-plate", amount = 11 * buildingmulti },
-        { type = "item", name = "t0-circuit", amount = 4 * buildingmulti },
-        { type = "item", name = "t0-brick", amount = 11 * buildingmulti },
-        { type = "item", name = "t0-pipe", amount = 18 * buildingmulti },
-      },
-      result = "algae-farm-2",
+    name = "angels-algae-farm-2",
+    energy_required = 5,
+    enabled = false,
+    ingredients = {
+      { type = "item", name = "algaefarm-2", amount = 1 },
+      { type = "item", name = "t0-plate", amount = 11 },
+      { type = "item", name = "t0-circuit", amount = 4 },
+      { type = "item", name = "t0-brick", amount = 11 },
+      { type = "item", name = "t0-pipe", amount = 18 },
     },
+    results = { { type = "item", name = "angels-algae-farm-2", amount = 1 } },
   },
 })
diff --git a/SeaBlock/data-updates/building-prerequisites.lua b/SeaBlock/data-updates/building-prerequisites.lua
index 8f81650c..8c63c4a4 100644
--- a/SeaBlock/data-updates/building-prerequisites.lua
+++ b/SeaBlock/data-updates/building-prerequisites.lua
@@ -1,66 +1,68 @@
+-- TODO: Remove this file. Changes should now be in Angel's
+
 -- Bronze prerequisites
-bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-1", "alloy-processing")
-bobmods.lib.tech.add_prerequisite("angels-cooling", "alloy-processing")
-bobmods.lib.tech.add_prerequisite("bio-nutrient-paste", "alloy-processing")
-bobmods.lib.tech.add_prerequisite("ore-floatation", "alloy-processing")
-bobmods.lib.tech.add_prerequisite("ore-processing-1", "alloy-processing")
-bobmods.lib.tech.add_prerequisite("powder-metallurgy-2", "alloy-processing")
-bobmods.lib.tech.add_prerequisite("strand-casting-1", "alloy-processing")
-bobmods.lib.tech.add_prerequisite("thermal-water-extraction", "alloy-processing")
-bobmods.lib.tech.add_prerequisite("water-washing-2", "alloy-processing")
+bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-1", "bob-alloy-processing")
+bobmods.lib.tech.add_prerequisite("angels-cooling", "bob-alloy-processing")
+bobmods.lib.tech.add_prerequisite("angels-bio-nutrient-paste", "bob-alloy-processing")
+bobmods.lib.tech.add_prerequisite("angels-ore-floatation", "bob-alloy-processing")
+bobmods.lib.tech.add_prerequisite("angels-ore-processing-1", "bob-alloy-processing")
+bobmods.lib.tech.add_prerequisite("angels-powder-metallurgy-2", "bob-alloy-processing")
+bobmods.lib.tech.add_prerequisite("angels-strand-casting-1", "bob-alloy-processing")
+bobmods.lib.tech.add_prerequisite("angels-thermal-water-extraction", "bob-alloy-processing")
+bobmods.lib.tech.add_prerequisite("angels-water-washing-2", "bob-alloy-processing")
 
 -- Clay Brick prerequisites
-bobmods.lib.tech.add_prerequisite("advanced-ore-refining-1", "angels-stone-smelting-1")
+bobmods.lib.tech.add_prerequisite("angels-advanced-ore-refining-1", "angels-stone-smelting-1")
 bobmods.lib.tech.add_prerequisite("angels-cooling", "angels-stone-smelting-1")
 bobmods.lib.tech.add_prerequisite("angels-metallurgy-2", "angels-stone-smelting-1")
 bobmods.lib.tech.add_prerequisite("fluid-handling", "angels-stone-smelting-1")
-bobmods.lib.tech.add_prerequisite("gardens", "angels-stone-smelting-1")
+bobmods.lib.tech.add_prerequisite("angels-gardens", "angels-stone-smelting-1")
 
 -- Brass prerequisites
-bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-2", "zinc-processing")
-bobmods.lib.tech.add_prerequisite("angels-metallurgy-3", "zinc-processing")
-bobmods.lib.tech.add_prerequisite("automation-3", "zinc-processing")
-bobmods.lib.tech.add_prerequisite("bio-desert-farm", "zinc-processing")
-bobmods.lib.tech.add_prerequisite("bio-refugium-puffer-1", "zinc-processing")
-bobmods.lib.tech.add_prerequisite("bio-swamp-farm", "zinc-processing")
-bobmods.lib.tech.add_prerequisite("bio-temperate-farm", "zinc-processing")
-bobmods.lib.tech.add_prerequisite("electronics-machine-2", "zinc-processing")
-bobmods.lib.tech.add_prerequisite("slag-processing-2", "zinc-processing")
-bobmods.lib.tech.add_prerequisite("water-treatment-3", "zinc-processing")
+bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-2", "bob-zinc-processing")
+bobmods.lib.tech.add_prerequisite("angels-metallurgy-3", "bob-zinc-processing")
+bobmods.lib.tech.add_prerequisite("automation-3", "bob-zinc-processing")
+bobmods.lib.tech.add_prerequisite("angels-bio-desert-farm", "bob-zinc-processing")
+bobmods.lib.tech.add_prerequisite("angels-bio-refugium-puffer-1", "bob-zinc-processing")
+bobmods.lib.tech.add_prerequisite("angels-bio-swamp-farm", "bob-zinc-processing")
+bobmods.lib.tech.add_prerequisite("angels-bio-temperate-farm", "bob-zinc-processing")
+bobmods.lib.tech.add_prerequisite("bob-electronics-machine-2", "bob-zinc-processing")
+bobmods.lib.tech.add_prerequisite("angels-slag-processing-2", "bob-zinc-processing")
+bobmods.lib.tech.add_prerequisite("angels-water-treatment-3", "bob-zinc-processing")
 
 -- Concrete Brick prerequisites
 bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-2", "angels-stone-smelting-2")
 bobmods.lib.tech.add_prerequisite("angels-metallurgy-3", "angels-stone-smelting-2")
-bobmods.lib.tech.add_prerequisite("bio-desert-farm", "angels-stone-smelting-2")
-bobmods.lib.tech.add_prerequisite("bio-swamp-farm", "angels-stone-smelting-2")
-bobmods.lib.tech.add_prerequisite("bio-temperate-farm", "angels-stone-smelting-2")
-bobmods.lib.tech.add_prerequisite("bio-refugium-hatchery", "angels-stone-smelting-2")
-bobmods.lib.tech.add_prerequisite("slag-processing-2", "angels-stone-smelting-2")
-bobmods.lib.tech.add_prerequisite("water-treatment-3", "angels-stone-smelting-2")
+bobmods.lib.tech.add_prerequisite("angels-bio-desert-farm", "angels-stone-smelting-2")
+bobmods.lib.tech.add_prerequisite("angels-bio-swamp-farm", "angels-stone-smelting-2")
+bobmods.lib.tech.add_prerequisite("angels-bio-temperate-farm", "angels-stone-smelting-2")
+bobmods.lib.tech.add_prerequisite("angels-bio-refugium-hatchery", "angels-stone-smelting-2")
+bobmods.lib.tech.add_prerequisite("angels-slag-processing-2", "angels-stone-smelting-2")
+bobmods.lib.tech.add_prerequisite("angels-water-treatment-3", "angels-stone-smelting-2")
 
 -- Titanium prerequisites
-bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-3", "titanium-processing")
-bobmods.lib.tech.add_prerequisite("angels-metallurgy-4", "titanium-processing")
-bobmods.lib.tech.add_prerequisite("automation-4", "titanium-processing")
-bobmods.lib.tech.add_prerequisite("bio-refugium-biter-1", "titanium-processing")
-bobmods.lib.tech.add_prerequisite("slag-processing-3", "titanium-processing")
-bobmods.lib.tech.add_prerequisite("water-treatment-4", "titanium-processing")
+bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-3", "bob-titanium-processing")
+bobmods.lib.tech.add_prerequisite("angels-metallurgy-4", "bob-titanium-processing")
+bobmods.lib.tech.add_prerequisite("automation-4", "bob-titanium-processing")
+bobmods.lib.tech.add_prerequisite("angels-bio-refugium-biter-1", "bob-titanium-processing")
+bobmods.lib.tech.add_prerequisite("angels-slag-processing-3", "bob-titanium-processing")
+bobmods.lib.tech.add_prerequisite("angels-water-treatment-4", "bob-titanium-processing")
 
 -- Reinforced concrete brick
 bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-3", "angels-stone-smelting-3")
 bobmods.lib.tech.add_prerequisite("angels-metallurgy-4", "angels-stone-smelting-3")
-bobmods.lib.tech.add_prerequisite("bio-refugium-biter-1", "angels-stone-smelting-3")
-bobmods.lib.tech.add_prerequisite("slag-processing-3", "angels-stone-smelting-3")
-bobmods.lib.tech.add_prerequisite("water-treatment-4", "angels-stone-smelting-3")
+bobmods.lib.tech.add_prerequisite("angels-bio-refugium-biter-1", "angels-stone-smelting-3")
+bobmods.lib.tech.add_prerequisite("angels-slag-processing-3", "angels-stone-smelting-3")
+bobmods.lib.tech.add_prerequisite("angels-water-treatment-4", "angels-stone-smelting-3")
 
 -- Copper tungsten / tungsten carbide prerequisites
-bobmods.lib.tech.add_prerequisite("ore-processing-5", "tungsten-alloy-processing")
+bobmods.lib.tech.add_prerequisite("angels-ore-processing-5", "bob-tungsten-alloy-processing")
 
 -- Nitinol prerequisites
-bobmods.lib.tech.add_prerequisite("ore-processing-5", "nitinol-processing")
+bobmods.lib.tech.add_prerequisite("angels-ore-processing-5", "bob-nitinol-processing")
 
 -- Advanced circuit
-bobmods.lib.tech.add_prerequisite("tank", "advanced-electronics")
+bobmods.lib.tech.add_prerequisite("tank", "advanced-circuit")
 
 -- Processing unit
-bobmods.lib.tech.add_prerequisite("bio-refugium-biter-1", "advanced-electronics-2")
+bobmods.lib.tech.add_prerequisite("angels-bio-refugium-biter-1", "processing-unit")
diff --git a/SeaBlock/data-updates/catalyst-recipes.lua b/SeaBlock/data-updates/catalyst-recipes.lua
index 931ec396..5284bd55 100644
--- a/SeaBlock/data-updates/catalyst-recipes.lua
+++ b/SeaBlock/data-updates/catalyst-recipes.lua
@@ -1,65 +1,117 @@
 -- Update catalyst recipes
-bobmods.lib.tech.remove_recipe_unlock("basic-chemistry-3", "catalyst-metal-red")
-seablock.lib.hide("item", "catalyst-metal-red")
-bobmods.lib.recipe.hide("catalyst-metal-red")
+bobmods.lib.tech.remove_recipe_unlock("angels-basic-chemistry-3", "angels-catalyst-metal-red")
+seablock.lib.hide("item", "angels-catalyst-metal-red")
+bobmods.lib.recipe.hide("angels-catalyst-metal-red")
 
-bobmods.lib.recipe.set_ingredients("catalyst-metal-green", {
-  { type = "item", name = "catalyst-metal-carrier", amount = 10 },
+bobmods.lib.recipe.set_ingredients("angels-catalyst-metal-green", {
+  { type = "item", name = "angels-catalyst-metal-carrier", amount = 10 },
   { type = "item", name = "copper-ore", amount = 1 },
   { type = "item", name = "iron-ore", amount = 1 },
 })
-bobmods.lib.recipe.set_ingredients("catalyst-metal-blue", {
-  { type = "item", name = "catalyst-metal-carrier", amount = 10 },
-  { type = "item", name = "bauxite-ore", amount = 1 },
-  { type = "item", name = "silver-ore", amount = 1 },
+bobmods.lib.recipe.set_ingredients("angels-catalyst-metal-blue", {
+  { type = "item", name = "angels-catalyst-metal-carrier", amount = 10 },
+  { type = "item", name = "bob-bauxite-ore", amount = 1 },
+  { type = "item", name = "bob-silver-ore", amount = 1 },
 })
-bobmods.lib.tech.add_recipe_unlock("angels-advanced-chemistry-4", "catalyst-metal-purple")
+bobmods.lib.tech.add_recipe_unlock("angels-advanced-chemistry-4", "sb-catalyst-metal-purple")
 
-bobmods.lib.recipe.replace_ingredient("liquid-acetic-acid-catalyst", "catalyst-metal-red", "catalyst-metal-green")
-bobmods.lib.recipe.replace_ingredient("gas-ammonia", "catalyst-metal-red", "catalyst-metal-green")
-bobmods.lib.recipe.replace_ingredient("catalyst-steam-cracking-naphtha", "catalyst-metal-red", "catalyst-metal-green")
+bobmods.lib.recipe.replace_ingredient(
+  "angels-liquid-acetic-acid-catalyst",
+  "angels-catalyst-metal-red",
+  "angels-catalyst-metal-green"
+)
+bobmods.lib.recipe.replace_ingredient("angels-gas-ammonia", "angels-catalyst-metal-red", "angels-catalyst-metal-green")
+bobmods.lib.recipe.replace_ingredient(
+  "angels-catalyst-steam-cracking-naphtha",
+  "angels-catalyst-metal-red",
+  "angels-catalyst-metal-green"
+)
 
-bobmods.lib.recipe.replace_ingredient("gas-synthesis-methanol", "catalyst-metal-green", "catalyst-metal-blue")
-bobmods.lib.recipe.replace_ingredient("gas-acid-catalyst", "catalyst-metal-green", "catalyst-metal-blue")
-bobmods.lib.recipe.replace_ingredient("liquid-styrene-catalyst", "catalyst-metal-green", "catalyst-metal-blue")
-bobmods.lib.recipe.replace_ingredient("gas-benzene-catalyst", "catalyst-metal-green", "catalyst-metal-blue")
-bobmods.lib.recipe.replace_ingredient("liquid-propionic-acid-catalyst", "catalyst-metal-green", "catalyst-metal-blue")
-bobmods.lib.recipe.replace_ingredient("catalyst-steam-cracking-butane", "catalyst-metal-green", "catalyst-metal-blue")
+bobmods.lib.recipe.replace_ingredient(
+  "angels-gas-synthesis-methanol",
+  "angels-catalyst-metal-green",
+  "angels-catalyst-metal-blue"
+)
+bobmods.lib.recipe.replace_ingredient(
+  "angels-gas-acid-catalyst",
+  "angels-catalyst-metal-green",
+  "angels-catalyst-metal-blue"
+)
+bobmods.lib.recipe.replace_ingredient(
+  "angels-liquid-styrene",
+  "angels-catalyst-metal-green",
+  "angels-catalyst-metal-blue"
+)
+bobmods.lib.recipe.replace_ingredient("angels-gas-benzene", "angels-catalyst-metal-green", "angels-catalyst-metal-blue")
+bobmods.lib.recipe.replace_ingredient(
+  "angels-liquid-propionic-acid",
+  "angels-catalyst-metal-green",
+  "angels-catalyst-metal-blue"
+)
+bobmods.lib.recipe.replace_ingredient(
+  "angels-gas-butadiene",
+  "angels-catalyst-metal-green",
+  "angels-catalyst-metal-blue"
+)
 
-bobmods.lib.recipe.replace_ingredient("liquid-naphtha-catalyst", "catalyst-metal-red", "catalyst-metal-purple")
-bobmods.lib.recipe.replace_ingredient("solid-sodium-cyanide", "catalyst-metal-green", "catalyst-metal-purple")
-bobmods.lib.recipe.replace_ingredient("gas-synthesis-methanation", "catalyst-metal-blue", "catalyst-metal-purple")
-bobmods.lib.recipe.replace_ingredient("gas-hydrazine", "catalyst-metal-blue", "catalyst-metal-purple")
-bobmods.lib.recipe.replace_ingredient("gas-synthesis-methanol", "catalyst-metal-blue", "catalyst-metal-purple")
+bobmods.lib.recipe.replace_ingredient(
+  "angels-liquid-naphtha-catalyst",
+  "angels-catalyst-metal-red",
+  "sb-catalyst-metal-purple"
+)
+bobmods.lib.recipe.replace_ingredient(
+  "angels-solid-sodium-cyanide",
+  "angels-catalyst-metal-green",
+  "sb-catalyst-metal-purple"
+)
+bobmods.lib.recipe.replace_ingredient(
+  "angels-gas-synthesis-methanation",
+  "angels-catalyst-metal-blue",
+  "sb-catalyst-metal-purple"
+)
+bobmods.lib.recipe.replace_ingredient("angels-gas-hydrazine", "angels-catalyst-metal-blue", "sb-catalyst-metal-purple")
+bobmods.lib.recipe.replace_ingredient(
+  "angels-gas-synthesis-methanol",
+  "angels-catalyst-metal-blue",
+  "sb-catalyst-metal-purple"
+)
 
-bobmods.lib.recipe.replace_ingredient("cumene-process", "catalyst-metal-blue", "catalyst-metal-yellow")
+bobmods.lib.recipe.replace_ingredient(
+  "angels-cumene-process",
+  "angels-catalyst-metal-blue",
+  "angels-catalyst-metal-yellow"
+)
 
 bobmods.lib.recipe.add_new_ingredient(
-  "liquid-mineral-oil-catalyst",
-  { type = "item", name = "catalyst-metal-purple", amount = 1 }
+  "angels-liquid-mineral-oil-catalyst",
+  { type = "item", name = "sb-catalyst-metal-purple", amount = 1 }
 )
 bobmods.lib.recipe.add_result(
-  "liquid-mineral-oil-catalyst",
-  { type = "item", name = "catalyst-metal-carrier", amount = 1 }
+  "angels-liquid-mineral-oil-catalyst",
+  { type = "item", name = "angels-catalyst-metal-carrier", amount = 1 }
 )
 
-bobmods.lib.tech.add_prerequisite("bio-plastic-2", "angels-advanced-chemistry-2")
-bobmods.lib.tech.add_prerequisite("sodium-processing-2", "angels-advanced-chemistry-4")
-bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-1", "basic-chemistry-3")
-bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-3", "thermal-water-extraction-2")
-bobmods.lib.tech.remove_prerequisite("angels-advanced-chemistry-1", "ore-floatation")
+bobmods.lib.tech.add_prerequisite("angels-bio-plastic-2", "angels-advanced-chemistry-2")
+bobmods.lib.tech.add_prerequisite("angels-sodium-processing-2", "angels-advanced-chemistry-4")
+bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-1", "angels-basic-chemistry-3")
+bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-3", "angels-thermal-water-extraction-2")
+bobmods.lib.tech.remove_prerequisite("angels-advanced-chemistry-1", "angels-ore-floatation")
 
 bobmods.lib.tech.add_new_science_pack("angels-nitrogen-processing-3", "production-science-pack", 1)
 bobmods.lib.tech.add_prerequisite("angels-nitrogen-processing-3", "angels-advanced-chemistry-4")
-bobmods.lib.tech.replace_prerequisite("resin-2", "angels-nitrogen-processing-3", "angels-advanced-chemistry-2")
+bobmods.lib.tech.replace_prerequisite("angels-resin-2", "angels-nitrogen-processing-3", "angels-advanced-chemistry-2")
 seablock.lib.moveeffect("angels-air-filter-3", "angels-nitrogen-processing-3", "angels-advanced-chemistry-2", 4)
-seablock.lib.moveeffect("gas-melamine", "angels-nitrogen-processing-3", "angels-advanced-chemistry-2")
+seablock.lib.moveeffect("angels-gas-melamine", "angels-nitrogen-processing-3", "angels-advanced-chemistry-2")
 
-bobmods.lib.tech.add_new_science_pack("gas-synthesis", "production-science-pack", 1)
-bobmods.lib.tech.add_prerequisite("gas-synthesis", "angels-advanced-chemistry-4")
+bobmods.lib.tech.add_new_science_pack("angels-gas-synthesis", "production-science-pack", 1)
+bobmods.lib.tech.add_prerequisite("angels-gas-synthesis", "angels-advanced-chemistry-4")
 
-seablock.lib.moveeffect("liquid-mineral-oil-catalyst", "angels-advanced-chemistry-3", "angels-advanced-chemistry-4")
-seablock.lib.moveeffect("catalyst-metal-carrier", "basic-chemistry-3", "angels-advanced-chemistry-1", 5)
-seablock.lib.moveeffect("catalyst-metal-green", "angels-advanced-chemistry-1", "angels-advanced-chemistry-1", 6)
-seablock.lib.moveeffect("catalyst-metal-blue", "angels-advanced-chemistry-3", "angels-advanced-chemistry-2", 8)
-seablock.lib.moveeffect("catalyst-metal-yellow", "angels-advanced-chemistry-5", "angels-advanced-chemistry-5", 6)
+seablock.lib.moveeffect(
+  "angels-liquid-mineral-oil-catalyst",
+  "angels-advanced-chemistry-3",
+  "angels-advanced-chemistry-4"
+)
+seablock.lib.moveeffect("angels-catalyst-metal-carrier", "angels-basic-chemistry-3", "angels-advanced-chemistry-1", 5)
+seablock.lib.moveeffect("angels-catalyst-metal-green", "angels-advanced-chemistry-1", "angels-advanced-chemistry-1", 6)
+seablock.lib.moveeffect("angels-catalyst-metal-blue", "angels-advanced-chemistry-3", "angels-advanced-chemistry-2", 8)
+seablock.lib.moveeffect("angels-catalyst-metal-yellow", "angels-advanced-chemistry-5", "angels-advanced-chemistry-5", 6)
diff --git a/SeaBlock/data-updates/clowns.lua b/SeaBlock/data-updates/clowns.lua
index 541c30ed..18813255 100644
--- a/SeaBlock/data-updates/clowns.lua
+++ b/SeaBlock/data-updates/clowns.lua
@@ -19,7 +19,7 @@ if mods["Clowns-Extended-Minerals"] then
         "recipe-name.slag-processing",
         { "item-name.clown-mat", { "entity-name.clowns-ore1" }, "Ore" },
       },
-      category = "crystallizing",
+      category = "angels-crystallizing",
       subgroup = "slag-processing-2",
       enabled = false,
       allow_decomposition = false,
@@ -51,7 +51,7 @@ if mods["Clowns-Extended-Minerals"] then
         "recipe-name.slag-processing",
         { "item-name.clown-mat", { "entity-name.clowns-ore2" }, "Ore" },
       },
-      category = "crystallizing",
+      category = "angels-crystallizing",
       subgroup = "slag-processing-2",
       enabled = false,
       allow_decomposition = false,
@@ -83,7 +83,7 @@ if mods["Clowns-Extended-Minerals"] then
         "recipe-name.slag-processing",
         { "item-name.clown-mat", { "entity-name.clowns-ore3" }, "Ore" },
       },
-      category = "crystallizing",
+      category = "angels-crystallizing",
       subgroup = "slag-processing-2",
       enabled = false,
       allow_decomposition = false,
@@ -115,7 +115,7 @@ if mods["Clowns-Extended-Minerals"] then
         "recipe-name.slag-processing",
         { "item-name.clown-mat", { "entity-name.clowns-ore4" }, "Ore" },
       },
-      category = "crystallizing",
+      category = "angels-crystallizing",
       subgroup = "slag-processing-2",
       enabled = false,
       allow_decomposition = false,
@@ -147,7 +147,7 @@ if mods["Clowns-Extended-Minerals"] then
         "recipe-name.slag-processing",
         { "item-name.clown-mat", { "entity-name.clowns-ore5" }, "Ore" },
       },
-      category = "crystallizing",
+      category = "angels-crystallizing",
       subgroup = "slag-processing-2",
       enabled = false,
       allow_decomposition = false,
@@ -179,7 +179,7 @@ if mods["Clowns-Extended-Minerals"] then
         "recipe-name.slag-processing",
         { "item-name.clown-mat", { "entity-name.clowns-ore6" }, "Ore" },
       },
-      category = "crystallizing",
+      category = "angels-crystallizing",
       subgroup = "slag-processing-2",
       enabled = false,
       allow_decomposition = false,
@@ -211,7 +211,7 @@ if mods["Clowns-Extended-Minerals"] then
         "recipe-name.slag-processing",
         { "item-name.clown-mat", { "entity-name.clowns-ore7" }, "Ore" },
       },
-      category = "crystallizing",
+      category = "angels-crystallizing",
       subgroup = "slag-processing-2",
       enabled = false,
       allow_decomposition = false,
@@ -243,7 +243,7 @@ if mods["Clowns-Extended-Minerals"] then
         "recipe-name.slag-processing",
         { "item-name.clown-mat", { "entity-name.clowns-ore8" }, "Ore" },
       },
-      category = "crystallizing",
+      category = "angels-crystallizing",
       subgroup = "slag-processing-2",
       enabled = false,
       allow_decomposition = false,
@@ -275,7 +275,7 @@ if mods["Clowns-Extended-Minerals"] then
         "recipe-name.slag-processing",
         { "item-name.clown-mat", { "entity-name.clowns-ore9" }, "Ore" },
       },
-      category = "crystallizing",
+      category = "angels-crystallizing",
       subgroup = "slag-processing-2",
       enabled = false,
       allow_decomposition = false,
@@ -303,7 +303,7 @@ if mods["Clowns-Extended-Minerals"] then
     {
       type = "recipe",
       name = "sb-clowns-resource-1",
-      category = "ore-refining-t1",
+      category = "angels-ore-refining-t1",
       subgroup = "resource-refining-2",
       enabled = false,
       allow_decomposition = false,
@@ -333,7 +333,7 @@ if mods["Clowns-Extended-Minerals"] then
     {
       type = "recipe",
       name = "sb-clowns-resource-2",
-      category = "ore-refining-t1",
+      category = "angels-ore-refining-t1",
       subgroup = "resource-refining-2",
       enabled = false,
       allow_decomposition = false,
@@ -371,6 +371,6 @@ if mods["Clowns-Extended-Minerals"] then
   seablock.lib.add_recipe_unlock("clowns-ore-crushing", "sb-slag-processing-clowns-3", 7)
   seablock.lib.add_recipe_unlock("clowns-ore-crushing", "sb-slag-processing-clowns-2", 4)
   seablock.lib.add_recipe_unlock("clowns-ore-crushing", "sb-slag-processing-clowns-1", 1)
-  seablock.lib.add_recipe_unlock("water-washing-2", "sb-clowns-resource-1")
+  seablock.lib.add_recipe_unlock("angels-water-washing-2", "sb-clowns-resource-1")
   seablock.lib.add_recipe_unlock("angels-oil-processing", "sb-clowns-resource-2")
 end
diff --git a/SeaBlock/data-updates/coal.lua b/SeaBlock/data-updates/coal.lua
index 3b320823..a084ffed 100644
--- a/SeaBlock/data-updates/coal.lua
+++ b/SeaBlock/data-updates/coal.lua
@@ -1,46 +1,45 @@
 -- Coal removal
-seablock.lib.substingredient("grenade", "coal", "wood-charcoal")
-seablock.lib.substingredient("explosives", "coal", "wood-charcoal")
-seablock.lib.substingredient("solid-fuel-from-hydrogen", "coal", "wood-charcoal")
+seablock.lib.substingredient("grenade", "coal", "angels-wood-charcoal")
+seablock.lib.substingredient("explosives", "coal", "angels-wood-charcoal")
+seablock.lib.substingredient("bob-solid-fuel-from-hydrogen", "coal", "angels-wood-charcoal")
 if mods["bobenemies"] then
-  seablock.lib.substingredient("alien-poison", "coal", "wood-charcoal")
-  seablock.lib.substingredient("alien-explosive", "coal", "wood-charcoal")
+  seablock.lib.substingredient("bob-alien-poison", "coal", "angels-wood-charcoal")
+  seablock.lib.substingredient("bob-alien-explosive", "coal", "angels-wood-charcoal")
 end
-seablock.lib.substingredient("filter-coal", "coal", "wood-charcoal")
-seablock.lib.substingredient("carbon", "coal", "wood-charcoal")
+seablock.lib.substingredient("angels-filter-coal", "coal", "angels-wood-charcoal")
+seablock.lib.substingredient("bob-carbon", "coal", "angels-wood-charcoal")
 if mods["Transport_Drones"] then
-  seablock.lib.substingredient("road", "coal", "wood-charcoal")
+  seablock.lib.substingredient("road", "coal", "angels-wood-charcoal")
 end
-seablock.lib.substingredient("carbon-separation-2", "coal", "wood-charcoal", 1)
-if mods["angelsaddons-storage"] and data.raw.recipe["silo-coal"] then
-  seablock.lib.substingredient("silo-coal", "coal-crushed", "wood-charcoal", 10)
+seablock.lib.substingredient("angels-gas-carbon-dioxide", "coal", "angels-wood-charcoal", 1)
+if mods["angelsaddons-storage"] and data.raw.recipe["angels-silo-coal"] then
+  seablock.lib.substingredient("angels-silo-coal", "angels-coal-crushed", "angels-wood-charcoal", 10)
 end
 
 -- Disable coal cracking technology
 seablock.lib.hide_technology("angels-coal-cracking")
-seablock.lib.moveeffect("pellet-coke", "angels-coal-cracking", "angels-coal-processing-2")
-angelsmods.functions.move_item("pellet-coke", "bio-processing-wood", "f[pellet-coke]")
-angelsmods.functions.move_item("pellet-coke", "bio-processing-wood", "f[pellet-coke]", "recipe")
+seablock.lib.moveeffect("angels-pellet-coke", "angels-coal-cracking", "angels-coal-processing-2")
+angelsmods.functions.move_item("angels-pellet-coke", "angels-bio-processing-wood", "f[pellet-coke]")
+angelsmods.functions.move_item("angels-pellet-coke", "angels-bio-processing-wood", "f[pellet-coke]", "recipe")
 
 -- Clear fuel value so these don't appear in Helmod's fuel picker
-data.raw.item["carbon"].fuel_emissions_multiplier = nil
-data.raw.item["carbon"].fuel_value = nil
-data.raw.item["carbon"].fuel_category = nil
+data.raw.item["bob-carbon"].fuel_emissions_multiplier = nil
+data.raw.item["bob-carbon"].fuel_value = nil
+data.raw.item["bob-carbon"].fuel_category = nil
 data.raw.item["coal"].fuel_emissions_multiplier = nil
 data.raw.item["coal"].fuel_value = nil
 data.raw.item["coal"].fuel_category = nil
-data.raw.item["coal-crushed"].fuel_value = nil
-data.raw.item["coal-crushed"].fuel_category = nil
-
-data.raw.recipe["coolant-used-filtration-1"].localised_name = { "recipe-name.coolant-used-filtration-1" }
-data.raw.recipe["coolant-used-filtration-2"].localised_name = { "recipe-name.coolant-used-filtration-2" }
+data.raw.item["angels-coal-crushed"].fuel_value = nil
+data.raw.item["angels-coal-crushed"].fuel_category = nil
 
 -- Move charcoal processing 3 to purple science
 -- Sodium carbonate is unusable before then
 bobmods.lib.tech.add_science_pack("angels-coal-processing-3", "chemical-science-pack", 1)
 bobmods.lib.tech.add_science_pack("angels-coal-processing-3", "production-science-pack", 1)
-bobmods.lib.tech.remove_prerequisite("sodium-processing-2", "angels-coal-processing-3")
-bobmods.lib.tech.add_prerequisite("angels-coal-processing-3", "sodium-processing-2")
+bobmods.lib.tech.remove_prerequisite("angels-sodium-processing-2", "angels-coal-processing-3")
+bobmods.lib.tech.add_prerequisite("angels-coal-processing-3", "angels-sodium-processing-2")
 
 -- Buff the Carbon 2 recipe to make it a bit more worthwhile
-bobmods.lib.recipe.set_result("coke-purification-2", { type = "item", name = "solid-carbon", amount = 8 })
+bobmods.lib.recipe.set_result("angels-coke-purification-2", { type = "item", name = "angels-solid-carbon", amount = 8 })
+
+data.raw.recipe["angels-filter-coal"].localised_name = { "item-name.angels-filter-charcoal" }
diff --git a/SeaBlock/data-updates/concrete.lua b/SeaBlock/data-updates/concrete.lua
index 7a8ae6fa..6906f153 100644
--- a/SeaBlock/data-updates/concrete.lua
+++ b/SeaBlock/data-updates/concrete.lua
@@ -1,75 +1,75 @@
 -- Swap out concrete for bricks
 
-if data.raw.recipe["burner-reactor-2"] then
-  seablock.lib.substingredient("burner-reactor-2", "concrete", "concrete-brick", nil)
-  bobmods.lib.tech.remove_prerequisite("burner-reactor-2", "concrete")
-  bobmods.lib.tech.add_prerequisite("burner-reactor-2", "angels-stone-smelting-2")
+if data.raw.recipe["bob-burner-reactor-2"] then
+  seablock.lib.substingredient("bob-burner-reactor-2", "concrete", "angels-concrete-brick", nil)
+  bobmods.lib.tech.remove_prerequisite("bob-burner-reactor-2", "concrete")
+  bobmods.lib.tech.add_prerequisite("bob-burner-reactor-2", "angels-stone-smelting-2")
 end
-seablock.lib.substingredient("centrifuge", "concrete", "concrete-brick", nil)
-if data.raw.recipe["fluid-reactor-2"] then
-  seablock.lib.substingredient("fluid-reactor-2", "concrete", "concrete-brick", nil)
+seablock.lib.substingredient("centrifuge", "concrete", "angels-concrete-brick", nil)
+if data.raw.recipe["bob-fluid-reactor-2"] then
+  seablock.lib.substingredient("bob-fluid-reactor-2", "concrete", "angels-concrete-brick", nil)
 end
-seablock.lib.substingredient("nuclear-reactor", "concrete", "concrete-brick", nil)
-seablock.lib.substingredient("rocket-silo", "concrete", "reinforced-concrete-brick", nil)
+seablock.lib.substingredient("nuclear-reactor", "concrete", "angels-concrete-brick", nil)
+seablock.lib.substingredient("rocket-silo", "concrete", "angels-reinforced-concrete-brick", nil)
 
 bobmods.lib.tech.replace_prerequisite("uranium-processing", "concrete", "angels-stone-smelting-2")
 bobmods.lib.tech.replace_prerequisite("rocket-silo", "concrete", "angels-stone-smelting-3")
 
 -- Swap concrete tiles
-local item = data.raw.item["concrete-brick"]
+local item = data.raw.item["angels-concrete-brick"]
 if item and item.place_as_tile then
   item.place_as_tile["result"] = "concrete"
 end
-item = data.raw.item["reinforced-concrete-brick"]
+item = data.raw.item["angels-reinforced-concrete-brick"]
 if item and item.place_as_tile then
   item.place_as_tile["result"] = "refined-concrete"
 end
 item = data.raw.item["concrete"]
 if item and item.place_as_tile then
-  item.place_as_tile["result"] = "tile-concrete-brick"
+  item.place_as_tile["result"] = "angels-tile-concrete-brick"
 end
 item = data.raw.item["refined-concrete"]
 if item and item.place_as_tile then
-  item.place_as_tile["result"] = "tile-reinforced-concrete-brick"
+  item.place_as_tile["result"] = "angels-tile-reinforced-concrete-brick"
 end
 
-item = data.raw.tile["concrete"]
-if item then
-  item.minable["result"] = "concrete-brick"
-  item.placeable_by = { item = "concrete-brick", count = 1 }
-  item.walking_speed_modifier = 1.4
+local tile = data.raw.tile["concrete"]
+if tile then
+  tile.minable["result"] = "angels-concrete-brick"
+  tile.placeable_by = { item = "angels-concrete-brick", count = 1 }
+  tile.walking_speed_modifier = 1.4
 end
-item = data.raw.tile["refined-concrete"]
-if item then
-  item.minable["result"] = "reinforced-concrete-brick"
-  item.placeable_by = { item = "reinforced-concrete-brick", count = 1 }
-  item.walking_speed_modifier = 1.55
+tile = data.raw.tile["refined-concrete"]
+if tile then
+  tile.minable["result"] = "angels-reinforced-concrete-brick"
+  tile.placeable_by = { item = "angels-reinforced-concrete-brick", count = 1 }
+  tile.walking_speed_modifier = 1.55
 end
-item = data.raw.tile["tile-concrete-brick"]
-if item then
-  item.minable["result"] = "concrete"
-  item.placeable_by = { item = "concrete", count = 1 }
-  item.walking_speed_modifier = 1.4
+tile = data.raw.tile["angels-tile-concrete-brick"]
+if tile then
+  tile.minable["result"] = "concrete"
+  tile.placeable_by = { item = "concrete", count = 1 }
+  tile.walking_speed_modifier = 1.4
 end
-item = data.raw.tile["tile-reinforced-concrete-brick"]
-if item then
-  item.minable["result"] = "refined-concrete"
-  item.placeable_by = { item = "refined-concrete", count = 1 }
-  item.walking_speed_modifier = 1.55
+tile = data.raw.tile["angels-tile-reinforced-concrete-brick"]
+if tile then
+  tile.minable["result"] = "refined-concrete"
+  tile.placeable_by = { item = "refined-concrete", count = 1 }
+  tile.walking_speed_modifier = 1.55
 end
-item = data.raw.tile["hazard-concrete-left"]
-if item then
-  item.walking_speed_modifier = 1.4
+tile = data.raw.tile["hazard-concrete-left"]
+if tile then
+  tile.walking_speed_modifier = 1.4
 end
-item = data.raw.tile["hazard-concrete-right"]
-if item then
-  item.walking_speed_modifier = 1.4
+tile = data.raw.tile["hazard-concrete-right"]
+if tile then
+  tile.walking_speed_modifier = 1.4
 end
-item = data.raw.tile["refined-hazard-concrete-left"]
-if item then
-  item.walking_speed_modifier = 1.55
+tile = data.raw.tile["refined-hazard-concrete-left"]
+if tile then
+  tile.walking_speed_modifier = 1.55
 end
-item = data.raw.tile["refined-hazard-concrete-right"]
-if item then
-  item.walking_speed_modifier = 1.55
+tile = data.raw.tile["refined-hazard-concrete-right"]
+if tile then
+  tile.walking_speed_modifier = 1.55
 end
diff --git a/SeaBlock/data-updates/fuel.lua b/SeaBlock/data-updates/fuel.lua
index 11f7ff9c..6995edae 100644
--- a/SeaBlock/data-updates/fuel.lua
+++ b/SeaBlock/data-updates/fuel.lua
@@ -1,49 +1,55 @@
 -- Reduce angels charcoal fuel value
-data.raw.item["wood-bricks"].fuel_value = "18MJ"
-data.raw.item["wood-charcoal"].fuel_value = "4MJ"
-data.raw.item["pellet-coke"].fuel_value = "24MJ"
+data.raw.item["angels-wood-bricks"].fuel_value = "18MJ"
+data.raw.item["angels-wood-charcoal"].fuel_value = "4MJ"
+data.raw.item["angels-pellet-coke"].fuel_value = "24MJ"
 
 -- Make hydrazine solid fuel match fuel_value
-if data.raw.fluid["hydrazine"] then
-  local hydrazinevalue = data.raw.fluid["hydrazine"].fuel_value
-  data.raw.fluid["gas-hydrazine"].fuel_value = hydrazinevalue
+if data.raw.fluid["angels-gas-hydrazine"] then
+  local hydrazinevalue = data.raw.fluid["angels-gas-hydrazine"].fuel_value
+  data.raw.fluid["angels-gas-hydrazine"].fuel_value = hydrazinevalue
   if hydrazinevalue:sub(-2) == "kJ" then
     local hydrazinevaluekj = tonumber(hydrazinevalue:sub(1, -3))
-    seablock.lib.substingredient("solid-fuel-hydrazine", "gas-hydrazine", nil, math.floor(24000 / hydrazinevaluekj))
+    seablock.lib.substingredient(
+      "angels-solid-fuel-hydrazine",
+      "angels-gas-hydrazine",
+      nil,
+      math.floor(24000 / hydrazinevaluekj)
+    )
   end
 end
 
 -- petroleum gas/methane has same solid fuel value as naphtha.
-data.raw.fluid["liquid-fuel-oil"].fuel_value = "1MJ"
-data.raw.fluid["liquid-naphtha"].fuel_value = "0.5MJ"
-data.raw.fluid["gas-methane"].fuel_value = "0.5MJ"
+data.raw.fluid["angels-liquid-fuel-oil"].fuel_value = "1MJ"
+data.raw.fluid["angels-liquid-naphtha"].fuel_value = "0.5MJ"
+data.raw.fluid["angels-gas-methane"].fuel_value = "0.5MJ"
 data.raw.fluid["crude-oil"].fuel_value = "0.5MJ"
-data.raw.item["enriched-fuel"].fuel_value = "50MJ"
-data.raw.item["enriched-fuel"].stack_size = 50
-data.raw.item["solid-carbon"].fuel_value = "2.5MJ"
+data.raw.item["bob-enriched-fuel"].fuel_value = "50MJ"
+data.raw.item["bob-enriched-fuel"].stack_size = 50
+data.raw.item["angels-solid-carbon"].fuel_value = "2.5MJ"
 
-seablock.lib.substingredient("solid-fuel-methane", "gas-methane", nil, 40)
-seablock.lib.substingredient("solid-fuel-naphtha", "liquid-naphtha", nil, 40)
-seablock.lib.substingredient("solid-fuel-fuel-oil", "liquid-fuel-oil", nil, 20)
+seablock.lib.substingredient("angels-solid-fuel-methane", "angels-gas-methane", nil, 40)
+seablock.lib.substingredient("angels-solid-fuel-naphtha", "angels-liquid-naphtha", nil, 40)
+seablock.lib.substingredient("angels-solid-fuel-fuel-oil", "angels-liquid-fuel-oil", nil, 20)
 
 for _, v in pairs({
-  "hydrogen",
-  "gas-hydrogen",
-  "gas-ethane",
-  "gas-butane",
-  "gas-propene",
-  "gas-methanol",
-  "gas-ethylene",
-  "gas-benzene",
-  "gas-ethanol",
+  "bob-hydrogen",
+  "angels-gas-hydrogen",
+  "angels-gas-ethane",
+  "angels-gas-butane",
+  "angels-gas-propene",
+  "angels-gas-methanol",
+  "angels-gas-ethylene",
+  "angels-gas-benzene",
+  "angels-gas-ethanol",
   "heavy-oil",
   "light-oil",
   "petroleum-gas",
-  "sour-gas",
-  "deuterium",
-  "hydrazine",
-  "alien-fire",
-  "glycerol",
+  "bob-sour-gas",
+  "bob-deuterium",
+  "angels-gas-deuterium",
+  "angels-gas-hydrazine",
+  "bob-alien-fire",
+  "angels-glycerol",
   "diesel-fuel",
 }) do
   if data.raw.fluid[v] then
diff --git a/SeaBlock/data-updates/furnaces.lua b/SeaBlock/data-updates/furnaces.lua
index 1b31c986..e8a168e8 100644
--- a/SeaBlock/data-updates/furnaces.lua
+++ b/SeaBlock/data-updates/furnaces.lua
@@ -1,16 +1,16 @@
 -- Fix up furnace tech icons
 if not mods["reskins-bobs"] then
   for _, v in pairs({
-    "fluid-mixing-furnace",
-    "steel-mixing-furnace",
+    "bob-fluid-mixing-furnace",
+    "bob-steel-mixing-furnace",
   }) do
     seablock.lib.copy_icon(data.raw.technology[v], data.raw.technology["advanced-material-processing"])
   end
 
   for _, v in pairs({
-    "electric-mixing-furnace",
-    "multi-purpose-furnace-1",
-    "multi-purpose-furnace-2",
+    "bob-electric-mixing-furnace",
+    "bob-multi-purpose-furnace-1",
+    "bob-multi-purpose-furnace-2",
     "advanced-material-processing-3",
     "advanced-material-processing-4",
   }) do
@@ -18,4 +18,4 @@ if not mods["reskins-bobs"] then
   end
 end
 
-bobmods.lib.tech.remove_prerequisite("steel-mixing-furnace", "angels-steel-smelting-1")
+bobmods.lib.tech.remove_prerequisite("bob-steel-mixing-furnace", "angels-steel-smelting-1")
diff --git a/SeaBlock/data-updates/groups.lua b/SeaBlock/data-updates/groups.lua
index 59671736..bf590147 100644
--- a/SeaBlock/data-updates/groups.lua
+++ b/SeaBlock/data-updates/groups.lua
@@ -14,7 +14,6 @@ if not mods["angelsindustries"] then
 
   move_item("battery", "bob-intermediates", "f-cba[battery]")
   move_item("iron-gear-wheel", "bob-gears", "aa[iron-gear-wheel]")
-  move_item("thorium-processing", "bob-nuclear", "l[thorium-processing]", "recipe")
 end
 
 if mods["SpaceMod"] then
@@ -42,8 +41,8 @@ if mods["SpaceMod"] then
 end
 
 if mods["Explosive Excavation"] then
-  move_item("blasting-charge", "petrochem-solids", "b[petrochem-solids-2]-c[blasting-charge]")
-  move_item("blasting-charge", "petrochem-solids-2", "a[explosives]-g", "recipe")
+  move_item("blasting-charge", "angels-petrochem-solids", "b[petrochem-solids-2]-c[blasting-charge]")
+  move_item("blasting-charge", "angels-petrochem-solids-2", "a[explosives]-g", "recipe")
 end
 
-move_item("solid-fuel-from-hydrogen", "petrochem-fuel", "e[bob]-d", "recipe")
+move_item("bob-solid-fuel-from-hydrogen", "angels-petrochem-fuel", "e[bob]-d", "recipe")
diff --git a/SeaBlock/data-updates/landfill.lua b/SeaBlock/data-updates/landfill.lua
index 16bc0559..4bd037d1 100644
--- a/SeaBlock/data-updates/landfill.lua
+++ b/SeaBlock/data-updates/landfill.lua
@@ -1,5 +1,5 @@
 -- Will need a lot of landfill
-seablock.lib.substingredient("landfill", "stone", "stone-crushed", 10)
+seablock.lib.substingredient("landfill", "stone", "angels-stone-crushed", 10)
 for k, v in pairs(data.raw.item) do
   if string.sub(k, 1, 8) == "landfill" then
     v.stack_size = 1000
@@ -12,13 +12,13 @@ if settings.startup["sb-default-landfill"] and data.raw.item[settings.startup["s
 end
 
 local function BuffLandfill(recipe)
-  seablock.lib.substingredient(recipe, "solid-mud", nil, 5)
+  seablock.lib.substingredient(recipe, "angels-solid-mud", nil, 5)
   bobmods.lib.recipe.set_energy_required(recipe, 2)
-  bobmods.lib.tech.remove_recipe_unlock("water-washing-1", recipe)
+  bobmods.lib.tech.remove_recipe_unlock("angels-water-washing-1", recipe)
   bobmods.lib.tech.add_recipe_unlock("landfill", recipe)
 end
 
-BuffLandfill("solid-mud-landfill")
+BuffLandfill("angels-solid-mud-landfill")
 
 if mods["LandfillPainting"] then
   BuffLandfill("landfill-dry-dirt")
@@ -27,15 +27,15 @@ if mods["LandfillPainting"] then
   BuffLandfill("landfill-red-desert-1")
   BuffLandfill("landfill-sand-3")
 else
-  bobmods.lib.tech.remove_recipe_unlock("water-washing-2", "solid-mud-landfill")
+  bobmods.lib.tech.remove_recipe_unlock("angels-water-washing-2", "angels-solid-mud-landfill")
 end
 
 -- Make landfill a red science tech
-data.raw.technology["landfill"].prerequisites = { "water-washing-1" }
+data.raw.technology["landfill"].prerequisites = { "angels-water-washing-1" }
 data.raw.technology["landfill"].unit = {
   count = 10,
   ingredients = { { type = "item", name = "automation-science-pack", amount = 1 } },
   time = 15,
 }
-bobmods.lib.tech.remove_prerequisite("water-washing-2", "landfill")
+bobmods.lib.tech.remove_prerequisite("angels-water-washing-2", "landfill")
 bobmods.lib.tech.ignore_tech_cost_multiplier("landfill", true)
diff --git a/SeaBlock/data-updates/military.lua b/SeaBlock/data-updates/military.lua
index d8da8a44..4af968bd 100644
--- a/SeaBlock/data-updates/military.lua
+++ b/SeaBlock/data-updates/military.lua
@@ -4,8 +4,6 @@ local mil_items = {
   { type = "ammo-turret", name = "bob-gun-turret-4" },
   { type = "ammo-turret", name = "bob-gun-turret-5" },
   { type = "ammo-turret", name = "bob-sniper-turret-3" },
-  { type = "armor", name = "heavy-armor-2" },
-  { type = "armor", name = "heavy-armor-3" },
   { type = "artillery-turret", name = "bob-artillery-turret-3" },
   { type = "artillery-wagon", name = "bob-artillery-wagon-3" },
   { type = "car", name = "bob-tank-2" },
@@ -25,17 +23,17 @@ local mil_items = {
   { type = "fluid-turret", name = "flamethrower-turret" },
   { type = "fluid-wagon", name = "bob-armoured-fluid-wagon-2" },
   { type = "fluid-wagon", name = "bob-armoured-fluid-wagon" },
-  { type = "fluid", name = "alien-acid" },
-  { type = "fluid", name = "alien-explosive" },
-  { type = "fluid", name = "alien-fire" },
-  { type = "fluid", name = "alien-poison" },
-  { type = "fluid", name = "liquid-glycerol" },
-  { type = "fluid", name = "liquid-toluene" },
-  { type = "fluid", name = "nitroglycerin" },
+  { type = "fluid", name = "bob-alien-acid" },
+  { type = "fluid", name = "bob-alien-explosive" },
+  { type = "fluid", name = "bob-alien-fire" },
+  { type = "fluid", name = "bob-alien-poison" },
+  { type = "fluid", name = "angels-liquid-glycerol" },
+  { type = "fluid", name = "angels-liquid-toluene" },
+  { type = "fluid", name = "bob-nitroglycerin" },
   { type = "gun", name = "combat-shotgun" },
   { type = "gun", name = "flamethrower" },
-  { type = "gun", name = "laser-rifle" },
-  { type = "gun", name = "rifle" },
+  { type = "gun", name = "bob-laser-rifle" },
+  { type = "gun", name = "bob-rifle" },
   { type = "gun", name = "shotgun" },
   { type = "item-with-entity-data", name = "bob-armoured-cargo-wagon-2" },
   { type = "item-with-entity-data", name = "bob-armoured-cargo-wagon" },
@@ -46,17 +44,17 @@ local mil_items = {
   { type = "item-with-entity-data", name = "bob-artillery-wagon-3" },
   { type = "item-with-entity-data", name = "bob-tank-2" },
   { type = "item-with-entity-data", name = "bob-tank-3" },
-  { type = "item", name = "acid-bullet-projectile" },
-  { type = "item", name = "acid-bullet" },
-  { type = "item", name = "acid-rocket-warhead" },
-  { type = "item", name = "alien-acid-barrel" },
-  { type = "item", name = "alien-blue-alloy" },
-  { type = "item", name = "alien-explosive-barrel" },
-  { type = "item", name = "alien-fire-barrel" },
-  { type = "item", name = "alien-orange-alloy" },
-  { type = "item", name = "alien-poison-barrel" },
-  { type = "item", name = "ap-bullet-projectile" },
-  { type = "item", name = "ap-bullet" },
+  { type = "item", name = "bob-acid-bullet-projectile" },
+  { type = "item", name = "bob-acid-bullet" },
+  { type = "item", name = "bob-acid-rocket-warhead" },
+  { type = "item", name = "bob-alien-acid-barrel" },
+  { type = "item", name = "bob-alien-blue-alloy" },
+  { type = "item", name = "bob-alien-explosive-barrel" },
+  { type = "item", name = "bob-alien-fire-barrel" },
+  { type = "item", name = "bob-alien-orange-alloy" },
+  { type = "item", name = "bob-alien-poison-barrel" },
+  { type = "item", name = "bob-ap-bullet-projectile" },
+  { type = "item", name = "bob-ap-bullet" },
   { type = "item", name = "bob-artillery-turret-3" },
   { type = "item", name = "bob-gun-turret-3" },
   { type = "item", name = "bob-gun-turret-4" },
@@ -73,79 +71,80 @@ local mil_items = {
   { type = "item", name = "bob-robot-laser-drone" },
   { type = "item", name = "bob-robot-plasma-drone" },
   { type = "item", name = "bob-sniper-turret-3" },
-  { type = "item", name = "bullet-casing" },
-  { type = "item", name = "bullet-projectile" },
-  { type = "item", name = "bullet" },
-  { type = "item", name = "combat-robot-dispenser-equipment" },
-  { type = "item", name = "cordite" },
+  { type = "item", name = "bob-bullet-casing" },
+  { type = "item", name = "bob-bullet-projectile" },
+  { type = "item", name = "bob-bullet" },
+  { type = "item", name = "bob-cordite" },
   { type = "item", name = "discharge-defense-equipment" },
-  { type = "item", name = "distractor-mine" },
-  { type = "item", name = "electric-bullet-projectile" },
-  { type = "item", name = "electric-bullet" },
-  { type = "item", name = "electric-rocket-warhead" },
-  { type = "item", name = "explosive-rocket-warhead" },
-  { type = "item", name = "flame-bullet-projectile" },
-  { type = "item", name = "flame-bullet" },
-  { type = "item", name = "flame-rocket-warhead" },
+  { type = "item", name = "bob-distractor-mine" },
+  { type = "item", name = "bob-electric-bullet-projectile" },
+  { type = "item", name = "bob-electric-bullet" },
+  { type = "item", name = "bob-electric-rocket-warhead" },
+  { type = "item", name = "bob-explosive-rocket-warhead" },
+  { type = "item", name = "bob-flame-bullet-projectile" },
+  { type = "item", name = "bob-flame-bullet" },
+  { type = "item", name = "bob-flame-rocket-warhead" },
   { type = "item", name = "flamethrower-turret" },
-  { type = "item", name = "gun-cotton" },
-  { type = "item", name = "gunmetal-alloy" },
-  { type = "item", name = "he-bullet-projectile" },
-  { type = "item", name = "he-bullet" },
-  { type = "item", name = "lab-alien" },
+  { type = "item", name = "bob-gun-cotton" },
+  { type = "item", name = "bob-gunmetal-alloy" },
+  { type = "item", name = "bob-he-bullet-projectile" },
+  { type = "item", name = "bob-he-bullet" },
+  { type = "item", name = "bob-lab-alien" },
   { type = "item", name = "land-mine" },
-  { type = "item", name = "laser-rifle-battery-case" },
-  { type = "item", name = "liquid-glycerol-barrel" },
-  { type = "item", name = "liquid-toluene-barrel" },
-  { type = "item", name = "magazine" },
-  { type = "item", name = "nitroglycerin-barrel" },
-  { type = "item", name = "petroleum-jelly" },
-  { type = "item", name = "piercing-rocket-warhead" },
-  { type = "item", name = "plasma-bullet-projectile" },
-  { type = "item", name = "plasma-bullet" },
-  { type = "item", name = "plasma-rocket-warhead" },
-  { type = "item", name = "poison-bullet-projectile" },
-  { type = "item", name = "poison-bullet" },
-  { type = "item", name = "poison-mine" },
-  { type = "item", name = "poison-rocket-warhead" },
-  { type = "item", name = "robot-drone-frame-large" },
-  { type = "item", name = "robot-drone-frame" },
-  { type = "item", name = "rocket-body" },
-  { type = "item", name = "rocket-warhead" },
-  { type = "item", name = "shot" },
-  { type = "item", name = "shotgun-shell-casing" },
-  { type = "item", name = "slowdown-mine" },
-  { type = "item", name = "uranium-bullet-projectile" },
-  { type = "item", name = "uranium-bullet" },
-  { type = "lab", name = "lab-alien" },
-  { type = "land-mine", name = "distractor-mine" },
-  { type = "land-mine", name = "land-mine" },
-  { type = "land-mine", name = "poison-mine" },
-  { type = "land-mine", name = "slowdown-mine" },
+  { type = "item", name = "bob-laser-rifle-battery-case" },
+  { type = "item", name = "angels-liquid-glycerol-barrel" },
+  { type = "item", name = "angels-liquid-toluene-barrel" },
+  { type = "item", name = "bob-magazine" },
+  { type = "item", name = "bob-nitroglycerin-barrel" },
+  { type = "item", name = "bob-petroleum-jelly" },
+  { type = "item", name = "bob-piercing-rocket-warhead" },
+  { type = "item", name = "bob-plasma-bullet-projectile" },
+  { type = "item", name = "bob-plasma-bullet" },
+  { type = "item", name = "bob-plasma-rocket-warhead" },
+  { type = "item", name = "bob-poison-bullet-projectile" },
+  { type = "item", name = "bob-poison-bullet" },
+  { type = "item", name = "bob-poison-mine" },
+  { type = "item", name = "bob-poison-rocket-warhead" },
+  { type = "item", name = "bob-robot-drone-frame-large" },
+  { type = "item", name = "bob-robot-drone-frame" },
+  { type = "item", name = "bob-rocket-body" },
+  { type = "item", name = "bob-rocket-warhead" },
+  { type = "item", name = "bob-shot" },
+  { type = "item", name = "bob-shotgun-shell-casing" },
+  { type = "item", name = "bob-slowdown-mine" },
+  { type = "item", name = "bob-uranium-bullet-projectile" },
+  { type = "item", name = "bob-uranium-bullet" },
+  { type = "lab", name = "bob-lab-alien" },
+  { type = "land-mine", name = "bob-distractor-mine" },
+  { type = "land-mine", name = "bob-land-mine" },
+  { type = "land-mine", name = "bob-poison-mine" },
+  { type = "land-mine", name = "bob-slowdown-mine" },
   { type = "locomotive", name = "bob-armoured-locomotive-2" },
   { type = "locomotive", name = "bob-armoured-locomotive" },
-  { type = "tool", name = "alien-science-pack-blue" },
-  { type = "tool", name = "alien-science-pack-green" },
-  { type = "tool", name = "alien-science-pack-orange" },
-  { type = "tool", name = "alien-science-pack-purple" },
-  { type = "tool", name = "alien-science-pack-red" },
-  { type = "tool", name = "alien-science-pack-yellow" },
-  { type = "tool", name = "alien-science-pack" },
-  { type = "tool", name = "science-pack-gold" },
+  { type = "tool", name = "bob-alien-science-pack-blue" },
+  { type = "tool", name = "bob-alien-science-pack-green" },
+  { type = "tool", name = "bob-alien-science-pack-orange" },
+  { type = "tool", name = "bob-alien-science-pack-purple" },
+  { type = "tool", name = "bob-alien-science-pack-red" },
+  { type = "tool", name = "bob-alien-science-pack-yellow" },
+  { type = "tool", name = "bob-alien-science-pack" },
+  { type = "tool", name = "bob-science-pack-gold" },
   { type = "unit", name = "bob-robot-flamethrower-drone" },
   { type = "unit", name = "bob-robot-gun-drone" },
   { type = "unit", name = "bob-robot-laser-drone" },
   { type = "unit", name = "bob-robot-plasma-drone" },
+  { type = "item", name = "bob-explosive-rocket-warhead" },
+  { type = "item", name = "bob-flame-rocket-warhead" },
 }
 
 local mil_tech = {
-  "alien-blue-research",
-  "alien-green-research",
-  "alien-orange-research",
-  "alien-purple-research",
-  "alien-red-research",
-  "alien-research",
-  "alien-yellow-research",
+  "bob-alien-blue-research",
+  "bob-alien-green-research",
+  "bob-alien-orange-research",
+  "bob-alien-purple-research",
+  "bob-alien-red-research",
+  "bob-alien-research",
+  "bob-alien-yellow-research",
   "angels-explosives-1",
   "angels-explosives-2",
   "bob-acid-bullets",
@@ -209,12 +208,12 @@ local mil_tech = {
   "bob-turrets-3",
   "bob-turrets-4",
   "bob-turrets-5",
-  "cordite-processing",
+  "bob-cordite-processing",
   "defender",
   "destroyer",
   "discharge-defense-equipment",
   "distractor",
-  "distractor-mine",
+  "bob-distractor-mine",
   "energy-weapons-damage-7", -- Infinite
   "explosive-rocketry",
   "flamethrower",
@@ -227,9 +226,9 @@ local mil_tech = {
   "follower-robot-count-7", -- Infinite
   "land-mine",
   "laser-shooting-speed-7",
-  "nitroglycerin-processing",
+  "bob-nitroglycerin-processing",
   "physical-projectile-damage-7", -- Infinite
-  "poison-mine",
+  "bob-poison-mine",
   "refined-flammables-1",
   "refined-flammables-2",
   "refined-flammables-3",
@@ -240,15 +239,15 @@ local mil_tech = {
   "sct-alien-science-pack",
   "sct-lab-alien",
   "sct-science-pack-gold",
-  "slowdown-mine",
+  "bob-slowdown-mine",
   "stronger-explosives-7", -- Infinite
   "uranium-ammo",
 }
 
 local mil_ammo = {
-  { type = "ammo", name = "acid-bullet-magazine" },
-  { type = "ammo", name = "ap-bullet-magazine" },
-  { type = "ammo", name = "better-shotgun-shell" },
+  { type = "ammo", name = "bob-acid-bullet-magazine" },
+  { type = "ammo", name = "bob-ap-bullet-magazine" },
+  { type = "ammo", name = "bob-better-shotgun-shell" },
   { type = "ammo", name = "bob-acid-rocket" },
   { type = "ammo", name = "bob-electric-rocket" },
   { type = "ammo", name = "bob-explosive-rocket" },
@@ -257,73 +256,76 @@ local mil_ammo = {
   { type = "ammo", name = "bob-plasma-rocket" },
   { type = "ammo", name = "bob-poison-rocket" },
   { type = "ammo", name = "bob-rocket" },
-  { type = "ammo", name = "bullet-magazine" },
-  { type = "ammo", name = "distractor-artillery-shell" },
-  { type = "ammo", name = "electric-bullet-magazine" },
+  { type = "ammo", name = "bob-bullet-magazine" },
+  { type = "ammo", name = "bob-distractor-artillery-shell" },
+  { type = "ammo", name = "bob-electric-bullet-magazine" },
   { type = "ammo", name = "explosive-artillery-shell" },
   { type = "ammo", name = "explosive-rocket" },
   { type = "ammo", name = "explosive-uranium-cannon-shell" },
-  { type = "ammo", name = "fire-artillery-shell" },
-  { type = "ammo", name = "flame-bullet-magazine" },
+  { type = "ammo", name = "bob-fire-artillery-shell" },
+  { type = "ammo", name = "bob-flame-bullet-magazine" },
   { type = "ammo", name = "flamethrower-ammo" },
-  { type = "ammo", name = "he-bullet-magazine" },
-  { type = "ammo", name = "laser-rifle-battery-amethyst" },
-  { type = "ammo", name = "laser-rifle-battery-diamond" },
-  { type = "ammo", name = "laser-rifle-battery-emerald" },
-  { type = "ammo", name = "laser-rifle-battery-ruby" },
-  { type = "ammo", name = "laser-rifle-battery-sapphire" },
-  { type = "ammo", name = "laser-rifle-battery-topaz" },
-  { type = "ammo", name = "laser-rifle-battery" },
+  { type = "ammo", name = "bob-he-bullet-magazine" },
+  { type = "ammo", name = "bob-laser-rifle-battery-amethyst" },
+  { type = "ammo", name = "bob-laser-rifle-battery-diamond" },
+  { type = "ammo", name = "bob-laser-rifle-battery-emerald" },
+  { type = "ammo", name = "bob-laser-rifle-battery-ruby" },
+  { type = "ammo", name = "bob-laser-rifle-battery-sapphire" },
+  { type = "ammo", name = "bob-laser-rifle-battery-topaz" },
+  { type = "ammo", name = "bob-laser-rifle-battery" },
   { type = "ammo", name = "piercing-shotgun-shell" },
-  { type = "ammo", name = "plasma-bullet-magazine" },
-  { type = "ammo", name = "poison-artillery-shell" },
-  { type = "ammo", name = "poison-bullet-magazine" },
-  { type = "ammo", name = "scatter-cannon-shell" },
-  { type = "ammo", name = "shotgun-acid-shell" },
-  { type = "ammo", name = "shotgun-ap-shell" },
-  { type = "ammo", name = "shotgun-electric-shell" },
-  { type = "ammo", name = "shotgun-explosive-shell" },
-  { type = "ammo", name = "shotgun-flame-shell" },
-  { type = "ammo", name = "shotgun-plasma-shell" },
-  { type = "ammo", name = "shotgun-poison-shell" },
+  { type = "ammo", name = "bob-plasma-bullet-magazine" },
+  { type = "ammo", name = "bob-poison-artillery-shell" },
+  { type = "ammo", name = "bob-poison-bullet-magazine" },
+  { type = "ammo", name = "bob-scatter-cannon-shell" },
+  { type = "ammo", name = "bob-shotgun-acid-shell" },
+  { type = "ammo", name = "bob-shotgun-ap-shell" },
+  { type = "ammo", name = "bob-shotgun-electric-shell" },
+  { type = "ammo", name = "bob-shotgun-explosive-shell" },
+  { type = "ammo", name = "bob-shotgun-flame-shell" },
+  { type = "ammo", name = "bob-shotgun-plasma-shell" },
+  { type = "ammo", name = "bob-shotgun-poison-shell" },
   { type = "ammo", name = "shotgun-shell" },
-  { type = "ammo", name = "shotgun-uranium-shell" },
-  { type = "ammo", name = "uranium-cannon-shell" },
+  { type = "ammo", name = "bob-shotgun-uranium-shell" },
+  { type = "ammo", name = "bob-uranium-cannon-shell" },
   { type = "ammo", name = "uranium-rounds-magazine" },
+  { type = "ammo", name = "uranium-cannon-shell" },
+  { type = "ammo", name = "explosive-uranium-cannon-shell" },
+  { type = "ammo", name = "bob-explosive-artillery-shell" },
   { type = "capsule", name = "cluster-grenade" },
   { type = "capsule", name = "defender-capsule" },
   { type = "capsule", name = "destroyer-capsule" },
   { type = "capsule", name = "discharge-defense-remote" },
   { type = "capsule", name = "distractor-capsule" },
-  { type = "capsule", name = "fire-capsule" },
+  { type = "capsule", name = "bob-fire-capsule" },
   { type = "capsule", name = "poison-capsule" },
   { type = "capsule", name = "slowdown-capsule" },
 }
 
 local mil_recipes = {
-  "acid-bullet",
-  "acid-bullet-magazine",
-  "acid-bullet-projectile",
-  "acid-rocket-warhead",
-  "alien-acid",
-  "alien-blue-alloy",
-  "alien-explosive",
-  "alien-fire",
-  "alien-orange-alloy",
-  "alien-poison",
-  "alien-science-pack",
-  "alien-science-pack-blue",
-  "alien-science-pack-green",
-  "alien-science-pack-orange",
-  "alien-science-pack-purple",
-  "alien-science-pack-red",
-  "alien-science-pack-yellow",
-  "angels-chemical-void-liquid-glycerol",
-  "angels-chemical-void-liquid-toluene",
-  "ap-bullet",
-  "ap-bullet-magazine",
-  "ap-bullet-projectile",
-  "better-shotgun-shell",
+  "bob-acid-bullet",
+  "bob-acid-bullet-magazine",
+  "bob-acid-bullet-projectile",
+  "bob-acid-rocket-warhead",
+  "bob-alien-acid",
+  "bob-alien-blue-alloy",
+  "bob-alien-explosive",
+  "bob-alien-fire",
+  "bob-alien-orange-alloy",
+  "bob-alien-poison",
+  "bob-alien-science-pack",
+  "bob-alien-science-pack-blue",
+  "bob-alien-science-pack-green",
+  "bob-alien-science-pack-orange",
+  "bob-alien-science-pack-purple",
+  "bob-alien-science-pack-red",
+  "bob-alien-science-pack-yellow",
+  "angels-chemical-void-angels-liquid-glycerol",
+  "angels-chemical-void-angels-liquid-toluene",
+  "bob-ap-bullet",
+  "bob-ap-bullet-magazine",
+  "bob-ap-bullet-projectile",
+  "bob-better-shotgun-shell",
   "bob-acid-rocket",
   "bob-armoured-cargo-wagon",
   "bob-armoured-cargo-wagon-2",
@@ -347,7 +349,6 @@ local mil_recipes = {
   "bob-plasma-rocket",
   "bob-plasma-turret-3",
   "bob-plasma-turret-4",
-  "bob-plasma-turret-5",
   "bob-poison-rocket",
   "bob-robot-flamethrower-drone",
   "bob-robot-gun-drone",
@@ -357,115 +358,112 @@ local mil_recipes = {
   "bob-sniper-turret-3",
   "bob-tank-2",
   "bob-tank-3",
-  "bullet",
-  "bullet-casing",
-  "bullet-magazine",
-  "bullet-projectile",
+  "bob-bullet",
+  "bob-bullet-casing",
+  "bob-bullet-magazine",
+  "bob-bullet-projectile",
   "cluster-grenade",
   "combat-shotgun",
-  "cordite",
+  "bob-cordite",
   "defender-capsule",
   "destroyer-capsule",
   "discharge-defense-equipment",
-  "discharge-defense-remote",
-  "distractor-artillery-shell",
+  "bob-distractor-artillery-shell",
   "distractor-capsule",
-  "distractor-mine",
-  "electric-bullet",
-  "electric-bullet-magazine",
-  "electric-bullet-projectile",
+  "bob-distractor-mine",
+  "bob-electric-bullet",
+  "bob-electric-bullet-magazine",
+  "bob-electric-bullet-projectile",
   "electric-energy-interface",
-  "electric-rocket-warhead",
-  "empty-alien-acid-barrel",
-  "empty-alien-explosive-barrel",
-  "empty-alien-fire-barrel",
-  "empty-alien-poison-barrel",
-  "empty-liquid-glycerol-barrel",
-  "empty-liquid-toluene-barrel",
-  "empty-nitroglycerin-barrel",
-  "explosive-artillery-shell",
+  "bob-electric-rocket-warhead",
+  "empty-bob-alien-acid-barrel",
+  "empty-bob-alien-explosive-barrel",
+  "empty-bob-alien-fire-barrel",
+  "empty-bob-alien-poison-barrel",
+  "empty-angels-liquid-glycerol-barrel",
+  "empty-angels-liquid-toluene-barrel",
+  "empty-bob-nitroglycerin-barrel",
+  "bob-explosive-artillery-shell",
   "explosive-rocket",
-  "explosive-rocket-warhead",
+  "bob-explosive-rocket-warhead",
   "explosive-uranium-cannon-shell",
-  "fill-alien-acid-barrel",
-  "fill-alien-explosive-barrel",
-  "fill-alien-fire-barrel",
-  "fill-alien-poison-barrel",
-  "fill-liquid-glycerol-barrel",
-  "fill-liquid-toluene-barrel",
-  "fill-nitroglycerin-barrel",
-  "fire-artillery-shell",
-  "fire-capsule",
-  "flame-bullet",
-  "flame-bullet-magazine",
-  "flame-bullet-projectile",
-  "flame-rocket-warhead",
+  "bob-alien-acid-barrel",
+  "bob-alien-explosive-barrel",
+  "bob-alien-fire-barrel",
+  "bob-alien-poison-barrel",
+  "angels-liquid-glycerol-barrel",
+  "angels-liquid-toluene-barrel",
+  "bob-nitroglycerin-barrel",
+  "bob-fire-artillery-shell",
+  "bob-fire-capsule",
+  "bob-flame-bullet",
+  "bob-flame-bullet-magazine",
+  "bob-flame-bullet-projectile",
+  "bob-flame-rocket-warhead",
   "flamethrower",
   "flamethrower-ammo",
   "flamethrower-turret",
-  "gas-fractioning-residual",
-  "gun-cotton",
-  "gunmetal-alloy",
-  "he-bullet",
-  "he-bullet-magazine",
-  "he-bullet-projectile",
-  "heavy-armor-2",
-  "heavy-armor-3",
-  "lab-alien",
+  "angels-gas-fractioning-residual",
+  "bob-gun-cotton",
+  "bob-gunmetal-alloy",
+  "bob-he-bullet",
+  "bob-he-bullet-magazine",
+  "bob-he-bullet-projectile",
+  "bob-lab-alien",
   "land-mine",
-  "laser-rifle",
-  "laser-rifle-battery",
-  "laser-rifle-battery-amethyst",
-  "laser-rifle-battery-case",
-  "laser-rifle-battery-diamond",
-  "laser-rifle-battery-emerald",
-  "laser-rifle-battery-ruby",
-  "laser-rifle-battery-sapphire",
-  "laser-rifle-battery-topaz",
-  "liquid-glycerol",
-  "liquid-toluene-from-benzene",
-  "liquid-toluene-from-naphtha",
-  "magazine",
-  "nitroglycerin",
-  "petroleum-jelly",
-  "piercing-rocket-warhead",
+  "bob-laser-rifle",
+  "bob-laser-rifle-battery",
+  "bob-laser-rifle-battery-amethyst",
+  "bob-laser-rifle-battery-case",
+  "bob-laser-rifle-battery-diamond",
+  "bob-laser-rifle-battery-emerald",
+  "bob-laser-rifle-battery-ruby",
+  "bob-laser-rifle-battery-sapphire",
+  "bob-laser-rifle-battery-topaz",
+  "angels-liquid-glycerol",
+  "angels-liquid-toluene-from-benzene",
+  "angels-liquid-toluene",
+  "bob-magazine",
+  "bob-nitroglycerin",
+  "bob-petroleum-jelly",
+  "bob-piercing-rocket-warhead",
   "piercing-shotgun-shell",
-  "plasma-bullet",
-  "plasma-bullet-magazine",
-  "plasma-bullet-projectile",
-  "plasma-rocket-warhead",
-  "poison-artillery-shell",
-  "poison-bullet",
-  "poison-bullet-magazine",
-  "poison-bullet-projectile",
+  "bob-plasma-bullet",
+  "bob-plasma-bullet-magazine",
+  "bob-plasma-bullet-projectile",
+  "bob-plasma-rocket-warhead",
+  "bob-poison-artillery-shell",
+  "bob-poison-bullet",
+  "bob-poison-bullet-magazine",
+  "bob-poison-bullet-projectile",
   "poison-capsule",
-  "poison-mine",
-  "poison-rocket-warhead",
-  "rifle",
-  "robot-drone-frame",
-  "robot-drone-frame-large",
-  "rocket-body",
-  "rocket-warhead",
-  "scatter-cannon-shell",
-  "science-pack-gold",
-  "shot",
+  "bob-poison-mine",
+  "bob-poison-rocket-warhead",
+  "bob-rifle",
+  "bob-robot-drone-frame",
+  "bob-robot-drone-frame-large",
+  "bob-rocket-body",
+  "bob-rocket-warhead",
+  "bob-scatter-cannon-shell",
+  "bob-science-pack-gold",
+  "bob-shot",
   "shotgun",
-  "shotgun-acid-shell",
-  "shotgun-ap-shell",
-  "shotgun-electric-shell",
-  "shotgun-explosive-shell",
-  "shotgun-flame-shell",
-  "shotgun-plasma-shell",
-  "shotgun-poison-shell",
+  "bob-shotgun-acid-shell",
+  "bob-shotgun-ap-shell",
+  "bob-shotgun-electric-shell",
+  "bob-shotgun-explosive-shell",
+  "bob-shotgun-flame-shell",
+  "bob-shotgun-plasma-shell",
+  "bob-shotgun-poison-shell",
   "shotgun-shell",
-  "shotgun-shell-casing",
-  "shotgun-uranium-shell",
+  "bob-shotgun-shell-casing",
+  "bob-shotgun-uranium-shell",
   "slowdown-capsule",
-  "slowdown-mine",
-  "solid-nitroglycerin",
-  "solid-trinitrotoluene",
-  "uranium-bullet",
-  "uranium-bullet-projectile",
+  "bob-slowdown-mine",
+  "angels-solid-nitroglycerin",
+  "angels-solid-trinitrotoluene",
+  "bob-uranium-bullet",
+  "bob-uranium-bullet-projectile",
   "uranium-cannon-shell",
   "uranium-rounds-magazine",
 }
@@ -493,45 +491,55 @@ for _, v in pairs(mil_recipes) do
   bobmods.lib.recipe.hide(v)
 end
 
+-- Remove hidden upgrade
+if mods["bobwarfare"] then
+  data.raw["ammo-turret"]["bob-gun-turret-2"].next_upgrade = nil
+  data.raw["ammo-turret"]["bob-sniper-turret-2"].next_upgrade = nil
+  data.raw["electric-turret"]["bob-plasma-turret-2"].next_upgrade = nil
+  data.raw["artillery-turret"]["bob-artillery-turret-2"].next_upgrade = nil
+  data.raw["artillery-wagon"]["bob-artillery-wagon-2"].next_upgrade = nil
+end
+data.raw["electric-turret"]["laser-turret"].next_upgrade = nil
+
 bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "gas-fractioning-residual")
-bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "empty-liquid-glycerol-barrel")
-bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "empty-liquid-toluene-barrel")
-bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "empty-nitroglycerin-barrel")
-bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "fill-liquid-glycerol-barrel")
-bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "fill-liquid-toluene-barrel")
-bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "fill-nitroglycerin-barrel")
-bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "empty-alien-acid-barrel")
-bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "empty-alien-explosive-barrel")
-bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "empty-alien-fire-barrel")
-bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "empty-alien-poison-barrel")
-bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "fill-alien-acid-barrel")
-bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "fill-alien-explosive-barrel")
-bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "fill-alien-fire-barrel")
-bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "fill-alien-poison-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-liquid-glycerol-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-liquid-toluene-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-bob-nitroglycerin-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "liquid-glycerol-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "liquid-toluene-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "bob-nitroglycerin-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "empty-bob-alien-acid-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "empty-bob-alien-explosive-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "empty-bob-alien-fire-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "empty-bob-alien-poison-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "bob-alien-acid-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "bob-alien-explosive-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "bob-alien-fire-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "bob-alien-poison-barrel")
 bobmods.lib.tech.remove_recipe_unlock("military", "shotgun")
 bobmods.lib.tech.remove_recipe_unlock("military", "shotgun-shell")
 bobmods.lib.tech.remove_recipe_unlock("military-3", "combat-shotgun")
-bobmods.lib.tech.remove_recipe_unlock("military-3", "fire-capsule")
+bobmods.lib.tech.remove_recipe_unlock("military-3", "bob-fire-capsule")
 bobmods.lib.tech.remove_recipe_unlock("military-3", "poison-capsule")
-bobmods.lib.tech.remove_recipe_unlock("military-3", "rifle")
+bobmods.lib.tech.remove_recipe_unlock("military-3", "bob-rifle")
 bobmods.lib.tech.remove_recipe_unlock("military-3", "slowdown-capsule")
-bobmods.lib.tech.remove_recipe_unlock("military-3", "sniper-rifle") -- Unlocked by it's own earlier tech
+bobmods.lib.tech.remove_recipe_unlock("military-3", "bob-sniper-rifle") -- Unlocked by it's own earlier tech
 bobmods.lib.tech.remove_recipe_unlock("military-4", "cluster-grenade")
 bobmods.lib.tech.remove_recipe_unlock("military-4", "piercing-shotgun-shell")
-bobmods.lib.tech.remove_recipe_unlock("robotics", "robot-drone-frame")
-bobmods.lib.tech.remove_recipe_unlock("robotics", "robot-drone-frame-large")
+bobmods.lib.tech.remove_recipe_unlock("robotics", "bob-robot-drone-frame")
+bobmods.lib.tech.remove_recipe_unlock("robotics", "bob-robot-drone-frame-large")
 bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "explosive-uranium-cannon-shell")
-bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "shotgun-uranium-shell")
-bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "uranium-bullet")
-bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "uranium-bullet-projectile")
+bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "bob-shotgun-uranium-shell")
+bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "bob-uranium-bullet")
+bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "bob-uranium-bullet-projectile")
 bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "uranium-cannon-shell")
 bobmods.lib.tech.remove_recipe_unlock("uranium-ammo", "uranium-rounds-magazine")
-bobmods.lib.tech.remove_recipe_unlock("zinc-processing", "gunmetal-alloy")
+bobmods.lib.tech.remove_recipe_unlock("bob-zinc-processing", "bob-gunmetal-alloy")
 
-seablock.lib.substresult("nutrients-refining-2", "liquid-glycerol", "water", nil)
-if data.raw.recipe["nutrients-refining-2"] then
-  data.raw.recipe["nutrients-refining-2"].icons = angelsmods.functions.create_liquid_recipe_icon({
-    "liquid-fuel-oil",
+seablock.lib.substresult("angels-nutrients-refining-2", "angels-liquid-glycerol", "water", nil)
+if data.raw.recipe["angels-nutrients-refining-2"] then
+  data.raw.recipe["angels-nutrients-refining-2"].icons = angelsmods.functions.create_liquid_recipe_icon({
+    "angels-liquid-fuel-oil",
     { "__base__/graphics/icons/fluid/water.png", 64 },
   }, { { 214, 146, 040 }, { 169, 130, 039 }, { 120, 083, 004 } })
 end
@@ -542,10 +550,10 @@ for i = 1, 6 do
   seablock.lib.remove_effect("physical-projectile-damage-" .. i, "turret-attack", "turret_id", "bob-gun-turret-5")
   seablock.lib.remove_effect("physical-projectile-damage-" .. i, "turret-attack", "turret_id", "bob-sniper-turret-3")
   seablock.lib.remove_effect("physical-projectile-damage-" .. i, "ammo-damage", "ammo_category", "shotgun-shell")
-  seablock.lib.remove_effect("energy-weapons-damage-" .. i, "ammo-damage", "ammo_category", "laser-rifle")
-  seablock.lib.remove_effect("energy-weapons-damage-" .. i, "ammo-damage", "ammo_category", "beam")
+  seablock.lib.remove_effect("laser-weapons-damage-" .. i, "ammo-damage", "ammo_category", "bob-laser-rifle")
+  seablock.lib.remove_effect("laser-weapons-damage-" .. i, "ammo-damage", "ammo_category", "beam")
   seablock.lib.remove_effect("weapon-shooting-speed-" .. i, "gun-speed", "ammo_category", "shotgun-shell")
-  seablock.lib.remove_effect("laser-shooting-speed-" .. i, "gun-speed", "ammo_category", "laser-rifle")
+  seablock.lib.remove_effect("laser-shooting-speed-" .. i, "gun-speed", "ammo_category", "bob-laser-rifle")
   seablock.lib.remove_effect("stronger-explosives-" .. i, "ammo-damage", "ammo_category", "landmine")
 end
 
@@ -569,7 +577,7 @@ local mil_techswap = {
       { "logistic-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
     },
   },
   -- 250 Red, Green, Blue, Purple, Pink, Yellow
@@ -580,7 +588,7 @@ local mil_techswap = {
       { "logistic-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
       { "utility-science-pack", 1 },
     },
   },
@@ -593,7 +601,7 @@ local mil_techswap = {
       { "military-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
     },
   },
   -- 250 Red, Green, Military, Blue, Purple, Pink, Yellow
@@ -605,7 +613,7 @@ local mil_techswap = {
       { "military-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
       { "utility-science-pack", 1 },
     },
   },
@@ -618,7 +626,7 @@ local mil_techswap = {
       { "military-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
       { "utility-science-pack", 1 },
       { "space-science-pack", 1 },
     },
@@ -631,7 +639,7 @@ local mil_techswap = {
       { "logistic-science-pack", 1 },
       { "military-science-pack", 1 },
       { "chemical-science-pack", 1 },
-      { mods["bobtech"] and "advanced-logistic-science-pack" or "production-science-pack", 1 },
+      { mods["bobtech"] and "bob-advanced-logistic-science-pack" or "production-science-pack", 1 },
     },
   },
   -- 250 Red, Green, Military, Blue, Purple, Pink, Yellow
@@ -643,7 +651,7 @@ local mil_techswap = {
       { "military-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
       { "utility-science-pack", 1 },
     },
   },
@@ -656,53 +664,53 @@ local mil_techswap = {
       { "military-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
       { "utility-science-pack", 1 },
       { "space-science-pack", 1 },
     },
   },
   -- 250 Red, Green, Military, Blue, Purple, Pink
   {
-    tech_name = "fusion-reactor-equipment-2",
+    tech_name = "bob-fission-reactor-equipment-2",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
       { "military-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
     },
   },
   -- 300 Red, Green, Military, Blue, Purple, Pink, Yellow
   {
-    tech_name = "fusion-reactor-equipment-3",
+    tech_name = "bob-fission-reactor-equipment-3",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
       { "military-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
       { "utility-science-pack", 1 },
     },
   },
   -- 350 Red, Green, Military, Blue, Purple, Pink, Yellow, White
   {
-    tech_name = "fusion-reactor-equipment-4",
+    tech_name = "bob-fission-reactor-equipment-4",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
       { "military-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
       { "utility-science-pack", 1 },
       { "space-science-pack", 1 },
     },
   },
   -- 150 Red, Green, Blue, Purple
   {
-    tech_name = "vehicle-battery-equipment-4",
+    tech_name = "bob-vehicle-battery-equipment-4",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
@@ -712,69 +720,69 @@ local mil_techswap = {
   },
   -- 200 Red, Green, Blue, Purple, Pink
   {
-    tech_name = "vehicle-battery-equipment-5",
+    tech_name = "bob-vehicle-battery-equipment-5",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
     },
   },
   -- 250 Red, Green, Blue, Purple, Pink, Yellow
   {
-    tech_name = "vehicle-battery-equipment-6",
+    tech_name = "bob-vehicle-battery-equipment-6",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
       { "utility-science-pack", 1 },
     },
   },
   -- 200 Red, Green, Military, Blue, Purple, Pink
   {
-    tech_name = "vehicle-energy-shield-equipment-4",
+    tech_name = "bob-vehicle-energy-shield-equipment-4",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
       { "military-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
     },
   },
   -- 250 Red, Green, Military, Blue, Purple, Pink, Yellow
   {
-    tech_name = "vehicle-energy-shield-equipment-5",
+    tech_name = "bob-vehicle-energy-shield-equipment-5",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
       { "military-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
       { "utility-science-pack", 1 },
     },
   },
   -- 300 Red, Green, Military, Blue, Purple, Pink, Yellow, White
   {
-    tech_name = "vehicle-energy-shield-equipment-6",
+    tech_name = "bob-vehicle-energy-shield-equipment-6",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
       { "military-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
       { "utility-science-pack", 1 },
       { "space-science-pack", 1 },
     },
   },
   -- 200 Red, Green, Blue, Purple, Yellow
   {
-    tech_name = "vehicle-fusion-cell-equipment-4",
+    tech_name = "bob-vehicle-fusion-cell-equipment-4",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
@@ -785,32 +793,32 @@ local mil_techswap = {
   },
   -- 250 Red, Green, Blue, Purple, Pink, Yellow
   {
-    tech_name = "vehicle-fusion-cell-equipment-5",
+    tech_name = "bob-vehicle-fusion-cell-equipment-5",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
       { "utility-science-pack", 1 },
     },
   },
   -- 300 Red, Green, Blue, Purple, Pink, Yellow, White
   {
-    tech_name = "vehicle-fusion-cell-equipment-6",
+    tech_name = "bob-vehicle-fusion-cell-equipment-6",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
       { "utility-science-pack", 1 },
       { "space-science-pack", 1 },
     },
   },
   -- 250 Red, Green, Military, Blue, Purple
   {
-    tech_name = "vehicle-big-turret-equipment-3",
+    tech_name = "bob-vehicle-big-turret-equipment-3",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
@@ -821,7 +829,7 @@ local mil_techswap = {
   },
   -- 300 Red, Green, Military, Blue, Purple
   {
-    tech_name = "vehicle-big-turret-equipment-4",
+    tech_name = "bob-vehicle-big-turret-equipment-4",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
@@ -832,32 +840,32 @@ local mil_techswap = {
   },
   -- 350 Red, Green, Military, Blue, Purple, Pink
   {
-    tech_name = "vehicle-big-turret-equipment-5",
+    tech_name = "bob-vehicle-big-turret-equipment-5",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
       { "military-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
     },
   },
   -- 400 Red, Green, Military, Blue, Purple, Pink, Yellow
   {
-    tech_name = "vehicle-big-turret-equipment-6",
+    tech_name = "bob-vehicle-big-turret-equipment-6",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
       { "military-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
       { "utility-science-pack", 1 },
     },
   },
   -- 350 Red, Green, Blue, Purple, Yellow
   {
-    tech_name = "vehicle-fusion-reactor-equipment-4",
+    tech_name = "bob-vehicle-fission-reactor-equipment-4",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
@@ -868,32 +876,32 @@ local mil_techswap = {
   },
   -- 400 Red, Green, Blue, Purple, Pink, Yellow
   {
-    tech_name = "vehicle-fusion-reactor-equipment-5",
+    tech_name = "bob-vehicle-fission-reactor-equipment-5",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
       { "utility-science-pack", 1 },
     },
   },
   -- 450 Red, Green, Blue, Purple, Pink, Yellow, White
   {
-    tech_name = "vehicle-fusion-reactor-equipment-6",
+    tech_name = "bob-vehicle-fission-reactor-equipment-6",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
       { "chemical-science-pack", 1 },
       { "production-science-pack", 1 },
-      { "advanced-logistic-science-pack", 1 },
+      { "bob-advanced-logistic-science-pack", 1 },
       { "utility-science-pack", 1 },
       { "space-science-pack", 1 },
     },
   },
   -- 400 Red, Green, Military, Blue, Purple, Pink, Yellow, White
   {
-    tech_name = "personal-laser-defense-equipment-6",
+    tech_name = "bob-personal-laser-defense-equipment-6",
     science_packs = {
       { "automation-science-pack", 1 },
       { "logistic-science-pack", 1 },
@@ -949,16 +957,16 @@ if mods["bobwarfare"] then
   bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-1", "military-3")
   bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-1", "angels-cobalt-steel-smelting-1")
   seablock.lib.substingredient("bob-plasma-turret-1", "electronic-circuit", "advanced-circuit", 40)
-  seablock.lib.substingredient("bob-plasma-turret-1", "steel-plate", "cobalt-steel-alloy", nil)
+  seablock.lib.substingredient("bob-plasma-turret-1", "steel-plate", "bob-cobalt-steel-alloy", nil)
 
   bobmods.lib.tech.add_new_science_pack("bob-plasma-turrets-2", "chemical-science-pack", 1)
   bobmods.lib.tech.add_new_science_pack("bob-plasma-turrets-2", "production-science-pack", 1)
   bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-2", "military-4")
-  bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-2", "battery-2")
+  bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-2", "bob-battery-2")
   bobmods.lib.tech.add_prerequisite("bob-plasma-turrets-2", "angels-titanium-smelting-1")
-  seablock.lib.substingredient("bob-plasma-turret-2", "battery", "lithium-ion-battery", nil)
+  seablock.lib.substingredient("bob-plasma-turret-2", "battery", "bob-lithium-ion-battery", nil)
   seablock.lib.substingredient("bob-plasma-turret-2", "advanced-circuit", "processing-unit", 40)
-  seablock.lib.substingredient("bob-plasma-turret-2", "steel-plate", "titanium-plate", nil)
+  seablock.lib.substingredient("bob-plasma-turret-2", "steel-plate", "bob-titanium-plate", nil)
 
   -- Make Military 4 take Purple science rather than Yellow science
   bobmods.lib.tech.remove_science_pack("military-4", "utility-science-pack")
@@ -966,7 +974,7 @@ if mods["bobwarfare"] then
   bobmods.lib.tech.replace_prerequisite("military-4", "utility-science-pack", "production-science-pack")
 
   -- Walking Vehicle (Antron) can now depend on Military 4
-  bobmods.lib.tech.replace_prerequisite("walking-vehicle", "military-3", "military-4")
+  bobmods.lib.tech.replace_prerequisite("bob-walking-vehicle", "military-3", "military-4")
 
   -- Move Artillery later
   bobmods.lib.tech.remove_science_pack("bob-artillery-turret-2", "utility-science-pack", 1)
@@ -974,26 +982,18 @@ if mods["bobwarfare"] then
   bobmods.lib.tech.add_new_science_pack("bob-artillery-turret-2", "production-science-pack", 1)
   bobmods.lib.tech.add_new_science_pack("bob-artillery-wagon-2", "production-science-pack", 1)
   bobmods.lib.tech.add_prerequisite("artillery", "military-3")
-  bobmods.lib.tech.add_prerequisite("artillery", "cobalt-processing")
+  bobmods.lib.tech.add_prerequisite("artillery", "bob-cobalt-processing")
   bobmods.lib.tech.add_prerequisite("artillery", "angels-stone-smelting-2")
-  seablock.lib.substingredient("artillery-turret", "iron-gear-wheel", "cobalt-steel-gear-wheel", nil)
-  seablock.lib.substingredient("artillery-turret", "concrete", "concrete-brick", nil)
-  seablock.lib.substingredient("artillery-turret", "steel-plate", "cobalt-steel-alloy", nil)
-  seablock.lib.substingredient("artillery-wagon", "iron-gear-wheel", "cobalt-steel-gear-wheel", nil)
-  seablock.lib.substingredient("artillery-wagon", "pipe", "brass-pipe", nil)
-  seablock.lib.substingredient("artillery-wagon", "steel-plate", "cobalt-steel-alloy", nil)
-
-  bobmods.lib.tech.add_prerequisite("artillery", "radars-3")
-  seablock.lib.substingredient("artillery-targeting-remote", "radar", "radar-3")
+  seablock.lib.substingredient("artillery-turret", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel", nil)
+  seablock.lib.substingredient("artillery-turret", "concrete", "angels-concrete-brick", nil)
+  seablock.lib.substingredient("artillery-turret", "steel-plate", "bob-cobalt-steel-alloy", nil)
+  seablock.lib.substingredient("artillery-wagon", "iron-gear-wheel", "bob-cobalt-steel-gear-wheel", nil)
+  seablock.lib.substingredient("artillery-wagon", "pipe", "bob-brass-pipe", nil)
+  seablock.lib.substingredient("artillery-wagon", "steel-plate", "bob-cobalt-steel-alloy", nil)
 
-  bobmods.lib.tech.add_prerequisite("spidertron", "radars-5")
-  seablock.lib.substingredient("spidertron-remote", "radar", "radar-5")
+  bobmods.lib.tech.add_prerequisite("artillery", "bob-radar-3")
 
-  -- Remove prerequisite as gunmetal smelting tech won't exist as we have disabled the trigger
-  bobmods.lib.tech.remove_prerequisite("bob-armor-making-3", "angels-gunmetal-smelting-1")
-
-  -- Remove dependencies on Alien Research
-  bobmods.lib.tech.remove_prerequisite("bob-power-armor-3", "alien-research")
+  bobmods.lib.tech.add_prerequisite("spidertron", "bob-radar-5")
 
   -- Adjust Power Armor
   bobmods.lib.tech.remove_science_pack("power-armor", "chemical-science-pack")
@@ -1001,18 +1001,18 @@ if mods["bobwarfare"] then
   bobmods.lib.tech.add_prerequisite("power-armor", "military-science-pack")
   bobmods.lib.tech.set_science_pack_count("power-armor", 150)
   bobmods.lib.recipe.replace_ingredient("power-armor", "processing-unit", "advanced-circuit")
-  bobmods.lib.tech.remove_prerequisite("power-armor", "advanced-electronics-2")
+  bobmods.lib.tech.remove_prerequisite("power-armor", "processing-unit")
 
   bobmods.lib.tech.remove_science_pack("power-armor-mk2", "utility-science-pack")
   bobmods.lib.tech.remove_prerequisite("power-armor-mk2", "utility-science-pack")
   bobmods.lib.tech.add_prerequisite("power-armor-mk2", "low-density-structure")
-  bobmods.lib.tech.add_prerequisite("power-armor-mk2", "advanced-electronics-2")
+  bobmods.lib.tech.add_prerequisite("power-armor-mk2", "processing-unit")
   bobmods.lib.tech.set_science_pack_count("power-armor-mk2", 200)
   bobmods.lib.tech.replace_prerequisite("power-armor-mk2", "military-4", "military-3")
 
   if mods["bobtech"] then
     bobmods.lib.tech.remove_prerequisite("bob-power-armor-3", "production-science-pack")
-    bobmods.lib.tech.add_prerequisite("bob-power-armor-3", "advanced-logistic-science-pack")
+    bobmods.lib.tech.add_prerequisite("bob-power-armor-3", "bob-advanced-logistic-science-pack")
   else
     bobmods.lib.tech.add_prerequisite("bob-power-armor-3", "military-4")
   end
@@ -1022,51 +1022,51 @@ end
 if mods["bobequipment"] then
   -- Batteries
   bobmods.lib.tech.remove_prerequisite("battery-mk2-equipment", "power-armor")
-  bobmods.lib.tech.add_prerequisite("battery-mk2-equipment", "advanced-electronics-2")
+  bobmods.lib.tech.add_prerequisite("battery-mk2-equipment", "processing-unit")
   if mods["bobtech"] then
-    bobmods.lib.tech.add_prerequisite("bob-battery-equipment-5", "advanced-logistic-science-pack")
+    bobmods.lib.tech.add_prerequisite("bob-battery-equipment-5", "bob-advanced-logistic-science-pack")
   end
 
   -- Personal Laser Defense
-  bobmods.lib.tech.add_prerequisite("personal-laser-defense-equipment-5", "utility-science-pack")
-  bobmods.lib.tech.add_prerequisite("personal-laser-defense-equipment-6", "space-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-personal-laser-defense-equipment-5", "utility-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-personal-laser-defense-equipment-6", "space-science-pack")
 
   -- Energy Shield
-  bobmods.lib.tech.add_prerequisite("energy-shield-mk2-equipment", "advanced-electronics-2")
+  bobmods.lib.tech.add_prerequisite("energy-shield-mk2-equipment", "processing-unit")
 
   -- Remove dependencies on Alien Research
-  bobmods.lib.tech.remove_prerequisite("bob-energy-shield-equipment-4", "alien-research")
-  bobmods.lib.tech.remove_prerequisite("bob-battery-equipment-4", "alien-research")
-  bobmods.lib.tech.remove_prerequisite("fusion-reactor-equipment-2", "alien-research")
-  bobmods.lib.tech.remove_prerequisite("personal-laser-defense-equipment-6", "alien-research")
+  bobmods.lib.tech.remove_prerequisite("bob-energy-shield-equipment-4", "bob-alien-research")
+  bobmods.lib.tech.remove_prerequisite("bob-battery-equipment-4", "bob-alien-research")
+  bobmods.lib.tech.remove_prerequisite("bob-fission-reactor-equipment-2", "bob-alien-research")
+  bobmods.lib.tech.remove_prerequisite("bob-personal-laser-defense-equipment-6", "bob-alien-research")
 end
 
 if mods["bobvehicleequipment"] then
   -- Remove dependencies on Alien Research
-  bobmods.lib.tech.remove_prerequisite("vehicle-battery-equipment-4", "alien-research")
-  bobmods.lib.tech.remove_prerequisite("vehicle-big-turret-equipment-4", "alien-research")
-  bobmods.lib.tech.remove_prerequisite("vehicle-energy-shield-equipment-4", "alien-research")
-  bobmods.lib.tech.remove_prerequisite("vehicle-fusion-cell-equipment-4", "alien-research")
-  bobmods.lib.tech.remove_prerequisite("vehicle-fusion-reactor-equipment-4", "alien-research")
+  bobmods.lib.tech.remove_prerequisite("bob-vehicle-battery-equipment-4", "bob-alien-research")
+  bobmods.lib.tech.remove_prerequisite("bob-vehicle-big-turret-equipment-4", "bob-alien-research")
+  bobmods.lib.tech.remove_prerequisite("bob-vehicle-shield-equipment-4", "bob-alien-research")
+  bobmods.lib.tech.remove_prerequisite("bob-vehicle-fission-cell-equipment-4", "bob-alien-research")
+  bobmods.lib.tech.remove_prerequisite("bob-vehicle-fission-reactor-equipment-4", "bob-alien-research")
 
-  bobmods.lib.tech.add_prerequisite("vehicle-big-turret-equipment-4", "military-4")
-  bobmods.lib.tech.add_prerequisite("vehicle-laser-defense-equipment-5", "utility-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-4", "military-4")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-laser-defense-equipment-5", "utility-science-pack")
 
   if mods["bobtech"] then
-    bobmods.lib.tech.add_prerequisite("vehicle-battery-equipment-5", "advanced-logistic-science-pack")
-    bobmods.lib.tech.add_prerequisite("vehicle-big-turret-equipment-5", "advanced-logistic-science-pack")
-    bobmods.lib.tech.add_prerequisite("vehicle-energy-shield-equipment-4", "advanced-logistic-science-pack")
-    bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-4", "advanced-logistic-science-pack")
-    bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-4", "advanced-logistic-science-pack")
+    bobmods.lib.tech.add_prerequisite("bob-vehicle-battery-equipment-5", "bob-advanced-logistic-science-pack")
+    bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-5", "bob-advanced-logistic-science-pack")
+    bobmods.lib.tech.add_prerequisite("bob-vehicle-shield-equipment-4", "bob-advanced-logistic-science-pack")
+    bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-4", "bob-advanced-logistic-science-pack")
+    bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-4", "bob-advanced-logistic-science-pack")
   end
 
-  bobmods.lib.tech.add_prerequisite("vehicle-battery-equipment-6", "utility-science-pack")
-  bobmods.lib.tech.add_prerequisite("vehicle-big-turret-equipment-6", "utility-science-pack")
-  bobmods.lib.tech.add_prerequisite("vehicle-energy-shield-equipment-5", "utility-science-pack")
-  bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-5", "utility-science-pack")
-  bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-5", "utility-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-battery-equipment-6", "utility-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-big-turret-equipment-6", "utility-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-shield-equipment-5", "utility-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-5", "utility-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-5", "utility-science-pack")
 
-  bobmods.lib.tech.add_prerequisite("vehicle-energy-shield-equipment-6", "space-science-pack")
-  bobmods.lib.tech.add_prerequisite("vehicle-fusion-cell-equipment-6", "space-science-pack")
-  bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-6", "space-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-shield-equipment-6", "space-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-cell-equipment-6", "space-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-6", "space-science-pack")
 end
diff --git a/SeaBlock/data-updates/misc.lua b/SeaBlock/data-updates/misc.lua
index c9e77ab3..c5916526 100644
--- a/SeaBlock/data-updates/misc.lua
+++ b/SeaBlock/data-updates/misc.lua
@@ -5,27 +5,27 @@ if data.raw.item["wind-turbine-2"] then
 end
 
 -- No natural gas, use methane for manganese pellet smelting
-seablock.lib.substingredient("pellet-manganese-smelting", "gas-natural-1", "gas-methane")
-bobmods.lib.tech.remove_prerequisite("angels-manganese-smelting-3", "oil-gas-extraction")
+seablock.lib.substingredient("angels-solid-manganese-oxide-2", "angels-gas-natural-1", "angels-gas-methane")
+bobmods.lib.tech.remove_prerequisite("angels-manganese-smelting-3", "oil-gathering")
 bobmods.lib.tech.add_prerequisite("angels-manganese-smelting-3", "angels-advanced-gas-processing")
 
 -- Remove steel's prerequiste on Chemical processing 1
-bobmods.lib.tech.remove_prerequisite("steel-processing", "chemical-processing-1")
+bobmods.lib.tech.remove_prerequisite("steel-processing", "bob-chemical-processing-1")
 
 -- Move Water Treatment from Electronics to Slag Processing 1. Hydro Plant no longer requires Green Circuits
 -- Slag Processing 1 is first source of Sulfuric Waste Water
-bobmods.lib.tech.remove_prerequisite("water-treatment", "angels-fluid-control")
-bobmods.lib.tech.add_prerequisite("water-treatment", "slag-processing-1")
+bobmods.lib.tech.remove_prerequisite("angels-water-treatment", "angels-fluid-control")
+bobmods.lib.tech.add_prerequisite("angels-water-treatment", "angels-slag-processing-1")
 
 -- Allow skipping of waste water recycling
-bobmods.lib.tech.remove_prerequisite("water-washing-1", "water-treatment")
-bobmods.lib.tech.add_prerequisite("water-washing-1", "automation")
-seablock.lib.moveeffect("yellow-waste-water-purification", "water-treatment-2", "water-treatment")
+bobmods.lib.tech.remove_prerequisite("angels-water-washing-1", "angels-water-treatment")
+bobmods.lib.tech.add_prerequisite("angels-water-washing-1", "automation")
+seablock.lib.moveeffect("angels-yellow-waste-water-purification", "angels-water-treatment-2", "angels-water-treatment")
 
-bobmods.lib.tech.remove_prerequisite("electronics", "chemical-processing-1")
+bobmods.lib.tech.remove_prerequisite("bob-electronics", "bob-chemical-processing-1")
 
-bobmods.lib.recipe.set_category("liquid-fish-atmosphere", "chemistry")
-seablock.lib.hide_technology("pumpjack")
+bobmods.lib.recipe.set_category("angels-liquid-fish-atmosphere", "chemistry")
+seablock.lib.hide_technology("oil-gathering")
 
 if not seablock.trigger.mining_productivity then
   for i = 1, 4, 1 do
@@ -49,108 +49,108 @@ end
 
 -- Add prerequisite for Tin and Lead
 if settings.startup["bobmods-logistics-beltoverhaul"].value then
-  bobmods.lib.tech.add_prerequisite("logistics", "ore-crushing")
+  bobmods.lib.tech.add_prerequisite("logistics", "angels-ore-crushing")
 end
 
 -- Tidy prerequisite for Brass
-bobmods.lib.tech.remove_prerequisite("zinc-processing", "electrolysis-1")
-bobmods.lib.tech.replace_prerequisite("battery-3", "zinc-processing", "angels-zinc-smelting-1")
+bobmods.lib.tech.remove_prerequisite("bob-zinc-processing", "bob-electrolysis-1")
+bobmods.lib.tech.replace_prerequisite("bob-battery-3", "bob-zinc-processing", "angels-zinc-smelting-1")
 if mods["bobpower"] then
-  bobmods.lib.tech.replace_prerequisite("electric-pole-2", "zinc-processing", "angels-brass-smelting-1")
-  bobmods.lib.tech.replace_prerequisite("electric-substation-2", "zinc-processing", "angels-brass-smelting-1")
+  bobmods.lib.tech.replace_prerequisite("bob-electric-pole-2", "bob-zinc-processing", "angels-brass-smelting-1")
+  bobmods.lib.tech.replace_prerequisite("bob-electric-substation-2", "bob-zinc-processing", "angels-brass-smelting-1")
 end
 
 -- Move recipes that shouldn't be unlocked at startup
 if mods["bobenemies"] then
-  seablock.lib.add_recipe_unlock("bio-processing-alien-3", "alien-artifact-red-from-small")
-  seablock.lib.add_recipe_unlock("bio-processing-alien-3", "alien-artifact-yellow-from-small")
-  seablock.lib.add_recipe_unlock("bio-processing-alien-3", "alien-artifact-orange-from-small")
-  seablock.lib.add_recipe_unlock("bio-processing-alien-3", "alien-artifact-blue-from-small")
-  seablock.lib.add_recipe_unlock("bio-processing-alien-3", "alien-artifact-purple-from-small")
-  seablock.lib.add_recipe_unlock("bio-processing-alien-3", "alien-artifact-green-from-small")
-  seablock.lib.add_recipe_unlock("bio-processing-alien-3", "alien-artifact-from-small")
+  seablock.lib.add_recipe_unlock("angels-bio-processing-alien-3", "bob-alien-artifact-red-from-small")
+  seablock.lib.add_recipe_unlock("angels-bio-processing-alien-3", "bob-alien-artifact-yellow-from-small")
+  seablock.lib.add_recipe_unlock("angels-bio-processing-alien-3", "bob-alien-artifact-orange-from-small")
+  seablock.lib.add_recipe_unlock("angels-bio-processing-alien-3", "bob-alien-artifact-blue-from-small")
+  seablock.lib.add_recipe_unlock("angels-bio-processing-alien-3", "bob-alien-artifact-purple-from-small")
+  seablock.lib.add_recipe_unlock("angels-bio-processing-alien-3", "bob-alien-artifact-green-from-small")
+  seablock.lib.add_recipe_unlock("angels-bio-processing-alien-3", "bob-alien-artifact")
 end
 
-bobmods.lib.tech.remove_prerequisite("tungsten-processing", "angels-nickel-smelting-1")
+bobmods.lib.tech.remove_prerequisite("bob-tungsten-processing", "angels-nickel-smelting-1")
 
-bobmods.lib.tech.remove_recipe_unlock("bio-arboretum-swamp-1", "solid-plastic")
+bobmods.lib.tech.remove_recipe_unlock("angels-bio-arboretum-swamp-1", "angels-solid-plastic")
 
 -- Buff Lime filtering
-seablock.lib.substingredient("filter-lime", "solid-lime", nil, 1)
-data.raw.recipe["filter-lime"].energy_required = 1
-data.raw.recipe["angels-sulfur-scrubber"].energy_required = 6
+seablock.lib.substingredient("angels-filter-lime", "angels-solid-lime", nil, 1)
+data.raw.recipe["angels-filter-lime"].energy_required = 1
+data.raw.recipe["angels-sulfur-air-scrubbing"].energy_required = 6
 
 -- Make Long Inserters a startup tech
 if data.raw.technology["logistics-0"] then
-  bobmods.lib.tech.replace_prerequisite("long-inserters-1", "logistics", "logistics-0")
+  bobmods.lib.tech.replace_prerequisite("bob-long-inserters-1", "logistics", "logistics-0")
 end
 
 -- Adjust for handcrafting boards
 
 -- Divide by 2
-seablock.lib.substingredient("solid-alginic-acid", "algae-brown", nil, 5)
-seablock.lib.substresult("solid-alginic-acid", "solid-alginic-acid", nil, 1)
-data.raw.recipe["solid-alginic-acid"].energy_required = 5
+seablock.lib.substingredient("angels-solid-alginic-acid", "angels-algae-brown", nil, 5)
+seablock.lib.substresult("angels-solid-alginic-acid", "angels-solid-alginic-acid", nil, 1)
+data.raw.recipe["angels-solid-alginic-acid"].energy_required = 5
 
 -- Divide by 5
-seablock.lib.substingredient("solid-wood-pulp", "cellulose-fiber", nil, 4)
-seablock.lib.substingredient("solid-wood-pulp", "solid-alginic-acid", nil, 1)
-seablock.lib.substresult("solid-wood-pulp", "solid-wood-pulp", nil, 4)
-data.raw.recipe["solid-wood-pulp"].energy_required = 0.8
+seablock.lib.substingredient("angels-solid-wood-pulp", "angels-cellulose-fiber", nil, 4)
+seablock.lib.substingredient("angels-solid-wood-pulp", "angels-solid-alginic-acid", nil, 1)
+seablock.lib.substresult("angels-solid-wood-pulp", "angels-solid-wood-pulp", nil, 4)
+data.raw.recipe["angels-solid-wood-pulp"].energy_required = 0.8
 
 -- Tidy up ore silo prerequisites
 if mods["angelsaddons-storage"] then
   bobmods.lib.tech.remove_prerequisite("ore-silos", "angels-coal-processing")
-  bobmods.lib.tech.replace_prerequisite("ore-silos", "ore-crushing", "ore-advanced-crushing")
+  bobmods.lib.tech.replace_prerequisite("ore-silos", "angels-ore-crushing", "angels-ore-advanced-crushing")
 end
 
 -- Logistic System prerequisite of Pink Science
-if not data.raw.tool["advanced-logistic-science-pack"] then
+if not data.raw.tool["bob-advanced-logistic-science-pack"] then
   bobmods.lib.tech.add_prerequisite("logistic-system", "utility-science-pack")
 end
 
 -- Saline rebalance
-seablock.lib.substingredient("solid-salt-dissolving", "solid-salt", nil, 15)
-seablock.lib.substingredient("solid-salt-dissolving", "water-purified", "water", 1000)
-seablock.lib.substresult("solid-salt-dissolving", "water-saline", nil, 1000)
-data.raw.recipe["solid-salt-dissolving"].energy_required = 5
+seablock.lib.substingredient("angels-solid-salt-dissolving", "angels-solid-salt", nil, 15)
+seablock.lib.substingredient("angels-solid-salt-dissolving", "angels-water-purified", "water", 1000)
+seablock.lib.substresult("angels-solid-salt-dissolving", "angels-water-saline", nil, 1000)
+data.raw.recipe["angels-solid-salt-dissolving"].energy_required = 5
 
 -- Add missing science packs
 
 for _, v in pairs({
-  "bio-processing-alien-3",
-  "gem-processing-1",
-  "gem-processing-2",
-  "gem-processing-3",
-  "geode-crystallization-1",
-  "polishing",
+  "angels-bio-processing-alien-3",
+  "bob-gem-processing-1",
+  "bob-gem-processing-2",
+  "bob-gem-processing-3",
+  "angels-geode-crystallization-1",
+  "bob-polishing",
 }) do
   if data.raw.technology[v] then
     bobmods.lib.tech.add_new_science_pack(v, "chemical-science-pack", 1)
   end
 end
 
-bobmods.lib.tech.add_prerequisite("polishing", "chemical-science-pack")
-bobmods.lib.tech.add_prerequisite("geode-crystallization-1", "chemical-science-pack")
+bobmods.lib.tech.add_prerequisite("bob-polishing", "chemical-science-pack")
+bobmods.lib.tech.add_prerequisite("angels-geode-crystallization-1", "chemical-science-pack")
 
 if mods["bobrevamp"] and not mods["bobclasses"] then
-  bobmods.lib.tech.add_new_science_pack("rtg", "production-science-pack", 1)
-  bobmods.lib.tech.add_new_science_pack("rtg", "utility-science-pack", 1)
-  bobmods.lib.tech.add_prerequisite("rtg", "utility-science-pack")
-  bobmods.lib.tech.remove_prerequisite("rtg", "angels-coal-processing-3")
-  bobmods.lib.tech.add_prerequisite("rtg", "sodium-processing-2")
+  bobmods.lib.tech.add_new_science_pack("bob-rtg", "production-science-pack", 1)
+  bobmods.lib.tech.add_new_science_pack("bob-rtg", "utility-science-pack", 1)
+  bobmods.lib.tech.add_prerequisite("bob-rtg", "utility-science-pack")
+  bobmods.lib.tech.remove_prerequisite("bob-rtg", "angels-coal-processing-3")
+  bobmods.lib.tech.add_prerequisite("bob-rtg", "angels-sodium-processing-2")
 end
 
 -- Swap gold for platinum
-seablock.lib.substingredient("processing-electronics", "angels-wire-platinum", nil, 20)
+seablock.lib.substingredient("bob-processing-electronics", "angels-wire-platinum", nil, 20)
 if mods["bobmodules"] then
-  seablock.lib.substingredient("module-processor-board-3", "angels-wire-platinum", "angels-plate-platinum", nil)
+  seablock.lib.substingredient("bob-module-processor-board-3", "angels-wire-platinum", "angels-plate-platinum", nil)
 end
-bobmods.lib.tech.add_prerequisite("advanced-electronics-3", "angels-platinum-smelting-1")
-seablock.lib.substresult("angelsore-pure-mix2-processing", "platinum-ore", nil, 2)
-seablock.lib.substresult("angelsore9-crystal-processing", "platinum-ore", nil, 2)
+bobmods.lib.tech.add_prerequisite("bob-advanced-processing-unit", "angels-platinum-smelting-1")
+seablock.lib.substresult("angels-ore-pure-mix2-processing", "angels-platinum-ore", nil, 2)
+seablock.lib.substresult("angels-ore9-crystal-processing", "angels-platinum-ore", nil, 2)
 -- Swap stiratite for crotinnium so all pure ores are used
-seablock.lib.substingredient("angelsore-pure-mix2-processing", "angels-ore3-pure", "angels-ore4-pure", nil)
+seablock.lib.substingredient("angels-ore-pure-mix2-processing", "angels-ore3-pure", "angels-ore4-pure", nil)
 
 -- Unhide rocket part to make it easier to view recipes
 if data.raw.recipe["rocket-part"] then
@@ -172,75 +172,93 @@ if data.raw.recipe["rocket-part"] then
 end
 
 -- Buff bob's silicon and tungsten recipes
-seablock.lib.substingredient("silicon-carbide", "silicon-powder", nil, 10)
-seablock.lib.substingredient("silicon-carbide", "carbon", nil, 10)
-data.raw.recipe["silicon-carbide"].result_count = 20
-
-seablock.lib.substingredient("silicon-nitride", "silicon-powder", nil, 10)
-seablock.lib.substingredient("silicon-nitride", "gas-nitrogen", nil, 130)
-data.raw.recipe["silicon-nitride"].result_count = 10
-
-seablock.lib.substingredient("tungsten-carbide", "tungsten-oxide", nil, 10)
-seablock.lib.substingredient("tungsten-carbide", "carbon", nil, 10)
-seablock.lib.substresult("tungsten-carbide", "tungsten-carbide", nil, 20)
-bobmods.lib.recipe.set_energy_required("tungsten-carbide", 6)
-
-seablock.lib.substingredient("tungsten-carbide-2", "powdered-tungsten", nil, 10)
-seablock.lib.substingredient("tungsten-carbide-2", "carbon", nil, 10)
-seablock.lib.substresult("tungsten-carbide-2", "tungsten-carbide", nil, 20)
-bobmods.lib.recipe.set_energy_required("tungsten-carbide-2", 6)
-
-seablock.lib.substingredient("copper-tungsten-alloy", "powdered-tungsten", nil, 15)
-seablock.lib.substingredient("copper-tungsten-alloy", "copper-plate", "powder-copper", 10)
-seablock.lib.substresult("copper-tungsten-alloy", "copper-tungsten-alloy", nil, 25)
-bobmods.lib.recipe.set_energy_required("copper-tungsten-alloy", 8)
-bobmods.lib.tech.add_prerequisite("tungsten-alloy-processing", "angels-copper-smelting-2")
+seablock.lib.substingredient("bob-silicon-carbide", "bob-silicon-powder", nil, 10)
+seablock.lib.substingredient("bob-silicon-carbide", "bob-carbon", nil, 10)
+data.raw.recipe["bob-silicon-carbide"].results[1].amount = 20
+
+seablock.lib.substingredient("bob-silicon-nitride", "bob-silicon-powder", nil, 10)
+seablock.lib.substingredient("bob-silicon-nitride", "angels-gas-nitrogen", nil, 130)
+data.raw.recipe["bob-silicon-nitride"].results[1].amount = 10
+
+seablock.lib.substingredient("bob-tungsten-carbide", "bob-tungsten-oxide", nil, 10)
+seablock.lib.substingredient("bob-tungsten-carbide", "bob-carbon", nil, 10)
+seablock.lib.substresult("bob-tungsten-carbide", "bob-tungsten-carbide", nil, 20)
+bobmods.lib.recipe.set_energy_required("bob-tungsten-carbide", 6)
+
+seablock.lib.substingredient("bob-tungsten-carbide-2", "bob-powdered-tungsten", nil, 10)
+seablock.lib.substingredient("bob-tungsten-carbide-2", "bob-carbon", nil, 10)
+seablock.lib.substresult("bob-tungsten-carbide-2", "bob-tungsten-carbide", nil, 20)
+bobmods.lib.recipe.set_energy_required("bob-tungsten-carbide-2", 6)
+
+seablock.lib.substingredient("bob-copper-tungsten-alloy", "bob-powdered-tungsten", nil, 15)
+seablock.lib.substingredient("bob-copper-tungsten-alloy", "copper-plate", "angels-powder-copper", 10)
+seablock.lib.substresult("bob-copper-tungsten-alloy", "bob-copper-tungsten-alloy", nil, 25)
+bobmods.lib.recipe.set_energy_required("bob-copper-tungsten-alloy", 8)
+bobmods.lib.tech.add_prerequisite("bob-tungsten-alloy-processing", "angels-copper-smelting-2")
 
 -- Other prerequisites
-if data.raw.technology["electronics-machine-1"] then
-  bobmods.lib.tech.add_prerequisite("electronics-machine-1", "electronics")
+if data.raw.technology["bob-electronics-machine-1"] then
+  bobmods.lib.tech.add_prerequisite("bob-electronics-machine-1", "bob-electronics")
 end
-bobmods.lib.tech.add_prerequisite("bio-pressing-1", "bio-nutrient-paste")
+bobmods.lib.tech.add_prerequisite("angels-bio-pressing-1", "angels-bio-nutrient-paste")
 
-bobmods.lib.tech.add_prerequisite("resins", "automation-2")
+bobmods.lib.tech.add_prerequisite("angels-resins", "automation-2")
 bobmods.lib.tech.add_prerequisite("plastics", "automation-2")
 if mods["boblogistics"] then
   bobmods.lib.tech.add_prerequisite("bob-repair-pack-2", "military")
 end
 bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-1", "fluid-handling")
-bobmods.lib.tech.add_prerequisite("water-treatment-2", "fluid-handling")
-bobmods.lib.tech.add_prerequisite("water-washing-2", "fluid-handling")
+bobmods.lib.tech.add_prerequisite("angels-water-treatment-2", "fluid-handling")
+bobmods.lib.tech.add_prerequisite("angels-water-washing-2", "fluid-handling")
 
 -- Nerf early game glass. Just need a little bit for arboretums
-seablock.lib.substingredient("quartz-glass", "quartz", nil, 10)
-seablock.lib.substresult("quartz-glass", "glass", nil, 1)
+seablock.lib.substingredient("bob-glass", "bob-quartz", nil, 10)
+seablock.lib.substresult("bob-glass", "bob-glass", nil, 1)
 
 -- Biologically active tile has been hidden so no need for the prerequisites
-bobmods.lib.tech.remove_prerequisite("bio-farm-2", "angels-glass-smelting-1")
-bobmods.lib.tech.remove_prerequisite("bio-farm-2", "angels-stone-smelting-2")
+bobmods.lib.tech.remove_prerequisite("angels-bio-farm-2", "angels-glass-smelting-1")
+bobmods.lib.tech.remove_prerequisite("angels-bio-farm-2", "angels-stone-smelting-2")
 
 -- Rebalance glass mixture recipes
-bobmods.lib.recipe.remove_ingredient("glass-mixture-1", "quartz")
-bobmods.lib.recipe.set_ingredient("glass-mixture-1", { "silicon-powder", 1 })
-
-bobmods.lib.recipe.remove_ingredient("glass-mixture-2", "quartz")
-bobmods.lib.recipe.set_ingredient("glass-mixture-2", { "silicon-powder", 2 })
-bobmods.lib.recipe.set_result("glass-mixture-2", { "solid-glass-mixture", 3 })
-bobmods.lib.recipe.set_energy_required("glass-mixture-2", 6)
-
-bobmods.lib.recipe.remove_ingredient("glass-mixture-3", "quartz")
-bobmods.lib.recipe.set_ingredient("glass-mixture-3", { "silicon-powder", 1 })
-bobmods.lib.recipe.set_ingredient("glass-mixture-3", { "solid-lime", 2 })
-bobmods.lib.recipe.set_result("glass-mixture-3", { "solid-glass-mixture", 4 })
-bobmods.lib.recipe.set_energy_required("glass-mixture-3", 8)
-
-bobmods.lib.recipe.set_energy_required("glass-mixture-4", 8)
+bobmods.lib.recipe.remove_ingredient("angels-solid-glass-mixture", "bob-quartz")
+bobmods.lib.recipe.set_ingredient(
+  "angels-solid-glass-mixture",
+  { type = "item", name = "bob-silicon-powder", amount = 1 }
+)
+
+bobmods.lib.recipe.remove_ingredient("angels-solid-glass-mixture-2", "bob-quartz")
+bobmods.lib.recipe.set_ingredient(
+  "angels-solid-glass-mixture-2",
+  { type = "item", name = "bob-silicon-powder", amount = 2 }
+)
+bobmods.lib.recipe.set_result(
+  "angels-solid-glass-mixture-2",
+  { type = "item", name = "angels-solid-glass-mixture", amount = 3 }
+)
+bobmods.lib.recipe.set_energy_required("angels-solid-glass-mixture-2", 6)
+
+bobmods.lib.recipe.remove_ingredient("angels-solid-glass-mixture-3", "bob-quartz")
+bobmods.lib.recipe.set_ingredient(
+  "angels-solid-glass-mixture-3",
+  { type = "item", name = "bob-silicon-powder", amount = 1 }
+)
+bobmods.lib.recipe.set_ingredient(
+  "angels-solid-glass-mixture-3",
+  { type = "item", name = "angels-solid-lime", amount = 2 }
+)
+bobmods.lib.recipe.set_result(
+  "angels-solid-glass-mixture-3",
+  { type = "item", name = "angels-solid-glass-mixture", amount = 4 }
+)
+bobmods.lib.recipe.set_energy_required("angels-solid-glass-mixture-3", 8)
+
+bobmods.lib.recipe.set_energy_required("angels-solid-glass-mixture-4", 8)
 
 -- Rebalance cement recipes
-bobmods.lib.recipe.replace_ingredient("cement-mixture-1", "quartz", "silicon-powder")
+bobmods.lib.recipe.replace_ingredient("angels-solid-cement", "bob-quartz", "bob-silicon-powder")
 
-bobmods.lib.recipe.remove_ingredient("cement-mixture-2", "iron-ore")
-bobmods.lib.recipe.replace_ingredient("cement-mixture-2", "quartz", "silicon-powder")
-bobmods.lib.recipe.set_ingredient("cement-mixture-2", { "solid-lime", 4 })
-bobmods.lib.recipe.set_result("cement-mixture-2", { "solid-cement", 4 })
-bobmods.lib.recipe.set_energy_required("cement-mixture-2", 16)
+bobmods.lib.recipe.remove_ingredient("angels-solid-cement-2", "iron-ore")
+bobmods.lib.recipe.replace_ingredient("angels-solid-cement-2", "bob-quartz", "bob-silicon-powder")
+bobmods.lib.recipe.set_ingredient("angels-solid-cement-2", { type = "item", name = "angels-solid-lime", amount = 4 })
+bobmods.lib.recipe.set_result("angels-solid-cement-2", { type = "item", name = "angels-solid-cement", amount = 4 })
+bobmods.lib.recipe.set_energy_required("angels-solid-cement-2", 16)
diff --git a/SeaBlock/data-updates/other-mods.lua b/SeaBlock/data-updates/other-mods.lua
index 6da50f87..16f013e2 100644
--- a/SeaBlock/data-updates/other-mods.lua
+++ b/SeaBlock/data-updates/other-mods.lua
@@ -1,11 +1,11 @@
 if mods["early_construction"] then
-  bobmods.lib.recipe.replace_ingredient("early-construction-robot", "coal", "wood-charcoal")
+  bobmods.lib.recipe.replace_ingredient("early-construction-robot", "coal", "angels-wood-charcoal")
   bobmods.lib.tech.add_prerequisite("early-construction-light-armor", "military")
-  bobmods.lib.tech.add_prerequisite("early-construction-light-armor", "bio-wood-processing-2")
+  bobmods.lib.tech.add_prerequisite("early-construction-light-armor", "angels-bio-wood-processing-2")
 end
 
 if mods["grappling-gun"] then
-  bobmods.lib.recipe.replace_ingredient("grappling-gun-ammo", "coal", "wood-charcoal")
+  bobmods.lib.recipe.replace_ingredient("grappling-gun-ammo", "coal", "angels-wood-charcoal")
 end
 
 if mods["jetpack"] then
@@ -14,12 +14,12 @@ if mods["jetpack"] then
   bobmods.lib.tech.remove_prerequisite("jetpack-1", "rocket-fuel")
   bobmods.lib.tech.remove_prerequisite("jetpack-1", "solar-panel-equipment")
   bobmods.lib.tech.add_prerequisite("jetpack-1", "modular-armor")
-  bobmods.lib.tech.add_prerequisite("jetpack-1", "rocket-booster-1")
+  bobmods.lib.tech.add_prerequisite("jetpack-1", "angels-rocket-booster-1")
   bobmods.lib.tech.add_prerequisite("jetpack-1", "military-science-pack")
-  bobmods.lib.tech.add_prerequisite("jetpack-1", "zinc-processing")
+  bobmods.lib.tech.add_prerequisite("jetpack-1", "bob-zinc-processing")
   bobmods.lib.recipe.replace_ingredient("jetpack-1", "electronic-circuit", "advanced-circuit")
-  bobmods.lib.recipe.replace_ingredient("jetpack-1", "pipe", "brass-pipe")
-  bobmods.lib.recipe.replace_ingredient("jetpack-1", "steel-plate", "invar-alloy")
+  bobmods.lib.recipe.replace_ingredient("jetpack-1", "pipe", "bob-brass-pipe")
+  bobmods.lib.recipe.replace_ingredient("jetpack-1", "steel-plate", "bob-invar-alloy")
 
   bobmods.lib.tech.add_science_pack("jetpack-2", "military-science-pack", 1)
   bobmods.lib.tech.add_prerequisite("jetpack-2", "advanced-electronics-2")
@@ -27,19 +27,22 @@ if mods["jetpack"] then
 
   bobmods.lib.tech.add_science_pack("jetpack-3", "military-science-pack", 1)
   bobmods.lib.tech.add_science_pack("jetpack-3", "production-science-pack", 1)
-  bobmods.lib.recipe.replace_ingredient("jetpack-3", "processing-unit", "advanced-processing-unit")
+  bobmods.lib.recipe.replace_ingredient("jetpack-3", "processing-unit", "bob-advanced-processing-unit")
 
   bobmods.lib.tech.add_science_pack("jetpack-4", "military-science-pack", 1)
   bobmods.lib.tech.add_science_pack("jetpack-4", "production-science-pack", 1)
   if mods["bobmodules"] then
     if mods["CircuitProcessing"] then
-      bobmods.lib.recipe.remove_ingredient("jetpack-4", "speed-module-4")
-      bobmods.lib.recipe.remove_ingredient("jetpack-4", "effectivity-module-4")
-      bobmods.lib.recipe.add_new_ingredient("jetpack-4", { type = "item", name = "speed-module-8", amount = 2 })
-      bobmods.lib.recipe.add_new_ingredient("jetpack-4", { type = "item", name = "effectivity-module-8", amount = 2 })
+      bobmods.lib.recipe.remove_ingredient("jetpack-4", "bob-speed-module-4")
+      bobmods.lib.recipe.remove_ingredient("jetpack-4", "bob-efficiency-module-4")
+      bobmods.lib.recipe.add_new_ingredient("jetpack-4", { type = "item", name = "bob-speed-module-5", amount = 2 })
+      bobmods.lib.recipe.add_new_ingredient(
+        "jetpack-4",
+        { type = "item", name = "bob-efficiency-module-5", amount = 2 }
+      )
     else
-      bobmods.lib.recipe.replace_ingredient("jetpack-4", "speed-module-3", "speed-module-8")
-      bobmods.lib.recipe.replace_ingredient("jetpack-4", "effectivity-module-3", "effectivity-module-8")
+      bobmods.lib.recipe.replace_ingredient("jetpack-4", "speed-module-3", "bob-speed-module-5")
+      bobmods.lib.recipe.replace_ingredient("jetpack-4", "efficiency-module-3", "bob-efficiency-module-5")
     end
   end
 end
diff --git a/SeaBlock/data-updates/petrochem.lua b/SeaBlock/data-updates/petrochem.lua
index 7ba57a66..90863006 100644
--- a/SeaBlock/data-updates/petrochem.lua
+++ b/SeaBlock/data-updates/petrochem.lua
@@ -12,73 +12,72 @@ local function movealleffects(from, to)
   end
   data.raw.technology[from].effects = {}
 end
-movealleffects("basic-chemistry-2", "basic-chemistry")
-movealleffects("basic-chemistry-3", "basic-chemistry-2")
+movealleffects("angels-basic-chemistry-2", "angels-basic-chemistry")
+movealleffects("angels-basic-chemistry-3", "angels-basic-chemistry-2")
 movealleffects("angels-advanced-chemistry-3", "angels-advanced-chemistry-2")
 movealleffects("angels-advanced-chemistry-4", "angels-advanced-chemistry-3")
 movealleffects("angels-advanced-chemistry-5", "angels-advanced-chemistry-4")
-movealleffects("chlorine-processing-3", "chlorine-processing-2")
-movealleffects("chlorine-processing-4", "chlorine-processing-2")
-bobmods.lib.tech.add_new_science_pack("basic-chemistry-2", "logistic-science-pack", 1)
+movealleffects("angels-chlorine-processing-3", "angels-chlorine-processing-2")
+movealleffects("angels-chlorine-processing-4", "angels-chlorine-processing-2")
+bobmods.lib.tech.add_new_science_pack("angels-basic-chemistry-2", "logistic-science-pack", 1)
 bobmods.lib.tech.add_new_science_pack("angels-advanced-chemistry-3", "production-science-pack", 1)
 bobmods.lib.tech.add_new_science_pack("angels-advanced-chemistry-4", "utility-science-pack", 1)
-bobmods.lib.tech.add_new_science_pack("chlorine-processing-2", "chemical-science-pack", 1)
+bobmods.lib.tech.add_new_science_pack("angels-chlorine-processing-2", "chemical-science-pack", 1)
 bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-4", "angels-advanced-chemistry-3")
 bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-4", "utility-science-pack")
-bobmods.lib.tech.add_prerequisite("chlorine-processing-2", "sodium-processing-1")
-bobmods.lib.tech.add_prerequisite("chlorine-processing-2", "angels-advanced-chemistry-2")
-seablock.lib.hide_technology("basic-chemistry-3")
+bobmods.lib.tech.add_prerequisite("angels-chlorine-processing-2", "angels-sodium-processing-1")
+bobmods.lib.tech.add_prerequisite("angels-chlorine-processing-2", "angels-advanced-chemistry-2")
+seablock.lib.hide_technology("angels-basic-chemistry-3")
 seablock.lib.hide_technology("angels-advanced-chemistry-5")
-seablock.lib.hide_technology("chlorine-processing-3")
-seablock.lib.hide_technology("chlorine-processing-4")
+seablock.lib.hide_technology("angels-chlorine-processing-3")
+seablock.lib.hide_technology("angels-chlorine-processing-4")
 
 -- Move recipes back
-seablock.lib.moveeffect("water-gas-shift-1", "basic-chemistry", "basic-chemistry-2")
-seablock.lib.moveeffect("water-gas-shift-2", "basic-chemistry", "basic-chemistry-2")
-bobmods.lib.tech.add_prerequisite("angels-nickel-smelting-1", "basic-chemistry-2")
+seablock.lib.moveeffect("angels-water-gas-shift-1", "angels-basic-chemistry", "angels-basic-chemistry-2")
+seablock.lib.moveeffect("angels-water-gas-shift-2", "angels-basic-chemistry", "angels-basic-chemistry-2")
+bobmods.lib.tech.add_prerequisite("angels-nickel-smelting-1", "angels-basic-chemistry-2")
 
 -- Make Basic Chemistry depend on Wood Processing 2
-bobmods.lib.tech.add_prerequisite("basic-chemistry", "bio-wood-processing-2")
+bobmods.lib.tech.add_prerequisite("angels-basic-chemistry", "angels-bio-wood-processing-2")
 
 -- Move Methane to Blue Science
-bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-2", "gas-refinery-small-2")
-bobmods.lib.tech.remove_recipe_unlock("flammables", "solid-fuel-methane")
-bobmods.lib.tech.remove_recipe_unlock("gas-processing", "gas-fractioning")
-bobmods.lib.tech.remove_recipe_unlock("gas-processing", "gas-refining")
-bobmods.lib.tech.remove_recipe_unlock("steam-cracking-1", "catalyst-steam-cracking-butane")
-bobmods.lib.tech.remove_recipe_unlock("steam-cracking-1", "steam-cracking-butane")
-bobmods.lib.tech.remove_recipe_unlock("steam-cracking-1", "steam-cracking-ethane")
-bobmods.lib.tech.remove_recipe_unlock("steam-cracking-1", "steam-cracking-methane")
-bobmods.lib.tech.remove_recipe_unlock("steam-cracking-2", "steam-cracking-oil-residual")
+bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-2", "angels-gas-refinery-small-2")
+bobmods.lib.tech.remove_recipe_unlock("flammables", "angels-solid-fuel-methane")
+bobmods.lib.tech.remove_recipe_unlock("angels-gas-processing", "angels-gas-fractioning")
+bobmods.lib.tech.remove_recipe_unlock("angels-gas-processing", "angels-gas-refining")
+bobmods.lib.tech.remove_recipe_unlock("angels-steam-cracking-1", "angels-gas-butadiene")
+bobmods.lib.tech.remove_recipe_unlock("angels-steam-cracking-1", "angels-steam-cracking-butane")
+bobmods.lib.tech.remove_recipe_unlock("angels-steam-cracking-1", "angels-gas-ethylene")
+bobmods.lib.tech.remove_recipe_unlock("angels-steam-cracking-1", "angels-steam-cracking-methane")
+bobmods.lib.tech.remove_recipe_unlock("angels-steam-cracking-2", "angels-steam-cracking-oil-residual")
 
-bobmods.lib.tech.add_recipe_unlock("angels-advanced-chemistry-2", "catalyst-steam-cracking-butane")
-bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "gas-refinery-small-2")
-bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "gas-refining")
-bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "gas-fractioning")
-bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "solid-fuel-methane")
+bobmods.lib.tech.add_recipe_unlock("angels-advanced-chemistry-2", "angels-gas-butadiene")
+bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "angels-gas-refinery-small-2")
+bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "angels-gas-refining")
+bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "angels-gas-fractioning")
+bobmods.lib.tech.add_recipe_unlock("angels-advanced-gas-processing", "angels-solid-fuel-methane")
 bobmods.lib.tech.add_recipe_unlock("fluid-handling", "angels-storage-tank-1")
-bobmods.lib.tech.add_recipe_unlock("steam-cracking-1", "steam-cracking-oil-residual")
-bobmods.lib.tech.add_recipe_unlock("steam-cracking-2", "steam-cracking-butane")
-bobmods.lib.tech.add_recipe_unlock("steam-cracking-2", "steam-cracking-ethane")
-bobmods.lib.tech.add_recipe_unlock("steam-cracking-2", "steam-cracking-methane")
-seablock.lib.add_recipe_unlock("bio-nutrient-paste", "gas-refinery-small", 2)
+bobmods.lib.tech.add_recipe_unlock("angels-steam-cracking-1", "angels-steam-cracking-oil-residual")
+bobmods.lib.tech.add_recipe_unlock("angels-steam-cracking-2", "angels-steam-cracking-butane")
+bobmods.lib.tech.add_recipe_unlock("angels-steam-cracking-2", "angels-gas-ethylene")
+bobmods.lib.tech.add_recipe_unlock("angels-steam-cracking-2", "angels-steam-cracking-methane")
+seablock.lib.add_recipe_unlock("angels-bio-nutrient-paste", "angels-gas-refinery-small", 2)
 
-bobmods.lib.tech.remove_prerequisite("advanced-material-processing-2", "gas-processing")
-bobmods.lib.tech.remove_prerequisite("angels-advanced-gas-processing", "steam-cracking-2")
-bobmods.lib.tech.remove_prerequisite("angels-oil-processing", "oil-gas-extraction")
-bobmods.lib.tech.remove_prerequisite("angels-sulfur-processing-3", "gas-processing")
-bobmods.lib.tech.remove_prerequisite("bio-nutrient-paste", "gas-processing")
-bobmods.lib.tech.remove_prerequisite("bio-processing-paste", "chlorine-processing-2")
-bobmods.lib.tech.remove_prerequisite("gas-processing", "oil-gas-extraction")
-bobmods.lib.tech.remove_prerequisite("steam-cracking-1", "gas-processing")
-bobmods.lib.tech.remove_prerequisite("steam-cracking-2", "angels-advanced-chemistry-2")
+bobmods.lib.tech.remove_prerequisite("advanced-material-processing-2", "angels-gas-processing")
+bobmods.lib.tech.remove_prerequisite("angels-advanced-gas-processing", "angels-steam-cracking-2")
+bobmods.lib.tech.remove_prerequisite("angels-oil-processing", "oil-gathering")
+bobmods.lib.tech.remove_prerequisite("angels-sulfur-processing-3", "angels-gas-processing")
+bobmods.lib.tech.remove_prerequisite("angels-bio-nutrient-paste", "angels-gas-processing")
+bobmods.lib.tech.remove_prerequisite("angels-bio-processing-paste", "angels-chlorine-processing-2")
+bobmods.lib.tech.remove_prerequisite("angels-gas-processing", "oil-gathering")
+bobmods.lib.tech.remove_prerequisite("angels-steam-cracking-1", "angels-gas-processing")
+bobmods.lib.tech.remove_prerequisite("angels-steam-cracking-2", "angels-advanced-chemistry-2")
 
-bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-2", "steam-cracking-2")
-bobmods.lib.tech.add_prerequisite("angels-advanced-gas-processing", "bio-nutrient-paste")
-bobmods.lib.tech.add_prerequisite("angels-advanced-gas-processing", "bio-refugium-puffer-1")
+bobmods.lib.tech.add_prerequisite("angels-advanced-chemistry-2", "angels-steam-cracking-2")
+bobmods.lib.tech.add_prerequisite("angels-advanced-gas-processing", "angels-bio-nutrient-paste")
+bobmods.lib.tech.add_prerequisite("angels-advanced-gas-processing", "angels-bio-refugium-puffer-1")
 bobmods.lib.tech.add_prerequisite("angels-oil-processing", "fluid-handling")
-bobmods.lib.tech.add_prerequisite("bio-processing-paste", "chlorine-processing-1")
-bobmods.lib.tech.add_prerequisite("steam-cracking-2", "angels-advanced-gas-processing")
+bobmods.lib.tech.add_prerequisite("angels-bio-processing-paste", "angels-chlorine-processing-1")
+bobmods.lib.tech.add_prerequisite("angels-steam-cracking-2", "angels-advanced-gas-processing")
 
-bobmods.lib.tech.hide("gas-processing")
-bobmods.lib.tech.hide("oil-gas-extraction")
+bobmods.lib.tech.hide("angels-gas-processing")
diff --git a/SeaBlock/data-updates/rubber.lua b/SeaBlock/data-updates/rubber.lua
index cf3d5ffe..c23c5bd4 100644
--- a/SeaBlock/data-updates/rubber.lua
+++ b/SeaBlock/data-updates/rubber.lua
@@ -1,13 +1,9 @@
 bobmods.lib.recipe.hide("bob-rubber")
-bobmods.lib.tech.remove_recipe_unlock("circuit-network", "insulated-cable")
-bobmods.lib.tech.add_recipe_unlock("rubbers", "insulated-cable")
-
--- Circuit network wires should not require rubber
-bobmods.lib.recipe.set_ingredients("green-wire", { { "solid-paper", 2 }, { "tinned-copper-cable", 1 } })
-bobmods.lib.recipe.set_ingredients("red-wire", { { "solid-paper", 2 }, { "tinned-copper-cable", 1 } })
+bobmods.lib.tech.remove_recipe_unlock("circuit-network", "bob-insulated-cable")
+bobmods.lib.tech.add_recipe_unlock("angels-rubbers", "bob-insulated-cable")
 
 if mods["CircuitProcessing"] then
-  bobmods.lib.tech.add_prerequisite("effectivity-module", "rubbers")
-  bobmods.lib.tech.add_prerequisite("productivity-module", "rubbers")
-  bobmods.lib.tech.add_prerequisite("speed-module", "rubbers")
+  bobmods.lib.tech.add_prerequisite("efficiency-module", "angels-rubbers")
+  bobmods.lib.tech.add_prerequisite("productivity-module", "angels-rubbers")
+  bobmods.lib.tech.add_prerequisite("speed-module", "angels-rubbers")
 end
diff --git a/SeaBlock/data-updates/science-cost-tweaker.lua b/SeaBlock/data-updates/science-cost-tweaker.lua
index 97224992..93cc4958 100644
--- a/SeaBlock/data-updates/science-cost-tweaker.lua
+++ b/SeaBlock/data-updates/science-cost-tweaker.lua
@@ -1,43 +1,43 @@
 if mods["ScienceCostTweakerM"] then
-  if data.raw.item["lab-2"] then
+  if data.raw.item["bob-lab-2"] then
     -- Update lab energy usage
-    data.raw.lab["lab-2"].energy_usage = "10MW"
+    data.raw.lab["bob-lab-2"].energy_usage = "10MW"
     -- Only two module slots for lab-2 if s.c.t. is installed (other labs have no module slots)
-    data.raw.lab["lab-2"].module_specification.module_slots = 2
+    data.raw.lab["bob-lab-2"].module_slots = 2
   end
 
   -- Change tech to use lab icon from SCT
-  data.raw.tool["sb-lab-tool"].icon = "__ScienceCostTweakerM__/graphics/sct-lab-t1/icon-64.png"
-  data.raw.tool["sb-lab-tool"].icon_mipmaps = 0
+  data.raw["technology"]["sb-startup4"].icon = "__ScienceCostTweakerM__/graphics/sct-lab-t1/icon-64.png"
+  data.raw["technology"]["sb-startup4"].icon_mipmaps = 0
 
   -- Reduce processing unit cost of S.C.T. high-tech science
   seablock.lib.substingredient("sct-htech-injector", "processing-unit", nil, 3)
 
   -- Hide empty tech (Lab 2 will have been moved to it's own tech sct-lab-lab2
-  seablock.lib.hide_technology("advanced-research")
+  seablock.lib.hide_technology("bob-advanced-research")
 
   -- Yellow science now requires Purple science
   -- Adjust any techs that needed Yellow but not Purple
 
-  bobmods.lib.tech.replace_science_pack("fusion-reactor-equipment", "utility-science-pack", "production-science-pack")
-  bobmods.lib.tech.replace_prerequisite("fusion-reactor-equipment", "utility-science-pack", "production-science-pack")
-  bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment", "low-density-structure")
+  bobmods.lib.tech.replace_science_pack("fission-reactor-equipment", "utility-science-pack", "production-science-pack")
+  bobmods.lib.tech.replace_prerequisite("fission-reactor-equipment", "utility-science-pack", "production-science-pack")
+  bobmods.lib.tech.add_prerequisite("fission-reactor-equipment", "low-density-structure")
   if mods["bobequipment"] then
-    bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment-3", "utility-science-pack")
+    bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-3", "utility-science-pack")
   end
 
   if mods["bobvehicleequipment"] then
     bobmods.lib.tech.replace_science_pack(
-      "vehicle-fusion-reactor-equipment-2",
+      "bob-vehicle-fission-reactor-equipment-2",
       "utility-science-pack",
       "production-science-pack"
     )
     bobmods.lib.tech.replace_prerequisite(
-      "vehicle-fusion-reactor-equipment-2",
+      "bob-vehicle-fission-reactor-equipment-2",
       "utility-science-pack",
       "production-science-pack"
     )
-    bobmods.lib.tech.add_prerequisite("vehicle-fusion-reactor-equipment-3", "utility-science-pack")
+    bobmods.lib.tech.add_prerequisite("bob-vehicle-fission-reactor-equipment-3", "utility-science-pack")
   end
 
   -- Move intermediates from Advanced Material Processing to Purple Science
diff --git a/SeaBlock/data-updates/slag-processing.lua b/SeaBlock/data-updates/slag-processing.lua
index a0922be3..9d285347 100644
--- a/SeaBlock/data-updates/slag-processing.lua
+++ b/SeaBlock/data-updates/slag-processing.lua
@@ -1,140 +1,132 @@
 -- Decrease amount of crushed stone for slag-slurry so it's still better than mineralized water crystallization
-seablock.lib.substingredient("stone-crushed-dissolution", "stone-crushed", nil, 20)
+seablock.lib.substingredient("angels-stone-crushed-dissolution", "angels-stone-crushed", "stone", 20)
 
--- Angels sludge crystalization usually gives normal smeltable ores. This would be far too easy,
--- so change recipes to give the weird ores that need extra processing steps.
+-- Angels sludge crystalization usually gives multiple ores. Change so we have one recipe per ore.
 for i = 1, 6 do
-  local recipe = data.raw.recipe["slag-processing-" .. i]
+  local recipe = data.raw.recipe["angels-slag-processing-" .. i]
   seablock.lib.copy_icon(recipe, {})
-  recipe.localised_name = { "recipe-name.slag-processing", { "item-name.angels-ore" .. i } }
+  recipe.localised_name = { "recipe-name.angels-slag-processing", { "item-name.angels-ore" .. i } }
   recipe.order = "a-a [angels-ore-" .. i .. "]"
 
-  recipe.ingredients = nil
-  recipe.results = nil
-  recipe.energy_required = nil
-  recipe.category = "crystallizing"
-
-  recipe.normal = {
-    energy_required = 4,
-    ingredients = { { type = "fluid", name = "mineral-sludge", amount = 25 } },
-    results = { { type = "item", name = "angels-ore" .. i, amount = 1 } },
-    enabled = false,
-  }
-
-  recipe.expensive = {
-    energy_required = 8,
-    ingredients = { { type = "fluid", name = "mineral-sludge", amount = 50 } },
-    results = { { type = "item", name = "angels-ore" .. i, amount = 1 } },
-    enabled = false,
-  }
+  recipe.category = "angels-crystallizing"
+  recipe.energy_required = 4
+  recipe.ingredients = { { type = "fluid", name = "angels-mineral-sludge", amount = 25 } }
+  recipe.results = { { type = "item", name = "angels-ore" .. i, amount = 1 } }
+  recipe.hidden = false
 end
 
 -- Angels ores 1, 3 (Saphirite, Stiratite) available from tutorial tech 1,
 -- Angels ores 5, 6 (Rubyte, Bobmonium) available from Slag processing 1
 -- Angels ores 2, 4 (Jivolite, Crotinnium) available from Advanced mechanical refining
-bobmods.lib.recipe.enabled("angelsore1-crushed-smelting", false)
-bobmods.lib.recipe.enabled("angelsore3-crushed-smelting", false)
-seablock.lib.moveeffect("catalysator-brown", "slag-processing-1", "advanced-ore-refining-1", 3)
-local slag1start = seablock.lib.findeffectidx(data.raw.technology["slag-processing-1"].effects, "slag-processing-1")
-seablock.lib.moveeffect("slag-processing-5", "slag-processing-2", "slag-processing-1", slag1start + 3)
-seablock.lib.moveeffect("slag-processing-6", "slag-processing-2", "slag-processing-1", slag1start + 4)
+bobmods.lib.recipe.enabled("angels-ore1-crushed-smelting", false)
+bobmods.lib.recipe.enabled("angels-ore3-crushed-smelting", false)
+seablock.lib.moveeffect("angels-catalysator-brown", "angels-slag-processing-1", "angels-advanced-ore-refining-1", 3)
+local slag1start =
+  seablock.lib.findeffectidx(data.raw.technology["angels-slag-processing-1"].effects, "angels-slag-processing-1")
+seablock.lib.insert_effect("angels-slag-processing-5", "angels-slag-processing-1", slag1start + 3)
+seablock.lib.insert_effect("angels-slag-processing-6", "angels-slag-processing-1", slag1start + 4)
 
 local slag2start = 0
-seablock.lib.moveeffect("slag-processing-2", "slag-processing-1", "ore-advanced-crushing", slag2start + 1)
-seablock.lib.moveeffect("slag-processing-4", "slag-processing-2", "ore-advanced-crushing", slag2start + 2)
-seablock.lib.moveeffect("angelsore2-crushed", "ore-crushing", "ore-advanced-crushing", slag2start + 3)
-seablock.lib.moveeffect("angelsore4-crushed", "ore-crushing", "ore-advanced-crushing", slag2start + 4)
-
-seablock.lib.add_recipe_unlock("ore-crushing", "angelsore5-crushed", 3)
-seablock.lib.add_recipe_unlock("ore-crushing", "angelsore6-crushed", 4)
-seablock.lib.add_recipe_unlock("ore-crushing", "iron-plate")
-seablock.lib.add_recipe_unlock("ore-crushing", "copper-plate")
-seablock.lib.add_recipe_unlock("ore-crushing", "lead-plate")
-seablock.lib.add_recipe_unlock("ore-crushing", "tin-plate")
-seablock.lib.add_recipe_unlock("ore-crushing", "quartz-glass")
+seablock.lib.moveeffect(
+  "angels-slag-processing-2",
+  "angels-slag-processing-1",
+  "angels-ore-advanced-crushing",
+  slag2start + 1
+)
+seablock.lib.insert_effect("angels-slag-processing-4", "angels-ore-advanced-crushing", slag2start + 2)
+seablock.lib.moveeffect("angels-ore2-crushed", "angels-ore-crushing", "angels-ore-advanced-crushing", slag2start + 3)
+seablock.lib.moveeffect("angels-ore4-crushed", "angels-ore-crushing", "angels-ore-advanced-crushing", slag2start + 4)
+
+seablock.lib.add_recipe_unlock("angels-ore-crushing", "angels-ore5-crushed", 3)
+seablock.lib.add_recipe_unlock("angels-ore-crushing", "angels-ore6-crushed", 4)
+seablock.lib.add_recipe_unlock("angels-ore-crushing", "iron-plate")
+seablock.lib.add_recipe_unlock("angels-ore-crushing", "copper-plate")
+seablock.lib.add_recipe_unlock("angels-ore-crushing", "bob-lead-plate")
+seablock.lib.add_recipe_unlock("angels-ore-crushing", "bob-tin-plate")
+seablock.lib.add_recipe_unlock("angels-ore-crushing", "bob-glass")
 
 seablock.lib.unhide_recipe("iron-plate")
 seablock.lib.unhide_recipe("copper-plate")
-seablock.lib.unhide_recipe("lead-plate")
-seablock.lib.unhide_recipe("tin-plate")
+seablock.lib.unhide_recipe("bob-lead-plate")
+seablock.lib.unhide_recipe("bob-tin-plate")
 
 -- Hide unwanted recipes
-bobmods.lib.recipe.hide("silver-plate")
-bobmods.lib.tech.remove_recipe_unlock("ore-crushing", "angelsore2-crushed-processing")
-bobmods.lib.tech.remove_recipe_unlock("ore-crushing", "angelsore4-crushed-processing")
-bobmods.lib.recipe.hide("angelsore2-crushed-processing")
-bobmods.lib.recipe.hide("angelsore4-crushed-processing")
-bobmods.lib.recipe.hide("angelsore5-crushed-smelting")
-bobmods.lib.recipe.hide("angelsore6-crushed-smelting")
+bobmods.lib.recipe.hide("bob-silver-plate")
+bobmods.lib.tech.remove_recipe_unlock("angels-ore-crushing", "angels-ore2-crushed-processing")
+bobmods.lib.tech.remove_recipe_unlock("angels-ore-crushing", "angels-ore4-crushed-processing")
+bobmods.lib.recipe.hide("angels-ore2-crushed-processing")
+bobmods.lib.recipe.hide("angels-ore4-crushed-processing")
+bobmods.lib.recipe.hide("angels-ore5-crushed-smelting")
+bobmods.lib.recipe.hide("angels-ore6-crushed-smelting")
 
 -- Add prerequisites
-bobmods.lib.tech.add_prerequisite("ore-floatation", "ore-advanced-crushing")
-bobmods.lib.tech.add_prerequisite("advanced-ore-refining-1", "ore-advanced-crushing")
+bobmods.lib.tech.add_prerequisite("angels-ore-floatation", "angels-ore-advanced-crushing")
+bobmods.lib.tech.add_prerequisite("angels-advanced-ore-refining-1", "angels-ore-advanced-crushing")
 
 -- Move Mechanical Refining under Slag Processing 1
-seablock.lib.moveeffect("ore-crusher", "ore-crushing", "automation")
-bobmods.lib.tech.remove_prerequisite("slag-processing-1", "ore-crushing")
-bobmods.lib.tech.remove_prerequisite("slag-processing-1", "logistic-science-pack")
-bobmods.lib.tech.remove_prerequisite("ore-crushing", "basic-chemistry")
-bobmods.lib.tech.add_prerequisite("ore-crushing", "slag-processing-1")
+seablock.lib.moveeffect("angels-ore-crusher", "angels-ore-crushing", "automation")
+bobmods.lib.tech.remove_prerequisite("angels-slag-processing-1", "angels-ore-crushing")
+bobmods.lib.tech.remove_prerequisite("angels-slag-processing-1", "logistic-science-pack")
+bobmods.lib.tech.remove_prerequisite("angels-ore-crushing", "angels-basic-chemistry")
+bobmods.lib.tech.add_prerequisite("angels-ore-crushing", "angels-slag-processing-1")
 
 -- Move crystallization ore recipes up above crushed ores
-data.raw["item-subgroup"]["slag-processing-1"].order = "ab"
+data.raw["item-subgroup"]["angels-slag-processing-1"].order = "ab"
 
 -- Red science level research for slag processing 1
-data.raw.technology["slag-processing-1"].unit = {
+data.raw.technology["angels-slag-processing-1"].unit = {
   count = 20,
   ingredients = { { "automation-science-pack", 1 } },
   time = 15,
 }
 
-bobmods.lib.tech.add_prerequisite("advanced-ore-refining-2", "ore-powderizer")
-bobmods.lib.tech.add_prerequisite("advanced-ore-refining-2", "advanced-electronics")
-bobmods.lib.tech.add_prerequisite("advanced-ore-refining-4", "advanced-electronics-3")
-bobmods.lib.tech.add_prerequisite("advanced-ore-refining-4", "angels-tungsten-smelting-1")
+bobmods.lib.tech.add_prerequisite("angels-advanced-ore-refining-2", "angels-ore-powderizer")
+bobmods.lib.tech.add_prerequisite("angels-advanced-ore-refining-2", "advanced-circuit")
+bobmods.lib.tech.add_prerequisite("angels-advanced-ore-refining-4", "bob-advanced-processing-unit")
+bobmods.lib.tech.add_prerequisite("angels-advanced-ore-refining-4", "angels-tungsten-smelting-1")
 
 -- Add an additional slag to the mixed sorting recipes
 for _, v in pairs({
   -- Saphirite
-  "angelsore1-crushed-processing",
-  "angelsore1-chunk-processing",
-  "angelsore1-crystal-processing",
+  "angels-ore1-crushed-processing",
+  "angels-ore1-chunk-processing",
+  "angels-ore1-crystal-processing",
   -- Jivolite
-  "angelsore2-chunk-processing",
-  "angelsore2-crystal-processing",
+  "angels-ore2-chunk-processing",
+  "angels-ore2-crystal-processing",
   -- Stiratite
-  "angelsore3-crushed-processing",
-  "angelsore3-chunk-processing",
-  "angelsore3-crystal-processing",
+  "angels-ore3-crushed-processing",
+  "angels-ore3-chunk-processing",
+  "angels-ore3-crystal-processing",
   -- Crotinnium
-  "angelsore4-chunk-processing",
-  "angelsore4-crystal-processing",
+  "angels-ore4-chunk-processing",
+  "angels-ore4-crystal-processing",
   -- Rubyte
-  "angelsore5-crushed-processing",
-  "angelsore5-chunk-processing",
-  "angelsore5-crystal-processing",
+  "angels-ore5-crushed-processing",
+  "angels-ore5-chunk-processing",
+  "angels-ore5-crystal-processing",
   -- Bobmonium
-  "angelsore6-crushed-processing",
-  "angelsore6-chunk-processing",
-  "angelsore6-crystal-processing",
+  "angels-ore6-crushed-processing",
+  "angels-ore6-chunk-processing",
+  "angels-ore6-crystal-processing",
 }) do
-  seablock.lib.substresult(v, "slag", nil, 2)
+  seablock.lib.substresult(v, "angels-slag", nil, 2)
 end
 
 -- Change the recipe icon for Dirt water electrolysis to show slag icon
-data.raw.recipe["dirt-water-separation"].icons = angelsmods.functions.add_number_icon_layer(
-  angelsmods.functions.get_object_icons("slag"),
+data.raw.recipe["angels-dirt-water-separation"].icons = angelsmods.functions.add_number_icon_layer(
+  angelsmods.functions.get_object_icons("angels-slag"),
   1,
   angelsmods.petrochem.number_tint
 )
-data.raw.recipe["dirt-water-separation-2"].icons = angelsmods.functions.add_number_icon_layer(
-  angelsmods.functions.get_object_icons("slag"),
+data.raw.recipe["angels-dirt-water-separation-2"].icons = angelsmods.functions.add_number_icon_layer(
+  angelsmods.functions.get_object_icons("angels-slag"),
   2,
   angelsmods.petrochem.number_tint
 )
 
 -- Move Ferrous & Cupric concentrate anodizing recipes from Electrowinning cell to Electrolyser 4
-table.insert(data.raw["assembling-machine"]["angels-electrolyser-4"].crafting_categories, "petrochem-electrolyser-4")
-bobmods.lib.recipe.set_category("angelsore8-anode-sludge", "petrochem-electrolyser-4")
-bobmods.lib.recipe.set_category("angelsore9-anode-sludge", "petrochem-electrolyser-4")
-bobmods.lib.tech.add_prerequisite("ore-electro-whinning-cell", "angels-advanced-chemistry-3")
+table.insert(data.raw["assembling-machine"]["angels-electrolyser-4"].crafting_categories, "sb-petrochem-electrolyser-4")
+bobmods.lib.recipe.set_category("angels-ore8-anode-sludge", "sb-petrochem-electrolyser-4")
+bobmods.lib.recipe.set_category("angels-ore9-anode-sludge", "sb-petrochem-electrolyser-4")
+bobmods.lib.tech.add_prerequisite("angels-ore-electro-whinning-cell", "angels-advanced-chemistry-3")
diff --git a/SeaBlock/data-updates/startup.lua b/SeaBlock/data-updates/startup.lua
index dfb8e71a..886cc01a 100644
--- a/SeaBlock/data-updates/startup.lua
+++ b/SeaBlock/data-updates/startup.lua
@@ -8,67 +8,67 @@
 local knowningredients = {
   ["angels-electrolyser"] = {
     { "iron-plate", 10 },
-    { "basic-circuit-board", 5 },
+    { "bob-basic-circuit-board", 5 },
     { "iron-stick", 22 },
     { "stone-brick", 10 },
   },
-  ["liquifier"] = {
+  ["angels-liquifier"] = {
     { "iron-plate", 10 },
-    { "basic-circuit-board", 5 },
+    { "bob-basic-circuit-board", 5 },
     { "pipe-to-ground", 2 },
     { "stone-brick", 10 },
   },
   ["offshore-pump"] = {
-    { "basic-circuit-board", 2 },
+    { "bob-basic-circuit-board", 2 },
     { "pipe", 1 },
     { "iron-gear-wheel", 10 },
   },
-  ["crystallizer"] = {
+  ["angels-crystallizer"] = {
     { "iron-plate", 10 },
-    { "basic-circuit-board", 5 },
-    { "copper-pipe", 5 },
+    { "bob-basic-circuit-board", 5 },
+    { "bob-copper-pipe", 5 },
     { "stone-brick", 10 },
   },
-  ["algae-farm"] = {
+  ["angels-algae-farm"] = {
     { "iron-plate", 10 },
-    { "basic-circuit-board", 5 },
+    { "bob-basic-circuit-board", 5 },
     { "iron-stick", 10 },
     { "stone-brick", 25 },
   },
   ["angels-flare-stack"] = {
     { "iron-plate", 5 },
-    { "basic-circuit-board", 5 },
+    { "bob-basic-circuit-board", 5 },
     { "pipe", 10 },
     { "stone-brick", 10 },
   },
-  ["seafloor-pump"] = {
+  ["angels-seafloor-pump"] = {
     { "iron-plate", 5 },
-    { "basic-circuit-board", 2 },
+    { "bob-basic-circuit-board", 2 },
     { "pipe", 5 },
   },
-  ["washing-plant"] = {
+  ["angels-washing-plant"] = {
     { "iron-plate", 10 },
-    { "basic-circuit-board", 5 },
+    { "bob-basic-circuit-board", 5 },
     { "pipe", 10 },
     { "stone-brick", 10 },
   },
-  ["angels-chemical-plant"] = {
+  ["chemical-plant"] = {
     { "iron-plate", 5 },
     { "iron-gear-wheel", 5 },
-    { "basic-circuit-board", 5 },
+    { "bob-basic-circuit-board", 5 },
     { "pipe", 5 },
   },
-  ["filtration-unit"] = {
+  ["angels-filtration-unit"] = {
     { "iron-plate", 5 },
-    { "basic-circuit-board", 5 },
+    { "bob-basic-circuit-board", 5 },
     { "pipe", 10 },
     { "stone-brick", 10 },
   },
-  ["filter-frame"] = {
+  ["angels-filter-frame"] = {
     { "iron-plate", 1 },
     { "iron-stick", 2 },
   },
-  ["burner-ore-crusher"] = {
+  ["angels-burner-ore-crusher"] = {
     { "stone", 5 },
     { "stone-furnace", 1 },
   },
@@ -99,11 +99,9 @@ end
 
 if data.raw.technology["sct-automation-science-pack"] then
   bobmods.lib.tech.add_prerequisite("sct-automation-science-pack", "sct-lab-t1")
-  data.raw.technology["sct-automation-science-pack"].unit = {
-    count = 1,
-    ingredients = { { "sb-lab-tool", 1 } },
-    time = 1,
-  }
+
+  data.raw.technology["sct-automation-science-pack"].research_trigger = { type = "craft-item", item = "lab" }
+  data.raw.technology["sct-automation-science-pack"].unit = nil
   data.raw.technology["sct-lab-t1"].unit = {
     count = 1,
     ingredients = {},
@@ -133,7 +131,7 @@ local function ironrecipe(recipe)
     ["iron-stick"] = true,
     ["pipe"] = true,
     ["pipe-to-ground"] = true,
-    ["basic-circuit-board"] = true,
+    ["bob-basic-circuit-board"] = true,
     ["electronic-circuit"] = true,
     ["stone-brick"] = true,
     ["copper-plate"] = true,
@@ -205,18 +203,20 @@ end
 -- Limit research required for startup techs.
 for k, v in pairs(seablock.startup_techs) do
   if data.raw.technology[k] then
-    if v[1] and data.raw.technology[k].unit.count > 20 then
-      data.raw.technology[k].unit.count = 20
-      data.raw.technology[k].unit.ingredients = { { "automation-science-pack", 1 } }
+    if data.raw.technology[k].unit then
+      if v[1] and data.raw.technology[k].unit.count > 20 then
+        data.raw.technology[k].unit.count = 20
+        data.raw.technology[k].unit.ingredients = { { "automation-science-pack", 1 } }
+      end
+      bobmods.lib.tech.ignore_tech_cost_multiplier(k, true)
+      data.raw.technology[k].unit.time = 15
     end
-    bobmods.lib.tech.ignore_tech_cost_multiplier(k, true)
-    data.raw.technology[k].unit.time = 15
   end
 end
 
 -- Make bio-wood-processing a startup tutorial tech
-data.raw.technology["bio-wood-processing"].prerequisites = { "sb-startup1" }
-data.raw.technology["bio-wood-processing"].unit = {
+data.raw.technology["angels-bio-wood-processing"].prerequisites = { "sb-startup1" }
+data.raw.technology["angels-bio-wood-processing"].unit = {
   count = 1,
   ingredients = {},
   time = 1,
diff --git a/SeaBlock/data-updates/sulfur.lua b/SeaBlock/data-updates/sulfur.lua
index 315ff94c..1f6ba9de 100644
--- a/SeaBlock/data-updates/sulfur.lua
+++ b/SeaBlock/data-updates/sulfur.lua
@@ -6,38 +6,38 @@ local washing_fluid_box = {
   pipe_connections = { { position = { -3, 0 }, type = "output" } },
 }
 for _, v in pairs({ "", "-2", "-3", "-4" }) do
-  local washingplant = data.raw["assembling-machine"]["washing-plant" .. v]
+  local washingplant = data.raw["assembling-machine"]["angels-washing-plant" .. v]
   if washingplant then
     table.insert(washingplant.fluid_boxes, washing_fluid_box)
   end
 end
-seablock.lib.addresult("washing-1", { type = "fluid", name = "gas-hydrogen-sulfide", amount = 2 })
+seablock.lib.addresult("angels-water-heavy-mud", { type = "fluid", name = "angels-gas-hydrogen-sulfide", amount = 2 })
 
 -- Sulfuric acid prerequisites
-bobmods.lib.tech.add_prerequisite("angels-sulfur-processing-1", "water-washing-1")
+bobmods.lib.tech.add_prerequisite("angels-sulfur-processing-1", "angels-water-washing-1")
 
 -- Sulfur 1 tech: Remove prerequisite Advanced lead smelting 1
 bobmods.lib.tech.remove_prerequisite("angels-sulfur-processing-1", "angels-lead-smelting-1")
 
 -- Move Sulfur Dioxide Gas from Sulfur processing 2 to Sulfur processing 1
-bobmods.lib.tech.remove_recipe_unlock("angels-sulfur-processing-2", "gas-sulfur-dioxide")
-bobmods.lib.tech.add_recipe_unlock("angels-sulfur-processing-1", "gas-sulfur-dioxide")
+bobmods.lib.tech.remove_recipe_unlock("angels-sulfur-processing-2", "angels-gas-sulfur-dioxide")
+bobmods.lib.tech.add_recipe_unlock("angels-sulfur-processing-1", "angels-gas-sulfur-dioxide")
 
 -- Move Sulfur from Sulfur processing 3 to Sulfur processing 1
-bobmods.lib.tech.remove_recipe_unlock("angels-sulfur-processing-3", "solid-sulfur")
-bobmods.lib.tech.add_recipe_unlock("angels-sulfur-processing-1", "solid-sulfur")
+bobmods.lib.tech.remove_recipe_unlock("angels-sulfur-processing-3", "angels-solid-sulfur")
+bobmods.lib.tech.add_recipe_unlock("angels-sulfur-processing-1", "angels-solid-sulfur")
 
 -- Sulfur is now available sooner so no longer need Sulfur 2 as a prerequisite
 -- Basic chem 2 isn't strictly required but don't want too many techs to depend directly on Green Science tech
 bobmods.lib.tech.remove_prerequisite("explosives", "angels-sulfur-processing-2")
-bobmods.lib.tech.add_prerequisite("explosives", "basic-chemistry-2")
+bobmods.lib.tech.add_prerequisite("explosives", "angels-basic-chemistry-2")
 
 bobmods.lib.tech.remove_prerequisite("battery", "angels-sulfur-processing-2")
 
 -- Combine Sulfur 3 and 4 and move to Blue Science
-seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "filter-lime", 1)
-seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-sulfur-scrubber", 2)
-seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "filter-lime-used", 3)
+seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-filter-lime", 1)
+seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-sulfur-air-scrubbing", 2)
+seablock.lib.add_recipe_unlock("angels-sulfur-processing-3", "angels-filter-lime-used-cleaning", 3)
 
 bobmods.lib.tech.hide("angels-sulfur-processing-4")
 bobmods.lib.tech.add_new_science_pack("angels-sulfur-processing-3", "chemical-science-pack", 1)
diff --git a/SeaBlock/data-updates/thermal-extractor.lua b/SeaBlock/data-updates/thermal-extractor.lua
index 376629f9..1f46955d 100644
--- a/SeaBlock/data-updates/thermal-extractor.lua
+++ b/SeaBlock/data-updates/thermal-extractor.lua
@@ -14,7 +14,10 @@ local function makeextractorlayers(bottom, top)
   local layers = {}
   if top then
     table.insert(layers, {
-      stripes = makestripes("__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", 16),
+      stripes = makestripes(
+        "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png",
+        16
+      ),
       priority = "high",
       width = 288,
       height = 288,
@@ -30,13 +33,16 @@ local function makeextractorlayers(bottom, top)
     height = 288,
     line_length = 4,
     shift = { 0, 0 },
-    filename = "__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-animation.png",
+    filename = "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-animation.png",
     frame_count = 16,
     animation_speed = 0.5,
   })
   if bottom then
     table.insert(layers, {
-      stripes = makestripes("__angelsrefining__/graphics/entity/thermal-extractor/thermal-extractor-base.png", 16),
+      stripes = makestripes(
+        "__angelsrefininggraphics__/graphics/entity/thermal-extractor/thermal-extractor-base.png",
+        16
+      ),
       priority = "high",
       width = 288,
       height = 288,
@@ -49,9 +55,9 @@ local function makeextractorlayers(bottom, top)
   return { layers = layers }
 end
 
-local extractor = data.raw["mining-drill"]["thermal-extractor"]
-data.raw["mining-drill"]["thermal-extractor"] = nil
-data.raw["assembling-machine"]["thermal-extractor"] = extractor
+local extractor = data.raw["mining-drill"]["angels-thermal-extractor"]
+data.raw["mining-drill"]["angels-thermal-extractor"] = nil
+data.raw["assembling-machine"]["angels-thermal-extractor"] = extractor
 extractor.type = "assembling-machine"
 extractor.crafting_speed = 1
 extractor.ingredient_count = 2
@@ -77,15 +83,18 @@ extractor.animation = {
   south = makeextractorlayers(false, false),
   west = makeextractorlayers(true, true),
 }
-extractor.crafting_categories = { "thermal-extractor" }
-extractor.fixed_recipe = "thermal-extractor-water"
-bobmods.lib.tech.add_recipe_unlock("thermal-water-extraction-2", "thermal-extractor-water")
-move_item("thermal-extractor", "water-treatment-building", "f[thermal-extractor]-b[extractor]", "item")
-bobmods.lib.recipe.add_ingredient("thermal-extractor", { "thermal-bore", 1 })
+extractor.crafting_categories = { "sb-thermal-extractor" }
+extractor.fixed_recipe = "sb-thermal-extractor-water"
+bobmods.lib.tech.add_recipe_unlock("angels-thermal-water-extraction-2", "sb-thermal-extractor-water")
+move_item("angels-thermal-extractor", "angels-water-treatment-building", "f[thermal-extractor]-b[extractor]", "item")
+bobmods.lib.recipe.add_ingredient(
+  "angels-thermal-extractor",
+  { type = "item", name = "angels-thermal-bore", amount = 1 }
+)
 
-local bore = data.raw["mining-drill"]["thermal-bore"]
-data.raw["mining-drill"]["thermal-bore"] = nil
-data.raw["assembling-machine"]["thermal-bore"] = bore
+local bore = data.raw["mining-drill"]["angels-thermal-bore"]
+data.raw["mining-drill"]["angels-thermal-bore"] = nil
+data.raw["assembling-machine"]["angels-thermal-bore"] = bore
 bore.type = "assembling-machine"
 bore.crafting_speed = 1
 bore.ingredient_count = 1
@@ -98,11 +107,19 @@ bore.fluid_boxes = {
     pipe_connections = {
       {
         type = "output",
-        positions = { { 1, -2 }, { 2, -1 }, { -1, 2 }, { -2, 1 } },
+        position = { -5, -3 },
       },
     },
   },
 }
+bore.animation = {
+  north = makeextractorlayers(false, false),
+  east = makeextractorlayers(true, true),
+  south = makeextractorlayers(false, false),
+  west = makeextractorlayers(true, true),
+}
+bore.crafting_categories = { "sb-thermal-bore" }
+bore.fixed_recipe = "sb-thermal-bore-water"
 
 local function makesheet(sheet, count, d)
   local r = table.deepcopy(sheet)
@@ -135,11 +152,12 @@ bore.crafting_categories = { "thermal-bore" }
 bore.fixed_recipe = "thermal-bore-water"
 bobmods.lib.tech.add_recipe_unlock("thermal-water-extraction", "thermal-bore-water")
 move_item("thermal-bore", "water-treatment-building", "f[thermal-extractor]-a[bore]", "item")
+move_item("angels-thermal-bore", "angels-water-treatment-building", "f[thermal-extractor]-a[bore]", "item")
 
 -- Fish Pressing requires thermal water so add a prerequisite
-if data.raw.technology["bio-pressing-fish"] then
-  bobmods.lib.tech.add_prerequisite("bio-pressing-fish", "thermal-water-extraction")
+if data.raw.technology["angels-bio-pressing-fish"] then
+  bobmods.lib.tech.add_prerequisite("angels-bio-pressing-fish", "angels-thermal-water-extraction")
 else
-  bobmods.lib.tech.add_prerequisite("bio-pressing-fish-1", "thermal-water-extraction")
+  bobmods.lib.tech.add_prerequisite("angels-bio-pressing-fish-1", "angels-thermal-water-extraction")
 end
-bobmods.lib.tech.add_prerequisite("thermal-water-extraction", "bio-processing-brown")
+bobmods.lib.tech.add_prerequisite("angels-thermal-water-extraction", "angels-bio-processing-brown")
diff --git a/SeaBlock/data-updates/unobtainable-items.lua b/SeaBlock/data-updates/unobtainable-items.lua
index 62fd2a7f..7f1be15a 100644
--- a/SeaBlock/data-updates/unobtainable-items.lua
+++ b/SeaBlock/data-updates/unobtainable-items.lua
@@ -1,9 +1,6 @@
 seablock.lib.hide("mining-drill", "burner-mining-drill")
 seablock.lib.hide("mining-drill", "electric-mining-drill")
 seablock.lib.hide("mining-drill", "pumpjack")
-seablock.lib.hide("storage-tank", "bob-overflow-valve")
-seablock.lib.hide("storage-tank", "bob-valve")
-seablock.lib.hide("storage-tank", "bob-topup-valve")
 
 -- Hide Oil & Gas Separator
 -- Hide Advanced Gas Refinery
@@ -12,155 +9,159 @@ seablock.lib.hide("storage-tank", "bob-topup-valve")
 -- Hide Multi-phase oil
 -- Hide gas fractioning - synthesis (only recipe available in advanced gas refinery)
 for _, item in pairs({
-  { type = "assembling-machine", name = "electro-whinning-cell" },
-  { type = "assembling-machine", name = "electro-whinning-cell-2" },
-  { type = "assembling-machine", name = "gas-refinery" },
-  { type = "assembling-machine", name = "gas-refinery-2" },
-  { type = "assembling-machine", name = "gas-refinery-3" },
-  { type = "assembling-machine", name = "gas-refinery-4" },
-  { type = "assembling-machine", name = "separator" },
-  { type = "assembling-machine", name = "separator-2" },
-  { type = "assembling-machine", name = "separator-3" },
-  { type = "assembling-machine", name = "separator-4" },
-  { type = "fluid", name = "gas-chlor-methane" },
-  { type = "fluid", name = "liquid-multi-phase-oil" },
-  { type = "item", name = "electro-whinning-cell" },
-  { type = "item", name = "electro-whinning-cell-2" },
-  { type = "item", name = "gas-chlor-methane-barrel" },
-  { type = "item", name = "gas-refinery" },
-  { type = "item", name = "gas-refinery-2" },
-  { type = "item", name = "gas-refinery-3" },
-  { type = "item", name = "gas-refinery-4" },
-  { type = "item", name = "liquid-multi-phase-oil-barrel" },
-  { type = "item", name = "separator" },
-  { type = "item", name = "separator-2" },
-  { type = "item", name = "separator-3" },
-  { type = "item", name = "separator-4" },
+  { type = "assembling-machine", name = "angels-electro-whinning-cell" },
+  { type = "assembling-machine", name = "angels-electro-whinning-cell-2" },
+  { type = "assembling-machine", name = "angels-gas-refinery" },
+  { type = "assembling-machine", name = "angels-gas-refinery-2" },
+  { type = "assembling-machine", name = "angels-gas-refinery-3" },
+  { type = "assembling-machine", name = "angels-gas-refinery-4" },
+  { type = "assembling-machine", name = "angels-separator" },
+  { type = "assembling-machine", name = "angels-separator-2" },
+  { type = "assembling-machine", name = "angels-separator-3" },
+  { type = "assembling-machine", name = "angels-separator-4" },
+  { type = "fluid", name = "angels-gas-chlor-methane" },
+  { type = "fluid", name = "angels-liquid-multi-phase-oil" },
+  { type = "item", name = "angels-electro-whinning-cell" },
+  { type = "item", name = "angels-electro-whinning-cell-2" },
+  { type = "item", name = "angels-gas-chlor-methane-barrel" },
+  { type = "item", name = "angels-gas-refinery" },
+  { type = "item", name = "angels-gas-refinery-2" },
+  { type = "item", name = "angels-gas-refinery-3" },
+  { type = "item", name = "angels-gas-refinery-4" },
+  { type = "item", name = "angels-liquid-multi-phase-oil-barrel" },
+  { type = "item", name = "angels-separator" },
+  { type = "item", name = "angels-separator-2" },
+  { type = "item", name = "angels-separator-3" },
+  { type = "item", name = "angels-separator-4" },
 }) do
   seablock.lib.hide(item.type, item.name)
 end
 
-bobmods.lib.recipe.hide("angels-chemical-void-gas-chlor-methane")
-bobmods.lib.recipe.hide("angels-chemical-void-liquid-multi-phase-oil")
-bobmods.lib.recipe.hide("electro-whinning-cell")
-bobmods.lib.recipe.hide("electro-whinning-cell-2")
-bobmods.lib.recipe.hide("empty-gas-chlor-methane-barrel")
-bobmods.lib.recipe.hide("empty-liquid-multi-phase-oil-barrel")
-bobmods.lib.recipe.hide("fill-gas-chlor-methane-barrel")
-bobmods.lib.recipe.hide("fill-liquid-multi-phase-oil-barrel")
-bobmods.lib.recipe.hide("gas-chlor-methane")
-bobmods.lib.recipe.hide("gas-fractioning-synthesis")
-bobmods.lib.recipe.hide("gas-refinery")
-bobmods.lib.recipe.hide("gas-refinery-2")
-bobmods.lib.recipe.hide("gas-refinery-3")
-bobmods.lib.recipe.hide("gas-refinery-4")
-bobmods.lib.recipe.hide("oil-separation")
-bobmods.lib.recipe.hide("separator")
-bobmods.lib.recipe.hide("separator-2")
-bobmods.lib.recipe.hide("separator-3")
-bobmods.lib.recipe.hide("separator-4")
-
-bobmods.lib.tech.remove_recipe_unlock("advanced-ore-refining-4", "electro-whinning-cell-2")
-bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-2", "separator-2")
-bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-3", "gas-refinery-2")
-bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-3", "separator-3")
-bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-4", "gas-refinery-3")
-bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-4", "separator-4")
-bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "gas-fractioning-synthesis")
-bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "gas-refinery")
-bobmods.lib.tech.remove_recipe_unlock("angels-nitrogen-processing-4", "gas-refinery-4")
-bobmods.lib.tech.remove_recipe_unlock("chlorine-processing-2", "gas-chlor-methane")
-bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "empty-liquid-multi-phase-oil-barrel")
-bobmods.lib.tech.remove_recipe_unlock("fluid-barrel-processing", "fill-liquid-multi-phase-oil-barrel")
-bobmods.lib.tech.remove_recipe_unlock("gas-canisters", "empty-gas-chlor-methane-barrel")
-bobmods.lib.tech.remove_recipe_unlock("gas-canisters", "fill-gas-chlor-methane-barrel")
-bobmods.lib.tech.remove_recipe_unlock("ore-electro-whinning-cell", "electro-whinning-cell")
-
-bobmods.lib.recipe.replace_ingredient("paste-cellulose", "gas-chlor-methane", "gas-chlorine")
+bobmods.lib.recipe.hide("angels-chemical-void-angels-gas-chlor-methane")
+bobmods.lib.recipe.hide("angels-chemical-void-angels-liquid-multi-phase-oil")
+bobmods.lib.recipe.hide("angels-electro-whinning-cell")
+bobmods.lib.recipe.hide("angels-electro-whinning-cell-2")
+bobmods.lib.recipe.hide("empty-angels-gas-chlor-methane-barrel")
+bobmods.lib.recipe.hide("empty-angels-liquid-multi-phase-oil-barrel")
+bobmods.lib.recipe.hide("angels-gas-chlor-methane-barrel")
+bobmods.lib.recipe.hide("angels-liquid-multi-phase-oil-barrel")
+bobmods.lib.recipe.hide("angels-gas-chlor-methane")
+bobmods.lib.recipe.hide("angels-gas-fractioning-synthesis")
+bobmods.lib.recipe.hide("angels-gas-refinery")
+bobmods.lib.recipe.hide("angels-gas-refinery-2")
+bobmods.lib.recipe.hide("angels-gas-refinery-3")
+bobmods.lib.recipe.hide("angels-gas-refinery-4")
+bobmods.lib.recipe.hide("angels-oil-separation")
+bobmods.lib.recipe.hide("angels-separator")
+bobmods.lib.recipe.hide("angels-separator-2")
+bobmods.lib.recipe.hide("angels-separator-3")
+bobmods.lib.recipe.hide("angels-separator-4")
+
+bobmods.lib.tech.remove_recipe_unlock("angels-advanced-ore-refining-4", "angels-electro-whinning-cell-2")
+bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-2", "angels-separator-2")
+bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-3", "angels-gas-refinery-2")
+bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-3", "angels-separator-3")
+bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-4", "angels-gas-refinery-3")
+bobmods.lib.tech.remove_recipe_unlock("angels-advanced-chemistry-4", "angels-separator-4")
+bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "angels-gas-fractioning-synthesis")
+bobmods.lib.tech.remove_recipe_unlock("angels-advanced-gas-processing", "angels-gas-refinery")
+bobmods.lib.tech.remove_recipe_unlock("angels-nitrogen-processing-4", "angels-gas-refinery-4")
+bobmods.lib.tech.remove_recipe_unlock("angels-chlorine-processing-2", "angels-gas-chlor-methane")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "empty-angels-liquid-multi-phase-oil-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-barrel-processing", "angels-liquid-multi-phase-oil-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-gas-canisters", "empty-angels-gas-chlor-methane-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-gas-canisters", "fill-gas-chlor-methane-barrel")
+bobmods.lib.tech.remove_recipe_unlock("angels-ore-electro-whinning-cell", "angels-electro-whinning-cell")
+
+bobmods.lib.recipe.replace_ingredient("angels-paste-cellulose", "angels-gas-chlor-methane", "angels-gas-chlorine")
 
 -- Hide recipes that take Chrome Ingots
-bobmods.lib.recipe.hide("molten-iron-smelting-5")
+bobmods.lib.recipe.hide("angels-liquid-molten-iron-5")
 bobmods.lib.tech.hide("angels-iron-casting-4")
 
-bobmods.lib.recipe.hide("molten-steel-smelting-5")
+bobmods.lib.recipe.hide("angels-liquid-molten-steel-5")
 bobmods.lib.tech.hide("angels-steel-smelting-4")
 
-bobmods.lib.recipe.hide("molten-titanium-smelting-5")
-bobmods.lib.tech.remove_recipe_unlock("angels-titanium-casting-3", "molten-titanium-smelting-5")
+bobmods.lib.recipe.hide("angels-liquid-molten-titanium-5")
+bobmods.lib.tech.remove_recipe_unlock("angels-titanium-casting-3", "angels-liquid-molten-titanium-5")
 bobmods.lib.tech.remove_prerequisite("angels-titanium-casting-3", "angels-chrome-smelting-1")
 
 -- Hide steam inserter
-seablock.lib.hide("inserter", "steam-inserter")
-bobmods.lib.recipe.hide("steam-inserter")
-seablock.lib.hide_item("steam-inserter")
-if data.raw.inserter["steam-inserter"] then
-  data.raw.inserter["steam-inserter"].next_upgrade = nil
-  bobmods.lib.recipe.replace_ingredient_in_all("steam-inserter", "burner-inserter")
+seablock.lib.hide("inserter", "bob-steam-inserter")
+bobmods.lib.recipe.hide("bob-steam-inserter")
+seablock.lib.hide_item("bob-steam-inserter")
+if data.raw.inserter["bob-steam-inserter"] then
+  data.raw.inserter["bob-steam-inserter"].next_upgrade = nil
+  bobmods.lib.recipe.replace_ingredient_in_all("bob-steam-inserter", "burner-inserter")
 end
-bobmods.lib.tech.remove_recipe_unlock(seablock.final_scripted_tech, "steam-inserter")
+bobmods.lib.tech.remove_recipe_unlock(seablock.final_scripted_tech, "bob-steam-inserter")
 
 -- Hide Liquid Fuel
-if data.raw.recipe["enriched-fuel-from-liquid-fuel"] then
-  bobmods.lib.recipe.set_ingredients("enriched-fuel-from-liquid-fuel", {
-    { type = "fluid", name = "liquid-fuel-oil", amount = 80 },
-    { type = "fluid", name = "gas-residual", amount = 20 },
+if data.raw.recipe["bob-enriched-fuel"] then
+  bobmods.lib.recipe.set_ingredients("bob-enriched-fuel", {
+    { type = "fluid", name = "angels-liquid-fuel-oil", amount = 80 },
+    { type = "fluid", name = "angels-gas-residual", amount = 20 },
   })
-  data.raw.recipe["enriched-fuel-from-liquid-fuel"].icons =
-    angelsmods.functions.create_solid_recipe_icon({ "liquid-fuel-oil", "gas-residual" }, "enriched-fuel")
+  data.raw.recipe["bob-enriched-fuel"].icons = angelsmods.functions.create_solid_recipe_icon(
+    { "angels-liquid-fuel-oil", "angels-gas-residual" },
+    "bob-enriched-fuel"
+  )
 end
-bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "empty-liquid-fuel-barrel")
-bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "fill-liquid-fuel-barrel")
-bobmods.lib.tech.remove_recipe_unlock("flammables", "liquid-fuel")
-bobmods.lib.recipe.hide("empty-liquid-fuel-barrel")
-bobmods.lib.recipe.hide("fill-liquid-fuel-barrel")
-bobmods.lib.recipe.hide("liquid-fuel")
-seablock.lib.hide("fluid", "liquid-fuel")
-seablock.lib.hide("item", "liquid-fuel-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "empty-bob-liquid-fuel-barrel")
+bobmods.lib.tech.remove_recipe_unlock("bob-fluid-canister-processing", "bob-liquid-fuel-barrel")
+bobmods.lib.tech.remove_recipe_unlock("flammables", "bob-liquid-fuel")
+bobmods.lib.recipe.hide("empty-bob-liquid-fuel-barrel")
+bobmods.lib.recipe.hide("bob-liquid-fuel-barrel")
+bobmods.lib.recipe.hide("bob-liquid-fuel")
+seablock.lib.hide("fluid", "bob-liquid-fuel")
+seablock.lib.hide("item", "bob-liquid-fuel-barrel")
 
 -- Swap out Nickel and Zinc plates
-seablock.lib.substingredient("roboport-antenna-3", "nickel-plate", "titanium-plate", nil)
-bobmods.lib.recipe.remove_ingredient("roboport-antenna-4", "nickel-plate")
-seablock.lib.substingredient("silver-zinc-battery", "zinc-plate", "solid-zinc-oxide", nil)
-
-seablock.lib.unhide_recipe("zinc-ore-processing-alt")
-bobmods.lib.tech.add_recipe_unlock("angels-zinc-smelting-2", "zinc-ore-processing-alt")
-bobmods.lib.tech.add_prerequisite("battery-3", "angels-zinc-smelting-2")
-if data.raw.recipe["pellet-zinc-smelting"] then
-  data.raw.recipe["pellet-zinc-smelting"].icons = angelsmods.functions.add_number_icon_layer(
-    angelsmods.functions.get_object_icons("solid-zinc-oxide"),
+seablock.lib.substingredient("bob-roboport-antenna-3", "bob-nickel-plate", "bob-titanium-plate", nil)
+bobmods.lib.recipe.remove_ingredient("bob-roboport-antenna-4", "bob-nickel-plate")
+seablock.lib.substingredient("bob-silver-zinc-battery", "bob-zinc-plate", "angels-solid-zinc-oxide", nil)
+seablock.lib.substingredient("angels-thorium-fuel-cell", "bob-zinc-plate", "steel-plate", nil)
+seablock.lib.substingredient("angels-deuterium-fuel-cell", "bob-zinc-plate", "steel-plate", nil)
+
+seablock.lib.unhide_recipe("angels-solid-zinc-oxide")
+bobmods.lib.tech.add_recipe_unlock("angels-zinc-smelting-2", "angels-solid-zinc-oxide")
+data.raw.recipe["angels-solid-zinc-oxide"].localised_name = nil
+
+bobmods.lib.tech.add_prerequisite("bob-battery-3", "angels-zinc-smelting-2")
+if data.raw.recipe["angels-pellet-zinc-smelting"] then
+  data.raw.recipe["angels-pellet-zinc-smelting"].icons = angelsmods.functions.add_number_icon_layer(
+    angelsmods.functions.get_object_icons("angels-solid-zinc-oxide"),
     2,
     angelsmods.smelting.number_tint
   )
 end
 
-if mods["angelsindustries"] then
-  seablock.lib.substingredient("angels-thorium-fuel-cell", "angels-plate-zinc", "lead-plate", nil)
-  seablock.lib.substingredient("angels-deuterium-fuel-cell", "angels-plate-zinc", "lead-plate", nil)
-end
+seablock.lib.substingredient("angels-thorium-fuel-cell", "angels-plate-zinc", "bob-lead-plate", nil)
+seablock.lib.substingredient("angels-deuterium-fuel-cell", "angels-plate-zinc", "bob-lead-plate", nil)
 
-seablock.lib.hide_item("nickel-plate")
-seablock.lib.hide_item("zinc-plate")
+seablock.lib.hide_item("bob-nickel-plate")
+seablock.lib.hide_item("bob-zinc-plate")
 bobmods.lib.recipe.hide("bob-zinc-plate")
-bobmods.lib.tech.remove_recipe_unlock("zinc-processing", "bob-zinc-plate")
+bobmods.lib.tech.remove_recipe_unlock("bob-zinc-processing", "bob-zinc-plate")
 
 if mods["cargo-ships"] then
   seablock.lib.hide_item("oil_rig")
 end
 
 -- Hide the farm environment kits
-seablock.lib.hide("item", "desert-upgrade")
-seablock.lib.hide("item", "swamp-upgrade")
-seablock.lib.hide("item", "temperate-upgrade")
-bobmods.lib.tech.remove_recipe_unlock("bio-desert-farm", "desert-upgrade")
-bobmods.lib.tech.remove_recipe_unlock("bio-swamp-farm", "swamp-upgrade")
-bobmods.lib.tech.remove_recipe_unlock("bio-temperate-farm", "temperate-upgrade")
-bobmods.lib.recipe.hide("desert-upgrade")
-bobmods.lib.recipe.hide("swamp-upgrade")
-bobmods.lib.recipe.hide("temperate-upgrade")
-
-bobmods.lib.recipe.remove_ingredient("desert-farm", "desert-upgrade")
-bobmods.lib.recipe.add_ingredient("desert-farm", { type = "item", name = "token-bio", amount = 5 })
-bobmods.lib.recipe.remove_ingredient("swamp-farm", "swamp-upgrade")
-bobmods.lib.recipe.add_ingredient("swamp-farm", { type = "item", name = "token-bio", amount = 5 })
-bobmods.lib.recipe.remove_ingredient("temperate-farm", "temperate-upgrade")
-bobmods.lib.recipe.add_ingredient("temperate-farm", { type = "item", name = "token-bio", amount = 5 })
+seablock.lib.hide("item", "angels-desert-upgrade")
+seablock.lib.hide("item", "angels-swamp-upgrade")
+seablock.lib.hide("item", "angels-temperate-upgrade")
+bobmods.lib.tech.remove_recipe_unlock("angels-bio-desert-farm", "angels-desert-upgrade")
+bobmods.lib.tech.remove_recipe_unlock("angels-bio-swamp-farm", "angels-swamp-upgrade")
+bobmods.lib.tech.remove_recipe_unlock("angels-bio-temperate-farm", "angels-temperate-upgrade")
+bobmods.lib.recipe.hide("angels-desert-upgrade")
+bobmods.lib.recipe.hide("angels-swamp-upgrade")
+bobmods.lib.recipe.hide("angels-temperate-upgrade")
+
+bobmods.lib.recipe.remove_ingredient("angels-desert-farm", "angels-desert-upgrade")
+bobmods.lib.recipe.add_ingredient("angels-desert-farm", { type = "item", name = "angels-token-bio", amount = 5 })
+bobmods.lib.recipe.remove_ingredient("angels-swamp-farm", "angels-swamp-upgrade")
+bobmods.lib.recipe.add_ingredient("angels-swamp-farm", { type = "item", name = "angels-token-bio", amount = 5 })
+bobmods.lib.recipe.remove_ingredient("angels-temperate-farm", "angels-temperate-upgrade")
+bobmods.lib.recipe.add_ingredient("angels-temperate-farm", { type = "item", name = "angels-token-bio", amount = 5 })
diff --git a/SeaBlock/data-updates/wood.lua b/SeaBlock/data-updates/wood.lua
index 3c600f3a..eb00e8ba 100644
--- a/SeaBlock/data-updates/wood.lua
+++ b/SeaBlock/data-updates/wood.lua
@@ -1,6 +1,6 @@
 -- Remove wood from basic underground belt and splitter recipes
-seablock.lib.removeingredient("basic-underground-belt", "wood")
-seablock.lib.removeingredient("basic-splitter", "wood")
+seablock.lib.removeingredient("bob-basic-underground-belt", "wood")
+seablock.lib.removeingredient("bob-basic-splitter", "wood")
 
 -- Can always apply productivity modules to furnace recipes, so make it official
 for k, v in pairs(data.raw.module) do
@@ -10,37 +10,38 @@ for k, v in pairs(data.raw.module) do
 end
 
 bobmods.lib.recipe.enabled("wooden-chest", false)
-bobmods.lib.recipe.enabled("wooden-board", false)
-bobmods.lib.recipe.enabled("cellulose-fiber-raw-wood", false)
+bobmods.lib.recipe.enabled("bob-wooden-board", false)
+bobmods.lib.recipe.enabled("angels-cellulose-fiber-raw-wood", false)
 
-bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing", "wood-pellets")
-bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "small-electric-pole")
-bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "wooden-chest")
-bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "wooden-board")
-bobmods.lib.tech.add_recipe_unlock("bio-wood-processing", "basic-circuit-board")
+bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing", "angels-wood-pellets")
+bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing", "small-electric-pole")
+bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing", "wooden-chest")
+bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing", "bob-wooden-board")
+bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing", "bob-basic-circuit-board")
 
-bobmods.lib.tech.remove_prerequisite("bio-wood-processing-2", "bio-farm-1")
-bobmods.lib.tech.remove_prerequisite("bio-wood-processing-2", "bio-wood-processing")
-bobmods.lib.tech.add_prerequisite("bio-wood-processing-2", "bio-processing-brown")
-bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "wood-charcoal")
-bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "bio-resin-wood-reprocessing")
-bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "bob-rubber")
-bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-2", "bio-processor")
-bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "wood-pellets")
-bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "wood-bricks")
-bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "sb-wood-bricks-charcoal")
-bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-2", "carbon-separation-2")
+bobmods.lib.tech.remove_prerequisite("angels-bio-wood-processing-2", "angels-bio-farm-1")
+bobmods.lib.tech.remove_prerequisite("angels-bio-wood-processing-2", "angels-bio-wood-processing")
+bobmods.lib.tech.add_prerequisite("angels-bio-wood-processing-2", "angels-bio-processing-brown")
+bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-2", "angels-wood-charcoal")
+bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-3", "angels-bio-resin-wood-reprocessing")
+bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-2", "bob-rubber")
+bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-2", "angels-bio-processor")
+bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing-2", "angels-wood-pellets")
+bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing-2", "angels-wood-bricks")
+bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing-2", "sb-wood-bricks-charcoal")
+bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing-2", "angels-gas-carbon-dioxide")
 
-bobmods.lib.tech.remove_prerequisite("bio-wood-processing-3", "angels-coal-processing")
-bobmods.lib.tech.add_prerequisite("bio-wood-processing-3", "bio-arboretum-1")
-bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-3", "wood-bricks")
-bobmods.lib.tech.add_recipe_unlock("bio-wood-processing-3", "cellulose-fiber-raw-wood")
+bobmods.lib.tech.remove_prerequisite("angels-bio-wood-processing-3", "angels-coal-processing")
+bobmods.lib.tech.add_prerequisite("angels-bio-wood-processing-3", "angels-bio-arboretum-1")
+bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-3", "angels-wood-bricks")
+bobmods.lib.tech.add_recipe_unlock("angels-bio-wood-processing-3", "angels-cellulose-fiber-raw-wood")
 
 -- Remove solid resin
-bobmods.lib.recipe.hide("bio-resin-wood-reprocessing")
-bobmods.lib.tech.remove_prerequisite("bio-wood-processing-2", "bio-farm-1")
-bobmods.lib.tech.remove_recipe_unlock("resins", "solid-resin")
-bobmods.lib.recipe.hide("solid-resin")
-seablock.lib.hide_item("resin")
-bobmods.lib.tech.remove_recipe_unlock("bio-arboretum-temperate-1", "bio-resin-resin-liquification")
-bobmods.lib.recipe.hide("bio-resin-resin-liquification")
+bobmods.lib.recipe.hide("angels-bio-resin-wood-reprocessing")
+bobmods.lib.tech.remove_prerequisite("angels-bio-wood-processing-2", "angels-bio-farm-1")
+bobmods.lib.tech.remove_recipe_unlock("angels-resins", "angels-solid-resin")
+bobmods.lib.recipe.hide("angels-solid-resin")
+seablock.lib.hide_item("angels-solid-resin")
+seablock.lib.hide_item("bob-resin")
+bobmods.lib.tech.remove_recipe_unlock("angels-bio-arboretum-temperate-1", "angels-bio-resin-resin-liquification")
+bobmods.lib.recipe.hide("angels-bio-resin-resin-liquification")
diff --git a/SeaBlock/data/ScienceCostTweakerM.lua b/SeaBlock/data/ScienceCostTweakerM.lua
index faa8ef4a..931b20b7 100644
--- a/SeaBlock/data/ScienceCostTweakerM.lua
+++ b/SeaBlock/data/ScienceCostTweakerM.lua
@@ -4,27 +4,27 @@ if mods["ScienceCostTweakerM"] then
 
   if mods["bobtech"] then
     -- Rename Lab 2 to Exoplanetary Studies Lab
-    if data.raw.item["lab-2"] then
-      data.raw.item["lab-2"].localised_name = { "item-name.sct-lab-lab2" }
+    if data.raw.item["bob-lab-2"] then
+      data.raw.item["bob-lab-2"].localised_name = { "item-name.sct-lab-lab2" }
     end
-    if data.raw.lab["lab-2"] then
-      data.raw.lab["lab-2"].localised_name = { "entity-name.sct-lab-lab2" }
+    if data.raw.lab["bob-lab-2"] then
+      data.raw.lab["bob-lab-2"].localised_name = { "entity-name.sct-lab-lab2" }
     end
 
-    bobmods.lib.recipe.set_ingredients("lab-2", {
-      { "sct-lab-t4", 1 },
-      { "rocket-silo", 1 },
-      { "nitinol-alloy", 100 },
-      { "express-stack-filter-inserter", 2 },
-      { "advanced-processing-unit", 20 },
+    bobmods.lib.recipe.set_ingredients("bob-lab-2", {
+      { type = "item", name = "sct-lab-t4", amount = 1 },
+      { type = "item", name = "rocket-silo", amount = 1 },
+      { type = "item", name = "bob-nitinol-alloy", amount = 100 },
+      { type = "item", name = "bob-express-bulk-inserter", amount = 2 },
+      { type = "item", name = "bob-advanced-processing-unit", amount = 20 },
     })
     bobmods.lib.tech.add_prerequisite("sct-lab-lab2", "rocket-silo")
     bobmods.lib.tech.remove_prerequisite("sct-space-science-pack", "rocket-silo")
     bobmods.lib.tech.add_prerequisite("sct-space-science-pack", "sct-lab-lab2")
-    if data.raw.technology["stack-inserter-4"] then
-      bobmods.lib.tech.add_prerequisite("sct-lab-lab2", "stack-inserter-4")
+    if data.raw.technology["bob-bulk-inserter-4"] then
+      bobmods.lib.tech.add_prerequisite("sct-lab-lab2", "bob-bulk-inserter-4")
     else
-      bobmods.lib.tech.add_prerequisite("sct-lab-lab2", "stack-inserter-2")
+      bobmods.lib.tech.add_prerequisite("sct-lab-lab2", "bob-bulk-inserter-2")
     end
   end
 end
diff --git a/SeaBlock/data/misc.lua b/SeaBlock/data/misc.lua
index b0a5beb6..f75ccaf2 100644
--- a/SeaBlock/data/misc.lua
+++ b/SeaBlock/data/misc.lua
@@ -31,4 +31,7 @@ angelsmods.trigger.smelting_products["gunmetal"].plate = false
 angelsmods.trigger.early_sulfuric_acid = true
 
 -- Copy Ore Processing Machine tech icon to Mechanical Refining
-seablock.lib.copy_icon(data.raw.technology["ore-crushing"], data.raw.technology["advanced-ore-refining-1"])
+seablock.lib.copy_icon(
+  data.raw.technology["angels-ore-crushing"],
+  data.raw.technology["angels-advanced-ore-refining-1"]
+)
diff --git a/SeaBlock/data/recipe.lua b/SeaBlock/data/recipe.lua
index 51bea663..99382395 100644
--- a/SeaBlock/data/recipe.lua
+++ b/SeaBlock/data/recipe.lua
@@ -1,12 +1,12 @@
 -- Buff Lead 3
-seablock.lib.substresult("anode-lead-smelting", "slag", "quartz", 1)
-seablock.lib.substingredient("anode-lead-smelting", "liquid-hexafluorosilicic-acid", nil, 20)
+seablock.lib.substresult("angels-ingot-lead-3", "angels-slag", "bob-quartz", 1)
+seablock.lib.substingredient("angels-ingot-lead-3", "angels-liquid-hexafluorosilicic-acid", nil, 20)
 
 -- Compost void recipe
-angelsmods.functions.make_void("solid-compost", "bio", 5)
+angelsmods.functions.make_void("angels-solid-compost", "bio", 5)
 
 -- Remove recipe Wood pellets > Carbon dioxide
 -- Move recipe Charcoal > Carbon dioxide from Basic chemistry to Wood processing 2
-bobmods.lib.tech.remove_recipe_unlock("bio-wood-processing-3", "gas-carbon-dioxide-from-wood")
-bobmods.lib.recipe.hide("gas-carbon-dioxide-from-wood")
-bobmods.lib.tech.remove_recipe_unlock("basic-chemistry", "carbon-separation-2")
+bobmods.lib.tech.remove_recipe_unlock("angels-bio-wood-processing-2", "angels-gas-carbon-dioxide-from-wood")
+bobmods.lib.recipe.hide("angels-gas-carbon-dioxide-from-wood")
+bobmods.lib.tech.remove_recipe_unlock("angels-basic-chemistry", "angels-gas-carbon-dioxide")
diff --git a/SeaBlock/data/tables.lua b/SeaBlock/data/tables.lua
index 5e6e2c13..b51b088e 100644
--- a/SeaBlock/data/tables.lua
+++ b/SeaBlock/data/tables.lua
@@ -4,7 +4,7 @@
 seablock.scripted_techs = {
   ["sb-startup1"] = true,
   ["sb-startup2"] = true,
-  ["bio-wood-processing"] = true,
+  ["angels-bio-wood-processing"] = true,
   ["sb-startup3"] = true,
   ["sb-startup4"] = true,
 }
@@ -25,16 +25,16 @@ seablock.startup_techs = {
   ["angels-fluid-control"] = { true },
   ["angels-sulfur-processing-1"] = { true },
   ["automation"] = { true },
-  ["basic-chemistry"] = { true },
+  ["angels-basic-chemistry"] = { true },
   -- Don't reduce the science pack cost of green algae
-  ["bio-processing-green"] = { false },
-  ["bio-wood-processing-2"] = { true },
-  ["long-inserters-1"] = { true },
+  ["angels-bio-processing-green"] = { false },
+  ["angels-bio-wood-processing-2"] = { true },
+  ["bob-long-inserters-1"] = { true },
   ["military"] = { true },
-  ["optics"] = { true },
-  ["slag-processing-1"] = { true },
+  ["lamp"] = { true },
+  ["angels-slag-processing-1"] = { true },
   ["steam-power"] = { true },
-  ["water-washing-1"] = { true },
+  ["angels-water-washing-1"] = { true },
 }
 
 if data.raw.technology["logistics-0"] then
@@ -48,26 +48,26 @@ end
 seablock.startup_recipes = {
   ["angels-electrolyser"] = true,
   ["angels-flare-stack"] = true,
-  ["burner-ore-crusher"] = true,
-  ["crystallizer"] = true,
-  ["dirt-water-separation"] = true,
-  ["liquifier"] = true,
+  ["angels-burner-ore-crusher"] = true,
+  ["angels-crystallizer"] = true,
+  ["angels-dirt-water-separation"] = true,
+  ["angels-liquifier"] = true,
   ["offshore-pump"] = true,
   ["sb-wood-foraging"] = true,
   ["sb-water-mineralized-crystallization"] = true,
-  ["slag-processing-stone"] = true,
-  ["stone-pipe"] = true,
-  ["stone-pipe-to-ground"] = true,
+  ["angels-stone-from-crushed-stone"] = true,
+  ["angels-stone-pipe"] = true,
+  ["angels-stone-pipe-to-ground"] = true,
   ["stone-brick"] = true,
-  ["stone-crushed"] = true,
-  ["water-mineralized"] = true,
+  ["angels-stone-crushed"] = true,
+  ["angels-water-mineralized"] = true,
 }
 
 if
   settings.startup["bobmods-assembly-multipurposefurnaces"]
   and settings.startup["bobmods-assembly-multipurposefurnaces"].value
 then
-  seablock.startup_recipes["stone-mixing-furnace"] = true
+  seablock.startup_recipes["bob-stone-mixing-furnace"] = true
 end
 
 -- seablock.final_scripted_tech
@@ -77,4 +77,4 @@ if data.raw.technology["sct-automation-science-pack"] then
   seablock.final_scripted_tech = "sct-automation-science-pack"
 end
 
-seablock.final_startup_tech = "slag-processing-1"
+seablock.final_startup_tech = "angels-slag-processing-1"
diff --git a/SeaBlock/data/tech-tree.lua b/SeaBlock/data/tech-tree.lua
index 780bbb15..51460bc3 100644
--- a/SeaBlock/data/tech-tree.lua
+++ b/SeaBlock/data/tech-tree.lua
@@ -1,12 +1,12 @@
 -- Add bio science to techs
 if mods["SpaceMod"] then
-  bobmods.lib.tech.add_new_science_pack("habitation", "token-bio", 1)
-  bobmods.lib.tech.add_new_science_pack("life-support-systems", "token-bio", 1)
+  bobmods.lib.tech.add_new_science_pack("habitation", "angels-token-bio", 1)
+  bobmods.lib.tech.add_new_science_pack("life-support-systems", "angels-token-bio", 1)
 end
 
 -- Remove empty tech Thermal water processing
-bobmods.lib.tech.remove_prerequisite("water-treatment-4", "thermal-water-processing")
-seablock.lib.hide_technology("thermal-water-processing")
+bobmods.lib.tech.remove_prerequisite("angels-water-treatment-4", "angels-thermal-water-processing")
+seablock.lib.hide_technology("angels-thermal-water-processing")
 
 -- Smelting techs don't need to depend on Coal processing 2 as carbon is unlocked earlier
 bobmods.lib.tech.remove_prerequisite("angels-aluminium-smelting-1", "angels-coal-processing-2")
@@ -19,41 +19,45 @@ bobmods.lib.tech.remove_prerequisite("angels-zinc-smelting-2", "angels-coal-proc
 bobmods.lib.tech.remove_prerequisite("angels-chrome-smelting-1", "angels-coal-processing-3")
 bobmods.lib.tech.remove_prerequisite("angels-iron-smelting-2", "angels-coal-processing-2")
 
-bobmods.lib.tech.replace_prerequisite("angels-coal-processing-2", "water-treatment-2", "basic-chemistry-3")
+bobmods.lib.tech.replace_prerequisite(
+  "angels-coal-processing-2",
+  "angels-water-treatment-2",
+  "angels-basic-chemistry-3"
+)
 
 -- Add other prerequisites
-bobmods.lib.tech.add_prerequisite("gardens", "electronics")
+bobmods.lib.tech.add_prerequisite("angels-gardens", "bob-electronics")
 if mods["ScienceCostTweakerM"] then
-  bobmods.lib.tech.add_prerequisite("sct-bio-science-pack", "bio-arboretum-1")
+  bobmods.lib.tech.add_prerequisite("sct-bio-science-pack", "angels-bio-arboretum-1")
   bobmods.lib.tech.add_prerequisite("sb-bio-processing-advanced", "sct-bio-science-pack")
-  bobmods.lib.tech.add_prerequisite("utility-science-pack", "rubber")
+  bobmods.lib.tech.add_prerequisite("utility-science-pack", "angels-rubber")
 end
-bobmods.lib.tech.add_prerequisite("angels-glass-smelting-1", "silicon-processing")
-bobmods.lib.tech.add_prerequisite("angels-stone-smelting-2", "silicon-processing")
+bobmods.lib.tech.add_prerequisite("angels-glass-smelting-1", "bob-silicon-processing")
+bobmods.lib.tech.add_prerequisite("angels-stone-smelting-2", "bob-silicon-processing")
 
 -- Add missing Science Pack Tech prerequisites
 
 -- Bio
 if mods["ScienceCostTweakerM"] then
-  bobmods.lib.tech.add_prerequisite("bio-desert-farming-1", "sct-bio-science-pack")
-  bobmods.lib.tech.add_prerequisite("bio-swamp-farming-1", "sct-bio-science-pack")
-  bobmods.lib.tech.add_prerequisite("bio-temperate-farming-1", "sct-bio-science-pack")
-  bobmods.lib.tech.add_prerequisite("bio-pressing-1", "sct-bio-science-pack")
-  bobmods.lib.tech.add_prerequisite("bio-arboretum-2", "sct-bio-science-pack")
-  bobmods.lib.tech.add_prerequisite("bio-arboretum-desert-1", "sct-bio-science-pack")
-  bobmods.lib.tech.add_prerequisite("bio-arboretum-swamp-1", "sct-bio-science-pack")
-  bobmods.lib.tech.add_prerequisite("bio-processing-alien-2", "sct-bio-science-pack")
-  bobmods.lib.tech.add_prerequisite("bio-refugium-hatchery", "sct-bio-science-pack")
-  bobmods.lib.tech.add_prerequisite("bio-fermentation", "sct-bio-science-pack")
-  bobmods.lib.tech.add_prerequisite("bio-processing-crystal-splinter-1", "sct-bio-science-pack")
-  bobmods.lib.tech.add_prerequisite("gardens-3", "sct-bio-science-pack")
+  bobmods.lib.tech.add_prerequisite("angels-bio-desert-farming-1", "sct-bio-science-pack")
+  bobmods.lib.tech.add_prerequisite("angels-bio-swamp-farming-1", "sct-bio-science-pack")
+  bobmods.lib.tech.add_prerequisite("angels-bio-temperate-farming-1", "sct-bio-science-pack")
+  bobmods.lib.tech.add_prerequisite("angels-bio-pressing-1", "sct-bio-science-pack")
+  bobmods.lib.tech.add_prerequisite("angels-bio-arboretum-2", "sct-bio-science-pack")
+  bobmods.lib.tech.add_prerequisite("angels-bio-arboretum-desert-1", "sct-bio-science-pack")
+  bobmods.lib.tech.add_prerequisite("angels-bio-arboretum-swamp-1", "sct-bio-science-pack")
+  bobmods.lib.tech.add_prerequisite("angels-bio-processing-alien-2", "sct-bio-science-pack")
+  bobmods.lib.tech.add_prerequisite("angels-bio-refugium-hatchery", "sct-bio-science-pack")
+  bobmods.lib.tech.add_prerequisite("angels-bio-fermentation", "sct-bio-science-pack")
+  bobmods.lib.tech.add_prerequisite("angels-bio-processing-crystal-splinter-1", "sct-bio-science-pack")
+  bobmods.lib.tech.add_prerequisite("angels-gardens-3", "sct-bio-science-pack")
 end
 
 -- Logistics / Green
-bobmods.lib.tech.add_prerequisite("water-washing-2", "logistic-science-pack")
-bobmods.lib.tech.add_prerequisite("advanced-ore-refining-1", "logistic-science-pack")
-bobmods.lib.tech.add_prerequisite("bio-processing-blue", "logistic-science-pack")
-bobmods.lib.tech.add_prerequisite("basic-chemistry-2", "logistic-science-pack")
+bobmods.lib.tech.add_prerequisite("angels-water-washing-2", "logistic-science-pack")
+bobmods.lib.tech.add_prerequisite("angels-advanced-ore-refining-1", "logistic-science-pack")
+bobmods.lib.tech.add_prerequisite("angels-bio-processing-blue", "logistic-science-pack")
+bobmods.lib.tech.add_prerequisite("angels-basic-chemistry-2", "logistic-science-pack")
 
 -- Chemical / Blue
 
@@ -61,12 +65,12 @@ bobmods.lib.tech.add_prerequisite("basic-chemistry-2", "logistic-science-pack")
 bobmods.lib.tech.add_prerequisite("logistic-system", "production-science-pack")
 
 -- Utility / Yellow
-bobmods.lib.tech.add_prerequisite("radars-5", "utility-science-pack")
+bobmods.lib.tech.add_prerequisite("bob-radar-5", "utility-science-pack")
 
 -- Space / White
 if mods["bobequipment"] then
   bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-6", "space-science-pack")
-  bobmods.lib.tech.add_prerequisite("fusion-reactor-equipment-4", "space-science-pack")
+  bobmods.lib.tech.add_prerequisite("bob-fission-reactor-equipment-4", "space-science-pack")
 end
 if mods["bobwarfare"] then
   bobmods.lib.tech.add_prerequisite("bob-power-armor-5", "space-science-pack")
@@ -91,16 +95,16 @@ bobmods.lib.tech.add_prerequisite("space-science-pack", "military")
 
 -- Steam power
 bobmods.lib.tech.add_prerequisite("automation", "steam-power")
-bobmods.lib.tech.add_prerequisite("optics", "steam-power")
+bobmods.lib.tech.add_prerequisite("lamp", "steam-power")
 if data.raw.technology["bob-greenhouse"] then
   bobmods.lib.tech.add_prerequisite("bob-greenhouse", "steam-power")
 end
 bobmods.lib.tech.add_prerequisite("angels-coal-processing", "steam-power")
 
 -- Gems are needed to make higher tier modules
-if data.raw.technology["gem-processing-3"] then
+if data.raw.technology["bob-gem-processing-3"] then
   --Module with 2 dots has the tech name of 3
-  bobmods.lib.tech.add_prerequisite("speed-module-3", "gem-processing-3")
-  bobmods.lib.tech.add_prerequisite("productivity-module-3", "gem-processing-3")
-  bobmods.lib.tech.add_prerequisite("effectivity-module-3", "gem-processing-3")
+  bobmods.lib.tech.add_prerequisite("speed-module-3", "bob-gem-processing-3")
+  bobmods.lib.tech.add_prerequisite("productivity-module-3", "bob-gem-processing-3")
+  bobmods.lib.tech.add_prerequisite("efficiency-module-3", "bob-gem-processing-3")
 end
diff --git a/SeaBlock/info.json b/SeaBlock/info.json
index 86926fbd..ba68cabe 100644
--- a/SeaBlock/info.json
+++ b/SeaBlock/info.json
@@ -1,7 +1,7 @@
 {
   "name": "SeaBlock",
-  "version": "0.5.17",
-  "factorio_version": "1.1",
+  "version": "0.6.0",
+  "factorio_version": "2.0",
   "title": "Sea Block",
   "author": "Trainwreck",
   "contact": "",
diff --git a/SeaBlock/locale/cs/SeaBlock.cfg b/SeaBlock/locale/cs/SeaBlock.cfg
index 92d1bd0e..62b8ceca 100644
--- a/SeaBlock/locale/cs/SeaBlock.cfg
+++ b/SeaBlock/locale/cs/SeaBlock.cfg
@@ -1,7 +1,6 @@
 [recipe-name]
 
 [item-name]
-charcoal=Dřevěné uhlí
 
 [entity-name]
 
diff --git a/SeaBlock/locale/de/SeaBlock.cfg b/SeaBlock/locale/de/SeaBlock.cfg
index c757903a..59b09c91 100644
--- a/SeaBlock/locale/de/SeaBlock.cfg
+++ b/SeaBlock/locale/de/SeaBlock.cfg
@@ -2,14 +2,13 @@
 sb-blue-algae-liquefaction=Blaualgenverflüssigung
 
 [item-name]
-charcoal=Holzkohle
-filter-charcoal=Holzkohlefilter
+angels-filter-charcoal=Holzkohlefilter
 
 [entity-name]
-silo-coal=Holzkohlesilo
+angels-silo-coal=Holzkohlesilo
 
 [entity-description]
-silo-coal=Silo mit einer "Holzkohle" Ästhetik.
+angels-silo-coal=Silo mit einer "Holzkohle" Ästhetik.
 
 [technology-name]
 sb-startup3=Einfache Leiterplatte
diff --git a/SeaBlock/locale/en/SeaBlock.cfg b/SeaBlock/locale/en/SeaBlock.cfg
index 9ada5263..169dc227 100644
--- a/SeaBlock/locale/en/SeaBlock.cfg
+++ b/SeaBlock/locale/en/SeaBlock.cfg
@@ -2,39 +2,41 @@
 sb-water-mineralized-crystallization=Mineralized water crystallization
 sb-wood-foraging=Forage for driftwood
 sb-blue-algae-liquefaction=Blue algae liquefaction
-slag-processing-filtering-1=Slurry charcoal filtering
-crystal-slurry-filtering-1=Crystal slurry charcoal filtering
-crystal-slurry-filtering-conversion-1=Crystal slurry to mineral sludge charcoal filtering
-coolant-used-filtration-1=Used coolant charcoal filtering
-coolant-used-filtration-2=Used coolant ceramic filtering
-liquid-raw-vegetable-oil-filtering-1=Raw vegetable oil charcoal filtering
-liquid-raw-vegetable-oil-filtering-2=Raw vegetable oil ceramic filtering
-liquid-raw-fish-oil-filtering-1=Raw fish oil charcoal filtering
-liquid-raw-fish-oil-filtering-2=Raw fish oil ceramic filtering
-coke-purification-2=Charcoal purification
+angels-slag-processing-filtering-1=Slurry charcoal filtering
+angels-crystal-slurry-filtering-1=Crystal slurry charcoal filtering
+angels-crystal-slurry-filtering-conversion-1=Crystal slurry to mineral sludge charcoal filtering
+angels-coolant-used-filtration-1=Used coolant charcoal filtering
+angels-coolant-used-filtration-2=Used coolant ceramic filtering
+angels-liquid-raw-vegetable-oil-filtering-1=Raw vegetable oil charcoal filtering
+angels-liquid-raw-vegetable-oil-filtering-2=Raw vegetable oil ceramic filtering
+angels-liquid-raw-fish-oil-filtering-1=Raw fish oil charcoal filtering
+angels-liquid-raw-fish-oil-filtering-2=Raw fish oil ceramic filtering
+angels-coke-purification-2=Charcoal purification
+sb-thermal-extractor-water=Produce thermal water
+sb-thermal-bore-water=Produce thermal water
+angels-stone-crushed=Slag processing to stone
+angels-stone-crushed-dissolution=Liquefy stone to slurry
 
 [item-name]
-charcoal=Charcoal
-filter-charcoal=Charcoal filter
-pellet-charcoal=Charcoal pellet
+angels-filter-charcoal=Charcoal filter
+angels-pellet-charcoal=Charcoal pellet
 rocket-part=Rocket part
 sct-lab-lab2=Exoplanetary Studies Lab
-catalyst-metal-purple=Purple metal catalyst
+sb-catalyst-metal-purple=Purple metal catalyst
 
 [entity-name]
-home=Home
+sb-rock-chest=Home
 sct-lab-lab2=Exoplanetary Studies Lab
-silo-coal=Charcoal silo
+angels-silo-coal=Charcoal silo
 
 [entity-description]
-silo-coal=Silo with a "Charcoal" aesthetic.
+angels-silo-coal=Silo with a "Charcoal" aesthetic.
 
 [technology-name]
 sb-startup1=Crush stiratite
 sb-startup3=Basic circuit board
 sb-startup4=Laboratory
 sb-bio-processing-green=Improved algae processing
-steam-power=Steam power
 sct-lab-lab2=Exoplanetary Studies Lab
 angels-coal-processing=Charcoal processing
 ftl-theory-D=Faster than light theory D2
@@ -70,3 +72,4 @@ landfill-count=Landfill placed
 
 [bvs-stat-tooltip]
 landfill-count=The amount of non-water tiles that currently exists. Includes generated islands. 
+
diff --git a/SeaBlock/locale/es-ES/SeaBlock.cfg b/SeaBlock/locale/es-ES/SeaBlock.cfg
index 6d7bd006..b2633df5 100644
--- a/SeaBlock/locale/es-ES/SeaBlock.cfg
+++ b/SeaBlock/locale/es-ES/SeaBlock.cfg
@@ -1,7 +1,6 @@
 [recipe-name]
 
 [item-name]
-charcoal=Carbón vegetal
 
 [entity-name]
 
diff --git a/SeaBlock/locale/fr/SeaBlock.cfg b/SeaBlock/locale/fr/SeaBlock.cfg
index 95de5b14..cc453f90 100644
--- a/SeaBlock/locale/fr/SeaBlock.cfg
+++ b/SeaBlock/locale/fr/SeaBlock.cfg
@@ -1,7 +1,6 @@
 [recipe-name]
 
 [item-name]
-charcoal=Charbon de bois
 
 [entity-name]
 
diff --git a/SeaBlock/locale/hu/SeaBlock.cfg b/SeaBlock/locale/hu/SeaBlock.cfg
index bb3ae221..123a6983 100644
--- a/SeaBlock/locale/hu/SeaBlock.cfg
+++ b/SeaBlock/locale/hu/SeaBlock.cfg
@@ -1,7 +1,6 @@
 [recipe-name]
 
 [item-name]
-charcoal=Faszén
 
 [entity-name]
 
diff --git a/SeaBlock/locale/ja/SeaBlock.cfg b/SeaBlock/locale/ja/SeaBlock.cfg
index b4a0079c..18a4a1fd 100644
--- a/SeaBlock/locale/ja/SeaBlock.cfg
+++ b/SeaBlock/locale/ja/SeaBlock.cfg
@@ -2,31 +2,30 @@
 sb-water-mineralized-crystallization=鉱水結晶化
 sb-wood-foraging=流木採集
 sb-blue-algae-liquefaction=青藻液化
-slag-processing-filtering-1=スラリー木炭ろ過
-crystal-slurry-filtering-1=結晶スラリー木炭ろ過
-crystal-slurry-filtering-conversion-1=結晶スラリーから鉱物スラッジへ木炭ろ過
-coolant-used-filtration-1=使用済み冷却液木炭ろ過
-coolant-used-filtration-2=使用済み冷却液陶製ろ過
-liquid-raw-vegetable-oil-filtering-1=生野菜油木炭ろ過
-liquid-raw-vegetable-oil-filtering-2=生野菜油陶製ろ過
-liquid-raw-fish-oil-filtering-1=生魚油木炭ろ過
-liquid-raw-fish-oil-filtering-2=生魚油陶製ろ過
-coke-purification-2=木炭浄化
+angels-slag-processing-filtering-1=スラリー木炭ろ過
+angels-crystal-slurry-filtering-1=結晶スラリー木炭ろ過
+angels-crystal-slurry-filtering-conversion-1=結晶スラリーから鉱物スラッジへ木炭ろ過
+angels-coolant-used-filtration-1=使用済み冷却液木炭ろ過
+angels-coolant-used-filtration-2=使用済み冷却液陶製ろ過
+angels-liquid-raw-vegetable-oil-filtering-1=生野菜油木炭ろ過
+angels-liquid-raw-vegetable-oil-filtering-2=生野菜油陶製ろ過
+angels-liquid-raw-fish-oil-filtering-1=生魚油木炭ろ過
+angels-liquid-raw-fish-oil-filtering-2=生魚油陶製ろ過
+angels-coke-purification-2=木炭浄化
 
 [item-name]
-charcoal=木炭
-filter-charcoal=木炭ろ過器
-pellet-charcoal=木炭顆粒
+angels-filter-charcoal=木炭ろ過器
+angels-pellet-charcoal=木炭顆粒
 rocket-part=ロケット部品
 sct-lab-lab2=系外惑星研究所
 
 [entity-name]
-home=ホーム
+sb-rock-chest=ホーム
 sct-lab-lab2=系外惑星研究所
-silo-coal=木炭サイロ
+angels-silo-coal=木炭サイロ
 
 [entity-description]
-silo-coal=「木炭」の美的要素を持つサイロ。
+angels-silo-coal=「木炭」の美的要素を持つサイロ。
 
 [technology-name]
 sb-startup1=破砕スチラタイト
@@ -69,4 +68,3 @@ landfill-count=埋立地が設置されました
 [bvs-stat-tooltip]
 landfill-count=現在存在する水以外のタイルの量。生成された島を含む。
 
-
diff --git a/SeaBlock/locale/ko/SeaBlock.cfg b/SeaBlock/locale/ko/SeaBlock.cfg
index 77793dbd..be05fbd4 100644
--- a/SeaBlock/locale/ko/SeaBlock.cfg
+++ b/SeaBlock/locale/ko/SeaBlock.cfg
@@ -1,7 +1,6 @@
 [recipe-name]
 
 [item-name]
-charcoal=숯
 
 [entity-name]
 
diff --git a/SeaBlock/locale/pl/SeaBlock.cfg b/SeaBlock/locale/pl/SeaBlock.cfg
index 6f8f5b73..8fb3e818 100644
--- a/SeaBlock/locale/pl/SeaBlock.cfg
+++ b/SeaBlock/locale/pl/SeaBlock.cfg
@@ -1,7 +1,6 @@
 [recipe-name]
 
 [item-name]
-charcoal=Węgiel drzewny
 
 [entity-name]
 
diff --git a/SeaBlock/locale/pt-BR/SeaBlock.cfg b/SeaBlock/locale/pt-BR/SeaBlock.cfg
index 4e503a53..0aeaa944 100644
--- a/SeaBlock/locale/pt-BR/SeaBlock.cfg
+++ b/SeaBlock/locale/pt-BR/SeaBlock.cfg
@@ -1,7 +1,6 @@
 [recipe-name]
 
 [item-name]
-charcoal=Carvão
 
 [entity-name]
 
diff --git a/SeaBlock/locale/ru/SeaBlock.cfg b/SeaBlock/locale/ru/SeaBlock.cfg
index 69e6a4f0..ad9b8467 100644
--- a/SeaBlock/locale/ru/SeaBlock.cfg
+++ b/SeaBlock/locale/ru/SeaBlock.cfg
@@ -2,30 +2,29 @@
 sb-water-mineralized-crystallization=Кристаллизация минеральной воды
 sb-wood-foraging=Собирать плавающую древесину
 sb-blue-algae-liquefaction=Ожижение синих водорослей
-slag-processing-filtering-1=Филтрация шлама через древесный уголь
-crystal-slurry-filtering-1=Фильтрация кристталльного шлама через древесный уголь
-crystal-slurry-filtering-conversion-1=Фильтрация через древесный уголь кристаллического шлама в минеральный шлам
-coolant-used-filtration-1=Фильтрация использованного охладителя через древесный уголь
-coolant-used-filtration-2=Фильтрация использованного охладителя через керамику
-liquid-raw-vegetable-oil-filtering-1=Фильтрация сырого овощного масла через древесный уголь
-liquid-raw-vegetable-oil-filtering-2=Фильтрация сырого овощного масла через керамику
-liquid-raw-fish-oil-filtering-1=Фильтрация сырого рыбного масла через древесный уголь
-liquid-raw-fish-oil-filtering-2=Фильтрация сырого рыбного масла через керамику
-coke-purification-2=Очищение древесного угля
+angels-slag-processing-filtering-1=Филтрация шлама через древесный уголь
+angels-crystal-slurry-filtering-1=Фильтрация кристталльного шлама через древесный уголь
+angels-crystal-slurry-filtering-conversion-1=Фильтрация через древесный уголь кристаллического шлама в минеральный шлам
+angels-coolant-used-filtration-1=Фильтрация использованного охладителя через древесный уголь
+angels-coolant-used-filtration-2=Фильтрация использованного охладителя через керамику
+angels-liquid-raw-vegetable-oil-filtering-1=Фильтрация сырого овощного масла через древесный уголь
+angels-liquid-raw-vegetable-oil-filtering-2=Фильтрация сырого овощного масла через керамику
+angels-liquid-raw-fish-oil-filtering-1=Фильтрация сырого рыбного масла через древесный уголь
+angels-liquid-raw-fish-oil-filtering-2=Фильтрация сырого рыбного масла через керамику
+angels-coke-purification-2=Очищение древесного угля
 
 [item-name]
-charcoal=Древесный уголь
-filter-charcoal=Фильтр из древесного угля
-pellet-charcoal=Гранулы древесного угля
+angels-filter-charcoal=Фильтр из древесного угля
+angels-pellet-charcoal=Гранулы древесного угля
 rocket-part=Часть ракеты
 sct-lab-lab2=Лаборатория экзопланетарных исследований
 
 [entity-name]
 sct-lab-lab2=Лаборатория экзопланетарных исследований
-silo-coal=Древесноугольный элеватор
+angels-silo-coal=Древесноугольный элеватор
 
 [entity-description]
-silo-coal=Элеватор с эстетикой древесного угля.
+angels-silo-coal=Элеватор с эстетикой древесного угля.
 
 [technology-name]
 sb-startup1=Измельчить ститарит
diff --git a/SeaBlock/locale/uk/SeaBlock.cfg b/SeaBlock/locale/uk/SeaBlock.cfg
index fe0cd248..8fc71a3e 100644
--- a/SeaBlock/locale/uk/SeaBlock.cfg
+++ b/SeaBlock/locale/uk/SeaBlock.cfg
@@ -2,39 +2,37 @@
 sb-water-mineralized-crystallization=Кристалізація мінералізованої води
 sb-wood-foraging=Корм для корчів
 sb-blue-algae-liquefaction=Зрідження синіх водоростей
-slag-processing-filtering-1=Фільтрація шламового вугілля
-crystal-slurry-filtering-1=Фільтрація кристалічної суспензії вугіллям
-crystal-slurry-filtering-conversion-1=Фільтрація кристалічного шламу на вугільному фільтрі з мінеральним шламом
-coolant-used-filtration-1=Фільтрація відпрацьованого теплоносія вугіллям
-coolant-used-filtration-2=Керамічна фільтрація відпрацьованої охолоджувальної рідини
-liquid-raw-vegetable-oil-filtering-1=Фільтрація сирої рослинної олії вугіллям
-liquid-raw-vegetable-oil-filtering-2=Керамічна фільтрація сирої рослинної олії
-liquid-raw-fish-oil-filtering-1=Фільтрація сирого риб'ячого жиру вугіллям
-liquid-raw-fish-oil-filtering-2=Керамічна фільтрація сирого риб'ячого жиру
-coke-purification-2=Очищення деревинного вугілля
+angels-slag-processing-filtering-1=Фільтрація шламового вугілля
+angels-crystal-slurry-filtering-1=Фільтрація кристалічної суспензії вугіллям
+angels-crystal-slurry-filtering-conversion-1=Фільтрація кристалічного шламу на вугільному фільтрі з мінеральним шламом
+angels-coolant-used-filtration-1=Фільтрація відпрацьованого теплоносія вугіллям
+angels-coolant-used-filtration-2=Керамічна фільтрація відпрацьованої охолоджувальної рідини
+angels-liquid-raw-vegetable-oil-filtering-1=Фільтрація сирої рослинної олії вугіллям
+angels-liquid-raw-vegetable-oil-filtering-2=Керамічна фільтрація сирої рослинної олії
+angels-liquid-raw-fish-oil-filtering-1=Фільтрація сирого риб'ячого жиру вугіллям
+angels-liquid-raw-fish-oil-filtering-2=Керамічна фільтрація сирого риб'ячого жиру
+angels-coke-purification-2=Очищення деревинного вугілля
 
 [item-name]
-charcoal=Деревне вугілля
-filter-charcoal=Фільтр з деревинного вугілля
-pellet-charcoal=Деревне вугілля в гранулах
+angels-filter-charcoal=Фільтр з деревинного вугілля
+angels-pellet-charcoal=Деревне вугілля в гранулах
 rocket-part=Частина ракети
 sct-lab-lab2=Лабораторія екзопланетарних досліджень
-catalyst-metal-purple=Каталізатор з фіолетового металу
+sb-catalyst-metal-purple=Каталізатор з фіолетового металу
 
 [entity-name]
-home=Головна
+sb-rock-chest=Головна
 sct-lab-lab2=Лабораторія екзопланетарних досліджень
-silo-coal=Вугільне сховище
+angels-silo-coal=Вугільне сховище
 
 [entity-description]
-silo-coal=Сховище з "вугільною" естетикою.
+angels-silo-coal=Сховище з "вугільною" естетикою.
 
 [technology-name]
 sb-startup1=Подрібнити стиратит
 sb-startup3=Базова друкована плата
 sb-startup4=Лабораторія
 sb-bio-processing-green=Поліпшена обробка водоростей
-steam-power=Парова енергія
 sct-lab-lab2=Лабораторія екзопланетарних досліджень
 angels-coal-processing=Перероблення деревного вугілля
 ftl-theory-D=Швидше за світло теорія D2
@@ -71,4 +69,3 @@ landfill-count=Насип ґрунту
 [bvs-stat-tooltip]
 landfill-count=Кількість неводних тайлів, що існують на цю мить. Включає згенеровані острови.
 
-
diff --git a/SeaBlock/locale/zh-CN/SeaBlock.cfg b/SeaBlock/locale/zh-CN/SeaBlock.cfg
index 9d667ad2..5795b124 100644
--- a/SeaBlock/locale/zh-CN/SeaBlock.cfg
+++ b/SeaBlock/locale/zh-CN/SeaBlock.cfg
@@ -1,7 +1,6 @@
 [recipe-name]
 
 [item-name]
-charcoal=木炭
 
 [entity-name]
 
diff --git a/SeaBlock/locale/zh-TW/SeaBlock.cfg b/SeaBlock/locale/zh-TW/SeaBlock.cfg
index 96edbf37..f4c6d88d 100644
--- a/SeaBlock/locale/zh-TW/SeaBlock.cfg
+++ b/SeaBlock/locale/zh-TW/SeaBlock.cfg
@@ -1,7 +1,6 @@
 [recipe-name]
 
 [item-name]
-charcoal=木炭
 
 [entity-name]
 
diff --git a/SeaBlock/migrations/SeaBlock_0.6.0.json b/SeaBlock/migrations/SeaBlock_0.6.0.json
new file mode 100644
index 00000000..1a35195e
--- /dev/null
+++ b/SeaBlock/migrations/SeaBlock_0.6.0.json
@@ -0,0 +1,24 @@
+{
+    "entity": 
+    [
+      ["rock-chest", "sb-rock-chest"]
+    ],
+    "item":
+    [
+      ["filter-charcoal", "angels-filter-charcoal"],
+      ["pellet-charcoal", "angels-pellet-charcoal"]
+    ],
+    "recipe":
+    [
+      ["thermal-bore-water", "sb-thermal-bore-water"],
+      ["thermal-extractor-water", "sb-thermal-extractor-water"],
+      ["crafting-handonly", "sb-crafting-handonly"]
+    ],
+    "recipe-category": 
+    [
+      ["crafting-handonly", "sb-crafting-handonly"],
+      ["thermal-bore", "sb-thermal-bore"],
+      ["thermal-extractor", "sb-thermal-extractor"],
+      ["petrochem-electrolyser-4", "sb-petrochem-electrolyser-4"]
+    ]
+}
diff --git a/SeaBlock/migrations/SeaBlock_0.6.0.lua b/SeaBlock/migrations/SeaBlock_0.6.0.lua
new file mode 100644
index 00000000..3fe5ccbc
--- /dev/null
+++ b/SeaBlock/migrations/SeaBlock_0.6.0.lua
@@ -0,0 +1,7 @@
+for _, surface in pairs(game.surfaces) do
+  for chunk in surface.get_chunks() do
+    angelsmods.migration.replace_item(surface.find_entities(chunk.area), {
+      ["angels-crushed-stone"] = "stone",
+    })
+  end
+end
diff --git a/SeaBlock/prototypes/item.lua b/SeaBlock/prototypes/item.lua
index e2dd8deb..d1b8d5dd 100644
--- a/SeaBlock/prototypes/item.lua
+++ b/SeaBlock/prototypes/item.lua
@@ -1,10 +1,10 @@
 data:extend({
   {
     type = "item",
-    name = "catalyst-metal-purple",
+    name = "sb-catalyst-metal-purple",
     icon = "__SeaBlock__/graphics/icons/catalyst-metal-purple.png",
     icon_size = 32,
-    subgroup = "petrochem-catalysts",
+    subgroup = "angels-petrochem-catalysts",
     order = "c[catalyst-metal]-d[purple]",
     stack_size = 200,
   },
diff --git a/SeaBlock/prototypes/recipe-category.lua b/SeaBlock/prototypes/recipe-category.lua
index ae9c42a2..87f5272b 100644
--- a/SeaBlock/prototypes/recipe-category.lua
+++ b/SeaBlock/prototypes/recipe-category.lua
@@ -1,19 +1,19 @@
 data:extend({
   {
     type = "recipe-category",
-    name = "crafting-handonly",
+    name = "sb-crafting-handonly",
   },
   {
     type = "recipe-category",
-    name = "thermal-bore",
+    name = "sb-thermal-bore",
   },
   {
     type = "recipe-category",
-    name = "thermal-extractor",
+    name = "sb-thermal-extractor",
   },
   {
     type = "recipe-category",
-    name = "petrochem-electrolyser-4",
+    name = "sb-petrochem-electrolyser-4",
   },
 })
 
diff --git a/SeaBlock/prototypes/recipe.lua b/SeaBlock/prototypes/recipe.lua
index f171cd8f..03fd785f 100644
--- a/SeaBlock/prototypes/recipe.lua
+++ b/SeaBlock/prototypes/recipe.lua
@@ -2,55 +2,55 @@ data:extend({
   {
     type = "recipe",
     name = "sb-wood-bricks-charcoal",
+    localised_name = { "item-name.angels-wood-charcoal" },
     category = "smelting",
     enabled = false,
     energy_required = 3.5,
-    ingredients = { { "wood-bricks", 1 } },
-    result = "wood-charcoal",
-    result_count = 5,
-    subgroup = "bio-processing-wood",
+    ingredients = { { type = "item", name = "angels-wood-bricks", amount = 1 } },
+    results = { { type = "item", name = "angels-wood-charcoal", amount = 5 } },
+    subgroup = "angels-bio-processing-wood",
   },
   {
     type = "recipe",
-    name = "thermal-bore-water",
-    category = "thermal-bore",
-    subgroup = "water-treatment",
+    name = "sb-thermal-bore-water",
+    category = "sb-thermal-bore",
+    subgroup = "angels-water-treatment",
     order = "h[thermal-bore-water]",
     energy_required = 10,
     enabled = false,
     ingredients = {
-      { type = "item", name = "lithium-chloride", amount = 1 },
+      { type = "item", name = "bob-lithium-chloride", amount = 1 },
     },
     results = {
-      { type = "fluid", name = "thermal-water", amount = 20 },
+      { type = "fluid", name = "angels-thermal-water", amount = 20 },
     },
   },
   {
     type = "recipe",
-    name = "thermal-extractor-water",
-    category = "thermal-extractor",
-    subgroup = "water-treatment",
+    name = "sb-thermal-extractor-water",
+    category = "sb-thermal-extractor",
+    subgroup = "angels-water-treatment",
     order = "h[thermal-extractor-water]",
     energy_required = 5,
     enabled = false,
     ingredients = {
       { type = "fluid", name = "steam", amount = 100 },
-      { type = "item", name = "lithium-chloride", amount = 2 },
+      { type = "item", name = "bob-lithium-chloride", amount = 2 },
     },
     results = {
-      { type = "fluid", name = "thermal-water", amount = 100 },
+      { type = "fluid", name = "angels-thermal-water", amount = 100 },
     },
   },
   {
     type = "recipe",
     name = "sb-water-mineralized-crystallization",
-    category = "crystallizing",
-    subgroup = "slag-processing-1",
+    category = "angels-crystallizing",
+    subgroup = "angels-slag-processing-1",
     order = "z[slag-processing]",
     enabled = true,
     energy_required = 2,
     ingredients = {
-      { type = "fluid", name = "water-mineralized", amount = 200 },
+      { type = "fluid", name = "angels-water-mineralized", amount = 200 },
     },
     results = {
       { type = "item", name = "angels-ore1", amount = 2, probability = 0.55 },
@@ -61,8 +61,8 @@ data:extend({
     type = "recipe",
     name = "sb-wood-foraging",
     localised_name = { "recipe-name.sb-wood-foraging" },
-    category = "crafting-handonly",
-    subgroup = "bio-processing-green",
+    category = "sb-crafting-handonly",
+    subgroup = "angels-bio-processing-green",
     enabled = true,
     energy_required = 4,
     ingredients = {},
@@ -75,17 +75,17 @@ data:extend({
   },
   {
     type = "recipe",
-    name = "catalyst-metal-purple",
+    name = "sb-catalyst-metal-purple",
     category = "crafting",
     energy_required = 2,
     enabled = false,
     ingredients = {
-      { type = "item", name = "catalyst-metal-carrier", amount = 10 },
-      { type = "item", name = "gold-ore", amount = 1 },
-      { type = "item", name = "rutile-ore", amount = 1 },
+      { type = "item", name = "angels-catalyst-metal-carrier", amount = 10 },
+      { type = "item", name = "bob-gold-ore", amount = 1 },
+      { type = "item", name = "bob-rutile-ore", amount = 1 },
     },
     results = {
-      { type = "item", name = "catalyst-metal-purple", amount = 10 },
+      { type = "item", name = "sb-catalyst-metal-purple", amount = 10 },
     },
   },
   {
@@ -104,26 +104,26 @@ data:extend({
     type = "recipe",
     name = "sb-blue-algae-liquefaction",
     icons = angelsmods.functions.create_liquid_recipe_icon({
-      "blue-cellulose-fiber",
+      "angels-blue-cellulose-fiber",
     }, { { 100, 100, 100 }, { 171, 161, 055 }, { 127, 163, 109 } }),
     category = "oil-processing",
     enabled = false,
     energy_required = 5,
     ingredients = {
-      { type = "item", name = "blue-cellulose-fiber", amount = 20 },
+      { type = "item", name = "angels-blue-cellulose-fiber", amount = 20 },
       { type = "fluid", name = "steam", amount = 100 },
     },
     results = {
       { type = "fluid", name = "crude-oil", amount = 90 },
-      { type = "fluid", name = "water-yellow-waste", amount = 70 },
-      { type = "fluid", name = "gas-carbon-dioxide", amount = 20 },
+      { type = "fluid", name = "angels-water-yellow-waste", amount = 70 },
+      { type = "fluid", name = "angels-gas-carbon-dioxide", amount = 20 },
     },
-    subgroup = "bio-processing-blue",
+    subgroup = "angels-bio-processing-blue",
     order = "d[blue-algae-liquefaction]",
   },
 })
 
-bobmods.lib.tech.add_prerequisite("angels-oil-processing", "bio-processing-blue")
+bobmods.lib.tech.add_prerequisite("angels-oil-processing", "angels-bio-processing-blue")
 bobmods.lib.tech.add_recipe_unlock("angels-oil-processing", "sb-blue-algae-liquefaction")
 
 -- Setup recipe bases
diff --git a/SeaBlock/prototypes/rockchest.lua b/SeaBlock/prototypes/rockchest.lua
index 5bffd253..917d8ce5 100644
--- a/SeaBlock/prototypes/rockchest.lua
+++ b/SeaBlock/prototypes/rockchest.lua
@@ -1,8 +1,7 @@
 data:extend({
   {
     type = "container",
-    name = "rock-chest",
-    localised_name = { "entity-name.home" },
+    name = "sb-rock-chest",
     icon = "__base__/graphics/icons/stone.png",
     icon_size = 32,
     flags = { "placeable-neutral", "player-creation" },
@@ -22,17 +21,11 @@ data:extend({
     close_sound = { filename = "__base__/sound/deconstruct-bricks.ogg" },
     vehicle_impact_sound = { filename = "__base__/sound/car-stone-impact.ogg", volume = 1.0 },
     picture = {
-      filename = "__base__/graphics/decorative/rock-big/rock-big-18.png",
-      width = 71,
-      height = 64,
-      shift = { 0.3125, 0.046875 },
-      hr_version = {
-        filename = "__base__/graphics/decorative/rock-big/hr-rock-big-18.png",
-        width = 141,
-        height = 128,
-        scale = 0.5,
-        shift = { 0.304688, 0.0390625 },
-      },
+      filename = "__base__/graphics/decorative/big-rock/big-rock-18.png",
+      width = 141, --taken from the old hr version
+      height = 128,
+      scale = 0.5,
+      shift = { 0.304688, 0.0390625 },
     },
 
     circuit_wire_connection_point = circuit_connector_definitions["chest"].points,
diff --git a/SeaBlock/prototypes/technology.lua b/SeaBlock/prototypes/technology.lua
index a760dccc..dd8d57e5 100644
--- a/SeaBlock/prototypes/technology.lua
+++ b/SeaBlock/prototypes/technology.lua
@@ -36,8 +36,8 @@ data:extend({
     icon = "__SeaBlock__/graphics/technology/ore.png",
     icon_size = 128,
     effects = {
-      { type = "unlock-recipe", recipe = "angelsore1-crushed-smelting" },
-      { type = "unlock-recipe", recipe = "angelsore3-crushed-smelting" },
+      { type = "unlock-recipe", recipe = "angels-ore1-crushed-smelting" },
+      { type = "unlock-recipe", recipe = "angels-ore3-crushed-smelting" },
       { type = "unlock-recipe", recipe = "copper-cable" },
     },
     unit = {
@@ -55,8 +55,8 @@ data:extend({
       { type = "unlock-recipe", recipe = "inserter" },
       { type = "unlock-recipe", recipe = "pipe" },
       { type = "unlock-recipe", recipe = "pipe-to-ground" },
-      { type = "unlock-recipe", recipe = "copper-pipe" },
-      { type = "unlock-recipe", recipe = "copper-pipe-to-ground" },
+      { type = "unlock-recipe", recipe = "bob-copper-pipe" },
+      { type = "unlock-recipe", recipe = "bob-copper-pipe-to-ground" },
       { type = "unlock-recipe", recipe = "iron-stick" },
       { type = "unlock-recipe", recipe = "iron-gear-wheel" },
       { type = "unlock-recipe", recipe = "burner-inserter" },
@@ -87,31 +87,31 @@ data:extend({
   {
     type = "technology",
     name = "sb-bio-processing-advanced",
-    localised_name = { "technology-name.bio-processing-green" },
-    localised_description = { "technology-description.bio-processing-green" },
-    icon = "__angelsbioprocessing__/graphics/technology/algae-farm-tech.png",
+    localised_name = { "technology-name.angels-bio-processing-green" },
+    localised_description = { "technology-description.angels-bio-processing-green" },
+    icon = "__angelsbioprocessinggraphics__/graphics/technology/algae-farm-tech.png",
     icon_size = 128,
     order = "c-a",
     prerequisites = {
-      "bio-processing-red",
-      "advanced-electronics",
+      "angels-bio-processing-red",
+      "advanced-circuit",
       "angels-stone-smelting-2",
-      "zinc-processing",
+      "bob-zinc-processing",
       "chemical-science-pack",
     },
     effects = {
       {
         type = "unlock-recipe",
-        recipe = "algae-farm-4",
+        recipe = "angels-algae-farm-4",
       },
     },
     unit = {
       count = 50,
       ingredients = {
-        { type = "item", name = "automation-science-pack", amount = 1 },
-        { type = "item", name = "logistic-science-pack", amount = 1 },
-        { type = "item", name = "token-bio", amount = 1 },
-        { type = "item", name = "chemical-science-pack", amount = 1 },
+        { "automation-science-pack", 1 },
+        { "logistic-science-pack", 1 },
+        { "angels-token-bio", 1 },
+        { "chemical-science-pack", 1 },
       },
       time = 30,
     },
@@ -146,11 +146,11 @@ data:extend({
 
 bobmods.lib.recipe.enabled("boiler", false)
 bobmods.lib.recipe.enabled("steam-engine", false)
-bobmods.lib.recipe.enabled("copper-pipe-to-ground", false)
-bobmods.lib.recipe.enabled("basic-circuit-board", false)
+bobmods.lib.recipe.enabled("bob-copper-pipe-to-ground", false)
+bobmods.lib.recipe.enabled("bob-basic-circuit-board", false)
 bobmods.lib.recipe.enabled("automation-science-pack", false)
-if data.raw.recipe["basic-transport-belt"] then
-  bobmods.lib.tech.add_recipe_unlock("sb-startup3", "basic-transport-belt")
+if data.raw.recipe["bob-basic-transport-belt"] then
+  bobmods.lib.tech.add_recipe_unlock("sb-startup3", "bob-basic-transport-belt")
 else
   bobmods.lib.tech.add_recipe_unlock("sb-startup3", "transport-belt")
 end
@@ -160,14 +160,14 @@ if mods["bobwarfare"] then
     {
       type = "technology",
       name = "sb-sniper-rifle",
-      localised_name = { "item-name.sniper-rifle" },
+      localised_name = { "item-name.bob-sniper-rifle" },
       icon_size = 256,
       icon_mipmaps = 4,
       icon = "__base__/graphics/technology/military.png",
       effects = {
         {
           type = "unlock-recipe",
-          recipe = "sniper-rifle",
+          recipe = "bob-sniper-rifle",
         },
       },
       prerequisites = { "military-science-pack" },
diff --git a/SeaBlock/remote.lua b/SeaBlock/remote.lua
index 82733888..18fd5849 100644
--- a/SeaBlock/remote.lua
+++ b/SeaBlock/remote.lua
@@ -1,23 +1,23 @@
 require("__core__/lualib/util")
 
 local function get_unlocks()
-  return util.table.deepcopy(global.unlocks)
+  return util.table.deepcopy(storage.unlocks)
 end
 
 local function set_unlock(item, techs)
-  global.unlocks[item] = techs
+  storage.unlocks[item] = techs
 end
 
 local function get_starting_items()
-  return util.table.deepcopy(global.starting_items)
+  return util.table.deepcopy(storage.starting_items)
 end
 
 local function set_starting_item(item, quantity)
-  global.starting_items[item] = quantity
+  storage.starting_items[item] = quantity
 end
 
 local function set_starting_items(items)
-  global.starting_items = items
+  storage.starting_items = items
 end
 
 -- Presets for Milestones mod
@@ -33,7 +33,8 @@ local function milestones_presets()
     { type = "item", name = "logistic-science-pack", quantity = 1 },
     { type = "item", name = "military-science-pack", quantity = 1 },
     { type = "item", name = "chemical-science-pack", quantity = 1 },
-    script.active_mods["bobtech"] and { type = "item", name = "advanced-logistic-science-pack", quantity = 1 } or nil,
+    script.active_mods["bobtech"] and { type = "item", name = "bob-advanced-logistic-science-pack", quantity = 1 }
+      or nil,
     { type = "item", name = "production-science-pack", quantity = 1 },
     { type = "item", name = "utility-science-pack", quantity = 1 },
     { type = "item", name = "space-science-pack", quantity = 1 },
@@ -43,7 +44,7 @@ local function milestones_presets()
     { type = "item", name = "military-science-pack", quantity = 1000, next = "x10" },
     { type = "item", name = "chemical-science-pack", quantity = 1000, next = "x10" },
     script.active_mods["bobtech"]
-        and { type = "item", name = "advanced-logistic-science-pack", quantity = 1000, next = "x10" }
+        and { type = "item", name = "bob-advanced-logistic-science-pack", quantity = 1000, next = "x10" }
       or nil,
     { type = "item", name = "production-science-pack", quantity = 1000, next = "x10" },
     { type = "item", name = "utility-science-pack", quantity = 1000, next = "x10" },
@@ -53,45 +54,45 @@ local function milestones_presets()
   -- Resources
   grouped_milestones["resorces"] = {
     { type = "group", name = "Resources" },
-    { type = "item", name = "wood-charcoal", quantity = 1 },
-    { type = "item", name = "basic-circuit-board", quantity = 1 },
+    { type = "item", name = "angels-wood-charcoal", quantity = 1 },
+    { type = "item", name = "bob-basic-circuit-board", quantity = 1 },
     { type = "item", name = "electronic-circuit", quantity = 1 },
     { type = "item", name = "advanced-circuit", quantity = 1 },
     { type = "item", name = "processing-unit", quantity = 1 },
-    { type = "item", name = "advanced-processing-unit", quantity = 1 },
+    { type = "item", name = "bob-advanced-processing-unit", quantity = 1 },
 
-    { type = "item", name = "basic-circuit-board", quantity = 10000, next = "x10" },
+    { type = "item", name = "bob-basic-circuit-board", quantity = 10000, next = "x10" },
     { type = "item", name = "electronic-circuit", quantity = 10000, next = "x10" },
     { type = "item", name = "advanced-circuit", quantity = 10000, next = "x10" },
     { type = "item", name = "processing-unit", quantity = 1000, next = "x10" },
-    { type = "item", name = "advanced-processing-unit", quantity = 100, next = "x10" },
+    { type = "item", name = "bob-advanced-processing-unit", quantity = 100, next = "x10" },
 
     { type = "item", name = "steel-plate", quantity = 1 },
-    { type = "item", name = "bronze-alloy", quantity = 1 },
-    { type = "item", name = "invar-alloy", quantity = 1 },
-    { type = "item", name = "brass-alloy", quantity = 1 },
-    { type = "item", name = "glass", quantity = 1 },
-    { type = "item", name = "silver-plate", quantity = 1 },
-
-    { type = "item", name = "aluminium-plate", quantity = 1 },
-    { type = "item", name = "titanium-plate", quantity = 1 },
-    { type = "item", name = "gold-plate", quantity = 1 },
-    { type = "item", name = "cobalt-steel-alloy", quantity = 1 },
+    { type = "item", name = "bob-bronze-alloy", quantity = 1 },
+    { type = "item", name = "bob-invar-alloy", quantity = 1 },
+    { type = "item", name = "bob-brass-alloy", quantity = 1 },
+    { type = "item", name = "bob-glass", quantity = 1 },
+    { type = "item", name = "bob-silver-plate", quantity = 1 },
+
+    { type = "item", name = "bob-aluminium-plate", quantity = 1 },
+    { type = "item", name = "bob-titanium-plate", quantity = 1 },
+    { type = "item", name = "bob-gold-plate", quantity = 1 },
+    { type = "item", name = "bob-cobalt-steel-alloy", quantity = 1 },
     { type = "item", name = "angels-plate-chrome", quantity = 1 },
     { type = "item", name = "angels-plate-platinum", quantity = 1 },
 
-    { type = "item", name = "tungsten-plate", quantity = 1 },
-    { type = "item", name = "copper-tungsten-alloy", quantity = 1 },
-    { type = "item", name = "tungsten-carbide", quantity = 1 },
-    { type = "item", name = "nitinol-alloy", quantity = 1 },
+    { type = "item", name = "bob-tungsten-plate", quantity = 1 },
+    { type = "item", name = "bob-copper-tungsten-alloy", quantity = 1 },
+    { type = "item", name = "bob-tungsten-carbide", quantity = 1 },
+    { type = "item", name = "bob-nitinol-alloy", quantity = 1 },
 
     { type = "item", name = "plastic-bar", quantity = 1 },
-    { type = "fluid", name = "liquid-resin", quantity = 100 },
-    { type = "item", name = "rubber", quantity = 1 },
-    { type = "item", name = "alien-bacteria", quantity = 1 },
+    { type = "fluid", name = "angels-liquid-resin", quantity = 100 },
+    { type = "item", name = "bob-rubber", quantity = 1 },
+    { type = "item", name = "angels-alien-bacteria", quantity = 1 },
     { type = "item", name = "sulfur", quantity = 1 },
-    { type = "fluid", name = "mineral-sludge", quantity = 1 },
-    { type = "fluid", name = "mineral-sludge", quantity = 10000, next = "x10" },
+    { type = "fluid", name = "angels-mineral-sludge", quantity = 1 },
+    { type = "fluid", name = "angels-mineral-sludge", quantity = 10000, next = "x10" },
   }
 
   -- Progress
@@ -113,36 +114,29 @@ local function milestones_presets()
     { type = "fluid", name = "liquid-fuel-oil", quantity = 1 },
     { type = "item", name = "locomotive", quantity = 1 },
     { type = "item", name = "construction-robot", quantity = 1 },
-    { type = "item", name = "logistic-chest-requester", quantity = 1 },
+    { type = "item", name = "requester-chest", quantity = 1 },
   }
 
   if not script.active_mods["bobmodules"] then
     -- Vanilla modules
     grouped_milestones["modules"] = {
       { type = "item", name = "productivity-module", quantity = 1 },
-      { type = "item", name = "productivity-module-4", quantity = 1 },
-      { type = "item", name = "productivity-module-6", quantity = 1 },
-    }
-  elseif script.active_mods["CircuitProcessing"] then
-    -- Circuit Processing modules
-    grouped_milestones["modules"] = {
       { type = "item", name = "productivity-module-2", quantity = 1 },
-      { type = "item", name = "productivity-module-4", quantity = 1 },
-      { type = "item", name = "productivity-module-6", quantity = 1 },
-      { type = "item", name = "productivity-module-8", quantity = 1 },
+      { type = "item", name = "productivity-module-3", quantity = 1 },
     }
   else
     -- Bob's Modules
     grouped_milestones["modules"] = {
       { type = "item", name = "productivity-module", quantity = 1 },
-      { type = "item", name = "productivity-module-8", quantity = 1 },
+      { type = "item", name = "productivity-module-3", quantity = 1 },
+      { type = "item", name = "bob-productivity-module-5", quantity = 1 },
     }
   end
 
   grouped_milestones["progress2"] = {
     { type = "item", name = "beacon", quantity = 1 },
-    script.active_mods["bobmodules"] and { type = "item", name = "beacon-2", quantity = 1 } or nil,
-    script.active_mods["bobmodules"] and { type = "item", name = "beacon-3", quantity = 1 } or nil,
+    script.active_mods["bobmodules"] and { type = "item", name = "bob-beacon-2", quantity = 1 } or nil,
+    script.active_mods["bobmodules"] and { type = "item", name = "bob-beacon-3", quantity = 1 } or nil,
     { type = "item", name = "rocket-fuel", quantity = 1 },
     { type = "technology", name = "rocket-silo", quantity = 1 },
     { type = "item", name = "nuclear-reactor", quantity = 1 },
@@ -218,7 +212,7 @@ local function milestones_presets()
 end
 
 local function get_jetpack_fuels()
-  return { ["enriched-fuel"] = 0.7 }
+  return { ["bob-enriched-fuel"] = 0.7 }
 end
 
 ---@param winning_force LuaForce
diff --git a/SeaBlock/starting-items.lua b/SeaBlock/starting-items.lua
index 9e75c7cd..fbb8b0c5 100644
--- a/SeaBlock/starting-items.lua
+++ b/SeaBlock/starting-items.lua
@@ -6,12 +6,12 @@ function seablock.populate_starting_items(items)
     ["small-electric-pole"] = 50,
     ["small-lamp"] = 12,
     ["iron-plate"] = 1200,
-    ["basic-circuit-board"] = 200,
-    ["stone-pipe"] = 100,
-    ["stone-pipe-to-ground"] = 50,
+    ["bob-basic-circuit-board"] = 200,
+    ["bob-stone-pipe"] = 100,
+    ["bob-stone-pipe-to-ground"] = 50,
     ["stone-brick"] = 500,
     ["pipe"] = 21,
-    ["copper-pipe"] = 5,
+    ["bob-copper-pipe"] = 5,
     ["iron-gear-wheel"] = 10,
     ["iron-stick"] = 88,
     ["pipe-to-ground"] = 2,
diff --git a/SeaBlockMetaPack/info.json b/SeaBlockMetaPack/info.json
index 29779670..09289a7e 100644
--- a/SeaBlockMetaPack/info.json
+++ b/SeaBlockMetaPack/info.json
@@ -1,7 +1,7 @@
 {
   "name": "SeaBlockMetaPack",
   "version": "1.1.4",
-  "factorio_version": "1.1",
+  "factorio_version": "2.0",
   "title": "Sea Block Pack - Official",
   "author": "Trainwreck",
   "contact": "https://forums.factorio.com/viewtopic.php?t=43759",