From 93ef3c8adc40ef4dfa717e1ab00f5f9458bb9952 Mon Sep 17 00:00:00 2001
From: Simon Brodtmann <github@accounts.brodtmann.info>
Date: Tue, 21 Oct 2025 14:48:40 +0200
Subject: [PATCH] Rename mod

---
 .gitignore                                    |  5 +-
 bzzirconium2/compatibility/hot-metals.lua     |  8 +--
 bzzirconium2/info.json                        |  2 +-
 bzzirconium2/magazine.lua                     |  6 +-
 bzzirconium2/me.lua                           |  2 +-
 bzzirconium2/strange-matter.lua               |  4 +-
 bzzirconium2/tech-updates.lua                 |  2 +-
 bzzirconium2/zircon-matter.lua                |  4 +-
 bzzirconium2/zircon-particle.lua              | 16 ++---
 bzzirconium2/zircon.lua                       | 16 ++---
 bzzirconium2/zirconium-asteroid-updates.lua   |  2 +-
 bzzirconium2/zirconium-enriched.lua           | 18 +++---
 bzzirconium2/zirconium-recipe-final-rrr.lua   |  2 +-
 .../zirconium-recipe-final-stacking.lua       | 12 ++--
 bzzirconium2/zirconium-recipe-se.lua          | 10 +--
 bzzirconium2/zirconium-recipe.lua             | 62 +++++++++----------
 16 files changed, 85 insertions(+), 86 deletions(-)

