diff --git a/Indium2/data-util.lua b/Indium2/data-util.lua
index 8226fd9..52c9094 100644
--- a/Indium2/data-util.lua
+++ b/Indium2/data-util.lua
@@ -1,18 +1,18 @@
 local util = {}
 
 util.bz = {}
-util.bz.carbon = mods["bzcarbon"] or mods["bzcarbon2"]
-util.bz.lead = mods["bzlead"] or mods["bzlead2"]
-util.bz.silicon = mods["bzsilicon"] or mods["bzsilicon2"]
-util.bz.tin = mods["bztin"] or mods["bztin2"]
-util.bz.titanium = mods["bztitanium"] or mods["bztitanium2"]
-util.bz.zirconium = mods["bzzirocnium"] or mods["bzzirocnium2"]
-util.bz.gold = mods["bzgold"] or mods["bzgold2"]
-util.bz.aluminum = mods["bzaluminum"] or mods["bzaluminum2"]
-util.bz.gas = mods["bzgas"] or mods["bzgas2"]
-util.bz.chlorine = mods["bzchlorine"] or mods["bzchlorine2"]
-util.bz.tungsten = mods["bztungsten"] or mods["bztungsten2"]
-util.bz.foundry = mods["bzfoundry"] or mods["bzfoundry2"] 
+util.bz.carbon = mods["bzcarbon"] and "bzcarbon" or mods["bzcarbon2"] and "bzcarbon2"
+util.bz.lead = mods["bzlead"] and "bzlead" or mods["bzlead2"] and "bzlead2"
+util.bz.silicon = mods["bzsilicon"] and "bzsilicon" or mods["bzsilicon2"] and "bzsilicon2"
+util.bz.tin = mods["bztin"] and "bztin" or mods["bztin2"] and "bztin2"
+util.bz.titanium = mods["bztitanium"] and "bztitanium" or mods["bztitanium2"] and "bztitanium2"
+util.bz.zirconium = mods["bzzirconium"] and "bzzirconium" or mods["bzzirconium2"] and "bzzirconium2"
+util.bz.gold = mods["bzgold"] and "bzgold" or mods["bzgold2"] and "bzgold2"
+util.bz.aluminum = mods["bzaluminum"] and "bzaluminum" or mods["bzaluminum2"] and "bzaluminum2"
+util.bz.gas = mods["bzgas"] and "bzgas" or mods["bzgas2"] and "bzgas2"
+util.bz.chlorine = mods["bzchlorine"] and "bzchlorine" or mods["bzchlorine2"] and "bzchlorine2"
+util.bz.tungsten = mods["bztungsten"] and "bztungsten" or mods["bztungsten2"] and "bztungsten2"
+util.bz.foundry = mods["bzfoundry"] and "bzfoundry" or mods["bzfoundry2"] and "bzfoundry2"
 
 -- se landfill
 -- params: ore, icon_size
diff --git a/Indium2/prototypes/indium-recipe.lua b/Indium2/prototypes/indium-recipe.lua
index e0c3a14..82c255f 100644
--- a/Indium2/prototypes/indium-recipe.lua
+++ b/Indium2/prototypes/indium-recipe.lua
@@ -99,7 +99,6 @@ if util.bz.silicon and data.raw.item["solar-cell"] then
   if mods["Krastorio2"] then
     table.insert(solar_cell_ingredients, {type="item", name="kr-rare-metals", amount=1})
   end
-  local mod = mods.bzsilicon and "__bzsilicon__" or "__bzsilicon2__"
 
   data:extend({
     {
@@ -107,7 +106,7 @@ if util.bz.silicon and data.raw.item["solar-cell"] then
       name = "indium-solar-cell",
       icons =
             {
-                { icon = mod .. "/graphics/icons/solar-cell.png", icon_size = 64 },
+                { icon = "__" .. util.bz.silicon .. "__/graphics/icons/solar-cell.png", icon_size = 64 },
                 { icon = "__Indium2__/graphics/icons/indium-plate.png", icon_size = 64, scale=0.2, shift= {-8, -8}},
             },
       category = "advanced-crafting",
@@ -133,13 +132,12 @@ if util.bz.foundry then
   solder_pcb_subgroup = "foundry-intermediate"
 end
 if mods["bismuth"] and util.bz.tin then
-  local mod = mods.bztin and "__bztin__" or "__bztin2__"
   data:extend({
     {
       type = "recipe",
       name = "indium-pcb-solder",
       icons = {
-                  { icon = mod .. "/graphics/icons/solder.png", icon_size = 128, tint = {r = 0.7, g = 0.5, b = 0.9, a = 1} },
+                  { icon = "__" .. util.bz.tin .. "__/graphics/icons/solder.png", icon_size = 128, tint = {r = 0.7, g = 0.5, b = 0.9, a = 1} },
                   { icon = "__Indium2__/graphics/icons/indium-plate.png", icon_size = 64, scale=0.2, shift= {-8, -8}},
                 },
       group = "intermediate-products",
diff --git a/Indium2/prototypes/technology.lua b/Indium2/prototypes/technology.lua
index 5ec6333..09eade6 100644
--- a/Indium2/prototypes/technology.lua
+++ b/Indium2/prototypes/technology.lua
@@ -58,8 +58,6 @@ data:extend(
     },
   })
 if (util.bz.tin and mods["bismuth"]) or false then
-  local mod = mods.bztin and "__bztin__" or "__bztin2__"
-
 data:extend(
   {
     {
@@ -67,7 +65,7 @@ data:extend(
       name = "indium-pcb-solder",
       icons =
       {
-        { icon = mod .. "/graphics/icons/solder.png", icon_size = 128, tint = {r = 0.7, g = 0.5, b = 0.9, a = 1} },
+        { icon = "__" .. util.bz.tin .. "__/graphics/icons/solder.png", icon_size = 128, tint = {r = 0.7, g = 0.5, b = 0.9, a = 1} },
         { icon = "__Indium2__/graphics/icons/indium-plate.png", icon_size = 64, shift= {-8, -8}},
       },
       prerequisites = {"indium-processing"},