diff --git a/bzsilicon2/compatibility/hot-metals.lua b/bzsilicon2/compatibility/hot-metals.lua
index 31dde6b..c5875e8 100644
--- a/bzsilicon2/compatibility/hot-metals.lua
+++ b/bzsilicon2/compatibility/hot-metals.lua
@@ -1,8 +1,8 @@
 local util = require("data-util")
 util.add_hot_metals({
   {name="silicon", icons={
-    { icon = "__bzsilicon__/graphics/icons/silicon.png", icon_size = 64},
-    { icon = "__bzsilicon__/graphics/icons/silicon.png", icon_size = 64, tint={.9,.3,0, .5}},
+    { icon = "__bzsilicon2__/graphics/icons/silicon.png", icon_size = 64},
+    { icon = "__bzsilicon2__/graphics/icons/silicon.png", icon_size = 64, tint={.9,.3,0, .5}},
   }},
 })
 
diff --git a/bzsilicon2/data-final-fixes.lua b/bzsilicon2/data-final-fixes.lua
index cc11835..c18bd81 100644
--- a/bzsilicon2/data-final-fixes.lua
+++ b/bzsilicon2/data-final-fixes.lua
@@ -1,6 +1,6 @@
 require("deadlock-stacking")
 
-local util = require("__bzsilicon__.data-util");
+local util = require("data-util");
  
 -- Mod Mash Splinter Electronics
 if mods.modmashsplinterelectronics then
diff --git a/bzsilicon2/deadlock-stacking.lua b/bzsilicon2/deadlock-stacking.lua
index 5dd9319..1299320 100644
--- a/bzsilicon2/deadlock-stacking.lua
+++ b/bzsilicon2/deadlock-stacking.lua
@@ -1,18 +1,18 @@
 -- Deadlock stacking recipes
-local util = require("__bzsilicon__.data-util");
+local util = require("data-util");
 
 if deadlock and deadlock["add_stack"] then
-  deadlock.add_stack("silica", "__bzsilicon__/graphics/icons/stacked/silica-stacked.png" , "deadlock-stacking-1", 64)
-  deadlock.add_stack("optical-fiber", "__bzsilicon__/graphics/icons/stacked/optical-fiber-stacked.png" , "deadlock-stacking-2", 64)
+  deadlock.add_stack("silica", "__bzsilicon2__/graphics/icons/stacked/silica-stacked.png" , "deadlock-stacking-1", 64)
+  deadlock.add_stack("optical-fiber", "__bzsilicon2__/graphics/icons/stacked/optical-fiber-stacked.png" , "deadlock-stacking-2", 64)
   if not util.k2() then
-    deadlock.add_stack("silicon", "__bzsilicon__/graphics/icons/stacked/silicon-stacked.png" , "deadlock-stacking-2", 64)
+    deadlock.add_stack("silicon", "__bzsilicon2__/graphics/icons/stacked/silicon-stacked.png" , "deadlock-stacking-2", 64)
   end
   if util.me.more_intermediates() then
-    deadlock.add_stack("silicon-wafer", "__bzsilicon__/graphics/icons/stacked/silicon-wafer-stacked.png" , "deadlock-stacking-2", 64)
-    deadlock.add_stack("solar-cell", "__bzsilicon__/graphics/icons/stacked/solar-cell-stacked.png" , "deadlock-stacking-2", 64)
+    deadlock.add_stack("silicon-wafer", "__bzsilicon2__/graphics/icons/stacked/silicon-wafer-stacked.png" , "deadlock-stacking-2", 64)
+    deadlock.add_stack("solar-cell", "__bzsilicon2__/graphics/icons/stacked/solar-cell-stacked.png" , "deadlock-stacking-2", 64)
   end
   if util.me.use_gyros() then
-    deadlock.add_stack("gyro", "__bzsilicon__/graphics/icons/stacked/gyro-stacked.png", "deadlock-stacking-3", 128)
+    deadlock.add_stack("gyro", "__bzsilicon2__/graphics/icons/stacked/gyro-stacked.png", "deadlock-stacking-3", 128)
   end
 end
 
diff --git a/bzsilicon2/info.json b/bzsilicon2/info.json
index a354f6f..867fe37 100644
--- a/bzsilicon2/info.json
+++ b/bzsilicon2/info.json
@@ -1,5 +1,5 @@
 {
-    "name": "bzsilicon",
+    "name": "bzsilicon2",
     "version": "2.0.16",
     "factorio_version": "2.0",
     "title": "Silica & Silicon",
@@ -18,6 +18,5 @@
       "(?) IndustrialRevolution",
 	    "base"
     ],
