From 9f00230657638a8fb6a85012941dc789588a49a7 Mon Sep 17 00:00:00 2001
From: Simon Brodtmann <github@accounts.brodtmann.info>
Date: Sat, 5 Jul 2025 15:57:07 +0200
Subject: [PATCH] Fix mod name references

---
 Bio_Industries_2/data-final-fixes.lua         |  6 +--
 Bio_Industries_2/data-updates.lua             |  6 +--
 Bio_Industries_2/data.lua                     |  2 +-
 Bio_Industries_2/libs/category-functions.lua  |  2 +-
 Bio_Industries_2/libs/functions.lua           |  2 +-
 Bio_Industries_2/libs/item-functions.lua      |  2 +-
 Bio_Industries_2/libs/recipe-functions.lua    |  2 +-
 .../libs/technology-functions.lua             |  2 +-
 Bio_Industries_2/libs/trees-and-terrains.lua  |  2 +-
 .../migrations/Bio_Industries_0.17.02.lua     |  2 +-
 .../migrations/Bio_Industries_0.17.06.lua     |  2 +-
 .../migrations/Bio_Industries_0.17.11.lua     |  2 +-
 .../migrations/Bio_Industries_0.17.13.lua     |  2 +-
 .../migrations/Bio_Industries_0.17.22.lua     |  2 +-
 .../migrations/Bio_Industries_0.17.26.lua     |  2 +-
 .../migrations/Bio_Industries_0.17.31.lua     |  2 +-
 .../migrations/Bio_Industries_0.18.01.lua     |  2 +-
 .../Bio_Industries_0.18.27_+_0.17.58.lua      |  2 +-
 .../Bio_Industries_0.18.31_+_1.01.01.lua      |  2 +-
 .../prototypes/Bio_Cannon/damage-type.lua     |  2 +-
 .../prototypes/Bio_Cannon/entity.lua          |  2 +-
 .../prototypes/Bio_Cannon/item-group.lua      |  2 +-
 .../prototypes/Bio_Cannon/item.lua            |  2 +-
 .../Bio_Cannon/projectiles-entity.lua         |  4 +-
 .../Bio_Cannon/projectiles-item.lua           |  2 +-
 .../Bio_Cannon/projectiles-recipe.lua         |  2 +-
 .../prototypes/Bio_Cannon/recipe.lua          |  2 +-
 .../Bio_Cannon/technology-updates.lua         |  2 +-
 .../prototypes/Bio_Cannon/technology.lua      |  2 +-
 .../Bio_Farm/compatible_recipes.lua           |  6 +--
 .../prototypes/Bio_Farm/entities.lua          |  8 ++--
 Bio_Industries_2/prototypes/Bio_Farm/item.lua |  2 +-
 .../prototypes/Bio_Farm/liquids.lua           |  2 +-
 .../prototypes/Bio_Farm/pipeConnectors.lua    | 10 ++--
 .../prototypes/Bio_Farm/recipe.lua            | 46 +++++++++----------
 .../prototypes/Bio_Farm/technology.lua        |  2 +-
 .../prototypes/Bio_Farm/technology2.lua       |  2 +-
 .../prototypes/Bio_Farm/tree_entities.lua     |  4 +-
 .../prototypes/Bio_Fuel/entities.lua          |  4 +-
 .../prototypes/Bio_Fuel/fluid.lua             |  2 +-
 Bio_Industries_2/prototypes/Bio_Fuel/item.lua |  2 +-
 .../prototypes/Bio_Fuel/pipeConnectors.lua    |  2 +-
 .../prototypes/Bio_Fuel/recipe.lua            |  6 +--
 .../prototypes/Bio_Fuel/technology.lua        |  2 +-
 .../prototypes/Bio_Garden/entities.lua        |  6 +--
 .../Bio_Garden/fluid_fertilizer.lua           |  2 +-
 .../prototypes/Bio_Garden/item.lua            |  2 +-
 .../prototypes/Bio_Garden/recipe.lua          |  4 +-
 .../prototypes/Bio_Solar_Farm/entities.lua    | 12 ++---
 .../prototypes/Bio_Solar_Farm/item.lua        |  2 +-
 .../prototypes/Bio_Solar_Farm/recipe.lua      |  2 +-
 .../prototypes/Bio_Turret/entity.lua          |  8 ++--
 .../prototypes/Bio_Turret/item-group.lua      |  2 +-
 .../prototypes/Bio_Turret/item.lua            |  2 +-
 .../prototypes/Bio_Turret/recipe.lua          |  8 ++--
 .../Bio_Turret/technology-updates.lua         |  2 +-
 .../prototypes/Bio_Tweaks/recipe.lua          |  2 +-
 .../prototypes/Industrial_Revolution.lua      |  2 +-
 .../Wood_Products/containers-entities.lua     |  2 +-
 .../Wood_Products/containers-item.lua         |  2 +-
 .../Wood_Products/containers-recipe.lua       |  2 +-
 .../prototypes/Wood_Products/entities.lua     |  2 +-
 .../prototypes/Wood_Products/item.lua         |  2 +-
 .../prototypes/Wood_Products/pipes.lua        |  4 +-
 .../prototypes/Wood_Products/recipe.lua       | 10 ++--
 Bio_Industries_2/prototypes/category.lua      |  6 +--
 .../compound_entities/hidden_lamps.lua        |  2 +-
 .../compound_entities/hidden_panels.lua       |  2 +-
 .../compound_entities/hidden_radars.lua       |  2 +-
 Bio_Industries_2/settings_changed.lua         |  4 +-
 70 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/Bio_Industries_2/data-final-fixes.lua b/Bio_Industries_2/data-final-fixes.lua
index 8b2faa1..08e6160 100644
--- a/Bio_Industries_2/data-final-fixes.lua
+++ b/Bio_Industries_2/data-final-fixes.lua
@@ -1,5 +1,5 @@
-local BioInd = require('common')('Bio_Industries')
-local ICONPATH = "__Bio_Industries__/graphics/icons/"
+local BioInd = require('common')('Bio_Industries_2')
+local ICONPATH = "__Bio_Industries_2__/graphics/icons/"
 
 -- If OwnlyMe's or Tral'a "Robot Tree Farm" mods are active, they will create variatons
 -- of our variations of tree prototypes. Remove them!
