diff --git a/bztungsten2/advanced-carbon-furnace.lua b/bztungsten2/advanced-carbon-furnace.lua
index f6a20d5..d2a3094 100644
--- a/bztungsten2/advanced-carbon-furnace.lua
+++ b/bztungsten2/advanced-carbon-furnace.lua
@@ -1,5 +1,5 @@
 local futil = require("util");
-local util = require("__bztungsten__.data-util");
+local util = require("data-util");
 
 if util.me.get_setting("bztungsten-advanced-carbon-furnace") == "yes" and not mods.Krastorio2 and not mods.bzfoundry2 then
   log("Using advanced carbon furnace")
diff --git a/bztungsten2/compatibility/248k.lua b/bztungsten2/compatibility/248k.lua
index be65eee..37d054b 100644
--- a/bztungsten2/compatibility/248k.lua
+++ b/bztungsten2/compatibility/248k.lua
@@ -1,4 +1,4 @@
-local util = require("__bztungsten__.data-util");
+local util = require("data-util");
 
 if mods["248k-Redux"] then
   local cuw = util.me.cuw() and "cuw" or "tungsten-plate"
diff --git a/bztungsten2/data-final-fixes.lua b/bztungsten2/data-final-fixes.lua
index b616fa8..1f7142f 100644
--- a/bztungsten2/data-final-fixes.lua
+++ b/bztungsten2/data-final-fixes.lua
@@ -5,7 +5,7 @@ require("tungsten-recipe-final-rrr")
 
 
 
-local util = require("__bztungsten__.data-util");
+local util = require("data-util");
 
 -- Only burners can make tungsten carbide in vanilla
 for i, entity in pairs(data.raw.furnace) do
