diff --git a/bzlead2/compatibility/data/hot-metals.lua b/bzlead2/compatibility/data/hot-metals.lua
index 03b1e1e..821a467 100644
--- a/bzlead2/compatibility/data/hot-metals.lua
+++ b/bzlead2/compatibility/data/hot-metals.lua
@@ -2,12 +2,12 @@ local util = require("data-util");
 
 util.add_hot_metals({
   {name="lead-plate", icons={
-    { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64},
-    { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, tint={.9,.3,0, .5}},
+    { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64},
+    { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, tint={.9,.3,0, .5}},
   }},
   {name="lead-expansion-bolt", icons={
-    { icon = "__bzlead__/graphics/icons/lead-expansion-bolt.png", icon_size = 128},
-    { icon = "__bzlead__/graphics/icons/lead-expansion-bolt.png", icon_size = 128, tint={.9,.3,0, .5}},
+    { icon = "__bzlead2__/graphics/icons/lead-expansion-bolt.png", icon_size = 128},
+    { icon = "__bzlead2__/graphics/icons/lead-expansion-bolt.png", icon_size = 128, tint={.9,.3,0, .5}},
   }},
 })
 
diff --git a/bzlead2/data-final-fixes.lua b/bzlead2/data-final-fixes.lua
index e24546b..cd87934 100644
--- a/bzlead2/data-final-fixes.lua
+++ b/bzlead2/data-final-fixes.lua
@@ -4,7 +4,7 @@ require("lead-recipe-final-rrr")
 require("lead-recipe-final-stacking")
 
 ----
-local util = require("__bzlead__.data-util");
+local util = require("__bzlead2__.data-util");
 
 
 if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then
