diff --git a/bzgas2/compatibility/248k.lua b/bzgas2/compatibility/248k.lua
index 0bacfec..d16aab8 100644
--- a/bzgas2/compatibility/248k.lua
+++ b/bzgas2/compatibility/248k.lua
@@ -6,7 +6,7 @@ if mods["248k-Redux"] then
       type = "recipe",
       name = "acid-gas-breakdown",
       icons = {
-        {icon = "__bzgas__/graphics/icons/gas.png", icon_size = 128},
+        {icon = "__bzgas2__/graphics/icons/gas.png", icon_size = 128},
         {icon = "__248k-Redux-graphics__/ressources/fluids/fi_acid_gas.png", icon_size = 64, scale=0.25, shift={-8,-8}},
       },
       category = "chemistry",
diff --git a/bzgas2/gas-boiler/data.lua b/bzgas2/gas-boiler/data.lua
index f328f6e..53e561b 100644
--- a/bzgas2/gas-boiler/data.lua
+++ b/bzgas2/gas-boiler/data.lua
@@ -2,7 +2,7 @@ require("factsheet")
 
 -- Added by Brevven for bzgas
 -- local gd = "__gas-boiler__"
-local gd = "__bzgas__/gas-boiler"
+local gd = "__bzgas2__/gas-boiler"
 
 
 