diff --git a/bztungsten2/info.json b/bztungsten2/info.json
index 226b6e9..53af9b4 100644
--- a/bztungsten2/info.json
+++ b/bztungsten2/info.json
@@ -1,5 +1,5 @@
 { 
-    "name": "bztungsten",
+    "name": "bztungsten2",
     "version": "0.7.13",
     "factorio_version": "2.0",
     "title": "Tungsten",
diff --git a/bztungsten2/me.lua b/bztungsten2/me.lua
index 68943e4..ab0226c 100644
--- a/bztungsten2/me.lua
+++ b/bztungsten2/me.lua
@@ -1,6 +1,6 @@
 local me = {}
 
-me.name = "bztungsten"
+me.name = "bztungsten2"
 me.tungsten_ore = "tungsten-ore"
 me.tungsten_plate = "tungsten-plate"
 me.tungsten_carbide_recipe = "tungsten-carbide"
diff --git a/bztungsten2/strange-matter.lua b/bztungsten2/strange-matter.lua
index 5afe28e..095bbf4 100644
--- a/bztungsten2/strange-matter.lua
+++ b/bztungsten2/strange-matter.lua
@@ -1,8 +1,8 @@
-local util = require("__bztungsten__.data-util");
+local util = require("__bztungsten2__.data-util");
 
 
 local ore = "tungsten-ore"
-local ore_icon = "__bztungsten__/graphics/icons/tungsten-ore.png"
+local ore_icon = "__bztungsten2__/graphics/icons/tungsten-ore.png"
 
 if mods["StrangeMatter"] then
 data:extend({
diff --git a/bztungsten2/tungsten-compressed.lua b/bztungsten2/tungsten-compressed.lua
index 498e84c..2f85c13 100644
--- a/bztungsten2/tungsten-compressed.lua
+++ b/bztungsten2/tungsten-compressed.lua
@@ -24,7 +24,7 @@ if simpleCompress then
       tungstenRecipe.results = {
         {type="item", name = "tungsten-plate", amount=simpleCompress.CompressedSmeltAmount},
       }
-      tungstenRecipe.icons = {{ icon = "__bztungsten__/graphics/icons/tungsten-plate.png", icon_size = 128 }}
+      tungstenRecipe.icons = {{ icon = "__bztungsten2__/graphics/icons/tungsten-plate.png", icon_size = 128 }}
       tungstenRecipe.subgroup = "raw-material"
       tungstenRecipe.order = "d[tungsten-plate]"
     end
diff --git a/bztungsten2/tungsten-enriched.lua b/bztungsten2/tungsten-enriched.lua
index e24bb23..71a81a2 100644
--- a/bztungsten2/tungsten-enriched.lua
+++ b/bztungsten2/tungsten-enriched.lua
@@ -1,5 +1,5 @@
 -- Enriched Titanium for Krastorio2
-local util = require("__bztungsten__.data-util");
+local util = require("data-util");
 
 if mods["Krastorio2"] then
 data:extend({
@@ -9,10 +9,10 @@ data:extend({
     icon_size = 64, icon_mipmaps = 3,
     icon = "__bztungsten__/graphics/icons/enriched-tungsten.png",
       pictures = {
-        {filename="__bztungsten__/graphics/icons/enriched-tungsten.png", size=64, scale=0.5},
-        {filename="__bztungsten__/graphics/icons/enriched-tungsten-2.png", size=64, scale=0.5},
-        {filename="__bztungsten__/graphics/icons/enriched-tungsten-3.png", size=64, scale=0.5},
-        {filename="__bztungsten__/graphics/icons/enriched-tungsten-4.png", size=64, scale=0.5},
+        {filename="__bztungsten2__/graphics/icons/enriched-tungsten.png", size=64, scale=0.5},
+        {filename="__bztungsten2__/graphics/icons/enriched-tungsten-2.png", size=64, scale=0.5},
+        {filename="__bztungsten2__/graphics/icons/enriched-tungsten-3.png", size=64, scale=0.5},
+        {filename="__bztungsten2__/graphics/icons/enriched-tungsten-4.png", size=64, scale=0.5},
       },
     subgroup = "raw-material",
     order = "e05-a[enriched-ores]-a1[enriched-tungsten]",
@@ -22,7 +22,7 @@ data:extend({
     type = "recipe",
     name = "enriched-tungsten",
     main_product = "enriched-tungsten",
-    icon = "__bztungsten__/graphics/icons/enriched-tungsten.png",
+    icon = "__bztungsten2__/graphics/icons/enriched-tungsten.png",
     icon_size = 64,
     category = "chemistry",
     energy_required = 3,
@@ -56,8 +56,8 @@ data:extend({
       name = "enriched-tungsten-plate",
       icons =
       {
-        { icon = "__bztungsten__/graphics/icons/tungsten-plate.png", icon_size = 128, icon_mipmaps = 3, },
-        { icon = "__bztungsten__/graphics/icons/enriched-tungsten.png", icon_size = 64, scale=0.25, shift= {-8, -8}},
+        { icon = "__bztungsten2__/graphics/icons/tungsten-plate.png", icon_size = 128, icon_mipmaps = 3, },
+        { icon = "__bztungsten2__/graphics/icons/enriched-tungsten.png", icon_size = 64, scale=0.25, shift= {-8, -8}},
       },
       category = "smelting",
       energy_required = 24,
diff --git a/bztungsten2/tungsten-matter.lua b/bztungsten2/tungsten-matter.lua
index d74e995..01c5974 100644
--- a/bztungsten2/tungsten-matter.lua
+++ b/bztungsten2/tungsten-matter.lua
@@ -9,7 +9,7 @@ if mods["Krastorio2"] then
       energy_required = 1,
       need_stabilizer = false,
       unlocked_by_technology = "tungsten-matter-processing",
-      icon = {icon = "__bztungsten__/graphics/icons/tungsten-ore.png", icon_size = 64, scale = 1.25}
+      icon = {icon = "__bztungsten2__/graphics/icons/tungsten-ore.png", icon_size = 64, scale = 1.25}
   })
 
   matter.make_recipes({
diff --git a/bztungsten2/tungsten-ore-particle.lua b/bztungsten2/tungsten-ore-particle.lua
index d3bc7dd..b3f0bef 100644
--- a/bztungsten2/tungsten-ore-particle.lua
+++ b/bztungsten2/tungsten-ore-particle.lua
@@ -8,7 +8,7 @@ data:extend(
     pictures =
     {
       {
-        filename = "__bztungsten__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-1.png",
+        filename = "__bztungsten2__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-1.png",
         priority = "extra-high",
         width = 32,
           height = 32,
@@ -16,7 +16,7 @@ data:extend(
           scale = 0.5
       },
       {
-        filename = "__bztungsten__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-2.png",
+        filename = "__bztungsten2__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-2.png",
         priority = "extra-high",
         width = 32,
           height = 32,
@@ -24,7 +24,7 @@ data:extend(
           scale = 0.5
       },
       {
-        filename = "__bztungsten__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-3.png",
+        filename = "__bztungsten2__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-3.png",
         priority = "extra-high",
         width = 32,
           height = 32,
@@ -32,7 +32,7 @@ data:extend(
           scale = 0.5
       },
       {
-        filename = "__bztungsten__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-4.png",
+        filename = "__bztungsten2__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-4.png",
         priority = "extra-high",
         width = 32,
           height = 32,
@@ -43,7 +43,7 @@ data:extend(
     shadows =
     {
       {
-        filename = "__bztungsten__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-shadow-1.png",
+        filename = "__bztungsten2__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-shadow-1.png",
         priority = "extra-high",
         width = 32,
           height = 32,
@@ -51,7 +51,7 @@ data:extend(
           scale = 0.5
       },
       {
-        filename = "__bztungsten__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-shadow-2.png",
+        filename = "__bztungsten2__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-shadow-2.png",
         priority = "extra-high",
        width = 32,
           height = 32,
@@ -59,7 +59,7 @@ data:extend(
           scale = 0.5
       },
       {
-        filename = "__bztungsten__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-shadow-3.png",
+        filename = "__bztungsten2__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-shadow-3.png",
         priority = "extra-high",
         width = 32,
           height = 32,
@@ -67,7 +67,7 @@ data:extend(
           scale = 0.5
       },
       {
-        filename = "__bztungsten__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-shadow-4.png",
+        filename = "__bztungsten2__/graphics/entity/tungsten-ore-particle/tungsten-ore-particle-shadow-4.png",
         priority = "extra-high",
         width = 32,
           height = 32,
diff --git a/bztungsten2/tungsten-ore.lua b/bztungsten2/tungsten-ore.lua
index 0f205de..beb6632 100644
--- a/bztungsten2/tungsten-ore.lua
+++ b/bztungsten2/tungsten-ore.lua
@@ -1,6 +1,6 @@
 local resource_autoplace = require('resource-autoplace');
 local item_sounds = require('__base__.prototypes.item_sounds')
-local util = require("__bztungsten__.data-util");
+local util = require("data-util");
 
 data.raw.planet.nauvis.map_gen_settings.autoplace_controls["tungsten-ore"] = {}
 data.raw.planet.nauvis.map_gen_settings.autoplace_settings.entity.settings["tungsten-ore"] = {}
@@ -51,7 +51,7 @@ data:extend({
         {
           sheet =
           {
-      filename = "__bztungsten__/graphics/entity/ores/tungsten-ore.png",
+      filename = "__bztungsten2__/graphics/entity/ores/tungsten-ore.png",
       priority = "extra-high",
       size = 128,
       frame_count = 8,
@@ -64,12 +64,12 @@ data:extend({
     type = "item",
     name = "tungsten-ore",
     icon_size = 64, icon_mipmaps = 3,
-    icon = "__bztungsten__/graphics/icons/tungsten-ore.png",
+    icon = "__bztungsten2__/graphics/icons/tungsten-ore.png",
     pictures = {
-      {filename="__bztungsten__/graphics/icons/tungsten-ore.png", size=64, scale=0.5},
-      {filename="__bztungsten__/graphics/icons/tungsten-ore-2.png", size=64, scale=0.5},
-      {filename="__bztungsten__/graphics/icons/tungsten-ore-3.png", size=64, scale=0.5},
-      {filename="__bztungsten__/graphics/icons/tungsten-ore-4.png", size=64, scale=0.5},
+      {filename="__bztungsten2__/graphics/icons/tungsten-ore.png", size=64, scale=0.5},
+      {filename="__bztungsten2__/graphics/icons/tungsten-ore-2.png", size=64, scale=0.5},
+      {filename="__bztungsten2__/graphics/icons/tungsten-ore-3.png", size=64, scale=0.5},
+      {filename="__bztungsten2__/graphics/icons/tungsten-ore-4.png", size=64, scale=0.5},
     },
     subgroup = "raw-resource",
     order = "t-c-a",
diff --git a/bztungsten2/tungsten-recipe-5d.lua b/bztungsten2/tungsten-recipe-5d.lua
index 7bf46c8..a79d5b6 100644
--- a/bztungsten2/tungsten-recipe-5d.lua
+++ b/bztungsten2/tungsten-recipe-5d.lua
@@ -1,4 +1,4 @@
-local util = require("__bztungsten__.data-util");
+local util = require("data-util");
 
 if mods["5dim_core"] then
 
@@ -36,14 +36,14 @@ if mods["5dim_core"] then
             name = "tungsten-dust",
             subgroup = "plates-dust",
             order = "d[tungsten-plate]",
-            icon = "__bztungsten__/graphics/icons/tungsten-powder.png",
+            icon = "__bztungsten2__/graphics/icons/tungsten-powder.png",
             icon_size = 64, icon_mipmaps = 3,
             stack_size = 200
         },
         {
             type = "recipe",
             name = "tungsten-plate-dust",
-            icon = "__bztungsten__/graphics/icons/tungsten-plate.png",
+            icon = "__bztungsten2__/graphics/icons/tungsten-plate.png",
             icon_size = 128, icon_mipmaps = 3,
             subgroup = "plates-plates2",
             order = "d[tungsten-plate]",
@@ -58,7 +58,7 @@ if mods["5dim_core"] then
         {
             type = "recipe",
             name = "tungsten-dust",
-            icon = "__bztungsten__/graphics/icons/tungsten-powder.png",
+            icon = "__bztungsten2__/graphics/icons/tungsten-powder.png",
             icon_size = 64, icon_mipmaps = 3,
             category = "mashering",
             subgroup = "",
@@ -78,7 +78,7 @@ if mods["5dim_core"] then
           category = "industrial-furnace",
           subgroup = "plates-industrial-dust",
           order = "ad[tungsten-plate]",
-          icon = "__bztungsten__/graphics/icons/tungsten-plate.png",
+          icon = "__bztungsten2__/graphics/icons/tungsten-plate.png",
           icon_size = 128, icon_mipmaps = 3,
           enabled = true,
           energy_required = 50,
@@ -91,7 +91,7 @@ if mods["5dim_core"] then
           category = "industrial-furnace",
           subgroup = "plates-industrial-ore",
           order = "ae[tungsten-carbide]",
-          icon = "__bztungsten__/graphics/icons/tungsten-carbide.png",
+          icon = "__bztungsten2__/graphics/icons/tungsten-carbide.png",
           icon_size = 128, icon_mipmaps = 3,
           enabled = true,
           energy_required = 500,
diff --git a/bztungsten2/tungsten-recipe-final-rrr.lua b/bztungsten2/tungsten-recipe-final-rrr.lua
index abda16a..f254194 100644
--- a/bztungsten2/tungsten-recipe-final-rrr.lua
+++ b/bztungsten2/tungsten-recipe-final-rrr.lua
@@ -1,4 +1,4 @@
-local util = require("__bztungsten__.data-util");
+local util = require("data-util");
 
 if mods["Rich-Rocks-Requiem"] then
   if data.raw.recipe["rrr-stone-processing"] then
diff --git a/bztungsten2/tungsten-recipe-final-stacking.lua b/bztungsten2/tungsten-recipe-final-stacking.lua
index f4eec28..72d80d3 100644
--- a/bztungsten2/tungsten-recipe-final-stacking.lua
+++ b/bztungsten2/tungsten-recipe-final-stacking.lua
@@ -1,20 +1,20 @@
 -- Deadlock stacking recipes
 
-local util = require("__bztungsten__.data-util");
+local util = require("data-util");
 
 if deadlock then
   deadlock.add_stack("tungsten-ore",  "__bztungsten__/graphics/icons/stacked/tungsten-ore-stacked.png", "deadlock-stacking-2", 64)
-  deadlock.add_stack("tungsten-plate", "__bztungsten__/graphics/icons/stacked/tungsten-plate-stacked.png" , "deadlock-stacking-2", 128)
-  deadlock.add_stack("tungsten-carbide", "__bztungsten__/graphics/icons/stacked/tungsten-carbide-stacked.png" , "deadlock-stacking-2", 128)
-  deadlock.add_stack("rocket-engine-nozzle", "__bztungsten__/graphics/icons/stacked/rocket-engine-nozzle-stacked.png" , "deadlock-stacking-2", 128)
+  deadlock.add_stack("tungsten-plate", "__bztungsten2__/graphics/icons/stacked/tungsten-plate-stacked.png" , "deadlock-stacking-2", 128)
+  deadlock.add_stack("tungsten-carbide", "__bztungsten2__/graphics/icons/stacked/tungsten-carbide-stacked.png" , "deadlock-stacking-2", 128)
+  deadlock.add_stack("rocket-engine-nozzle", "__bztungsten2__/graphics/icons/stacked/rocket-engine-nozzle-stacked.png" , "deadlock-stacking-2", 128)
   if mods["Krastorio2"] then
-    deadlock.add_stack("enriched-tungsten", "__bztungsten__/graphics/icons/stacked/enriched-tungsten-stacked.png" , "deadlock-stacking-2", 64)
+    deadlock.add_stack("enriched-tungsten", "__bztungsten2__/graphics/icons/stacked/enriched-tungsten-stacked.png" , "deadlock-stacking-2", 64)
   end
   if data.raw.item["tungsten-ingot"] then
     deadlock.add_stack("tungsten-ingot", nil, "deadlock-stacking-2", nil)
   end
   if util.me.cuw() then
-    deadlock.add_stack("cuw", "__bztungsten__/graphics/icons/stacked/cuw-stacked.png" , "deadlock-stacking-2", 128)
+    deadlock.add_stack("cuw", "__bztungsten2__/graphics/icons/stacked/cuw-stacked.png" , "deadlock-stacking-2", 128)
   end
   if data.raw.item["tungsten-powder"] then
     deadlock.add_stack("tungsten-powder", nil, "deadlock-stacking-2", nil)
diff --git a/bztungsten2/tungsten-recipe-se.lua b/bztungsten2/tungsten-recipe-se.lua
index ef833d6..1f2f05b 100644
--- a/bztungsten2/tungsten-recipe-se.lua
+++ b/bztungsten2/tungsten-recipe-se.lua
@@ -28,7 +28,7 @@ if string.sub(mods["space-exploration"], 1, 3) >= "0.6" then
   {
     type = "item",
     name = "tungsten-ingot",
-    icons = {{icon = "__bztungsten__/graphics/icons/tungsten-ingot.png", icon_size = 128}},
+    icons = {{icon = "__bztungsten2__/graphics/icons/tungsten-ingot.png", icon_size = 128}},
     order = "b-b",
     stack_size = 50,
     subgroup = "tungsten",
@@ -37,7 +37,7 @@ if string.sub(mods["space-exploration"], 1, 3) >= "0.6" then
   util.me.sinter() and {
     type = "item",
     name = "tungsten-powder",
-    icons = {{icon = "__bztungsten__/graphics/icons/tungsten-powder.png", icon_size = 64, icon_mipmaps = 3}},
+    icons = {{icon = "__bztungsten2__/graphics/icons/tungsten-powder.png", icon_size = 64, icon_mipmaps = 3}},
     order = "b-a-x",
     subgroup = "tungsten",
     stack_size = 200,
@@ -48,7 +48,7 @@ if string.sub(mods["space-exploration"], 1, 3) >= "0.6" then
     max_temperature = 3422,
     base_color = {r=255, g=160, b=60},
     flow_color = {r=255, g=160, b=60},
-    icons = {{icon = "__bztungsten__/graphics/icons/molten-tungsten.png", icon_size = 128}},
+    icons = {{icon = "__bztungsten2__/graphics/icons/molten-tungsten.png", icon_size = 128}},
     order = "a[molten]-a",
     pressure_to_speed_ratio = 0.4,
     flow_to_energy_ratio = 0.59,
@@ -109,10 +109,10 @@ if string.sub(mods["space-exploration"], 1, 3) >= "0.6" then
     name = "tungsten-carbide-casting",
     category = "casting",
     icons = {
-      {icon = "__bztungsten__/graphics/icons/tungsten-carbide.png", icon_size = 128},
+      {icon = "__bztungsten2__/graphics/icons/tungsten-carbide.png", icon_size = 128},
       util.me.sinter() and
-      {icon = "__bztungsten__/graphics/icons/tungsten-powder.png", icon_size = 64, scale = 0.25, shift = {-8, -8}} or
-      {icon = "__bztungsten__/graphics/icons/molten-tungsten.png", icon_size = 128, scale = 0.125, shift = {-8, -8}},
+      {icon = "__bztungsten2__/graphics/icons/tungsten-powder.png", icon_size = 64, scale = 0.25, shift = {-8, -8}} or
+      {icon = "__bztungsten2__/graphics/icons/molten-tungsten.png", icon_size = 128, scale = 0.125, shift = {-8, -8}},
     },
     results = {{type="item", name="tungsten-carbide", amount=4}},
     energy_required = 40,
@@ -129,8 +129,8 @@ if string.sub(mods["space-exploration"], 1, 3) >= "0.6" then
     category = "crafting",
     name = "tungsten-ingot-to-plate",
     icons = {
-      {icon = "__bztungsten__/graphics/icons/tungsten-plate.png", icon_size = 128},
-      {icon = "__bztungsten__/graphics/icons/tungsten-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}},
+      {icon = "__bztungsten2__/graphics/icons/tungsten-plate.png", icon_size = 128},
+      {icon = "__bztungsten2__/graphics/icons/tungsten-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}},
     },
     results = {
       {type="item", name = "tungsten-plate", amount = 10},
@@ -185,7 +185,7 @@ else
       },
       icons =
       {
-        { icon = "__bztungsten__/graphics/icons/tungsten-plate.png", icon_size = 128, icon_mipmaps = 3 },
+        { icon = "__bztungsten2__/graphics/icons/tungsten-plate.png", icon_size = 128, icon_mipmaps = 3 },
         { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}},
       },
     },
@@ -214,7 +214,7 @@ else
       },
       icons =
       {
-        { icon = "__bztungsten__/graphics/icons/tungsten-plate.png", icon_size = 128, icon_mipmaps = 3,},
+        { icon = "__bztungsten2__/graphics/icons/tungsten-plate.png", icon_size = 128, icon_mipmaps = 3,},
         { icon = "__space-exploration-graphics__/graphics/icons/vulcanite-block.png", icon_size = 64, scale=0.25, shift= {-10, -10}},
       },
     },
@@ -233,7 +233,7 @@ if mods["aai-industry"] and not mods["Krastorio2"] and not mods.bzfoundry2 then
     order = "z[tungsten-carbide]",
     icons =
     {
-      { icon = "__bztungsten__/graphics/icons/tungsten-carbide.png", icon_size = 128 },
+      { icon = "__bztungsten2__/graphics/icons/tungsten-carbide.png", icon_size = 128 },
       { icon = "__base__/graphics/icons/coal.png", icon_size = 64, icon_mipmaps=4, scale=0.25, shift= {-10, -10}},
     },
     enabled = false,
diff --git a/bztungsten2/tungsten-recipe-updates.lua b/bztungsten2/tungsten-recipe-updates.lua
index 835e04c..e41ae62 100644
--- a/bztungsten2/tungsten-recipe-updates.lua
+++ b/bztungsten2/tungsten-recipe-updates.lua
@@ -1,4 +1,4 @@
-local util = require("__bztungsten__.data-util");
+local util = require("data-util");
 
 local cuw = "tungsten-plate"
 if util.me.cuw() then cuw = "cuw" end
diff --git a/bztungsten2/tungsten-recipe.lua b/bztungsten2/tungsten-recipe.lua
index 164d200..9d38537 100644
--- a/bztungsten2/tungsten-recipe.lua
+++ b/bztungsten2/tungsten-recipe.lua
@@ -11,7 +11,7 @@ data:extend({
   {
     type = "item",
     name = "tungsten-carbide",
-    icon = "__bztungsten__/graphics/icons/tungsten-carbide.png",
+    icon = "__bztungsten2__/graphics/icons/tungsten-carbide.png",
     icon_size = 128,
     subgroup = "raw-material",
     order = "z[tungsten-carbide]",
@@ -20,7 +20,7 @@ data:extend({
   {
     type = "item",
     name = util.me.tungsten_plate,
-    icon = "__bztungsten__/graphics/icons/tungsten-plate.png",
+    icon = "__bztungsten2__/graphics/icons/tungsten-plate.png",
     icon_size = 128, icon_mipmaps = 3,
     subgroup = "raw-material",
     order = "b[tungsten-plate]",
@@ -37,13 +37,13 @@ data:extend({
     category = "smelting",
     order = "d[tungsten-plate]",
     icons = (mods["Krastorio2"] and {
-          { icon = "__bztungsten__/graphics/icons/tungsten-plate.png", icon_size = 128, icon_mipmaps = 3, },
-          { icon = "__bztungsten__/graphics/icons/tungsten-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}},
+          { icon = "__bztungsten2__/graphics/icons/tungsten-plate.png", icon_size = 128, icon_mipmaps = 3, },
+          { icon = "__bztungsten2__/graphics/icons/tungsten-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}},
         } or mods.bobplates and {
           { icon = "__bobplates__/graphics/icons/plate/tungsten-plate.png", icon_size = 32},
         } or
         {
-          { icon = "__bztungsten__/graphics/icons/tungsten-plate.png", icon_size = 128},
+          { icon = "__bztungsten2__/graphics/icons/tungsten-plate.png", icon_size = 128},
         }),
     enabled = false,
     energy_required = mods["Krastorio2"] and 24 or 32/15,
@@ -56,7 +56,7 @@ data:extend({
     icons = {{ icon =
       mods.bobplates
       and "__bobplates__/graphics/icons/technology/tungsten-processing.png"
-      or "__bztungsten__/graphics/technology/tungsten-processing.png",
+      or "__bztungsten2__/graphics/technology/tungsten-processing.png",
       icon_size = mods.bobplates and 64 or 256,
     }},
     effects =
@@ -90,7 +90,7 @@ data:extend({
   mods["TheBigFurnace"] and {
     type = "recipe",
     name = "big-tungsten-plate",
-    icons = { { icon = "__bztungsten__/graphics/icons/tungsten-plate.png", icon_size = 128 }, },
+    icons = { { icon = "__bztungsten2__/graphics/icons/tungsten-plate.png", icon_size = 128 }, },
     subgroup = "raw-material",
     category = "big-smelting",
     order = "d[tungsten-plate]",
@@ -141,7 +141,7 @@ data:extend({
     order = "z[tungsten-carbide]",
     icons = { mods.bobplates and 
       { icon = "__bobplates__/graphics/icons/plate/tungsten-carbide-plate.png", icon_size = 64}
-      or { icon = "__bztungsten__/graphics/icons/tungsten-carbide.png", icon_size = 128}
+      or { icon = "__bztungsten2__/graphics/icons/tungsten-carbide.png", icon_size = 128}
     },
     enabled = false,
     energy_required = mods["Krastorio2"] and 48 or 64/3,
@@ -154,7 +154,7 @@ data:extend({
   {
     type = "item",
     name = "rocket-engine-nozzle",
-    icon = "__bztungsten__/graphics/icons/rocket-engine-nozzle.png",
+    icon = "__bztungsten2__/graphics/icons/rocket-engine-nozzle.png",
     icon_size = 128,
     subgroup = "intermediate-product",
     order = "z[rocket-engine-nozzle]",
@@ -167,7 +167,7 @@ data:extend({
     subgroup = "intermediate-product",
     order = "z[rocket-engine-nozzle]",
     icons = {
-          { icon = "__bztungsten__/graphics/icons/rocket-engine-nozzle.png", icon_size = 128}
+          { icon = "__bztungsten2__/graphics/icons/rocket-engine-nozzle.png", icon_size = 128}
     },
     enabled = false,
     energy_required = 5,
@@ -181,7 +181,7 @@ if util.me.cuw() then
     {
       type = "item",
       name = "cuw",
-      icon = "__bztungsten__/graphics/icons/cuw.png",
+      icon = "__bztungsten2__/graphics/icons/cuw.png",
       icon_size = 128,
       subgroup = "raw-material",
       order = "z[cuw]",
diff --git a/bztungsten2/tungsten-sim.lua b/bztungsten2/tungsten-sim.lua
index 1e68503..796ab9d 100644
--- a/bztungsten2/tungsten-sim.lua
+++ b/bztungsten2/tungsten-sim.lua
@@ -11,7 +11,7 @@
 if (not mods["bobplates"] and not mods["angelssmelting"]) then
 data.raw["utility-constants"]["default"].main_menu_simulations["tungsten-nozzle"] = {
   checkboard = false,
-  save = "__bztungsten__/menu-simulations/tungsten-nozzle-sim.zip", length = 15*60,
+  save = "__bztungsten2__/menu-simulations/tungsten-nozzle-sim.zip", length = 15*60,
   init =
   [[
     local logo = game.surfaces.nauvis.find_entities_filtered{