-    "description": "Adds silica, silicon, and basic fiber optics to the game. Compatible with Space Age including a new plant & production chain on Gleba.\n\nA standalone piece of BZ Mods, with graphics by snouz."
 }
 
diff --git a/bzsilicon2/me.lua b/bzsilicon2/me.lua
index 4e05a87..41e6d9b 100644
--- a/bzsilicon2/me.lua
+++ b/bzsilicon2/me.lua
@@ -1,5 +1,5 @@
 local me = {} 
-me.name = "bzsilicon"
+me.name = "bzsilicon2"
 me.resources = {{"razorgrass-plant", "gleba"}}
 me.silicon_processing = (mods and data.raw.technology["kr-silicon-processing"] and "kr-silicon-processing") or "silicon-processing"
 me.recipes = {"silica", "silicon", "optical-fiber", "silicon-wafer", "solar-cell", "gyro", "silicon-smelting-vulcanite"}
diff --git a/bzsilicon2/prototypes/gyro.lua b/bzsilicon2/prototypes/gyro.lua
index 364120d..fa63616 100644
--- a/bzsilicon2/prototypes/gyro.lua
+++ b/bzsilicon2/prototypes/gyro.lua
@@ -28,7 +28,7 @@ data:extend({
   {
     type = "item",
     name = "gyro",
-    icon = "__bzsilicon__/graphics/icons/gyro.png",
+    icon = "__bzsilicon2__/graphics/icons/gyro.png",
     icon_size = 128,
     inventory_move_sound = item_sounds.electric_small_inventory_move,
     pick_sound = item_sounds.electric_small_inventory_pickup,
@@ -53,7 +53,7 @@ data:extend({
     type = "technology",
     name = "gyro",
     icon_size = 256, 
-    icon = "__bzsilicon__/graphics/technology/gyro.png",
+    icon = "__bzsilicon2__/graphics/technology/gyro.png",
     effects = {{type = "unlock-recipe", recipe="gyro"}},
     unit =
     {
diff --git a/bzsilicon2/prototypes/optical-fiber.lua b/bzsilicon2/prototypes/optical-fiber.lua
index 8896afc..5d19140 100644
--- a/bzsilicon2/prototypes/optical-fiber.lua
+++ b/bzsilicon2/prototypes/optical-fiber.lua
@@ -1,12 +1,12 @@
 -- Optical Fiber
-local util = require("__bzsilicon__.data-util");
+local util = require("data-util");
 local item_sounds = require('__base__.prototypes.item_sounds')
 data:extend(
 {
   {
     type = "item",
     name = "optical-fiber",
-    icon = "__bzsilicon__/graphics/icons/optical-fiber.png",
+    icon = "__bzsilicon2__/graphics/icons/optical-fiber.png",
     icon_size = 64, icon_mipmaps = 3,
     inventory_move_sound = item_sounds.wire_inventory_move,
     pick_sound = item_sounds.wire_inventory_pickup,
@@ -34,7 +34,7 @@ data:extend(
   {
     type = "technology",
     name = "fiber-optics",
-    icon = "__bzsilicon__/graphics/technology/optical-fiber-tech.png",
+    icon = "__bzsilicon2__/graphics/technology/optical-fiber-tech.png",
     icon_size = 256, icon_mipmaps = 4,
     effects =
     {
diff --git a/bzsilicon2/prototypes/razorgrass.lua b/bzsilicon2/prototypes/razorgrass.lua
index 888382d..803c5f8 100644
--- a/bzsilicon2/prototypes/razorgrass.lua
+++ b/bzsilicon2/prototypes/razorgrass.lua
@@ -22,7 +22,7 @@ local function razorgrass_variations()
     local sy = math.floor((i-1)/per_row) * width -- Shadow images are rotated
     local variation = {
       trunk = {
-        filename = "__bzsilicon__/graphics/entity/razorgrass.png",
+        filename = "__bzsilicon2__/graphics/entity/razorgrass.png",
         flags = { "mipmap" },
         surface = "gleba",
         width = width,
@@ -34,7 +34,7 @@ local function razorgrass_variations()
         scale = 0.33 * scale_multiplier
       },
       leaves = {
-        filename = "__bzsilicon__/graphics/entity/razorgrass-leaves.png",
+        filename = "__bzsilicon2__/graphics/entity/razorgrass-leaves.png",
         flags = { "mipmap" },
         surface = "gleba",
         width = width,
@@ -46,7 +46,7 @@ local function razorgrass_variations()
         scale = 0.33 * scale_multiplier
       },
       normal = {
-        filename = "__bzsilicon__/graphics/entity/razorgrass-normal.png",
+        filename = "__bzsilicon2__/graphics/entity/razorgrass-normal.png",
         surface = "gleba",
         width = width,
         height = height,
@@ -64,8 +64,8 @@ local function razorgrass_variations()
         surface = "gleba",
         filenames =
         {
-          "__bzsilicon__/graphics/entity/razorgrass-shadow.png",
-          "__bzsilicon__/graphics/entity/razorgrass-shadow2.png",
+          "__bzsilicon2__/graphics/entity/razorgrass-shadow.png",
+          "__bzsilicon2__/graphics/entity/razorgrass-shadow2.png",
         },
         width = height,  --shadows are rotated
         height = width,  --shadows are rotated
@@ -122,7 +122,7 @@ data:extend({
   {
     type = "plant",
     name = "razorgrass-plant", --silica
-    icon = "__bzsilicon__/graphics/technology/razorgrass.png",
+    icon = "__bzsilicon2__/graphics/technology/razorgrass.png",
     icon_size = 256,
     growth_ticks = 5 * 60 * 60,
     agricultural_tower_tint = {primary = {.2, .7, .7}, secondary = {.4, .9, .9}},
@@ -216,7 +216,7 @@ data:extend({
     type = "technology",
     name = "razorgrass",
     icon_size = 256,
-    icon = "__bzsilicon__/graphics/technology/razorgrass.png",
+    icon = "__bzsilicon2__/graphics/technology/razorgrass.png",
     effects = util.me.more_intermediates() and {
       { type = "unlock-recipe", recipe = "silicone", },
       { type = "unlock-recipe", recipe = "razorgrass-dried", },
@@ -236,13 +236,13 @@ data:extend({
   {
     type = "item",
     name = "razorgrass",
-    icon = "__bzsilicon__/graphics/icons/razorgrass.png",
+    icon = "__bzsilicon2__/graphics/icons/razorgrass.png",
     icon_size = 128,
     pictures = {
-      {filename="__bzsilicon__/graphics/icons/razorgrass.png", size=128, scale=.3},
-      {filename="__bzsilicon__/graphics/icons/razorgrass-1.png", size=128, scale=.3},
-      {filename="__bzsilicon__/graphics/icons/razorgrass-2.png", size=128, scale=.3},
-      {filename="__bzsilicon__/graphics/icons/razorgrass-3.png", size=128, scale=.3},
+      {filename="__bzsilicon2__/graphics/icons/razorgrass.png", size=128, scale=.3},
+      {filename="__bzsilicon2__/graphics/icons/razorgrass-1.png", size=128, scale=.3},
+      {filename="__bzsilicon2__/graphics/icons/razorgrass-2.png", size=128, scale=.3},
+      {filename="__bzsilicon2__/graphics/icons/razorgrass-3.png", size=128, scale=.3},
     },
     inventory_move_sound = space_age_item_sounds.agriculture_inventory_move,
     pick_sound = space_age_item_sounds.agriculture_inventory_pickup,
@@ -260,13 +260,13 @@ data:extend({
   {
     type = "item",
     name = "razorgrass-dried",
-    icon = "__bzsilicon__/graphics/icons/razorgrass-dried.png",
+    icon = "__bzsilicon2__/graphics/icons/razorgrass-dried.png",
     icon_size = 128,
     pictures = {
-      {filename="__bzsilicon__/graphics/icons/razorgrass-dried.png", size=128, scale=.3},
-      {filename="__bzsilicon__/graphics/icons/razorgrass-dried-1.png", size=128, scale=.3},
-      {filename="__bzsilicon__/graphics/icons/razorgrass-dried-2.png", size=128, scale=.3},
-      {filename="__bzsilicon__/graphics/icons/razorgrass-dried-3.png", size=128, scale=.3},
+      {filename="__bzsilicon2__/graphics/icons/razorgrass-dried.png", size=128, scale=.3},
+      {filename="__bzsilicon2__/graphics/icons/razorgrass-dried-1.png", size=128, scale=.3},
+      {filename="__bzsilicon2__/graphics/icons/razorgrass-dried-2.png", size=128, scale=.3},
+      {filename="__bzsilicon2__/graphics/icons/razorgrass-dried-3.png", size=128, scale=.3},
     },
     inventory_move_sound = space_age_item_sounds.agriculture_inventory_move,
     pick_sound = space_age_item_sounds.agriculture_inventory_pickup,
@@ -283,7 +283,7 @@ data:extend({
   {
     type = "item",
     name = "razorgrass-ash",
-    icon = "__bzsilicon__/graphics/icons/ash.png",
+    icon = "__bzsilicon2__/graphics/icons/ash.png",
     icon_size = 64,
     inventory_move_sound = item_sounds.sulfur_inventory_move,
     pick_sound = item_sounds.resource_inventory_pickup,
@@ -314,8 +314,8 @@ data:extend({
     type = "recipe",
     name = "razorgrass-ash-washing",
     icons = {
-      { icon = "__bzsilicon__/graphics/icons/ash.png", icon_size = 64, scale=0.5, shift = {-4,-4}},
-      { icon = "__bzsilicon__/graphics/icons/silica.png", icon_size = 64, scale=0.25, shift={8, 8}},
+      { icon = "__bzsilicon2__/graphics/icons/ash.png", icon_size = 64, scale=0.5, shift = {-4,-4}},
+      { icon = "__bzsilicon2__/graphics/icons/silica.png", icon_size = 64, scale=0.25, shift={8, 8}},
     },
     subgroup = "agriculture-processes",
     category = "chemistry",
@@ -334,15 +334,15 @@ data:extend({
   {
     type = "item",
     name = "razorgrass-seed",
-    icon = "__bzsilicon__/graphics/icons/razorgrass-seed.png",
+    icon = "__bzsilicon2__/graphics/icons/razorgrass-seed.png",
     icon_size = 128,
     localised_name = {"item-name.razorgrass-seed"},
     localised_description = {"item-description.razorgrass-seed"},
     pictures = {
-      {filename="__bzsilicon__/graphics/icons/razorgrass-seed.png", size=128, scale=.25},
-      {filename="__bzsilicon__/graphics/icons/razorgrass-seed-1.png", size=128, scale=.25},
-      {filename="__bzsilicon__/graphics/icons/razorgrass-seed-2.png", size=128, scale=.25},
-      {filename="__bzsilicon__/graphics/icons/razorgrass-seed-3.png", size=128, scale=.25},
+      {filename="__bzsilicon2__/graphics/icons/razorgrass-seed.png", size=128, scale=.25},
+      {filename="__bzsilicon2__/graphics/icons/razorgrass-seed-1.png", size=128, scale=.25},
+      {filename="__bzsilicon2__/graphics/icons/razorgrass-seed-2.png", size=128, scale=.25},
+      {filename="__bzsilicon2__/graphics/icons/razorgrass-seed-3.png", size=128, scale=.25},
     },
     subgroup = "agriculture-processes",
     order = "a[seeds]-r[razorgrass-seed]",
diff --git a/bzsilicon2/prototypes/silica-recipe.lua b/bzsilicon2/prototypes/silica-recipe.lua
index 8da893d..c53817c 100644
--- a/bzsilicon2/prototypes/silica-recipe.lua
+++ b/bzsilicon2/prototypes/silica-recipe.lua
@@ -1,5 +1,5 @@
 -- Silica
-local util = require("__bzsilicon__.data-util");
+local util = require("data-util");
 local item_sounds = require('__base__.prototypes.item_sounds')
 data:extend(
 {
@@ -52,7 +52,7 @@ data:extend(
   {
     type = "item",
     name = "silica",
-    icon = "__bzsilicon__/graphics/icons/silica.png",
+    icon = "__bzsilicon2__/graphics/icons/silica.png",
     icon_size = 64, icon_mipmaps = 3,
     inventory_move_sound = item_sounds.sulfur_inventory_move,
     pick_sound = item_sounds.resource_inventory_pickup,
@@ -66,7 +66,7 @@ data:extend(
     type = "technology",
     name = "silica-processing",
     icon_size = 256, icon_mipmaps = 4,
-    icon = "__bzsilicon__/graphics/technology/silica-processing.png",
+    icon = "__bzsilicon2__/graphics/technology/silica-processing.png",
     effects =
     {
       {
@@ -95,7 +95,7 @@ data:extend(
     type = "technology",
     name = "silica-processing",
     icon_size = 256, icon_mipmaps = 4,
-    icon = "__bzsilicon__/graphics/technology/silica-processing.png",
+    icon = "__bzsilicon2__/graphics/technology/silica-processing.png",
     prerequisites = {"logistic-science-pack"},
     effects =
     {
diff --git a/bzsilicon2/prototypes/silicon-recipe.lua b/bzsilicon2/prototypes/silicon-recipe.lua
index 75e904a..1438107 100644
--- a/bzsilicon2/prototypes/silicon-recipe.lua
+++ b/bzsilicon2/prototypes/silicon-recipe.lua
@@ -45,7 +45,7 @@ data:extend(
   {
     type = "item",
     name = "silicon",
-    icon = "__bzsilicon__/graphics/icons/silicon.png",
+    icon = "__bzsilicon2__/graphics/icons/silicon.png",
     icon_size = 64, icon_mipmaps = 3,
     inventory_move_sound = item_sounds.sulfur_inventory_move,
     pick_sound = item_sounds.resource_inventory_pickup,
@@ -60,7 +60,7 @@ data:extend(
     type = "technology",
     name = "silicon-processing",
     icon_size = 256, icon_mipmaps = 4,
-    icon = "__bzsilicon__/graphics/technology/silicon-processing.png",
+    icon = "__bzsilicon2__/graphics/technology/silicon-processing.png",
     effects =
     {
       {
@@ -93,7 +93,7 @@ data:extend({
   {
     type = "item",
     name = "silicon-wafer",
-    icon = "__bzsilicon__/graphics/icons/silicon-wafer.png",
+    icon = "__bzsilicon2__/graphics/icons/silicon-wafer.png",
     icon_size = 64, icon_mipmaps = 3,
     inventory_move_sound = item_sounds.electric_small_inventory_move,
     pick_sound = item_sounds.electric_small_inventory_pickup,
@@ -123,7 +123,7 @@ data:extend({
   {
     type = "item",
     name = "silicone",
-    icon = "__bzsilicon__/graphics/icons/silicone.png",
+    icon = "__bzsilicon2__/graphics/icons/silicone.png",
     icon_size = 64,
     subgroup = "intermediate-product",
     stack_size = util.get_stack_size(100),
@@ -133,7 +133,7 @@ data:extend({
   {
     type = "recipe",
     name = "silicone",
-    icon = "__bzsilicon__/graphics/icons/silicone-recipe.png",
+    icon = "__bzsilicon2__/graphics/icons/silicone-recipe.png",
     icon_size = 128,
     subgroup = "intermediate-product",
     category = mods["space-age"] and "organic-or-chemistry" or "crafting-with-fluid",
@@ -150,7 +150,7 @@ data:extend({
   {
     type = "item",
     name = "solar-cell",
-    icon = "__bzsilicon__/graphics/icons/solar-cell.png",
+    icon = "__bzsilicon2__/graphics/icons/solar-cell.png",
     icon_size = 64, icon_mipmaps = 3,
     inventory_move_sound = item_sounds.electric_small_inventory_move,
     pick_sound = item_sounds.electric_small_inventory_pickup,
diff --git a/bzsilicon2/recipes/silicon-vulcanite.lua b/bzsilicon2/recipes/silicon-vulcanite.lua
index 36eceb0..d871b2e 100644
--- a/bzsilicon2/recipes/silicon-vulcanite.lua
+++ b/bzsilicon2/recipes/silicon-vulcanite.lua
@@ -43,7 +43,7 @@ if mods["space-exploration"] then
         {type="item", name = "silicon", amount = 3},
       },
       icons = {
-        { icon = "__bzsilicon__/graphics/icons/silicon.png", icon_size = 64, icon_mipmaps = 3 },
+        { icon = "__bzsilicon2__/graphics/icons/silicon.png", icon_size = 64, icon_mipmaps = 3 },
         { icon = "__space-exploration-graphics__/graphics/icons/fluid/pyroflux.png", icon_size = 64, scale=0.25, shift= {-10, -10}}
       },
     },
diff --git a/bzsilicon2/strange-matter.lua b/bzsilicon2/strange-matter.lua
index e81ae92..f90925e 100644
--- a/bzsilicon2/strange-matter.lua
+++ b/bzsilicon2/strange-matter.lua
@@ -1,8 +1,8 @@
-local util = require("__bzsilicon__.data-util");
+local util = require("data-util");
 
 
 local ore = "silica"
-local ore_icon = "__bzsilicon__/graphics/icons/silica.png"
+local ore_icon = "__bzsilicon2__/graphics/icons/silica.png"
 
 if mods["StrangeMatter"] then
 data:extend({