diff --git a/bzfoundry2/data-final-fixes.lua b/bzfoundry2/data-final-fixes.lua
index 1b97ac0..085548e 100644
--- a/bzfoundry2/data-final-fixes.lua
+++ b/bzfoundry2/data-final-fixes.lua
@@ -10,7 +10,7 @@ end
 
 if data.raw.item["coke"] and not mods.Krastorio2 then
   if deadlock then
-    deadlock.add_stack("coke", "__bzfoundry__/graphics/icons/coke-stacked.png", "deadlock-stacking-1", 128)
+    deadlock.add_stack("coke", "__bzfoundry2__/graphics/icons/coke-stacked.png", "deadlock-stacking-1", 128)
   end
   if deadlock_crating then
     deadlock_crating.add_crate("coke", "deadlock-crating-1")
diff --git a/bzfoundry2/data-util.lua b/bzfoundry2/data-util.lua
index 4547d4f..026ef8b 100644
--- a/bzfoundry2/data-util.lua
+++ b/bzfoundry2/data-util.lua
@@ -44,7 +44,7 @@ if get_setting("bz-recipe-bypass") then
 end
 
 function util.is_foundry()
-  return mods.bzfoundry and not me.get_setting("bzfoundry-minimal")
+  return mods.bzfoundry2 and not me.get_setting("bzfoundry-minimal")
 end
 
 function should_force(options)