diff --git a/.gitignore b/.gitignore
index 318cbef..85e49ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-*.bak
-*.blend*
-.idea
\ No newline at end of file
+.idea
+*.zip
\ No newline at end of file
diff --git a/bzzirconium2/compatibility/hot-metals.lua b/bzzirconium2/compatibility/hot-metals.lua
index 761c6b4..d9b1b03 100644
--- a/bzzirconium2/compatibility/hot-metals.lua
+++ b/bzzirconium2/compatibility/hot-metals.lua
@@ -2,12 +2,12 @@ local util = require("data-util");
 
 util.add_hot_metals({
   {name="zirconium-plate", icons={
-    { icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128},
-    { icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128, tint={.9,.3,0, .5}},
+    { icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png", icon_size = 128},
+    { icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png", icon_size = 128, tint={.9,.3,0, .5}},
   }},
   {name="zircaloy-4", icons={
-    { icon = "__bzzirconium__/graphics/icons/zircaloy-4.png", icon_size = 128},
-    { icon = "__bzzirconium__/graphics/icons/zircaloy-4.png", icon_size = 128, tint={.9,.3,0, .5}},
+    { icon = "__bzzirconium2__/graphics/icons/zircaloy-4.png", icon_size = 128},
+    { icon = "__bzzirconium2__/graphics/icons/zircaloy-4.png", icon_size = 128, tint={.9,.3,0, .5}},
   }},
 
 })
diff --git a/bzzirconium2/info.json b/bzzirconium2/info.json
index 68f4c40..4155cee 100644
--- a/bzzirconium2/info.json
+++ b/bzzirconium2/info.json
@@ -1,5 +1,5 @@
 {
-    "name": "bzzirconium",
+    "name": "bzzirconium2",
     "version": "2.1.13",
     "factorio_version": "2.0",
     "title": "Zirconium",
diff --git a/bzzirconium2/magazine.lua b/bzzirconium2/magazine.lua
index 977ddb9..80d87dd 100644
--- a/bzzirconium2/magazine.lua
+++ b/bzzirconium2/magazine.lua
@@ -23,7 +23,7 @@ if util.me.ammo() then
       {
         type = "ammo",
         name = "explosive-rounds-magazine",
-        icon = "__bzzirconium__/graphics/icons/magazine.png",
+        icon = "__bzzirconium2__/graphics/icons/magazine.png",
         icon_size = 64, icon_mipmaps = 4,
         ammo_category = "bullet",
         ammo_type =
@@ -113,7 +113,7 @@ if util.me.ammo() then
       {
         type = "ammo",
         name = "explosive-rounds-rifle-magazine",
-        icon = "__bzzirconium__/graphics/icons/r-magazine.png",
+        icon = "__bzzirconium2__/graphics/icons/r-magazine.png",
         inventory_move_sound = item_sounds.ammo_small_inventory_move,
         pick_sound = item_sounds.ammo_small_inventory_pickup,
         drop_sound = item_sounds.ammo_small_inventory_move,
@@ -230,7 +230,7 @@ if util.me.ammo() then
       {
         type = "ammo",
         name = "explosive-rounds-anti-material-rifle-magazine",
-        icon = "__bzzirconium__/graphics/icons/am-magazine.png",
+        icon = "__bzzirconium2__/graphics/icons/am-magazine.png",
         icon_size = 64,
         icon_mipmaps = 4,
         ammo_type = {
diff --git a/bzzirconium2/me.lua b/bzzirconium2/me.lua
index 3743cac..2a7c845 100644
--- a/bzzirconium2/me.lua
+++ b/bzzirconium2/me.lua
@@ -1,6 +1,6 @@
 local me = {}
 
-me.name = "bzzirconium"
+me.name = "bzzirconium2"
 me.resources = {{"zircon", "nauvis"}}
 me.recipes = {"zirconium-plate", "zirconia", "cermet",
            "enriched-zirconia-smelting",
diff --git a/bzzirconium2/strange-matter.lua b/bzzirconium2/strange-matter.lua
index 2193121..4e01a0c 100644
--- a/bzzirconium2/strange-matter.lua
+++ b/bzzirconium2/strange-matter.lua
@@ -1,8 +1,8 @@
-local util = require("__bzzirconium__.data-util");
+local util = require("data-util");
 
 
 local ore = "zircon"
-local ore_icon = "__bzzirconium__/graphics/icons/zircon.png"
+local ore_icon = "__bzzirconium2__/graphics/icons/zircon.png"
 
 if mods["StrangeMatter"] then
 data:extend({
diff --git a/bzzirconium2/tech-updates.lua b/bzzirconium2/tech-updates.lua
index 5f27a10..3144f52 100644
--- a/bzzirconium2/tech-updates.lua
+++ b/bzzirconium2/tech-updates.lua
@@ -1,4 +1,4 @@
-local util = require("__bzzirconium__.data-util");
+local util = require("data-util");
 
 util.add_prerequisite("advanced-material-processing", "zirconia-processing")
 util.add_prerequisite("low-density-structure", "zirconia-processing")
diff --git a/bzzirconium2/zircon-matter.lua b/bzzirconium2/zircon-matter.lua
index 81946ac..c58100d 100644
--- a/bzzirconium2/zircon-matter.lua
+++ b/bzzirconium2/zircon-matter.lua
@@ -1,5 +1,5 @@
 -- Matter recipes for Krastorio2
-local util = require("__bzzirconium__.data-util");
+local util = require("data-util");
 if util.k2() then
 
   util.k2matter({
@@ -15,7 +15,7 @@ if util.k2() then
       unlocked_by = "zirconium-matter-processing",
     },
     k2baseicon = "stone",
-    icon = { icon = "__bzzirconium__/graphics/icons/zircon.png", icon_size = 128, scale = 0.5}
+    icon = { icon = "__bzzirconium2__/graphics/icons/zircon.png", icon_size = 128, scale = 0.5}
   }, false)
 
   util.k2matter({
diff --git a/bzzirconium2/zircon-particle.lua b/bzzirconium2/zircon-particle.lua
index 0282303..251e0fe 100644
--- a/bzzirconium2/zircon-particle.lua
+++ b/bzzirconium2/zircon-particle.lua
@@ -8,7 +8,7 @@ data:extend(
     pictures =
     {
       {
-          filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-1.png",
+          filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-1.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -16,7 +16,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-2.png",
+          filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-2.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -24,7 +24,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-3.png",
+          filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-3.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -32,7 +32,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-4.png",
+          filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-4.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -43,7 +43,7 @@ data:extend(
     shadows =
     {
       {
-          filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-1.png",
+          filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-1.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -51,7 +51,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-2.png",
+          filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-2.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -59,7 +59,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-3.png",
+          filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-3.png",
           priority = "extra-high",
           width = 32,
           height = 32,
@@ -67,7 +67,7 @@ data:extend(
           scale = 0.5
       },
       {
-          filename = "__bzzirconium__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-4.png",
+          filename = "__bzzirconium2__/graphics/entity/zircon-particle/hr-zircon-particle-shadow-4.png",
           priority = "extra-high",
           width = 32,
           height = 32,
diff --git a/bzzirconium2/zircon.lua b/bzzirconium2/zircon.lua
index d80a653..d35aef3 100644
--- a/bzzirconium2/zircon.lua
+++ b/bzzirconium2/zircon.lua
@@ -23,7 +23,7 @@ data:extend({
 	{
     type = "resource",
     name = "zircon",
-    icon = "__bzzirconium__/graphics/icons/zircon.png",
+    icon = "__bzzirconium2__/graphics/icons/zircon.png",
     icon_size = 128,
     flags = {"placeable-neutral"},
     order="a-b-a",
@@ -54,7 +54,7 @@ data:extend({
         {
           sheet =
           {
-      filename = "__bzzirconium__/graphics/entity/ores/hr-zircon.png",
+      filename = "__bzzirconium2__/graphics/entity/ores/hr-zircon.png",
       priority = "extra-high",
       size = 128,
       frame_count = 8,
@@ -67,13 +67,13 @@ data:extend({
       type = "item",
       name = "zircon",
       icon_size = 128,
-      icon = "__bzzirconium__/graphics/icons/zircon.png",
+      icon = "__bzzirconium2__/graphics/icons/zircon.png",
       pictures = {
-        {filename="__bzzirconium__/graphics/icons/zircon.png", size=128, scale=0.25},
-        {filename="__bzzirconium__/graphics/icons/zircon-1.png", size=128, scale=0.25},
-        {filename="__bzzirconium__/graphics/icons/zircon-2.png", size=128, scale=0.25},
-        {filename="__bzzirconium__/graphics/icons/zircon-3.png", size=128, scale=0.25},
-        {filename="__bzzirconium__/graphics/icons/zircon-4.png", size=128, scale=0.25},
+        {filename="__bzzirconium2__/graphics/icons/zircon.png", size=128, scale=0.25},
+        {filename="__bzzirconium2__/graphics/icons/zircon-1.png", size=128, scale=0.25},
+        {filename="__bzzirconium2__/graphics/icons/zircon-2.png", size=128, scale=0.25},
+        {filename="__bzzirconium2__/graphics/icons/zircon-3.png", size=128, scale=0.25},
+        {filename="__bzzirconium2__/graphics/icons/zircon-4.png", size=128, scale=0.25},
       },
       inventory_move_sound = item_sounds.resource_inventory_move,
       pick_sound = item_sounds.resource_inventory_pickup,
diff --git a/bzzirconium2/zirconium-asteroid-updates.lua b/bzzirconium2/zirconium-asteroid-updates.lua
index 84be43b..81e3249 100644
--- a/bzzirconium2/zirconium-asteroid-updates.lua
+++ b/bzzirconium2/zirconium-asteroid-updates.lua
@@ -11,7 +11,7 @@ if mods["space-age"] then
       icons = 
       {
         {icon="__space-age__/graphics/icons/advanced-oxide-asteroid-crushing.png", icon_size=64},
-        {icon="__bzzirconium__/graphics/icons/zirconia.png", icon_size=128, scale=0.1875, shift={0,8}},
+        {icon="__bzzirconium2__/graphics/icons/zirconia.png", icon_size=128, scale=0.1875, shift={0,8}},
       },
       category = "crushing",
       subgroup="space-crushing",
diff --git a/bzzirconium2/zirconium-enriched.lua b/bzzirconium2/zirconium-enriched.lua
index 21800a3..71da0fe 100644
--- a/bzzirconium2/zirconium-enriched.lua
+++ b/bzzirconium2/zirconium-enriched.lua
@@ -1,5 +1,5 @@
 -- Enriched Titanium for Krastorio2
-local util = require("__bzzirconium__.data-util");
+local util = require("data-util");
 
 if util.k2() then
 data:extend({
@@ -7,12 +7,12 @@ data:extend({
     type = "item",
     name = "enriched-zircon",
     icon_size = 128,
-    icon = "__bzzirconium__/graphics/icons/enriched-zircon.png",
+    icon = "__bzzirconium2__/graphics/icons/enriched-zircon.png",
     pictures = {
-      {filename="__bzzirconium__/graphics/icons/enriched-zircon.png", size=128, scale=0.25},
-      {filename="__bzzirconium__/graphics/icons/enriched-zircon-2.png", size=128, scale=0.25},
-      {filename="__bzzirconium__/graphics/icons/enriched-zircon-3.png", size=128, scale=0.25},
-      {filename="__bzzirconium__/graphics/icons/enriched-zircon-4.png", size=128, scale=0.25},
+      {filename="__bzzirconium2__/graphics/icons/enriched-zircon.png", size=128, scale=0.25},
+      {filename="__bzzirconium2__/graphics/icons/enriched-zircon-2.png", size=128, scale=0.25},
+      {filename="__bzzirconium2__/graphics/icons/enriched-zircon-3.png", size=128, scale=0.25},
+      {filename="__bzzirconium2__/graphics/icons/enriched-zircon-4.png", size=128, scale=0.25},
     },
     subgroup = "raw-material",
     order = "e05-a[enriched-ores]-a1[enriched-zircon]",
@@ -21,7 +21,7 @@ data:extend({
   {
     type = "recipe",
     name = "enriched-zircon",
-    icon = "__bzzirconium__/graphics/icons/enriched-zircon.png",
+    icon = "__bzzirconium2__/graphics/icons/enriched-zircon.png",
     icon_size = 128,
     category = "chemistry",
     main_product = "enriched-zircon",
@@ -57,8 +57,8 @@ data:extend({
       name = "enriched-zirconia-smelting",
       icons =
       {
-        { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128, icon_mipmaps = 3, },
-        { icon = "__bzzirconium__/graphics/icons/enriched-zircon.png", icon_size = 128, scale=0.125, shift= {-8, -8}},
+        { icon = "__bzzirconium2__/graphics/icons/zirconia.png", icon_size = 128, icon_mipmaps = 3, },
+        { icon = "__bzzirconium2__/graphics/icons/enriched-zircon.png", icon_size = 128, scale=0.125, shift= {-8, -8}},
       },
       category = "smelting",
       energy_required = 24,
diff --git a/bzzirconium2/zirconium-recipe-final-rrr.lua b/bzzirconium2/zirconium-recipe-final-rrr.lua
index b61dbab..357b685 100644
--- a/bzzirconium2/zirconium-recipe-final-rrr.lua
+++ b/bzzirconium2/zirconium-recipe-final-rrr.lua
@@ -1,4 +1,4 @@
-local util = require("__bzzirconium__.data-util");
+local util = require("data-util");
 
 if mods["Rich-Rocks-Requiem"] then
   if data.raw.recipe["rrr-stone-processing"] then
diff --git a/bzzirconium2/zirconium-recipe-final-stacking.lua b/bzzirconium2/zirconium-recipe-final-stacking.lua
index 5e0f1e8..3c352d6 100644
--- a/bzzirconium2/zirconium-recipe-final-stacking.lua
+++ b/bzzirconium2/zirconium-recipe-final-stacking.lua
@@ -1,16 +1,16 @@
 -- Deadlock stacking recipes
 
-local util = require("__bzzirconium__.data-util");
+local util = require("data-util");
 
 if deadlock and deadlock["add_stack"] then
-  deadlock.add_stack("zircon",  "__bzzirconium__/graphics/icons/stacked/zircon-stacked.png", "deadlock-stacking-1", 64)
-  deadlock.add_stack("zirconia",  "__bzzirconium__/graphics/icons/stacked/zirconia-stacked.png", "deadlock-stacking-2", 128)
-  deadlock.add_stack("zirconium-plate", "__bzzirconium__/graphics/icons/stacked/zirconium-plate-stacked.png" , "deadlock-stacking-2", 128)
+  deadlock.add_stack("zircon",  "__bzzirconium2__/graphics/icons/stacked/zircon-stacked.png", "deadlock-stacking-1", 64)
+  deadlock.add_stack("zirconia",  "__bzzirconium2__/graphics/icons/stacked/zirconia-stacked.png", "deadlock-stacking-2", 128)
+  deadlock.add_stack("zirconium-plate", "__bzzirconium2__/graphics/icons/stacked/zirconium-plate-stacked.png" , "deadlock-stacking-2", 128)
   if util.me.use_cermet() then
-    deadlock.add_stack("cermet",  "__bzzirconium__/graphics/icons/stacked/cermet-stacked.png", "deadlock-stacking-2", 128)
+    deadlock.add_stack("cermet",  "__bzzirconium2__/graphics/icons/stacked/cermet-stacked.png", "deadlock-stacking-2", 128)
   end
   if util.k2() then
-    deadlock.add_stack("enriched-zircon", "__bzzirconium__/graphics/icons/stacked/enriched-zircon-stacked.png" , "deadlock-stacking-2", 128)
+    deadlock.add_stack("enriched-zircon", "__bzzirconium2__/graphics/icons/stacked/enriched-zircon-stacked.png" , "deadlock-stacking-2", 128)
   end
   if util.k2() or mods["space-exploration"] then
     deadlock.add_stack("zirconium-tungstate", nil, "deadlock-stacking-2", 64)
diff --git a/bzzirconium2/zirconium-recipe-se.lua b/bzzirconium2/zirconium-recipe-se.lua
index d74fd88..75b5ea8 100644
--- a/bzzirconium2/zirconium-recipe-se.lua
+++ b/bzzirconium2/zirconium-recipe-se.lua
@@ -1,5 +1,5 @@
 -- Additional recipes if Space Exploration mod is enabled
-local util = require("__bzzirconium__.data-util");
+local util = require("data-util");
 
 if mods["space-exploration"] then
   se_delivery_cannon_recipes["zircon"] = {name= "zircon"}
@@ -24,7 +24,7 @@ if mods["space-exploration"] then
   {
     type = "item",
     name = "zirconium-ingot",
-    icons = {{icon = "__bzzirconium__/graphics/icons/zirconium-ingot.png", icon_size = 128}},
+    icons = {{icon = "__bzzirconium2__/graphics/icons/zirconium-ingot.png", icon_size = 128}},
     order = "b-b",
     stack_size = 50,
     subgroup = "zirconium",
@@ -36,7 +36,7 @@ if mods["space-exploration"] then
     max_temperature = 1852,
     base_color = {r=121, g=80, b=80},
     flow_color = {r=121, g=80, b=80},
-    icons = {{icon = "__bzzirconium__/graphics/icons/molten-zirconium.png", icon_size = 128}},
+    icons = {{icon = "__bzzirconium2__/graphics/icons/molten-zirconium.png", icon_size = 128}},
     order = "a[molten]-a",
     pressure_to_speed_ratio = 0.4,
     flow_to_energy_ratio = 0.59,
@@ -81,8 +81,8 @@ if mods["space-exploration"] then
     name = "zirconium-ingot-to-plate",
 
     icons = {
-      {icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128, icon_mipmaps = 3},
-      {icon = "__bzzirconium__/graphics/icons/zirconium-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}},
+      {icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png", icon_size = 128, icon_mipmaps = 3},
+      {icon = "__bzzirconium2__/graphics/icons/zirconium-ingot.png", icon_size = 128, scale = 0.125, shift = {-8, -8}},
     },
     results = {
       {type = "item", name = "zirconium-plate", amount = 10},
diff --git a/bzzirconium2/zirconium-recipe.lua b/bzzirconium2/zirconium-recipe.lua
index 852bcfc..35580e5 100644
--- a/bzzirconium2/zirconium-recipe.lua
+++ b/bzzirconium2/zirconium-recipe.lua
@@ -7,7 +7,7 @@ data:extend({
   {
     type = "item",
     name = "zirconia",
-    icon = "__bzzirconium__/graphics/icons/zirconia.png",
+    icon = "__bzzirconium2__/graphics/icons/zirconia.png",
     icon_size = 128,
     inventory_move_sound = item_sounds.brick_inventory_move,
     pick_sound = item_sounds.brick_inventory_pickup,
@@ -26,10 +26,10 @@ data:extend({
     order = "z[zirconia]",
     icons = (util.k2() and
         {
-          { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128 },
-          { icon = "__bzzirconium__/graphics/icons/zircon.png", icon_size = 128,  scale=0.25, shift= {-8, -8}},
+          { icon = "__bzzirconium2__/graphics/icons/zirconia.png", icon_size = 128 },
+          { icon = "__bzzirconium2__/graphics/icons/zircon.png", icon_size = 128,  scale=0.25, shift= {-8, -8}},
         } or {
-          { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128,  },
+          { icon = "__bzzirconium2__/graphics/icons/zirconia.png", icon_size = 128,  },
         }
 ),
      -- (util.k2() and
@@ -65,12 +65,12 @@ data:extend({
   {
     type = "item",
     name = "zirconium-sponge",
-    icon = "__bzzirconium__/graphics/icons/zirconium-sponge.png",
+    icon = "__bzzirconium2__/graphics/icons/zirconium-sponge.png",
     icon_size = 128,
     pictures = {
-      {filename = "__bzzirconium__/graphics/icons/zirconium-sponge.png",   size=128, scale=0.25},
-      {filename = "__bzzirconium__/graphics/icons/zirconium-sponge-1.png", size=128, scale=0.25},
-      {filename = "__bzzirconium__/graphics/icons/zirconium-sponge-2.png", size=128, scale=0.25},
+      {filename = "__bzzirconium2__/graphics/icons/zirconium-sponge.png",   size=128, scale=0.25},
+      {filename = "__bzzirconium2__/graphics/icons/zirconium-sponge-1.png", size=128, scale=0.25},
+      {filename = "__bzzirconium2__/graphics/icons/zirconium-sponge-2.png", size=128, scale=0.25},
     },
     inventory_move_sound = item_sounds.wire_inventory_move,
     pick_sound = item_sounds.wire_inventory_pickup,
@@ -97,7 +97,7 @@ data:extend({
   {
     type = "item",
     name = "zirconium-plate",
-    icon = "__bzzirconium__/graphics/icons/zirconium-plate.png",
+    icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png",
     icon_size = 128,
     subgroup = "raw-material",
     order = "d[zirconium-plate]",
@@ -117,10 +117,10 @@ data:extend({
     order = "d[zirconium-plate]",
     icons = (util.k2() and
         {
-          { icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128 },
-          { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size = 128,  scale=0.125, shift= {-8, -8}},
+          { icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png", icon_size = 128 },
+          { icon = "__bzzirconium2__/graphics/icons/zirconia.png", icon_size = 128,  scale=0.125, shift= {-8, -8}},
         } or {
-          { icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128,  },
+          { icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png", icon_size = 128,  },
         }
 ),
     -- (util.k2() and
@@ -146,7 +146,7 @@ data:extend({
     type = "technology",
     name = "zirconia-processing",
     icon_size = 340,
-    icon = "__bzzirconium__/graphics/technology/zirconia-processing.png",
+    icon = "__bzzirconium2__/graphics/technology/zirconia-processing.png",
     effects =
     {
       {
@@ -161,7 +161,7 @@ data:extend({
     type = "technology",
     name = "zirconium-processing",
     icon_size = 128,
-    icon = "__bzzirconium__/graphics/icons/zirconium-plate.png",
+    icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png",
     effects =
     {
       {
@@ -205,14 +205,14 @@ data:extend({
   {
     type = "item",
     name = "cermet",
-    icon = "__bzzirconium__/graphics/icons/cermet.png",
+    icon = "__bzzirconium2__/graphics/icons/cermet.png",
     icon_size = 128,
     pictures = {
-      {filename = "__bzzirconium__/graphics/icons/cermet.png",   size=128, scale=0.25},
-      {filename = "__bzzirconium__/graphics/icons/cermet-1.png", size=128, scale=0.25},
-      {filename = "__bzzirconium__/graphics/icons/cermet-2.png", size=128, scale=0.25},
-      {filename = "__bzzirconium__/graphics/icons/cermet-3.png", size=128, scale=0.25},
-      {filename = "__bzzirconium__/graphics/icons/cermet-4.png", size=128, scale=0.25},
+      {filename = "__bzzirconium2__/graphics/icons/cermet.png",   size=128, scale=0.25},
+      {filename = "__bzzirconium2__/graphics/icons/cermet-1.png", size=128, scale=0.25},
+      {filename = "__bzzirconium2__/graphics/icons/cermet-2.png", size=128, scale=0.25},
+      {filename = "__bzzirconium2__/graphics/icons/cermet-3.png", size=128, scale=0.25},
+      {filename = "__bzzirconium2__/graphics/icons/cermet-4.png", size=128, scale=0.25},
     },
     inventory_move_sound = item_sounds.wire_inventory_move,
     pick_sound = item_sounds.wire_inventory_pickup,
@@ -230,7 +230,7 @@ data:extend({
     allow_productivity = true,
     auto_recycle = false,
     order = "z[zirconia]",
-    icons = { { icon = "__bzzirconium__/graphics/icons/cermet.png", icon_size = 128,  } },
+    icons = { { icon = "__bzzirconium2__/graphics/icons/cermet.png", icon_size = 128,  } },
     enabled = false,
     energy_required = #cermet_i + 1,
     ingredients = cermet_i,
@@ -240,7 +240,7 @@ data:extend({
     type = "technology",
     name = "cermet",
     icon_size = 512,
-    icon = "__bzzirconium__/graphics/technology/cermet.png",
+    icon = "__bzzirconium2__/graphics/technology/cermet.png",
     effects =
     {
       {
@@ -278,7 +278,7 @@ data:extend({
     subgroup = "raw-resource",
     order = "bzz",
     icons = {
-      { icon = "__bzzirconium__/graphics/icons/zircon.png", icon_size=128, scale=0.25, shift={4,4}},
+      { icon = "__bzzirconium2__/graphics/icons/zircon.png", icon_size=128, scale=0.25, shift={4,4}},
       { icon = "__base__/graphics/icons/stone.png",         icon_size=64, scale=0.25, shift={-4,-4}},
     },
     enabled = not mods.quality,
@@ -298,7 +298,7 @@ data:extend({
     order = "bzz",
     icons = {
       { icon = "__base__/graphics/icons/stone.png",         icon_size=64, scale=0.5, shift={4,4} },
-      { icon = "__bzzirconium__/graphics/icons/zircon.png", icon_size=128, scale=0.125, shift={-4,-4}},
+      { icon = "__bzzirconium2__/graphics/icons/zircon.png", icon_size=128, scale=0.125, shift={-4,-4}},
     },
     enabled = not mods.quality,
     energy_required = 1,
@@ -336,8 +336,8 @@ data:extend({
     subgroup = "raw-material",
     order = "z[zircon]",
     icons = {
-      { icon = "__bzzirconium__/graphics/icons/zircon.png", icon_size=128},
-      { icon = "__bzzirconium__/graphics/icons/zirconium-sponge.png", icon_size=128, scale=0.25, shift={-8,-8}},
+      { icon = "__bzzirconium2__/graphics/icons/zircon.png", icon_size=128},
+      { icon = "__bzzirconium2__/graphics/icons/zirconium-sponge.png", icon_size=128, scale=0.25, shift={-8,-8}},
     },
     enabled = false,
     energy_required = 10,
@@ -356,7 +356,7 @@ data:extend({
     subgroup = "raw-material",
     order = "z[zircon]",
     icons = {
-      { icon = "__bzzirconium__/graphics/icons/zirconia.png", icon_size=128},
+      { icon = "__bzzirconium2__/graphics/icons/zirconia.png", icon_size=128},
       { icon = "__space-age__/graphics/icons/pentapod-egg.png", icon_size=64, scale=0.25, shift={-4,-4}},
     },
     enabled = false,
@@ -382,7 +382,7 @@ data:extend({
     allow_productivity = true,
     subgroup = "vulcanus-processes",
     order = "d[zirconium-plate]",
-    icons ={{ icon = "__bzzirconium__/graphics/icons/zirconium-plate.png", icon_size = 128}},
+    icons ={{ icon = "__bzzirconium2__/graphics/icons/zirconium-plate.png", icon_size = 128}},
     enabled = false,
     energy_required = 3.2,
     ingredients = {util.item("zirconium-sponge", 1), util.fluid("vacuum")},
@@ -397,7 +397,7 @@ data:extend({
     order = "d[zirconium-gettering]",
     icons = {
           util.vacuum_icon,
-          { icon = "__bzzirconium__/graphics/icons/zirconium-sponge.png", icon_size = 128, scale=0.125, shift = {-8, -8}},
+          { icon = "__bzzirconium2__/graphics/icons/zirconium-sponge.png", icon_size = 128, scale=0.125, shift = {-8, -8}},
         },
     enabled = false,
     allow_productivity = true,
@@ -420,7 +420,7 @@ data:extend({
   {
     type = "item",
     name = "zirconium-tungstate",
-    icons = {{icon = "__bzzirconium__/graphics/icons/zircon-powder.png",
+    icons = {{icon = "__bzzirconium2__/graphics/icons/zircon-powder.png",
               icon_size = 64, tint = {a=1, r=.95, g=.75, b=0}}},
     inventory_move_sound = item_sounds.sulfur_inventory_move,
     pick_sound = item_sounds.resource_inventory_pickup,
@@ -462,7 +462,7 @@ data:extend({
   {
     type = "item",
     name = "zircaloy-4",
-    icons = {{icon = "__bzzirconium__/graphics/icons/zircaloy-4.png", icon_size = 128}},
+    icons = {{icon = "__bzzirconium2__/graphics/icons/zircaloy-4.png", icon_size = 128}},
     inventory_move_sound = item_sounds.metal_small_inventory_move,
     pick_sound = item_sounds.metal_small_inventory_pickup,
     drop_sound = item_sounds.metal_small_inventory_move,