@@ -376,7 +376,7 @@ if mods["Krastorio2"] then
   }
   for _, recipe in pairs(data.raw.recipe) do
     BioInd.writeDebug("Recipe has \"mod\" property: %s", {recipe.mod and true or false})
-    if recipe.mod == "Bio_Industries" then
+    if recipe.mod == "Bio_Industries_2" then
       krastorio.recipes.multiplyIngredients(recipe.name, update, 4)
       krastorio.recipes.multiplyProducts(recipe.name, update, 4)
       BioInd.writeDebug("Changed ingredients for %s: %s", {recipe and recipe.name or "nil", recipe and recipe.ingredients or "nil"})
diff --git a/Bio_Industries_2/data-updates.lua b/Bio_Industries_2/data-updates.lua
index 64c2e6f..86f06cd 100644
--- a/Bio_Industries_2/data-updates.lua
+++ b/Bio_Industries_2/data-updates.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 for var, name in pairs({
   Bio_Cannon = "BI_Bio_Cannon",
@@ -18,7 +18,7 @@ end
 
 --~ BioInd.show("data.raw.recipe[\"bi-sulfur\"]", data.raw.recipe["bi-sulfur"])
 BioInd.show("BI.Settings.BI_Easy_Bio_Gardens", BI.Settings.BI_Easy_Bio_Gardens)
-local ICONPATH = "__Bio_Industries__/graphics/icons/"
+local ICONPATH = "__Bio_Industries_2__/graphics/icons/"
 
 ----Update the Wood Pipe Images
 require("prototypes.Wood_Products.pipes")
@@ -810,7 +810,7 @@ BioInd.writeDebug("Removed technology " .. "bi-tech-coal-processing-" .. i)
   end
 end
 
--- Moved here from data-final-fixes.lua for 0.18.34/1.1.4! (Fixes https://mods.factorio.com/mod/Bio_Industries/discussion/5ff517c391699300236170a2)
+-- Moved here from data-final-fixes.lua for 0.18.34/1.1.4! (Fixes https://mods.factorio.com/mod/Bio_Industries_2/discussion/5ff517c391699300236170a2)
 -- "Transport drones" ruins rails by removing object-layer from the collision mask. That
 -- causes problems for our "Wooden rail bridges" as they will also pass through cliffs.
 require("prototypes.Wood_Products.rail_updates")
diff --git a/Bio_Industries_2/data.lua b/Bio_Industries_2/data.lua
index ac9a67f..be763f4 100644
--- a/Bio_Industries_2/data.lua
+++ b/Bio_Industries_2/data.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 if not BI then BI = {} end
 if not BI.Settings then BI.Settings = {} end
diff --git a/Bio_Industries_2/libs/category-functions.lua b/Bio_Industries_2/libs/category-functions.lua
index d226f63..9b955d3 100644
--- a/Bio_Industries_2/libs/category-functions.lua
+++ b/Bio_Industries_2/libs/category-functions.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 if not thxbob.lib.machine then thxbob.lib.machine = {} end
 
diff --git a/Bio_Industries_2/libs/functions.lua b/Bio_Industries_2/libs/functions.lua
index 9864627..6c77806 100644
--- a/Bio_Industries_2/libs/functions.lua
+++ b/Bio_Industries_2/libs/functions.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 
 -- Merges table2's contents into table1.
diff --git a/Bio_Industries_2/libs/item-functions.lua b/Bio_Industries_2/libs/item-functions.lua
index fb63750..2bf0b14 100644
--- a/Bio_Industries_2/libs/item-functions.lua
+++ b/Bio_Industries_2/libs/item-functions.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 if not thxbob.lib.item then thxbob.lib.item = {} end
 
diff --git a/Bio_Industries_2/libs/recipe-functions.lua b/Bio_Industries_2/libs/recipe-functions.lua
index f8bb1db..1b3402f 100644
--- a/Bio_Industries_2/libs/recipe-functions.lua
+++ b/Bio_Industries_2/libs/recipe-functions.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 if not thxbob.lib.recipe then thxbob.lib.recipe = {} end
 
diff --git a/Bio_Industries_2/libs/technology-functions.lua b/Bio_Industries_2/libs/technology-functions.lua
index 7ac5936..e3e3a15 100644
--- a/Bio_Industries_2/libs/technology-functions.lua
+++ b/Bio_Industries_2/libs/technology-functions.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 if not thxbob.lib.tech then thxbob.lib.tech = {} end
 
diff --git a/Bio_Industries_2/libs/trees-and-terrains.lua b/Bio_Industries_2/libs/trees-and-terrains.lua
index 9b2e660..71b87c2 100644
--- a/Bio_Industries_2/libs/trees-and-terrains.lua
+++ b/Bio_Industries_2/libs/trees-and-terrains.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('common')('Bio_Industries')
+--~ local BioInd = require('common')('Bio_Industries_2')
 
 local terrains = {}
 
diff --git a/Bio_Industries_2/migrations/Bio_Industries_0.17.02.lua b/Bio_Industries_2/migrations/Bio_Industries_0.17.02.lua
index 521d026..e17a203 100644
--- a/Bio_Industries_2/migrations/Bio_Industries_0.17.02.lua
+++ b/Bio_Industries_2/migrations/Bio_Industries_0.17.02.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('__Bio_Industries__/common')('Bio_Industries')
+--~ local BioInd = require('__Bio_Industries_2__/common')('Bio_Industries_2')
 
 --~ game.reload_script()
 
diff --git a/Bio_Industries_2/migrations/Bio_Industries_0.17.06.lua b/Bio_Industries_2/migrations/Bio_Industries_0.17.06.lua
index 5fdf0ab..05ec2fd 100644
--- a/Bio_Industries_2/migrations/Bio_Industries_0.17.06.lua
+++ b/Bio_Industries_2/migrations/Bio_Industries_0.17.06.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('__Bio_Industries__/common')('Bio_Industries')
+--~ local BioInd = require('__Bio_Industries_2__/common')('Bio_Industries_2')
 
 --~ game.reload_script()
 
diff --git a/Bio_Industries_2/migrations/Bio_Industries_0.17.11.lua b/Bio_Industries_2/migrations/Bio_Industries_0.17.11.lua
index f1a5152..182836f 100644
--- a/Bio_Industries_2/migrations/Bio_Industries_0.17.11.lua
+++ b/Bio_Industries_2/migrations/Bio_Industries_0.17.11.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('__Bio_Industries__/common')('Bio_Industries')
+--~ local BioInd = require('__Bio_Industries_2__/common')('Bio_Industries_2')
 
 --~ game.reload_script()
 
diff --git a/Bio_Industries_2/migrations/Bio_Industries_0.17.13.lua b/Bio_Industries_2/migrations/Bio_Industries_0.17.13.lua
index 785aca4..fdef829 100644
--- a/Bio_Industries_2/migrations/Bio_Industries_0.17.13.lua
+++ b/Bio_Industries_2/migrations/Bio_Industries_0.17.13.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('__Bio_Industries__/common')('Bio_Industries')
+--~ local BioInd = require('__Bio_Industries_2__/common')('Bio_Industries_2')
 
 --~ game.reload_script()
 
diff --git a/Bio_Industries_2/migrations/Bio_Industries_0.17.22.lua b/Bio_Industries_2/migrations/Bio_Industries_0.17.22.lua
index 2016439..d7fa812 100644
--- a/Bio_Industries_2/migrations/Bio_Industries_0.17.22.lua
+++ b/Bio_Industries_2/migrations/Bio_Industries_0.17.22.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('__Bio_Industries__/common')('Bio_Industries')
+--~ local BioInd = require('__Bio_Industries_2__/common')('Bio_Industries_2')
 
 --~ game.reload_script()
 
diff --git a/Bio_Industries_2/migrations/Bio_Industries_0.17.26.lua b/Bio_Industries_2/migrations/Bio_Industries_0.17.26.lua
index 29b0a6e..f60a44e 100644
--- a/Bio_Industries_2/migrations/Bio_Industries_0.17.26.lua
+++ b/Bio_Industries_2/migrations/Bio_Industries_0.17.26.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('__Bio_Industries__/common')('Bio_Industries')
+--~ local BioInd = require('__Bio_Industries_2__/common')('Bio_Industries_2')
 
 --~ game.reload_script()
 
diff --git a/Bio_Industries_2/migrations/Bio_Industries_0.17.31.lua b/Bio_Industries_2/migrations/Bio_Industries_0.17.31.lua
index 8218566..bd5a28d 100644
--- a/Bio_Industries_2/migrations/Bio_Industries_0.17.31.lua
+++ b/Bio_Industries_2/migrations/Bio_Industries_0.17.31.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('__Bio_Industries__/common')('Bio_Industries')
+--~ local BioInd = require('__Bio_Industries_2__/common')('Bio_Industries_2')
 
 --~ game.reload_script()
 
diff --git a/Bio_Industries_2/migrations/Bio_Industries_0.18.01.lua b/Bio_Industries_2/migrations/Bio_Industries_0.18.01.lua
index 8c6afa3..2dc639b 100644
--- a/Bio_Industries_2/migrations/Bio_Industries_0.18.01.lua
+++ b/Bio_Industries_2/migrations/Bio_Industries_0.18.01.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('__Bio_Industries__/common')('Bio_Industries')
+--~ local BioInd = require('__Bio_Industries_2__/common')('Bio_Industries_2')
 --~ game.reload_script()
 
 
diff --git a/Bio_Industries_2/migrations/Bio_Industries_0.18.27_+_0.17.58.lua b/Bio_Industries_2/migrations/Bio_Industries_0.18.27_+_0.17.58.lua
index 8b4887f..4142e24 100644
--- a/Bio_Industries_2/migrations/Bio_Industries_0.18.27_+_0.17.58.lua
+++ b/Bio_Industries_2/migrations/Bio_Industries_0.18.27_+_0.17.58.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('__Bio_Industries__/common')('Bio_Industries')
+--~ local BioInd = require('__Bio_Industries_2__/common')('Bio_Industries_2')
 ------------------------------------------------------------------------------------
 -- For some reason, the recipe for bi-biomass-2 was more advanced than the recipe
 -- for bi-biomass-3. This worked because we changed their order whereever they've
diff --git a/Bio_Industries_2/migrations/Bio_Industries_0.18.31_+_1.01.01.lua b/Bio_Industries_2/migrations/Bio_Industries_0.18.31_+_1.01.01.lua
index d3f57ed..36f76b2 100644
--- a/Bio_Industries_2/migrations/Bio_Industries_0.18.31_+_1.01.01.lua
+++ b/Bio_Industries_2/migrations/Bio_Industries_0.18.31_+_1.01.01.lua
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------------
 -- Just remove some obsolete global tables!
 ------------------------------------------------------------------------------------
---~ local BioInd = require('__Bio_Industries__/common')('Bio_Industries')
+--~ local BioInd = require('__Bio_Industries_2__/common')('Bio_Industries_2')
 
 if global and global.bi then
   global.bi.terrains = nil
diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/damage-type.lua b/Bio_Industries_2/prototypes/Bio_Cannon/damage-type.lua
index 1b01779..72294c2 100644
--- a/Bio_Industries_2/prototypes/Bio_Cannon/damage-type.lua
+++ b/Bio_Industries_2/prototypes/Bio_Cannon/damage-type.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('common')('Bio_Industries')
+--~ local BioInd = require('common')('Bio_Industries_2')
 
 data:extend({
 
diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua b/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua
index 2dc1475..222c3ec 100644
--- a/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua
+++ b/Bio_Industries_2/prototypes/Bio_Cannon/entity.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 local ENTITYPATH = BioInd.modRoot .. "/graphics/entities/bio_cannon/"
diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/item-group.lua b/Bio_Industries_2/prototypes/Bio_Cannon/item-group.lua
index 416ab6e..9ea7b9a 100644
--- a/Bio_Industries_2/prototypes/Bio_Cannon/item-group.lua
+++ b/Bio_Industries_2/prototypes/Bio_Cannon/item-group.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('common')('Bio_Industries')
+--~ local BioInd = require('common')('Bio_Industries_2')
 
 if BI.Settings.Bio_Cannon then
   data:extend({
diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/item.lua b/Bio_Industries_2/prototypes/Bio_Cannon/item.lua
index 4c40b50..e6f75dc 100644
--- a/Bio_Industries_2/prototypes/Bio_Cannon/item.lua
+++ b/Bio_Industries_2/prototypes/Bio_Cannon/item.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-entity.lua b/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-entity.lua
index 4d82326..67f8a13 100644
--- a/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-entity.lua
+++ b/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-entity.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/entities/bio_cannon/projectiles/"
 
@@ -297,7 +297,7 @@ if BI.Settings.Bio_Cannon then
       },
       sound = {
       {
-        filename = "__Bio_Industries__/sound/boom.ogg",
+        filename = "__Bio_Industries_2__/sound/boom.ogg",
         volume = 4.0
       },
       },
diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-item.lua b/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-item.lua
index b4c7801..f1c958b 100644
--- a/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-item.lua
+++ b/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-item.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/weapon/"
 
diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-recipe.lua b/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-recipe.lua
index 0daa092..fc3af29 100644
--- a/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-recipe.lua
+++ b/Bio_Industries_2/prototypes/Bio_Cannon/projectiles-recipe.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('common')('Bio_Industries')
+--~ local BioInd = require('common')('Bio_Industries_2')
 
 if BI.Settings.Bio_Cannon then
 
diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/recipe.lua b/Bio_Industries_2/prototypes/Bio_Cannon/recipe.lua
index dc86eab..a92e641 100644
--- a/Bio_Industries_2/prototypes/Bio_Cannon/recipe.lua
+++ b/Bio_Industries_2/prototypes/Bio_Cannon/recipe.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('common')('Bio_Industries')
+--~ local BioInd = require('common')('Bio_Industries_2')
 
 if BI.Settings.Bio_Cannon then
 
diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/technology-updates.lua b/Bio_Industries_2/prototypes/Bio_Cannon/technology-updates.lua
index 7d1df7e..189d483 100644
--- a/Bio_Industries_2/prototypes/Bio_Cannon/technology-updates.lua
+++ b/Bio_Industries_2/prototypes/Bio_Cannon/technology-updates.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('common')('Bio_Industries')
+--~ local BioInd = require('common')('Bio_Industries_2')
 
 --~ if not mods["Natural_Evolution_Buildings"] and BI.Settings.Bio_Cannon then
 
diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/technology.lua b/Bio_Industries_2/prototypes/Bio_Cannon/technology.lua
index edf759f..33b7436 100644
--- a/Bio_Industries_2/prototypes/Bio_Cannon/technology.lua
+++ b/Bio_Industries_2/prototypes/Bio_Cannon/technology.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/technology/"
 
diff --git a/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua b/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua
index 20cbe40..27ab934 100644
--- a/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua
+++ b/Bio_Industries_2/prototypes/Bio_Farm/compatible_recipes.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 local ICONPATHMIPS = BioInd.modRoot .. "/graphics/icons/mips/"
@@ -128,7 +128,7 @@ if not data.raw.item["resin"] then
       main_procuct = "",
       -- This is a custom property for use by "Krastorio 2" (it will change
       -- ingredients/results; used for wood/wood pulp)
-      mod = "Bio_Industries",
+      mod = "Bio_Industries_2",
     },
   })
   -- Order in table reflects order in display (Tech tree), so we remove the last
@@ -369,7 +369,7 @@ if data.raw.item["wooden-board"] and mods["bobelectronics"] then
       },
       -- This is a custom property for use by "Krastorio 2" (it will change
       -- ingredients/results; used for wood/wood pulp)
-      mod = "Bio_Industries",
+      mod = "Bio_Industries_2",
     },
   })
   thxbob.lib.tech.add_recipe_unlock("electronics", "bi-press-wood")