diff --git a/bzlead2/info.json b/bzlead2/info.json
index e915e3c..1f571c5 100644
--- a/bzlead2/info.json
+++ b/bzlead2/info.json
@@ -1,13 +1,13 @@
 {
-    "name": "bzlead",
-    "version": "2.0.27",
+    "name": "bzlead2",
+    "version": "2.0.29",
     "factorio_version": "2.0",
     "title": "Lead",
     "author": "Brevven",
     "contact": "",
     "homepage": "",
     "dependencies": [
-      "base >= 1.1.0",
+      "base >= 2.0.0",
       "? space-age",
       "? bzsilicon",
       "? hot-metals",
diff --git a/bzlead2/lead-asteroid-updates.lua b/bzlead2/lead-asteroid-updates.lua
index bb2ab06..30eee0d 100644
--- a/bzlead2/lead-asteroid-updates.lua
+++ b/bzlead2/lead-asteroid-updates.lua
@@ -20,7 +20,7 @@ if mods["space-age"] then
       {
         {icon="__space-age__/graphics/icons/metallic-asteroid-crushing.png", size=64},
         {icon="__base__/graphics/icons/iron-ore.png", size=64, scale=0.25, shift={-8,0}},
-        {icon="__bzlead__/graphics/icons/lead-ore.png", size=64, scale=0.25, shift={8,0}},
+        {icon="__bzlead2__/graphics/icons/lead-ore.png", size=64, scale=0.25, shift={8,0}},
       },
       category = "crushing",
       subgroup="space-crushing",
diff --git a/bzlead2/lead-compressed.lua b/bzlead2/lead-compressed.lua
index 05bbf7e..1e7b417 100644
--- a/bzlead2/lead-compressed.lua
+++ b/bzlead2/lead-compressed.lua
@@ -29,7 +29,7 @@ if simpleCompress then
           } or {
             {type="item", name = "lead-plate", amount=simpleCompress.CompressedSmeltAmount},
           }
-      leadRecipe.icons = {{ icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64 }}
+      leadRecipe.icons = {{ icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64 }}
       leadRecipe.subgroup = "raw-material"
       leadRecipe.order = "d[lead-plate]"
     end
diff --git a/bzlead2/lead-enriched.lua b/bzlead2/lead-enriched.lua
index 26bc32f..d62f037 100644
--- a/bzlead2/lead-enriched.lua
+++ b/bzlead2/lead-enriched.lua
@@ -8,13 +8,13 @@ data:extend(
     type = "item",
     name = "enriched-lead",
     icon_size = 64,
-    icon = "__bzlead__/graphics/icons/enriched-lead.png",
+    icon = "__bzlead2__/graphics/icons/enriched-lead.png",
     icon_mipmaps = 3,
     pictures = {
-      {filename="__bzlead__/graphics/icons/enriched-lead.png", size=64, scale=0.5},
-      {filename="__bzlead__/graphics/icons/enriched-lead-1.png", size=64, scale=0.5},
-      {filename="__bzlead__/graphics/icons/enriched-lead-2.png", size=64, scale=0.5},
-      {filename="__bzlead__/graphics/icons/enriched-lead-3.png", size=64, scale=0.5},
+      {filename="__bzlead2__/graphics/icons/enriched-lead.png", size=64, scale=0.5},
+      {filename="__bzlead2__/graphics/icons/enriched-lead-1.png", size=64, scale=0.5},
+      {filename="__bzlead2__/graphics/icons/enriched-lead-2.png", size=64, scale=0.5},
+      {filename="__bzlead2__/graphics/icons/enriched-lead-3.png", size=64, scale=0.5},
     },
     subgroup = "raw-material",
     order = "e05-a[enriched-ores]-a1[enriched-lead]",
@@ -24,7 +24,7 @@ data:extend(
     type = "recipe",
     name = "enriched-lead",
     main_product = "enriched-lead",
-    icon = "__bzlead__/graphics/icons/enriched-lead.png",
+    icon = "__bzlead2__/graphics/icons/enriched-lead.png",
     icon_size = 64,
     icon_mipmaps = 3,
     category = "chemistry",
@@ -60,8 +60,8 @@ data:extend(
       name = "enriched-lead-plate",
       icons =
       {
-        { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3 },
-        { icon = "__bzlead__/graphics/icons/enriched-lead.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}},
+        { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3 },
+        { icon = "__bzlead2__/graphics/icons/enriched-lead.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}},
       },
       category = "smelting",
       energy_required = 16,
diff --git a/bzlead2/lead-matter.lua b/bzlead2/lead-matter.lua
index 9d8f239..3a1b1b3 100644
--- a/bzlead2/lead-matter.lua
+++ b/bzlead2/lead-matter.lua
@@ -14,7 +14,7 @@ data:extend(
         icon_size = 256,
       },
       {
-        icon = "__bzlead__/graphics/icons/lead-ore.png",
+        icon = "__bzlead2__/graphics/icons/lead-ore.png",
         icon_size = 64, icon_mipmaps = 3,
         scale = 1.25,
       }
diff --git a/bzlead2/lead-ore-particle.lua b/bzlead2/lead-ore-particle.lua
index 5d094dc..bb4d645 100644
--- a/bzlead2/lead-ore-particle.lua
+++ b/bzlead2/lead-ore-particle.lua
@@ -8,7 +8,7 @@ data:extend(
     pictures =
     {
       {
-          filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-1.png",
+          filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-1.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -16,7 +16,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-2.png",
+          filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-2.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -24,7 +24,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-3.png",
+          filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-3.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -32,7 +32,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-4.png",
+          filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-4.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -43,7 +43,7 @@ data:extend(
     shadows =
     {
       {
-          filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png",
+          filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-1.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -51,7 +51,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png",
+          filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-2.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -59,7 +59,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png",
+          filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-3.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -67,7 +67,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzlead__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png",
+          filename = "__bzlead2__/graphics/entity/lead-ore-particle/hr-lead-ore-particle-shadow-4.png",
           priority = "extra-high",
           width = 32,
           height = 32,
diff --git a/bzlead2/lead-ore.lua b/bzlead2/lead-ore.lua
index 4868082..8f1672c 100644
--- a/bzlead2/lead-ore.lua
+++ b/bzlead2/lead-ore.lua
@@ -1,5 +1,5 @@
 local resource_autoplace = require('resource-autoplace')
-local util = require("__bzlead__.data-util");
+local util = require("data-util");
 local item_sounds = require('__base__.prototypes.item_sounds')
 
 data.raw.planet.nauvis.map_gen_settings.autoplace_controls["lead-ore"] = {}
@@ -29,7 +29,7 @@ data:extend({
     icon_size = 64, icon_mipmaps = 3,
     category="basic-solid",
     name = "lead-ore",
-    icon = "__bzlead__/graphics/icons/lead-ore.png",
+    icon = "__bzlead2__/graphics/icons/lead-ore.png",
     flags = {"placeable-neutral"},
     order="a-b-a",
     map_color = {r=0.35, g=0.10, b=0.10},
@@ -57,7 +57,7 @@ data:extend({
     stages =
     {
       sheet = {
-        filename = "__bzlead__/graphics/entity/ores/hr-lead-ore.png",
+        filename = "__bzlead2__/graphics/entity/ores/hr-lead-ore.png",
         priority = "extra-high",
         size = 128,
         frame_count = 8,
@@ -70,12 +70,12 @@ data:extend({
       type = "item",
       name = "lead-ore",
       icon_size = 64, icon_mipmaps = 3,
-      icon = "__bzlead__/graphics/icons/lead-ore.png",
+      icon = "__bzlead2__/graphics/icons/lead-ore.png",
       pictures = {
-        {filename="__bzlead__/graphics/icons/lead-ore.png", size=64, scale=0.5},
-        {filename="__bzlead__/graphics/icons/lead-ore-1.png", size=64, scale=0.5},
-        {filename="__bzlead__/graphics/icons/lead-ore-2.png", size=64, scale=0.5},
-        {filename="__bzlead__/graphics/icons/lead-ore-3.png", size=64, scale=0.5},
+        {filename="__bzlead2__/graphics/icons/lead-ore.png", size=64, scale=0.5},
+        {filename="__bzlead2__/graphics/icons/lead-ore-1.png", size=64, scale=0.5},
+        {filename="__bzlead2__/graphics/icons/lead-ore-2.png", size=64, scale=0.5},
+        {filename="__bzlead2__/graphics/icons/lead-ore-3.png", size=64, scale=0.5},
       },
       subgroup = "raw-resource",
       order = "t-c-a",
diff --git a/bzlead2/lead-recipe-colors.lua b/bzlead2/lead-recipe-colors.lua
index b1f07e1..eaa0c05 100644
--- a/bzlead2/lead-recipe-colors.lua
+++ b/bzlead2/lead-recipe-colors.lua
@@ -1,4 +1,4 @@
-local util = require("__bzlead__.data-util");
+local util = require("data-util");
 
 
 
diff --git a/bzlead2/lead-recipe-final-5d.lua b/bzlead2/lead-recipe-final-5d.lua
index 7694bb4..ccedb9e 100644
--- a/bzlead2/lead-recipe-final-5d.lua
+++ b/bzlead2/lead-recipe-final-5d.lua
@@ -1,4 +1,4 @@
-local util = require("__bzlead__.data-util");
+local util = require("data-util");
 
 if mods["5dim_core"] then
 local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate"
@@ -16,7 +16,7 @@ local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate"
         category = "industrial-furnace",
         subgroup = "plates-industrial-ore",
         order = "ad[lead-plate]",
-        icon = "__bzlead__/graphics/icons/lead-plate.png",
+        icon = "__bzlead2__/graphics/icons/lead-plate.png",
         icon_size = 64, icon_mipmaps = 3,
         enabled = true,
         energy_required = 65,
@@ -35,14 +35,14 @@ local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate"
               name = "lead-dust",
               subgroup = "plates-dust",
               order = "d[lead-plate]",
-              icon = "__bzlead__/graphics/icons/lead-powder.png",
+              icon = "__bzlead2__/graphics/icons/lead-powder.png",
               icon_size = 64, icon_mipmaps = 3,
               stack_size = 200
           },
           {
               type = "recipe",
               name = "lead-plate-dust",
-              icon = "__bzlead__/graphics/icons/lead-plate.png",
+              icon = "__bzlead2__/graphics/icons/lead-plate.png",
               icon_size = 64, icon_mipmaps = 3,
               subgroup = "plates-plates2",
               order = "d[lead-plate]",
@@ -60,7 +60,7 @@ local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate"
               type = "recipe",
               name = "lead-dust",
               main_product = "lead-dust",
-              icon = "__bzlead__/graphics/icons/lead-powder.png",
+              icon = "__bzlead2__/graphics/icons/lead-powder.png",
               icon_size = 64, icon_mipmaps = 3,
               category = "mashering",
               subgroup = "",
@@ -80,7 +80,7 @@ local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate"
             category = "industrial-furnace",
             subgroup = "plates-industrial-dust",
             order = "ad[lead-plate]",
-            icon = "__bzlead__/graphics/icons/lead-plate.png",
+            icon = "__bzlead2__/graphics/icons/lead-plate.png",
             icon_size = 64, icon_mipmaps = 3,
             enabled = true,
             energy_required = 65,
diff --git a/bzlead2/lead-recipe-final-rrr.lua b/bzlead2/lead-recipe-final-rrr.lua
index 6e57a43..134e9ab 100644
--- a/bzlead2/lead-recipe-final-rrr.lua
+++ b/bzlead2/lead-recipe-final-rrr.lua
@@ -1,4 +1,4 @@
-local util = require("__bzlead__.data-util");
+local util = require("data-util");
 
 if mods["Rich-Rocks-Requiem"] then
   if data.raw.recipe["rrr-stone-processing"] then
diff --git a/bzlead2/lead-recipe-final-stacking.lua b/bzlead2/lead-recipe-final-stacking.lua
index 4619c65..16b59d0 100644
--- a/bzlead2/lead-recipe-final-stacking.lua
+++ b/bzlead2/lead-recipe-final-stacking.lua
@@ -1,11 +1,11 @@
-local util = require("__bzlead__.data-util");
+local util = require("data-util");
 
 -- Deadlock stacking recipes
 if deadlock and deadlock["add_stack"] then
-  deadlock.add_stack("lead-ore",  "__bzlead__/graphics/icons/stacked/lead-ore-stacked.png", "deadlock-stacking-1", 64)
-  deadlock.add_stack("lead-plate", "__bzlead__/graphics/icons/stacked/lead-plate-stacked.png" , "deadlock-stacking-1", 64)
+  deadlock.add_stack("lead-ore",  "__bzlead2__/graphics/icons/stacked/lead-ore-stacked.png", "deadlock-stacking-1", 64)
+  deadlock.add_stack("lead-plate", "__bzlead2__/graphics/icons/stacked/lead-plate-stacked.png" , "deadlock-stacking-1", 64)
   if util.k2() then
-    deadlock.add_stack("enriched-lead", "__bzlead__/graphics/icons/stacked/enriched-lead-stacked.png" , "deadlock-stacking-1", 64)
+    deadlock.add_stack("enriched-lead", "__bzlead2__/graphics/icons/stacked/enriched-lead-stacked.png" , "deadlock-stacking-1", 64)
   end
   if data.raw.item["lead-ingot"] then
     deadlock.add_stack("lead-ingot", nil, "deadlock-stacking-1", nil)
diff --git a/bzlead2/lead-recipe-se.lua b/bzlead2/lead-recipe-se.lua
index cf5b0a4..c1626eb 100644
--- a/bzlead2/lead-recipe-se.lua
+++ b/bzlead2/lead-recipe-se.lua
@@ -20,7 +20,7 @@ if mods["space-exploration"] then
   {
     type = "item",
     name = "lead-ingot",
-    icons = {{icon = "__bzlead__/graphics/icons/lead-ingot.png", icon_size = 128}},
+    icons = {{icon = "__bzlead2__/graphics/icons/lead-ingot.png", icon_size = 128}},
     order = "b-b",
     stack_size = 50,
     subgroup = "lead",
@@ -32,7 +32,7 @@ if mods["space-exploration"] then
     max_temperature = 600,
     base_color = {r=121, g=80, b=80},
     flow_color = {r=121, g=80, b=80},
-    icons = {{icon = "__bzlead__/graphics/icons/molten-lead.png", icon_size = 128}},
+    icons = {{icon = "__bzlead2__/graphics/icons/molten-lead.png", icon_size = 128}},
     order = "a[molten]-a",
     pressure_to_speed_ratio = 0.4,
     flow_to_energy_ratio = 0.59,
@@ -77,8 +77,8 @@ if mods["space-exploration"] then
     name = "lead-ingot-to-plate",
 
     icons = {
-      {icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3},
-      {icon = "__bzlead__/graphics/icons/lead-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}},
+      {icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3},
+      {icon = "__bzlead2__/graphics/icons/lead-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}},
     },
     results = {
       {type="item", name = "lead-plate", amount = 10},
diff --git a/bzlead2/lead-recipe-updates.lua b/bzlead2/lead-recipe-updates.lua
index e693144..1ea9603 100644
--- a/bzlead2/lead-recipe-updates.lua
+++ b/bzlead2/lead-recipe-updates.lua
@@ -1,6 +1,6 @@
 -- Titanium recipe & tech changes
 --
-local util = require("__bzlead__.data-util");
+local util = require("data-util");
 
 local leb = util.me.more_entities() and "lead-expansion-bolt" or "lead-plate"
 
diff --git a/bzlead2/lead-recipe.lua b/bzlead2/lead-recipe.lua
index dbfda83..2131137 100644
--- a/bzlead2/lead-recipe.lua
+++ b/bzlead2/lead-recipe.lua
@@ -1,6 +1,6 @@
 -- Lead smelting
 
-local util = require("__bzlead__.data-util");
+local util = require("data-util");
 local item_sounds = require('__base__.prototypes.item_sounds')
 
 if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"] and not mods["IndustrialRevolution"]) then
@@ -12,10 +12,10 @@ data:extend({
     order = "d[lead-plate]",
     icons = (util.k2() and
         {
-          { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, },
-          { icon = "__bzlead__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}},
+          { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, },
+          { icon = "__bzlead2__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}},
         } or {
-          { icon = "__bzlead__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, },
+          { icon = "__bzlead2__/graphics/icons/lead-plate.png", icon_size = 64, icon_mipmaps = 3, },
         }
 ),
     main_product = util.me.lead_plate,
@@ -59,7 +59,7 @@ data:extend({
   {
     type = "item",
     name = util.me.lead_plate,
-    icon = "__bzlead__/graphics/icons/lead-plate.png",
+    icon = "__bzlead2__/graphics/icons/lead-plate.png",
     icon_size = 64, icon_mipmaps = 3,
     subgroup = "raw-material",
     order = "b[lead-plate]",
@@ -107,7 +107,7 @@ data:extend({
     subgroup = "intermediate-product",
     rocket_capacity = 1000,
     stack_size=100,
-    icon = "__bzlead__/graphics/icons/lead-expansion-bolt.png",
+    icon = "__bzlead2__/graphics/icons/lead-expansion-bolt.png",
     icon_size = 128,
     order = "a[basic-intermediates]-e[expansion-bolt]",
     weight = 2*kg,
@@ -136,9 +136,9 @@ data:extend({
     subgroup = "vulcanus-processes",
     order = "z[casting]-d[casting-solder]",
     icons = {
-      {icon = "__bzlead__/graphics/icons/lead-expansion-bolt.png", icon_size = 128, shift={0,8}},
+      {icon = "__bzlead2__/graphics/icons/lead-expansion-bolt.png", icon_size = 128, shift={0,8}},
       {icon = "__space-age__/graphics/icons/fluid/molten-iron.png", icon_size = 64, shift={-4,-4}},
-      {icon = "__bzlead__/graphics/icons/molten-lead-sa.png", icon_size = 64, shift={4,-4}},
+      {icon = "__bzlead2__/graphics/icons/molten-lead-sa.png", icon_size = 64, shift={4,-4}},
     },
     enabled = false,
     ingredients = {
@@ -162,7 +162,7 @@ data:extend({
   {
     type = "fluid",
     name = "molten-lead",
-    icon = "__bzlead__/graphics/icons/molten-lead-sa.png",
+    icon = "__bzlead2__/graphics/icons/molten-lead-sa.png",
     subgroup = "fluid",
     order = "b[new-fluid]-b[vulcanus]-d[molten-lead]",
     default_temperature = 1500,
@@ -177,7 +177,7 @@ data:extend({
     name = "molten-lead-from-lava",
     icons = {
      {icon = "__base__/graphics/icons/stone.png", icon_size=64, shift={-8,8}},
-     {icon = "__bzlead__/graphics/icons/molten-lead-sa.png", icon_size=64, shift={8,8}},
+     {icon = "__bzlead2__/graphics/icons/molten-lead-sa.png", icon_size=64, shift={8,8}},
      {icon = "__space-age__/graphics/icons/fluid/lava.png", icon_size=64, shift={0,-8}},
     },
     category = "metallurgy",
@@ -231,8 +231,8 @@ data:extend({
     subgroup = "vulcanus-processes",
     order = "b[casting]-d[casting-lead]",
     icons = {
-      {icon = "__bzlead__/graphics/icons/lead-plate.png", size = 64, shift={-4,4}},
-      {icon = "__bzlead__/graphics/icons/molten-lead-sa.png", size = 64, shift={4,-4}},
+      {icon = "__bzlead2__/graphics/icons/lead-plate.png", size = 64, shift={-4,4}},
+      {icon = "__bzlead2__/graphics/icons/molten-lead-sa.png", size = 64, shift={4,-4}},
     },
     enabled = false,
     ingredients =
@@ -256,7 +256,7 @@ data:extend({
     type = "item",
     name = "chelated-lead",
     icons = {
-      {icon="__bzlead__/graphics/icons/lead-powder.png", icon_size = 64}
+      {icon="__bzlead2__/graphics/icons/lead-powder.png", icon_size = 64}
     },
     subgroup = "agriculture-processes",
     order = "b[agriculture]-c[lead]",
@@ -275,7 +275,7 @@ data:extend({
     order = "e[chelation]-a[lead]",
     icons = {
       {icon = "__space-age__/graphics/icons/yumako-mash.png", size=64, shift={-4,-4}},
-      {icon="__bzlead__/graphics/icons/lead-powder.png", icon_size = 64, shift={4,4}},
+      {icon="__bzlead2__/graphics/icons/lead-powder.png", icon_size = 64, shift={4,4}},
     },
     enabled = false,
     allow_productivity = true,
@@ -301,7 +301,7 @@ data:extend({
     auto_recycle_helper = false,
     icons = {
       {icon = "__base__/graphics/icons/fluid/sulfuric-acid.png", size = 64, shift={-4,-4}},
-      {icon = "__bzlead__/graphics/icons/lead-ore.png", size = 64, shift={4,4}},
+      {icon = "__bzlead2__/graphics/icons/lead-ore.png", size = 64, shift={4,4}},
     },
     enabled = false,
     allow_productivity = true,
@@ -366,7 +366,7 @@ data:extend({
     icons = (util.k2() and
         {
           { icon = "__IndustrialRevolution__/graphics/icons/64/lead-ingot.png", icon_size = 64, icon_mipmaps = 4, },
-          { icon = "__bzlead__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}},
+          { icon = "__bzlead2__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}},
         } or {
           { icon = "__IndustrialRevolution__/graphics/icons/64/lead-ingot.png", icon_size = 64, icon_mipmaps = 4, },
         }),
@@ -419,7 +419,7 @@ data:extend({
     { icon = util.k2assets().."/icons/items/pistol-ammo-1.png", icon_size = 64},
     { icon = "__base__/graphics/icons/iron-plate.png", icon_size = 64,
       scale=0.25, shift= {8, -6}},
-    { icon = "__bzlead__/graphics/icons/lead-plate.png",
+    { icon = "__bzlead2__/graphics/icons/lead-plate.png",
       icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -6}},
   },
 },
@@ -451,7 +451,7 @@ data:extend({
     { icon = util.k2assets().."/icons/items/pistol-ammo-1.png", icon_size = 64},
     { icon = "__base__/graphics/icons/copper-plate.png", icon_size = 64,
       scale=0.25, shift= {8, -6}},
-    { icon = "__bzlead__/graphics/icons/lead-plate.png",
+    { icon = "__bzlead2__/graphics/icons/lead-plate.png",
       icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -6}},
   },
 },
@@ -468,7 +468,7 @@ data:extend({
     { icon = util.k2assets().."/icons/ammo/rifle-magazine.png", icon_size = 64},
     { icon = "__base__/graphics/icons/iron-plate.png", icon_size = 64,
       scale=0.25, shift= {8, -6}},
-    { icon = "__bzlead__/graphics/icons/lead-plate.png",
+    { icon = "__bzlead2__/graphics/icons/lead-plate.png",
       icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -6}},
   },
 },
@@ -500,7 +500,7 @@ data:extend({
     { icon = util.k2assets().."/icons/ammo/rifle-magazine.png", icon_size = 64},
     { icon = "__base__/graphics/icons/copper-plate.png", icon_size = 64,
       scale=0.25, shift= {8, -6}},
-    { icon = "__bzlead__/graphics/icons/lead-plate.png",
+    { icon = "__bzlead2__/graphics/icons/lead-plate.png",
       icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -6}},
   },
 },
@@ -522,7 +522,7 @@ data:extend({
     { icon = "__base__/graphics/icons/firearm-magazine.png", icon_size = 64},
     { icon = "__base__/graphics/icons/iron-plate.png", icon_size = 64,
       scale=0.25, shift= {8, -8}},
-    { icon = "__bzlead__/graphics/icons/lead-plate.png",
+    { icon = "__bzlead2__/graphics/icons/lead-plate.png",
       icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}},
   },
 },
@@ -556,7 +556,7 @@ data:extend({
     { icon = "__base__/graphics/icons/firearm-magazine.png", icon_size = 64},
     { icon = "__base__/graphics/icons/copper-plate.png", icon_size = 64,
       scale=0.25, shift= {8, -8}},
-    { icon = "__bzlead__/graphics/icons/lead-plate.png",
+    { icon = "__bzlead2__/graphics/icons/lead-plate.png",
       icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {-8, -8}},
   },
 },
diff --git a/bzlead2/lead-sim.lua b/bzlead2/lead-sim.lua
index 9cc3551..2503bfd 100644
--- a/bzlead2/lead-sim.lua
+++ b/bzlead2/lead-sim.lua
@@ -11,7 +11,7 @@
 if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then
 data.raw["utility-constants"]["default"].main_menu_simulations["lead-ammo"] = {
   checkboard = false,
-  save = "__bzlead__/menu-simulations/lead-ammo-sim.zip", length = 15*60,
+  save = "__bzlead2__/menu-simulations/lead-ammo-sim.zip", length = 15*60,
   init =
   [[
     local logo = game.surfaces.nauvis.find_entities_filtered{
diff --git a/bzlead2/me.lua b/bzlead2/me.lua
index 0864b75..bfcc419 100644
--- a/bzlead2/me.lua
+++ b/bzlead2/me.lua
@@ -1,6 +1,6 @@
 local me = {}
 
-me.name = "bzlead"
+me.name = "bzlead2"
 me.resources = {{"lead-ore", "nauvis"}}
 me.fluid_mining = false
 me.lead_ore = "lead-ore"
diff --git a/bzlead2/omni.lua b/bzlead2/omni.lua
index a80c779..3f54567 100644
--- a/bzlead2/omni.lua
+++ b/bzlead2/omni.lua
@@ -1,4 +1,4 @@
-local util = require("__bzlead__.data-util");
+local util = require("data-util");
 
 if (not mods["pyrawores"] and not mods["bobplates"] and not mods["angelssmelting"]) then
 if omni and omni.matter then
@@ -10,7 +10,7 @@ if omni and omni.matter then
    data.raw.recipe["omnicium-plate-mix"].icons = 
     {
       {icon = data.raw.item["omnicium-plate"].icons[1].icon},
-      {icon = "__bzlead__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {8, -8}},
+      {icon = "__bzlead2__/graphics/icons/lead-ore.png", icon_size = 64, icon_mipmaps = 3, scale=0.25, shift= {8, -8}},
       {icon = "__base__/graphics/icons/iron-ore.png", scale =0.25, icon_size=64, shift={-6, 6}},
     }
   end
diff --git a/bzlead2/other-entities.lua b/bzlead2/other-entities.lua
index ecfae7e..4e6babb 100644
--- a/bzlead2/other-entities.lua
+++ b/bzlead2/other-entities.lua
@@ -1,4 +1,4 @@
-local leadutil = require("__bzlead__.data-util");
+local leadutil = require("data-util");
 require("data-util")
 
 if leadutil.me.more_entities() and data.raw.item["lead-plate"] then
@@ -7,7 +7,7 @@ data:extend({
   {
     type = "item",
     name = "lead-chest",
-    icon = "__bzlead__/graphics/icons/lead-chest.png",
+    icon = "__bzlead2__/graphics/icons/lead-chest.png",
     icon_size = 64, icon_mipmaps = 3,
     subgroup = "storage",
     order = "a[items]-az[lead-chest]",
@@ -24,7 +24,7 @@ data:extend({
 {
     type = "container",
     name = "lead-chest",
-    icon = "__bzlead__/graphics/icons/lead-chest.png",
+    icon = "__bzlead2__/graphics/icons/lead-chest.png",
     icon_size = 64, icon_mipmaps = 3,
     flags = {"placeable-neutral", "player-creation"},
     minable = {mining_time = 0.2, result = "lead-chest"},
@@ -55,7 +55,7 @@ data:extend({
       layers =
       {
         {
-            filename = "__bzlead__/graphics/entity/hr-lead-chest.png",
+            filename = "__bzlead2__/graphics/entity/hr-lead-chest.png",
             priority = "extra-high",
             width = 66,
             height = 76,
@@ -63,7 +63,7 @@ data:extend({
             scale = 0.5
         },
         {
-            filename = "__bzlead__/graphics/entity/hr-lead-chest-shadow.png",
+            filename = "__bzlead2__/graphics/entity/hr-lead-chest-shadow.png",
             priority = "extra-high",
             width = 110,
             height = 50,
@@ -80,7 +80,7 @@ data:extend({
   {
     type = "corpse",
     name = "lead-chest-remnants",
-    icon = "__bzlead__/graphics/icons/lead-chest.png",
+    icon = "__bzlead2__/graphics/icons/lead-chest.png",
     icon_size = 64, icon_mipmaps = 3,
     flags = {"placeable-neutral", "building-direction-8-way", "not-on-map"},
     subgroup = "storage-remnants",
@@ -95,7 +95,7 @@ data:extend({
     hidden_in_factoriopedia = true,
     animation =
     {
-        filename = "__bzlead__/graphics/entity/hr-lead-chest-remnants.png",
+        filename = "__bzlead2__/graphics/entity/hr-lead-chest-remnants.png",
         line_length = 1,
         width = 126,
         height = 78,
diff --git a/bzlead2/strange-matter.lua b/bzlead2/strange-matter.lua
index 450c8d7..3480b4d 100644
--- a/bzlead2/strange-matter.lua
+++ b/bzlead2/strange-matter.lua
@@ -1,8 +1,8 @@
-local util = require("__bzlead__.data-util");
+local util = require("data-util");
 
 
 local ore = "lead-ore"
-local ore_icon = "__bzlead__/graphics/icons/lead-ore.png"
+local ore_icon = "__bzlead2__/graphics/icons/lead-ore.png"
 
 if mods["StrangeMatter"] then
 data:extend({