diff --git a/bzgas2/gas-sim.lua b/bzgas2/gas-sim.lua
index c23cd55..58f45dd 100644
--- a/bzgas2/gas-sim.lua
+++ b/bzgas2/gas-sim.lua
@@ -10,7 +10,7 @@
 
 data.raw["utility-constants"]["default"].main_menu_simulations["gas-rig"] = {
   checkboard = false,
-  save = "__bzgas__/menu-simulations/gas-rig-sim.zip", length = 15*60,
+  save = "__bzgas2__/menu-simulations/gas-rig-sim.zip", length = 15*60,
   init =
   [[
     local logo = game.surfaces.nauvis.find_entities_filtered{
diff --git a/bzgas2/matter.lua b/bzgas2/matter.lua
index f0d50e9..acf60cf 100644
--- a/bzgas2/matter.lua
+++ b/bzgas2/matter.lua
@@ -15,7 +15,7 @@ data:extend(
         icon_size = 256,
       },
       {
-        icon = "__bzgas__/graphics/icons/gas.png",
+        icon = "__bzgas2__/graphics/icons/gas.png",
         icon_size = 128,
         scale = 1.4,
       }
diff --git a/bzgas2/me.lua b/bzgas2/me.lua
index 96a15cf..78bc781 100644
--- a/bzgas2/me.lua
+++ b/bzgas2/me.lua
@@ -1,6 +1,6 @@
 local me = {}
 
-me.name = "bzgas"
+me.name = "bzgas2"
 me.list = {}
 me.recipes = {"bakelite", "phenol", "phenol-from-oil"} -- formaldehyde excluded intentionally for theme
 
diff --git a/bzgas2/prototypes/bakelite.lua b/bzgas2/prototypes/bakelite.lua
index 303cdf0..5018dd3 100644
--- a/bzgas2/prototypes/bakelite.lua
+++ b/bzgas2/prototypes/bakelite.lua
@@ -9,7 +9,7 @@ data:extend({
   {
     type = "item",
     name = "bakelite",
-    icon = "__bzgas__/graphics/icons/bakelite.png",
+    icon = "__bzgas2__/graphics/icons/bakelite.png",
     icon_size = 128,
     subgroup = "raw-material",
     order = "g[bakelite]",
@@ -33,7 +33,7 @@ data:extend({
   {
     type = "technology",
     name = "bakelite",
-    icon = "__bzgas__/graphics/technology/bakelite.png",
+    icon = "__bzgas2__/graphics/technology/bakelite.png",
     icon_size = 256,
     prerequisites = b_prereq,
     effects = {
diff --git a/bzgas2/prototypes/basic-chemical-plant.lua b/bzgas2/prototypes/basic-chemical-plant.lua
index d9e3ab5..5ed79ac 100644
--- a/bzgas2/prototypes/basic-chemical-plant.lua
+++ b/bzgas2/prototypes/basic-chemical-plant.lua
@@ -31,7 +31,7 @@ plant_i.icon_size = nil
 plant_i.icon_mipmaps = nil
 plant_i.icons = {
   {icon="__base__/graphics/icons/chemical-plant.png", icon_size=64},
-  {icon="__bzgas__/graphics/icons/chemical-plant-overlay.png", icon_size=64},
+  {icon="__bzgas2__/graphics/icons/chemical-plant-overlay.png", icon_size=64},
 }
 
 data.raw.item["basic-chemical-plant"] = plant_i
@@ -47,17 +47,17 @@ plant_e.name = "basic-chemical-plant"
 plant_e.minable = {mining_time = 0.5, result = "basic-chemical-plant"}
 plant_e.module_slots = 0
 plant_e.graphics_set.working_visualisations = {plant_e.graphics_set.working_visualisations[1], plant_e.graphics_set.working_visualisations[2]} -- no smoke
-plant_e.graphics_set.animation.north.layers[1].filename="__bzgas__/graphics/entity/hr-chemical-plant.png"
-plant_e.graphics_set.animation.south.layers[1].filename="__bzgas__/graphics/entity/hr-chemical-plant.png"
-plant_e.graphics_set.animation.east.layers[1].filename="__bzgas__/graphics/entity/hr-chemical-plant.png"
-plant_e.graphics_set.animation.west.layers[1].filename="__bzgas__/graphics/entity/hr-chemical-plant.png"
+plant_e.graphics_set.animation.north.layers[1].filename="__bzgas2__/graphics/entity/hr-chemical-plant.png"
+plant_e.graphics_set.animation.south.layers[1].filename="__bzgas2__/graphics/entity/hr-chemical-plant.png"
+plant_e.graphics_set.animation.east.layers[1].filename="__bzgas2__/graphics/entity/hr-chemical-plant.png"
+plant_e.graphics_set.animation.west.layers[1].filename="__bzgas2__/graphics/entity/hr-chemical-plant.png"
 plant_e.next_upgrade="chemical-plant"
 plant_e.icon = nil
 plant_e.icon_size = nil
 plant_e.icon_mipmaps = nil
 plant_e.icons = {
   {icon="__base__/graphics/icons/chemical-plant.png", icon_size=64},
-  {icon="__bzgas__/graphics/icons/chemical-plant-overlay.png", icon_size=64},
+  {icon="__bzgas2__/graphics/icons/chemical-plant-overlay.png", icon_size=64},
 }
 
 plant_e.energy_source = {
diff --git a/bzgas2/prototypes/formaldehyde.lua b/bzgas2/prototypes/formaldehyde.lua
index a957ee6..36b0be4 100644
--- a/bzgas2/prototypes/formaldehyde.lua
+++ b/bzgas2/prototypes/formaldehyde.lua
@@ -16,7 +16,7 @@ data:extend({
     fuel_value = "0.5kJ",
     base_color = {r=0.77, g=0.87, b=0.67},
     flow_color = {r=0.77, g=0.87, b=0.77},
-    icon =  "__bzgas__/graphics/icons/formaldehyde.png",
+    icon =  "__bzgas2__/graphics/icons/formaldehyde.png",
     icon_size = 128,
     order = "a[fluid]-f[formaldehyde]"
   },
@@ -38,7 +38,7 @@ data:extend({
   {
     type = "technology",
     name = "basic-chemistry",
-    icon = "__bzgas__/graphics/technology/formaldehyde.png",
+    icon = "__bzgas2__/graphics/technology/formaldehyde.png",
     icon_size = 256,
     prerequisites = {"gas-extraction"},
     effects = {
diff --git a/bzgas2/prototypes/gas-extractor.lua b/bzgas2/prototypes/gas-extractor.lua
index e1ddf72..02f8b15 100644
--- a/bzgas2/prototypes/gas-extractor.lua
+++ b/bzgas2/prototypes/gas-extractor.lua
@@ -35,7 +35,7 @@ data:extend({
   {
     type = "item",
     name = "gas-extractor",
-    icon = "__bzgas__/graphics/icons/gas-extractor.png",
+    icon = "__bzgas2__/graphics/icons/gas-extractor.png",
     icon_size = 128,
     subgroup = "extraction-machine",
     order = "b[fluids]-b[gas-extractor]",
@@ -52,7 +52,7 @@ data:extend({
   {
     type = "technology",
     name = "gas-extraction",
-    icon = "__bzgas__/graphics/technology/gas-processing.png",
+    icon = "__bzgas2__/graphics/technology/gas-processing.png",
     icon_size = 256,
     --prerequisites = ge_prereq,
     effects = {
@@ -67,7 +67,7 @@ data:extend({
   {
     type = "mining-drill",
     name = "gas-extractor",
-    icon = "__bzgas__/graphics/icons/gas-extractor.png",
+    icon = "__bzgas2__/graphics/icons/gas-extractor.png",
     icon_size = 128,
     flags = {"placeable-neutral", "player-creation"},
     minable = {mining_time = 0.5, result = "gas-extractor"},
@@ -112,7 +112,7 @@ data:extend({
     base_render_layer = "lower-object-above-shadow",
     base_picture = {
       north = {
-        filename = "__bzgas__/graphics/entity/gas-extractor-base-n.png",
+        filename = "__bzgas2__/graphics/entity/gas-extractor-base-n.png",
         priority = "extra-high",
         width = 175,
         height = 179,
@@ -120,7 +120,7 @@ data:extend({
         shift = futil.by_pixel(0, -4),
       },
       south = {
-        filename = "__bzgas__/graphics/entity/gas-extractor-base-s.png",
+        filename = "__bzgas2__/graphics/entity/gas-extractor-base-s.png",
         priority = "extra-high",
         width = 175,
         height = 149,
@@ -128,7 +128,7 @@ data:extend({
         shift = futil.by_pixel(0, 13),
       },
       east = {
-        filename = "__bzgas__/graphics/entity/gas-extractor-base-e.png",
+        filename = "__bzgas2__/graphics/entity/gas-extractor-base-e.png",
         priority = "extra-high",
         width = 207,
         height = 129,
@@ -136,7 +136,7 @@ data:extend({
         shift = futil.by_pixel(8, 8),
       },
       west = {
-        filename = "__bzgas__/graphics/entity/gas-extractor-base-w.png",
+        filename = "__bzgas2__/graphics/entity/gas-extractor-base-w.png",
         priority = "extra-high",
         width = 207,
         height = 129,
@@ -149,7 +149,7 @@ data:extend({
         north = {
           layers = {
             {
-              filename = "__bzgas__/graphics/entity/gas-extractor-animated.png",
+              filename = "__bzgas2__/graphics/entity/gas-extractor-animated.png",
               priority = "extra-high",
               width = 267,
               height = 604,
@@ -161,7 +161,7 @@ data:extend({
             },
             {
               stripes = futil.multiplystripes(100, { {
-                filename = "__bzgas__/graphics/entity/gas-extractor-shadow.png",
+                filename = "__bzgas2__/graphics/entity/gas-extractor-shadow.png",
                 width_in_frames = 1,
                 height_in_frames = 1,
               } }),
diff --git a/bzgas2/prototypes/gas.lua b/bzgas2/prototypes/gas.lua
index 1d1e495..3a9325c 100644
--- a/bzgas2/prototypes/gas.lua
+++ b/bzgas2/prototypes/gas.lua
@@ -19,7 +19,7 @@ data:extend({
   {
     type = "resource",
     name = "gas",
-    icon =  "__bzgas__/graphics/icons/gas.png",
+    icon =  "__bzgas2__/graphics/icons/gas.png",
     icon_size = 128,
     flags = {"placeable-neutral"},
     category = "gas",
@@ -70,7 +70,7 @@ data:extend({
     {
       sheet =
       {
-        filename = "__bzgas__/graphics/entity/ores/hr-gas.png",
+        filename = "__bzgas2__/graphics/entity/ores/hr-gas.png",
         priority = "extra-high",
         width = 128,
         height = 128,
@@ -84,7 +84,7 @@ data:extend({
     {
       sheet =
       {
-        filename = "__bzgas__/graphics/entity/ores/hr-gas-effect.png",
+        filename = "__bzgas2__/graphics/entity/ores/hr-gas-effect.png",
         priority = "extra-high",
         width = 128,
         height = 128,
@@ -110,7 +110,7 @@ data:extend({
     emissions_multiplier = util.se6() and 1.1 or 0.75,
     base_color = {r=0.67, g=0.87, b=0.77},
     flow_color = {r=0.67, g=0.87, b=0.87},
-    icon =  "__bzgas__/graphics/icons/gas.png",
+    icon =  "__bzgas2__/graphics/icons/gas.png",
     icon_size = 128,
     order = "a[fluid]-f[gas]"
   },
diff --git a/bzgas2/prototypes/k2-recipe.lua b/bzgas2/prototypes/k2-recipe.lua
index 3e11b16..53aa9a4 100644
--- a/bzgas2/prototypes/k2-recipe.lua
+++ b/bzgas2/prototypes/k2-recipe.lua
@@ -9,7 +9,7 @@ if mods.Krastorio2 then
       main_product = "kr-hydrogen",
       icons = {
         {icon = "__Krastorio2Assets__/icons/fluids/hydrogen.png", icon_size = 64, icon_mipmaps = 4},
-        {icon =  "__bzgas__/graphics/icons/gas.png", icon_size = 128, scale = 0.125, shift={-8,-8}},
+        {icon =  "__bzgas2__/graphics/icons/gas.png", icon_size = 128, scale = 0.125, shift={-8,-8}},
       },
       enabled = false,
       ingredients = {
@@ -28,7 +28,7 @@ if mods.Krastorio2 then
       subgroup = "fluid-recipes",
       main_product = "formaldehyde",
       icons = {
-        {icon =  "__bzgas__/graphics/icons/formaldehyde.png", icon_size = 128, scale = 0.125},
+        {icon =  "__bzgas2__/graphics/icons/formaldehyde.png", icon_size = 128, scale = 0.125},
         {icon ="__Krastorio2Assets__/icons/fluids/biomethanol.png", icon_size = 64, scale = 0.125, icon_mipmaps = 4, shift={-5,-5}},
       },
       enabled = false,
diff --git a/bzgas2/prototypes/phenol.lua b/bzgas2/prototypes/phenol.lua
index a70fff0..538bada 100644
--- a/bzgas2/prototypes/phenol.lua
+++ b/bzgas2/prototypes/phenol.lua
@@ -6,12 +6,12 @@ data:extend({
   {
     type = "item",
     name = "phenol",
-    icon = "__bzgas__/graphics/icons/phenol.png", icon_size = 128,
+    icon = "__bzgas2__/graphics/icons/phenol.png", icon_size = 128,
     pictures = {
-      {filename = "__bzgas__/graphics/icons/phenol.png",   size = 128, scale = 0.25},
-      {filename = "__bzgas__/graphics/icons/phenol-2.png", size = 128, scale = 0.25},
-      {filename = "__bzgas__/graphics/icons/phenol-3.png", size = 128, scale = 0.25},
-      {filename = "__bzgas__/graphics/icons/phenol-4.png", size = 128, scale = 0.25},
+      {filename = "__bzgas2__/graphics/icons/phenol.png",   size = 128, scale = 0.25},
+      {filename = "__bzgas2__/graphics/icons/phenol-2.png", size = 128, scale = 0.25},
+      {filename = "__bzgas2__/graphics/icons/phenol-3.png", size = 128, scale = 0.25},
+      {filename = "__bzgas2__/graphics/icons/phenol-4.png", size = 128, scale = 0.25},
     },
     subgroup = "raw-material",
     order = "g[phenol]",
@@ -37,7 +37,7 @@ if data.raw.item[mods["Krastorio2"] and "kr-coke" or "coke"] then
         category = cat,
         main_product = "phenol",
         enabled = false,
-        icon = "__bzgas__/graphics/icons/phenol.png", icon_size = 128,
+        icon = "__bzgas2__/graphics/icons/phenol.png", icon_size = 128,
         ingredients = {{type="item", name="coal", amount=6}, {type="item", name="wood", amount=6}},
         energy_required = 16,
         subgroup = "raw-material",
@@ -55,7 +55,7 @@ if data.raw.item[mods["Krastorio2"] and "kr-coke" or "coke"] then
         category = cat,
         main_product = "phenol",
         enabled = false,
-		     icon = "__bzgas__/graphics/icons/phenol.png", icon_size = 128,
+		     icon = "__bzgas2__/graphics/icons/phenol.png", icon_size = 128,
         ingredients = {{type="item", name="coal", amount=4}},
         energy_required = 6.4,
 		     subgroup = "raw-material",
@@ -88,7 +88,7 @@ if data.raw.item[mods["Krastorio2"] and "kr-coke" or "coke"] then
       category = "chemistry",
       enabled = false,
       icons = {
-        {icon = "__bzgas__/graphics/icons/phenol.png", icon_size = 128},
+        {icon = "__bzgas2__/graphics/icons/phenol.png", icon_size = 128},
         light_oil_icon,
       },
       ingredients = {
diff --git a/bzgas2/prototypes/se-recipe.lua b/bzgas2/prototypes/se-recipe.lua
index 6302d7a..c6301ee 100644
--- a/bzgas2/prototypes/se-recipe.lua
+++ b/bzgas2/prototypes/se-recipe.lua
@@ -16,7 +16,7 @@ if util.se6() then
       main_product = "se-methane-gas",
       icons = {
         {icon =  "__space-exploration-graphics__/graphics/icons/fluid/methane-gas.png", icon_size = 64},
-        {icon =  "__bzgas__/graphics/icons/gas.png", icon_size = 128, scale = 0.125, shift={-8,-8}},
+        {icon =  "__bzgas2__/graphics/icons/gas.png", icon_size = 128, scale = 0.125, shift={-8,-8}},
       },
       enabled = false,
       ingredients = {
@@ -33,7 +33,7 @@ if util.se6() then
       category = "chemistry",
       subgroup = "fluid-recipes",
       icons = {
-        {icon =  "__bzgas__/graphics/icons/formaldehyde.png", icon_size = 128, scale = 0.125},
+        {icon =  "__bzgas2__/graphics/icons/formaldehyde.png", icon_size = 128, scale = 0.125},
         {icon =  "__space-exploration-graphics__/graphics/icons/fluid/methane-gas.png", icon_size = 64, scale = 0.125, shift={-8,-8}},
       },
       enabled = false,
diff --git a/bzgas2/stacking.lua b/bzgas2/stacking.lua
index 45892a4..40a9c1e 100644
--- a/bzgas2/stacking.lua
+++ b/bzgas2/stacking.lua
@@ -3,9 +3,9 @@
 local util = require("data-util");
 
 if deadlock then
-  deadlock.add_stack("bakelite",  "__bzgas__/graphics/icons/stacked/bakelite.png", "deadlock-stacking-1", 128)
+  deadlock.add_stack("bakelite",  "__bzgas2__/graphics/icons/stacked/bakelite.png", "deadlock-stacking-1", 128)
   if data.raw.item["phenol"] then
-    deadlock.add_stack("phenol",  "__bzgas__/graphics/icons/stacked/phenol.png", "deadlock-stacking-1", 128)
+    deadlock.add_stack("phenol",  "__bzgas2__/graphics/icons/stacked/phenol.png", "deadlock-stacking-1", 128)
   end
 end
 
diff --git a/bzgas2/strange-matter.lua b/bzgas2/strange-matter.lua
index 2318e82..2401ba5 100644
--- a/bzgas2/strange-matter.lua
+++ b/bzgas2/strange-matter.lua
@@ -1,7 +1,7 @@
 local util = require("data-util");
 
 local ore = "gas"
-local ore_icon = "__bzgas__/graphics/icons/gas.png"
+local ore_icon = "__bzgas2__/graphics/icons/gas.png"
 
 if mods["StrangeMatter"] then
 data:extend({