diff --git a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua
index 6fe0374..93a2926 100644
--- a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua
+++ b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 --~ local ICONPATH = BioInd.modRoot .. "/graphics/entities/biofarm/"
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
@@ -515,7 +515,7 @@ data:extend({
     },
     allowed_effects = {"consumption", "speed", "pollution"},
     animation = {
-      filename = "__Bio_Industries__/graphics/entities/cokery/cokery_sheet.png",
+      filename = "__Bio_Industries_2__/graphics/entities/cokery/cokery_sheet.png",
       frame_count = 28,
       line_length = 7,
       width = 256,
@@ -561,7 +561,7 @@ data:extend({
     collision_box = {{-0.8, -0.8}, {0.8, 0.8}},
     selection_box = {{-1.0, -1.0}, {1.0, 1.0}},
     animation = {
-      filename = "__Bio_Industries__/graphics/entities/stone-crusher/stone_crusher_anim.png",
+      filename = "__Bio_Industries_2__/graphics/entities/stone-crusher/stone_crusher_anim.png",
       priority = "high",
       width = 65,
       height = 78,
@@ -570,7 +570,7 @@ data:extend({
       shift = {0.0, -0.1}
     },
     working_visualisations = {
-      filename = "__Bio_Industries__/graphics/entities/stone-crusher/stone-crusher-anim.png",
+      filename = "__Bio_Industries_2__/graphics/entities/stone-crusher/stone-crusher-anim.png",
       priority = "high",
       width = 65,
       height = 78,
diff --git a/Bio_Industries_2/prototypes/Bio_Farm/item.lua b/Bio_Industries_2/prototypes/Bio_Farm/item.lua
index 4095a39..b727179 100644
--- a/Bio_Industries_2/prototypes/Bio_Farm/item.lua
+++ b/Bio_Industries_2/prototypes/Bio_Farm/item.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 local ICONPATHMIPS = BioInd.modRoot .. "/graphics/icons/mips/"
diff --git a/Bio_Industries_2/prototypes/Bio_Farm/liquids.lua b/Bio_Industries_2/prototypes/Bio_Farm/liquids.lua
index b2f707d..d8a0871 100644
--- a/Bio_Industries_2/prototypes/Bio_Farm/liquids.lua
+++ b/Bio_Industries_2/prototypes/Bio_Farm/liquids.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
diff --git a/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua b/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua
index 059b080..789b1d2 100644
--- a/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua
+++ b/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
@@ -190,28 +190,28 @@ function BioFarm_Pipe_Connectors_Left()
   return
   {
     north = {
-        filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-N_l.png",
+        filename = "__Bio_Industries_2__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-N_l.png",
         priority = "extra-high",
         width = 51,
         height = 35,
         shift = {0.25, 1},
     },
     east = {
-        filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-E_l.png",
+        filename = "__Bio_Industries_2__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-E_l.png",
         priority = "extra-high",
         width = 18,
         height = 48,
         shift = {-1, -0.25},
     },
     south = {
-        filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-S_l.png",
+        filename = "__Bio_Industries_2__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-S_l.png",
         priority = "extra-high",
         width = 49,
         height = 25,
         shift = {0.5, -1},
     },
     west = {
-        filename = "__Bio_Industries__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-W_l.png",
+        filename = "__Bio_Industries_2__/graphics/entities/biofarm/pipe_connections/Bio_Farm-pipe-W_l.png",
         priority = "extra-high",
         width = 16,
         height = 51,
diff --git a/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua b/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua
index 1086834..0831639 100644
--- a/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua
+++ b/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
@@ -35,7 +35,7 @@ data:extend({
     order = "a[bi]-ssw-a1[bi-seed-1]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -69,7 +69,7 @@ data:extend({
     order = "a[bi]-ssw-a1[bi-seed-2]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -103,7 +103,7 @@ data:extend({
     order = "a[bi]-ssw-a1[bi-seed-3]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -137,7 +137,7 @@ data:extend({
     order = "a[bi]-ssw-a1[bi-seed-4]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -170,7 +170,7 @@ data:extend({
     order = "b[bi]-ssw-b1[bi-Seedling_Mk1]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -204,7 +204,7 @@ data:extend({
     order = "b[bi]-ssw-b1[bi-Seedling_Mk2]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -237,7 +237,7 @@ data:extend({
     order = "b[bi]-ssw-b1[bi-Seedling_Mk3]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -271,7 +271,7 @@ data:extend({
     order = "b[bi]-ssw-b1[bi-Seedling_Mk4]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -305,7 +305,7 @@ data:extend({
     order = "c[bi]-ssw-c1[raw-wood1]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -340,7 +340,7 @@ data:extend({
     order = "c[bi]-ssw-c1[raw-wood2]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -375,7 +375,7 @@ data:extend({
     order = "c[bi]-ssw-c1[raw-wood3]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -410,7 +410,7 @@ data:extend({
     order = "c[bi]-ssw-c1[raw-wood4]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -546,7 +546,7 @@ data:extend({
     allow_decomposition = false,        -- Added for 0.18.34/1.1.4
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -579,7 +579,7 @@ data:extend({
     allow_decomposition = false,        -- Added for 0.18.34/1.1.4
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -615,7 +615,7 @@ data:extend({
     allow_decomposition = false,        -- Added for 0.18.34/1.1.4
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -649,7 +649,7 @@ data:extend({
     allow_decomposition = true,         -- Changed for 0.18.34/1.1.4
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -682,7 +682,7 @@ data:extend({
 
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -715,7 +715,7 @@ data:extend({
     main_product = "",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -744,7 +744,7 @@ data:extend({
     allow_as_intermediate = false,
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -773,7 +773,7 @@ data:extend({
     allow_as_intermediate = false,
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
@@ -905,7 +905,7 @@ data:extend({
     --~ localised_name = {"item-name.pellet-coke"},
     --~ localised_description = {"item-description.pellet-coke"},
     icon = ICONPATH .. "pellet_coke_solid.png",
-    --icon = "__Bio_Industries__/graphics/icons/pellet_coke_c.png",
+    --icon = "__Bio_Industries_2__/graphics/icons/pellet_coke_c.png",
     icon_size = 64,
     icons = {
       {
@@ -1372,7 +1372,7 @@ data:extend({
     order = "b[bi-fertilizer]-b[bi-adv-fertilizer-2]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
diff --git a/Bio_Industries_2/prototypes/Bio_Farm/technology.lua b/Bio_Industries_2/prototypes/Bio_Farm/technology.lua
index 25ebad9..2b76a57 100644
--- a/Bio_Industries_2/prototypes/Bio_Farm/technology.lua
+++ b/Bio_Industries_2/prototypes/Bio_Farm/technology.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 local coal_processing = require("prototypes.Bio_Farm.coal_processing")
 
 local ICONPATH = BioInd.modRoot .. "/graphics/technology/"
diff --git a/Bio_Industries_2/prototypes/Bio_Farm/technology2.lua b/Bio_Industries_2/prototypes/Bio_Farm/technology2.lua
index 92c4165..5128dcc 100644
--- a/Bio_Industries_2/prototypes/Bio_Farm/technology2.lua
+++ b/Bio_Industries_2/prototypes/Bio_Farm/technology2.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/technology/"
 
diff --git a/Bio_Industries_2/prototypes/Bio_Farm/tree_entities.lua b/Bio_Industries_2/prototypes/Bio_Farm/tree_entities.lua
index 5817ec7..720cfda 100644
--- a/Bio_Industries_2/prototypes/Bio_Farm/tree_entities.lua
+++ b/Bio_Industries_2/prototypes/Bio_Farm/tree_entities.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 --[[
 
@@ -127,7 +127,7 @@ for id, prototype in pairs(data.raw.tree) do
           local max = 2
           if i <= max then
             variation.trunk.layers = {{
-              filename = "__Bio_Industries__/graphics/icons/Seedling_a.png",
+              filename = "__Bio_Industries_2__/graphics/icons/Seedling_a.png",
               priority = "extra-high",
               width = 64,
               height = 64,
diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua b/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua
index 04b69e4..84d79cb 100644
--- a/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua
+++ b/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 local ENTITYPATH = "__base__/graphics/entity/boiler/"
@@ -77,7 +77,7 @@ data:extend({
     collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
     selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
     animation = {
-      filename = "__Bio_Industries__/graphics/entities/bioreactor/bioreactor.png",
+      filename = "__Bio_Industries_2__/graphics/entities/bioreactor/bioreactor.png",
       priority = "high",
       width = 128,
       height = 150,
diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/fluid.lua b/Bio_Industries_2/prototypes/Bio_Fuel/fluid.lua
index af82675..2c5df22 100644
--- a/Bio_Industries_2/prototypes/Bio_Fuel/fluid.lua
+++ b/Bio_Industries_2/prototypes/Bio_Fuel/fluid.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/item.lua b/Bio_Industries_2/prototypes/Bio_Fuel/item.lua
index f0c0afe..cbd66ab 100644
--- a/Bio_Industries_2/prototypes/Bio_Fuel/item.lua
+++ b/Bio_Industries_2/prototypes/Bio_Fuel/item.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua b/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua
index 2cc6bc3..b481898 100644
--- a/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua
+++ b/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 local ENTITYPATH = "__base__/graphics/entity/assembling-machine-2/"
diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua b/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua
index 97c801a..901bb82 100644
--- a/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua
+++ b/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 --~ local new_battery_icon = BioInd.check_base_version("0.18.47")
@@ -244,7 +244,7 @@ if BI.Settings.BI_Bio_Fuel then
       --~ order = "b[cellulose-2]",
       -- This is a custom property for use by "Krastorio 2" (it will change
       -- ingredients/results; used for wood/wood pulp)
-      mod = "Bio_Industries",
+      mod = "Bio_Industries_2",
     },
 
     -- PLASTIC 1 --
@@ -286,7 +286,7 @@ if BI.Settings.BI_Bio_Fuel then
       --~ order = "b[bi-plastic-1]",
       -- This is a custom property for use by "Krastorio 2" (it will change
       -- ingredients/results; used for wood/wood pulp)
-      mod = "Bio_Industries",
+      mod = "Bio_Industries_2",
     },
 
     -- PLASTIC 2 --
diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/technology.lua b/Bio_Industries_2/prototypes/Bio_Fuel/technology.lua
index 2e87622..ac27442 100644
--- a/Bio_Industries_2/prototypes/Bio_Fuel/technology.lua
+++ b/Bio_Industries_2/prototypes/Bio_Fuel/technology.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/technology/"
 
diff --git a/Bio_Industries_2/prototypes/Bio_Garden/entities.lua b/Bio_Industries_2/prototypes/Bio_Garden/entities.lua
index 0c32859..6a8c276 100644
--- a/Bio_Industries_2/prototypes/Bio_Garden/entities.lua
+++ b/Bio_Industries_2/prototypes/Bio_Garden/entities.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
@@ -37,7 +37,7 @@ data:extend({
       off_when_no_fluid_recipe = true
     },
     animation = {
-      filename = "__Bio_Industries__/graphics/entities/biogarden/bio_garden_x.png",
+      filename = "__Bio_Industries_2__/graphics/entities/biogarden/bio_garden_x.png",
       width = 160,
       height = 160,
       frame_count = 12,
@@ -48,7 +48,7 @@ data:extend({
     open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
     close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
     working_sound = {
-      sound = { { filename = "__Bio_Industries__/sound/rainforest_ambience.ogg", volume = 0.8 } },
+      sound = { { filename = "__Bio_Industries_2__/sound/rainforest_ambience.ogg", volume = 0.8 } },
       idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 },
       apparent_volume = 1.5,
     },
diff --git a/Bio_Industries_2/prototypes/Bio_Garden/fluid_fertilizer.lua b/Bio_Industries_2/prototypes/Bio_Garden/fluid_fertilizer.lua
index 4915896..ffacdaa 100644
--- a/Bio_Industries_2/prototypes/Bio_Garden/fluid_fertilizer.lua
+++ b/Bio_Industries_2/prototypes/Bio_Garden/fluid_fertilizer.lua
@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------------
 --   Create fluid fertilizers, recipes, and unlocks if the setting requires it!   --
 ------------------------------------------------------------------------------------
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
 --~ BioInd.show("fluid_fertilizer.lua -- BI.Settings.BI_Easy_Bio_Gardens", BI.Settings.BI_Easy_Bio_Gardens)
diff --git a/Bio_Industries_2/prototypes/Bio_Garden/item.lua b/Bio_Industries_2/prototypes/Bio_Garden/item.lua
index edea9f3..f92600b 100644
--- a/Bio_Industries_2/prototypes/Bio_Garden/item.lua
+++ b/Bio_Industries_2/prototypes/Bio_Garden/item.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
diff --git a/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua b/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua
index 822ecfa..38be3e9 100644
--- a/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua
+++ b/Bio_Industries_2/prototypes/Bio_Garden/recipe.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
@@ -38,7 +38,7 @@ data:extend({
     always_show_made_in = false,        -- Changed for 0.18.34/1.1.4
     allow_decomposition = true,         -- Changed for 0.18.34/1.1.4    -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
 
diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua
index da10a8a..575bb12 100644
--- a/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua
+++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/entities.lua
@@ -1,8 +1,8 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 require ("util")
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
-local ENTITYPATH = "__Bio_Industries__/graphics/entities/bio_solar_farm/"
+local ENTITYPATH = "__Bio_Industries_2__/graphics/entities/bio_solar_farm/"
 
 --~ local BIGICONS = BioInd.check_base_version("0.18.0")
 
@@ -410,7 +410,7 @@ data:extend({
     fire_glow_flicker_enabled = false,
     fire_glow = {
       north = {
-          filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png",
+          filename = "__Bio_Industries_2__/graphics/entities/small-lamp/light-on-patch.png",
           priority = "extra-high",
           frame_count = 1,
           width = 62,
@@ -420,7 +420,7 @@ data:extend({
           blend_mode = "additive",
       },
       east = {
-          filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png",
+          filename = "__Bio_Industries_2__/graphics/entities/small-lamp/light-on-patch.png",
           priority = "extra-high",
           frame_count = 1,
           width = 62,
@@ -429,7 +429,7 @@ data:extend({
           blend_mode = "additive",
       },
       south = {
-          filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png",
+          filename = "__Bio_Industries_2__/graphics/entities/small-lamp/light-on-patch.png",
           priority = "extra-high",
           frame_count = 1,
           width = 62,
@@ -438,7 +438,7 @@ data:extend({
           blend_mode = "additive",
       },
       west = {
-          filename = "__Bio_Industries__/graphics/entities/small-lamp/light-on-patch.png",
+          filename = "__Bio_Industries_2__/graphics/entities/small-lamp/light-on-patch.png",
           priority = "extra-high",
           frame_count = 1,
           width = 62,
diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/item.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/item.lua
index 488eab5..ab60ac6 100644
--- a/Bio_Industries_2/prototypes/Bio_Solar_Farm/item.lua
+++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/item.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
diff --git a/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua b/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua
index 2092f8c..a181a88 100644
--- a/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua
+++ b/Bio_Industries_2/prototypes/Bio_Solar_Farm/recipe.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
diff --git a/Bio_Industries_2/prototypes/Bio_Turret/entity.lua b/Bio_Industries_2/prototypes/Bio_Turret/entity.lua
index 113f8a9..15ce5dd 100644
--- a/Bio_Industries_2/prototypes/Bio_Turret/entity.lua
+++ b/Bio_Industries_2/prototypes/Bio_Turret/entity.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
@@ -203,7 +203,7 @@ return
 {
   layers = {
     {
-      filename = "__Bio_Industries__/graphics/entities/bio_turret/bio_turret.png",
+      filename = "__Bio_Industries_2__/graphics/entities/bio_turret/bio_turret.png",
       priority = "medium",
       scale = 0.5,
       width = 224,
@@ -274,7 +274,7 @@ data:extend({
       }, ]]
       range = 20,
       sound = {
-        filename = "__Bio_Industries__/sound/dart-turret.ogg",
+        filename = "__Bio_Industries_2__/sound/dart-turret.ogg",
         volume = 0.85
       },
     },
@@ -309,7 +309,7 @@ data:extend({
       projectile_creation_distance = 1.125,
       range = 17,
       sound = {
-        filename = "__Bio_Industries__/sound/dart-turret.ogg",
+        filename = "__Bio_Industries_2__/sound/dart-turret.ogg",
         volume = 0.65
       },
     },
diff --git a/Bio_Industries_2/prototypes/Bio_Turret/item-group.lua b/Bio_Industries_2/prototypes/Bio_Turret/item-group.lua
index 7ad24f6..a85145d 100644
--- a/Bio_Industries_2/prototypes/Bio_Turret/item-group.lua
+++ b/Bio_Industries_2/prototypes/Bio_Turret/item-group.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('common')('Bio_Industries')
+--~ local BioInd = require('common')('Bio_Industries_2')
 
 --~ local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
diff --git a/Bio_Industries_2/prototypes/Bio_Turret/item.lua b/Bio_Industries_2/prototypes/Bio_Turret/item.lua
index 6339a29..c40c89b 100644
--- a/Bio_Industries_2/prototypes/Bio_Turret/item.lua
+++ b/Bio_Industries_2/prototypes/Bio_Turret/item.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
diff --git a/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua b/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua
index 4c95a2a..6ecac23 100644
--- a/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua
+++ b/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
@@ -50,7 +50,7 @@ data:extend({
     order = "[bio-ammo]-a-[darts]-1",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
   --- Standard Dart Ammo
@@ -249,7 +249,7 @@ data:extend({
     order = "b[turret]-e[bi-dart-turret]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
   --- Dart Rifle
@@ -303,5 +303,5 @@ data:extend({
   },
   -- This is a custom property for use by "Krastorio 2" (it will change
   -- ingredients/results; used for wood/wood pulp)
-        mod = "Bio_Industries",
+        mod = "Bio_Industries_2",
 })
diff --git a/Bio_Industries_2/prototypes/Bio_Turret/technology-updates.lua b/Bio_Industries_2/prototypes/Bio_Turret/technology-updates.lua
index d098594..b8cc503 100644
--- a/Bio_Industries_2/prototypes/Bio_Turret/technology-updates.lua
+++ b/Bio_Industries_2/prototypes/Bio_Turret/technology-updates.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
diff --git a/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua b/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua
index c875a8e..24eb38a 100644
--- a/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua
+++ b/Bio_Industries_2/prototypes/Bio_Tweaks/recipe.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
diff --git a/Bio_Industries_2/prototypes/Industrial_Revolution.lua b/Bio_Industries_2/prototypes/Industrial_Revolution.lua
index dd26b2c..2de35e1 100644
--- a/Bio_Industries_2/prototypes/Industrial_Revolution.lua
+++ b/Bio_Industries_2/prototypes/Industrial_Revolution.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 if mods["IndustrialRevolution"] then
   ------------------------------------------------------------------------------------
diff --git a/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua b/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua
index 7e6ec54..3f036e0 100644
--- a/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua
+++ b/Bio_Industries_2/prototypes/Wood_Products/containers-entities.lua
@@ -2,7 +2,7 @@ if not BI.Settings.BI_Bigger_Wooden_Chests then
   return
 end
 
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 
 BioInd.writeDebug("Creating bigger wooden chests!")
diff --git a/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua b/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua
index f58e2d0..b83c7ed 100644
--- a/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua
+++ b/Bio_Industries_2/prototypes/Wood_Products/containers-item.lua
@@ -2,7 +2,7 @@ if not BI.Settings.BI_Bigger_Wooden_Chests then
   return
 end
 
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
 
diff --git a/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua b/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua
index 07e18ee..6893b17 100644
--- a/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua
+++ b/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua
@@ -2,7 +2,7 @@ if not BI.Settings.BI_Bigger_Wooden_Chests then
   return
 end
 
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
 
diff --git a/Bio_Industries_2/prototypes/Wood_Products/entities.lua b/Bio_Industries_2/prototypes/Wood_Products/entities.lua
index 3d24878..6333862 100644
--- a/Bio_Industries_2/prototypes/Wood_Products/entities.lua
+++ b/Bio_Industries_2/prototypes/Wood_Products/entities.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 local WOODPATH = BioInd.modRoot .. "/graphics/entities/wood_products/"
diff --git a/Bio_Industries_2/prototypes/Wood_Products/item.lua b/Bio_Industries_2/prototypes/Wood_Products/item.lua
index 5485d03..227dea7 100644
--- a/Bio_Industries_2/prototypes/Wood_Products/item.lua
+++ b/Bio_Industries_2/prototypes/Wood_Products/item.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
diff --git a/Bio_Industries_2/prototypes/Wood_Products/pipes.lua b/Bio_Industries_2/prototypes/Wood_Products/pipes.lua
index b2b77a8..7917aa1 100644
--- a/Bio_Industries_2/prototypes/Wood_Products/pipes.lua
+++ b/Bio_Industries_2/prototypes/Wood_Products/pipes.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('common')('Bio_Industries')
+--~ local BioInd = require('common')('Bio_Industries_2')
 
 --~ local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
@@ -134,7 +134,7 @@ local pipes_sheet = {
   }
 }
 
-local sheet_path = "__Bio_Industries__/graphics/entities/wood_products/wood_pipe/"
+local sheet_path = "__Bio_Industries_2__/graphics/entities/wood_products/wood_pipe/"
 local sheet_name = "pipe_sheet.png"
 
 function change_graphics (was_picture, sheet_element, quality)
diff --git a/Bio_Industries_2/prototypes/Wood_Products/recipe.lua b/Bio_Industries_2/prototypes/Wood_Products/recipe.lua
index bbb0607..249f1c5 100644
--- a/Bio_Industries_2/prototypes/Wood_Products/recipe.lua
+++ b/Bio_Industries_2/prototypes/Wood_Products/recipe.lua
@@ -1,4 +1,4 @@
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
 
@@ -51,7 +51,7 @@ data:extend({
     order = "a[energy]-b[small-electric-pole]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
   --- Huge Wooden Pole
@@ -103,7 +103,7 @@ data:extend({
     order = "a[energy]-d[big-electric-pole]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
   --- Wooden Fence
@@ -150,7 +150,7 @@ data:extend({
     subgroup = "defensive-structure",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
   --- Wooden Rail
@@ -411,7 +411,7 @@ data:extend({
     order = "a[pipe]-1a[pipe]",
     -- This is a custom property for use by "Krastorio 2" (it will change
     -- ingredients/results; used for wood/wood pulp)
-    mod = "Bio_Industries",
+    mod = "Bio_Industries_2",
   },
 
   -- Wood Pipe to Ground
diff --git a/Bio_Industries_2/prototypes/category.lua b/Bio_Industries_2/prototypes/category.lua
index f0a900b..0fc5b24 100644
--- a/Bio_Industries_2/prototypes/category.lua
+++ b/Bio_Industries_2/prototypes/category.lua
@@ -1,4 +1,4 @@
---~ local BioInd = require('common')('Bio_Industries')
+--~ local BioInd = require('common')('Bio_Industries_2')
 
 data:extend(
   {
@@ -8,11 +8,11 @@ data:extend(
       name = "bio-industries",
       order = "vaa-a",
       inventory_order = "v-a",
-      icon = "__Bio_Industries__/graphics/technology/BioIndustries_64.png",
+      icon = "__Bio_Industries_2__/graphics/technology/BioIndustries_64.png",
       icon_size = 64,
       icons = {
           {
-              icon = "__Bio_Industries__/graphics/technology/BioIndustries_64.png",
+              icon = "__Bio_Industries_2__/graphics/technology/BioIndustries_64.png",
               icon_size = 64,
           }
       },
diff --git a/Bio_Industries_2/prototypes/compound_entities/hidden_lamps.lua b/Bio_Industries_2/prototypes/compound_entities/hidden_lamps.lua
index 0473ee4..1b3c821 100644
--- a/Bio_Industries_2/prototypes/compound_entities/hidden_lamps.lua
+++ b/Bio_Industries_2/prototypes/compound_entities/hidden_lamps.lua
@@ -1,5 +1,5 @@
 -- Add functions that are also used in other files (debugging output etc.)
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 BioInd.writeDebug("Entered prototypes.hidden_lamps.lua of \"%s\".", {BioInd.modName})
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
diff --git a/Bio_Industries_2/prototypes/compound_entities/hidden_panels.lua b/Bio_Industries_2/prototypes/compound_entities/hidden_panels.lua
index df8bc80..2c41057 100644
--- a/Bio_Industries_2/prototypes/compound_entities/hidden_panels.lua
+++ b/Bio_Industries_2/prototypes/compound_entities/hidden_panels.lua
@@ -1,5 +1,5 @@
 -- Add functions that are also used in other files (debugging output etc.)
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 BioInd.writeDebug("Entered prototypes.hidden_panels.lua of \"%s\".", {BioInd.modName})
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
diff --git a/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua b/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua
index 4369356..9f42cd8 100644
--- a/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua
+++ b/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua
@@ -1,5 +1,5 @@
 -- Add functions that are also used in other files (debugging output etc.)
-local BioInd = require('common')('Bio_Industries')
+local BioInd = require('common')('Bio_Industries_2')
 BioInd.writeDebug("Entered prototypes.hidden_radars.lua of \"%s\".", {BioInd.modName})
 
 local ICONPATH = BioInd.modRoot .. "/graphics/icons/"
diff --git a/Bio_Industries_2/settings_changed.lua b/Bio_Industries_2/settings_changed.lua
index 629dc28..9126db9 100644
--- a/Bio_Industries_2/settings_changed.lua
+++ b/Bio_Industries_2/settings_changed.lua
@@ -4,7 +4,7 @@
 -- read!
 --------------------------------------------------------------------
 
---~ local BioInd = require('common')('Bio_Industries')
+--~ local BioInd = require('common')('Bio_Industries_2')
 
 local settings_changed = {}
 
@@ -32,7 +32,7 @@ log("Entered function settings_changed.musk_floor!")
     force = BioInd.MuskForceName
   -- Singleplayer mode: use force of first player
   elseif not game.is_multiplayer() then
-    -- Apparently, this crashed for someone (https://mods.factorio.com/mod/Bio_Industries/discussion/649d41b778d997d29385b8cf).
+    -- Apparently, this crashed for someone (https://mods.factorio.com/mod/Bio_Industries_2/discussion/649d41b778d997d29385b8cf).
     -- Could it be that a game that was originally a multiplayer game has been saved and reused
     -- as singleplayer game, but there was no player 1? Let's go over all players and break after
     -- the first hit, so we make sure we'll get the single player whatever its index!