diff --git a/bzfoundry2/info.json b/bzfoundry2/info.json
index 68de52d..7877a0f 100644
--- a/bzfoundry2/info.json
+++ b/bzfoundry2/info.json
@@ -1,5 +1,5 @@
 {
-    "name": "bzfoundry",
+    "name": "bzfoundry2",
     "version": "2.0.0",
     "factorio_version": "2.0",
     "title": "Foundry",
diff --git a/bzfoundry2/me.lua b/bzfoundry2/me.lua
index 09fd319..0fb3b40 100644
--- a/bzfoundry2/me.lua
+++ b/bzfoundry2/me.lua
@@ -1,6 +1,6 @@
 local me =  {}
 
-me.name = "bzfoundry"
+me.name = "bzfoundry2"
 
 function me.basic_founding()
   return mods.bztin or mods.bzaluminum2
diff --git a/bzfoundry2/prototypes/coke.lua b/bzfoundry2/prototypes/coke.lua
index 98a70d8..14dba26 100644
--- a/bzfoundry2/prototypes/coke.lua
+++ b/bzfoundry2/prototypes/coke.lua
@@ -5,13 +5,13 @@ data:extend({
   {
     type = "item",
     name = "coke",
-    icon = "__bzfoundry__/graphics/icons/coke-icon.png",
+    icon = "__bzfoundry2__/graphics/icons/coke-icon.png",
     icon_size = 128,
     pictures = {
-      {size = 128, filename = "__bzfoundry__/graphics/icons/coke.png",   scale = 0.125},
-      {size = 128, filename = "__bzfoundry__/graphics/icons/coke-1.png", scale = 0.125},
-      {size = 128, filename = "__bzfoundry__/graphics/icons/coke-2.png", scale = 0.125},
-      {size = 128, filename = "__bzfoundry__/graphics/icons/coke-3.png", scale = 0.125},
+      {size = 128, filename = "__bzfoundry2__/graphics/icons/coke.png",   scale = 0.125},
+      {size = 128, filename = "__bzfoundry2__/graphics/icons/coke-1.png", scale = 0.125},
+      {size = 128, filename = "__bzfoundry2__/graphics/icons/coke-2.png", scale = 0.125},
+      {size = 128, filename = "__bzfoundry2__/graphics/icons/coke-3.png", scale = 0.125},
     },
     fuel_category = "chemical",
     fuel_value = "10MJ",
@@ -42,7 +42,7 @@ data:extend({
         energy_required = 3.2,
         enabled=false,
         icons = {
-          { icon = "__bzfoundry__/graphics/icons/coke-icon.png", icon_size = 128},
+          { icon = "__bzfoundry2__/graphics/icons/coke-icon.png", icon_size = 128},
           { icon = "__base__/graphics/icons/wood.png", icon_size = 64, scale=0.25, shift={8,-8}},
         },
       },
diff --git a/bzfoundry2/prototypes/entity/electric-foundry.lua b/bzfoundry2/prototypes/entity/electric-foundry.lua
index d0cc05b..1666509 100644
--- a/bzfoundry2/prototypes/entity/electric-foundry.lua
+++ b/bzfoundry2/prototypes/entity/electric-foundry.lua
@@ -11,7 +11,7 @@ data:extend({
   {
     type = "assembling-machine",
     name = "electric-foundry",
-    icon = "__bzfoundry__/graphics/icons/electric-foundry.png",
+    icon = "__bzfoundry2__/graphics/icons/electric-foundry.png",
     icon_size = 64,
     flags = {"placeable-neutral","player-creation"},
     minable = {mining_time = 0.2, result = "electric-foundry"},
@@ -50,7 +50,7 @@ data:extend({
     {
       sound =
       {
-        filename = "__bzfoundry__/sound/entity/foundry/foundry.ogg",
+        filename = "__bzfoundry2__/sound/entity/foundry/foundry.ogg",
         volume = 0.5,
         audible_distance_modifier = 0.6
       },
@@ -58,24 +58,24 @@ data:extend({
       fade_out_ticks = 20,
       sound_accents =
       {
-        {sound = {filename = "__bzfoundry__/sound/entity/foundry/foundry-pipe-out.ogg", volume = 0.9, audible_distance_modifier = 0.4}, frame = 2},
-        {sound = {filename = "__bzfoundry__/sound/entity/foundry/foundry-slide-close.ogg", volume = 0.65, audible_distance_modifier = 0.3}, frame = 18},
-        {sound = {filename = "__bzfoundry__/sound/entity/foundry/foundry-clamp.ogg", volume = 0.45, audible_distance_modifier = 0.3}, frame = 39},
-        {sound = {filename = "__bzfoundry__/sound/entity/foundry/foundry-slide-stop.ogg", volume = 0.7, audible_distance_modifier = 0.4}, frame = 43},
-        {sound = {variations = sound_variations("__bzfoundry__/sound/entity/foundry/foundry-fire-whoosh", 3, 0.8), audible_distance_modifier = 0.3}, frame = 64},
-        {sound = {filename = "__bzfoundry__/sound/entity/foundry/foundry-metal-clunk.ogg", volume = 0.65, audible_distance_modifier = 0.4}, frame = 64},
-        {sound = {filename = "__bzfoundry__/sound/entity/foundry/foundry-slide-open.ogg", volume = 0.65, audible_distance_modifier = 0.3}, frame = 74},
-        {sound = {filename = "__bzfoundry__/sound/entity/foundry/foundry-pipe-in.ogg", volume = 0.75, audible_distance_modifier = 0.4}, frame = 106},
-        {sound = {filename = "__bzfoundry__/sound/entity/foundry/foundry-smoke-puff.ogg", volume = 0.8, audible_distance_modifier = 0.3}, frame = 106},
-        {sound = {variations = sound_variations("__bzfoundry__/sound/entity/foundry/foundry-pour", 2, 0.7)}, frame = 110},
-        {sound = {filename = "__bzfoundry__/sound/entity/foundry/foundry-rocks.ogg", volume = 0.65, audible_distance_modifier = 0.3}, frame = 120},
-        {sound = {filename = "__bzfoundry__/sound/entity/foundry/foundry-blade.ogg", volume = 0.7}, frame = 126},
+        {sound = {filename = "__bzfoundry2__/sound/entity/foundry/foundry-pipe-out.ogg", volume = 0.9, audible_distance_modifier = 0.4}, frame = 2},
+        {sound = {filename = "__bzfoundry2__/sound/entity/foundry/foundry-slide-close.ogg", volume = 0.65, audible_distance_modifier = 0.3}, frame = 18},
+        {sound = {filename = "__bzfoundry2__/sound/entity/foundry/foundry-clamp.ogg", volume = 0.45, audible_distance_modifier = 0.3}, frame = 39},
+        {sound = {filename = "__bzfoundry2__/sound/entity/foundry/foundry-slide-stop.ogg", volume = 0.7, audible_distance_modifier = 0.4}, frame = 43},
+        {sound = {variations = sound_variations("__bzfoundry2__/sound/entity/foundry/foundry-fire-whoosh", 3, 0.8), audible_distance_modifier = 0.3}, frame = 64},
+        {sound = {filename = "__bzfoundry2__/sound/entity/foundry/foundry-metal-clunk.ogg", volume = 0.65, audible_distance_modifier = 0.4}, frame = 64},
+        {sound = {filename = "__bzfoundry2__/sound/entity/foundry/foundry-slide-open.ogg", volume = 0.65, audible_distance_modifier = 0.3}, frame = 74},
+        {sound = {filename = "__bzfoundry2__/sound/entity/foundry/foundry-pipe-in.ogg", volume = 0.75, audible_distance_modifier = 0.4}, frame = 106},
+        {sound = {filename = "__bzfoundry2__/sound/entity/foundry/foundry-smoke-puff.ogg", volume = 0.8, audible_distance_modifier = 0.3}, frame = 106},
+        {sound = {variations = sound_variations("__bzfoundry2__/sound/entity/foundry/foundry-pour", 2, 0.7)}, frame = 110},
+        {sound = {filename = "__bzfoundry2__/sound/entity/foundry/foundry-rocks.ogg", volume = 0.65, audible_distance_modifier = 0.3}, frame = 120},
+        {sound = {filename = "__bzfoundry2__/sound/entity/foundry/foundry-blade.ogg", volume = 0.7}, frame = 126},
       },
       max_sounds_per_prototype = 2
     },
     water_reflection =
     {
-      pictures = util.sprite_load("__bzfoundry__/graphics/entity/electric-foundry/foundry-reflection",
+      pictures = util.sprite_load("__bzfoundry2__/graphics/entity/electric-foundry/foundry-reflection",
       {
           scale = 4,
           shift = {0,2}
@@ -86,7 +86,7 @@ data:extend({
   {
     type = "corpse",
     name = "electric-foundry-remnants",
-    icon = "__bzfoundry__/graphics/icons/electric-foundry.png",
+    icon = "__bzfoundry2__/graphics/icons/electric-foundry.png",
     flags = {"placeable-neutral", "not-on-map"},
     hidden_in_factoriopedia = true,
     subgroup = "smelting-machine-remnants",
@@ -101,7 +101,7 @@ data:extend({
     remove_on_tile_placement = false,
     animation =
     {
-      filename = "__bzfoundry__/graphics/entity/electric-foundry/foundry-remnants.png",
+      filename = "__bzfoundry2__/graphics/entity/electric-foundry/foundry-remnants.png",
       line_length = 1,
       width = 494,
       height = 478,
@@ -114,7 +114,7 @@ data:extend({
   {
     type = "explosion",
     name = "foundry-explosion",
-    icon = "__bzfoundry__/graphics/icons/electric-foundry.png",
+    icon = "__bzfoundry2__/graphics/icons/electric-foundry.png",
     flags = {"not-on-map"},
     hidden = true,
     subgroup = "smelting-machine-explosions",
diff --git a/bzfoundry2/prototypes/entity/foundry-pictures.lua b/bzfoundry2/prototypes/entity/foundry-pictures.lua
index 7018d00..b860f1d 100644
--- a/bzfoundry2/prototypes/entity/foundry-pictures.lua
+++ b/bzfoundry2/prototypes/entity/foundry-pictures.lua
@@ -2,7 +2,7 @@ local foundry_animation_speed = 0.16
 local frames = 128
 
 local function foundry_main_pictures()
-  return util.sprite_load("__bzfoundry__/graphics/entity/electric-foundry/foundry-main",
+  return util.sprite_load("__bzfoundry2__/graphics/entity/electric-foundry/foundry-main",
   {
     animation_speed = foundry_animation_speed,
     frame_count = frames,
@@ -11,7 +11,7 @@ local function foundry_main_pictures()
 end
 
 local function foundry_main_shadow_pictures()
-  return util.sprite_load("__bzfoundry__/graphics/entity/electric-foundry/foundry-shadow",
+  return util.sprite_load("__bzfoundry2__/graphics/entity/electric-foundry/foundry-shadow",
   {
     animation_speed = foundry_animation_speed,
     frame_count = frames,
@@ -25,7 +25,7 @@ local function foundry_working_pictures()
   {
     fadeout = true,
     animation =
-    util.sprite_load("__bzfoundry__/graphics/entity/electric-foundry/foundry-working",
+    util.sprite_load("__bzfoundry2__/graphics/entity/electric-foundry/foundry-working",
       {
         animation_speed = foundry_animation_speed,
         frame_count = frames,
@@ -41,7 +41,7 @@ local function foundry_lights_pictures()
     effect = "flicker",
     fadeout = true,
     animation =
-    util.sprite_load("__bzfoundry__/graphics/entity/electric-foundry/foundry-lights",
+    util.sprite_load("__bzfoundry2__/graphics/entity/electric-foundry/foundry-lights",
       {
         draw_as_glow = true,
         animation_speed = foundry_animation_speed,
@@ -57,7 +57,7 @@ local function foundry_status_lamp_pictures()
   return
   {
     animation =
-    util.sprite_load("__bzfoundry__/graphics/entity/electric-foundry/foundry-status-lamp",
+    util.sprite_load("__bzfoundry2__/graphics/entity/electric-foundry/foundry-status-lamp",
       {
         draw_as_glow = true,
         repeat_count = frames,
diff --git a/bzfoundry2/prototypes/entity/foundry.lua b/bzfoundry2/prototypes/entity/foundry.lua
index 2f828a4..6141576 100644
--- a/bzfoundry2/prototypes/entity/foundry.lua
+++ b/bzfoundry2/prototypes/entity/foundry.lua
@@ -10,7 +10,7 @@ local foundry = table.deepcopy(data.raw["assembling-machine"]["electric-foundry"
 meld(foundry, {
   name = "foundry",
   next_upgrade = "electric-foundry",
-  icon = "__bzfoundry__/graphics/icons/foundry.png",
+  icon = "__bzfoundry2__/graphics/icons/foundry.png",
   minable = {mining_time = 0.2, result = "foundry"},
   energy_usage = "180kW",
   energy_source = {
@@ -32,8 +32,8 @@ meld(foundry, {
   },
 })
 foundry.graphics_set.animation.layers[1].filenames = {
-  "__bzfoundry__/graphics/entity/foundry/foundry-main-1.png",
-  "__bzfoundry__/graphics/entity/foundry/foundry-main-2.png"
+  "__bzfoundry2__/graphics/entity/foundry/foundry-main-1.png",
+  "__bzfoundry2__/graphics/entity/foundry/foundry-main-2.png"
 }
 
 data:extend({
@@ -41,7 +41,7 @@ data:extend({
   {
       type = "corpse",
       name = "foundry-remnants",
-      icon = "__bzfoundry__/graphics/icons/foundry.png",
+      icon = "__bzfoundry2__/graphics/icons/foundry.png",
       flags = {"placeable-neutral", "not-on-map"},
       hidden_in_factoriopedia = true,
       subgroup = "smelting-machine-remnants",
@@ -56,7 +56,7 @@ data:extend({
       remove_on_tile_placement = false,
       animation =
       {
-        filename = "__bzfoundry__/graphics/entity/foundry/foundry-remnants.png",
+        filename = "__bzfoundry2__/graphics/entity/foundry/foundry-remnants.png",
         line_length = 1,
         width = 494,
         height = 478,
diff --git a/bzfoundry2/prototypes/foundry.lua b/bzfoundry2/prototypes/foundry.lua
index 74ef89b..9de4904 100644
--- a/bzfoundry2/prototypes/foundry.lua
+++ b/bzfoundry2/prototypes/foundry.lua
@@ -14,7 +14,7 @@ data:extend({
   {
     type = "item",
     name = "foundry",
-    icon = "__bzfoundry__/graphics/icons/foundry.png",
+    icon = "__bzfoundry2__/graphics/icons/foundry.png",
     icon_size = 64,
     subgroup = "founding-machines",
     order = "z[foundry]",
@@ -32,7 +32,7 @@ data:extend({
     type = "technology",
     name = "foundry",
     icon_size = 256,
-    icon = "__bzfoundry__/graphics/icons/technology/foundry.png",
+    icon = "__bzfoundry2__/graphics/icons/technology/foundry.png",
     prerequisites = {"automation"},
     effects = {
       {type = "unlock-recipe", recipe = "foundry"},
@@ -62,7 +62,7 @@ data:extend({
   {
     type = "item",
     name = "electric-foundry",
-    icon = "__bzfoundry__/graphics/icons/electric-foundry.png",
+    icon = "__bzfoundry2__/graphics/icons/electric-foundry.png",
     icon_size = 64,
     subgroup = "founding-machines",
     order = "z[foundryelectric]",
@@ -93,7 +93,7 @@ data:extend({
     type = "technology",
     name = "electric-foundry",
     icon_size = 256,
-    icon = "__bzfoundry__/graphics/icons/technology/electric-foundry.png",
+    icon = "__bzfoundry2__/graphics/icons/technology/electric-foundry.png",
     prerequisites = {"automation-3"},
     effects = {
       {type = "unlock-recipe", recipe = "electric-foundry"},
@@ -117,7 +117,7 @@ if util.me.founding_plates() then
       type = "technology",
       name = "advanced-founding",
       icons = {
-        {icon = "__bzfoundry__/graphics/icons/technology/foundry.png", icon_size = 256},
+        {icon = "__bzfoundry2__/graphics/icons/technology/foundry.png", icon_size = 256},
         (mods.bzcarbon and
          { icon = "__bzcarbon__/graphics/icons/graphite-2.png",
            icon_size = 128, scale=0.5, shift={32, -32}})
@@ -153,7 +153,7 @@ if util.me.founding_plates() then
         type = "technology",
         name = "advanced-founding-space",
         icons = {
-          {icon = "__bzfoundry__/graphics/icons/technology/foundry.png", icon_size = 256},
+          {icon = "__bzfoundry2__/graphics/icons/technology/foundry.png", icon_size = 256},
           (mods.bzcarbon and
            { icon = "__bzcarbon__/graphics/icons/graphite-2.png",
              icon_size = 128, scale=0.5, shift={32, -32}})