diff --git a/mods/pyutest/pyutest_core/blocks.lua b/mods/pyutest/pyutest_core/blocks.lua
index 60944b1..3e69f9d 100644
--- a/mods/pyutest/pyutest_core/blocks.lua
+++ b/mods/pyutest/pyutest_core/blocks.lua
@@ -179,148 +179,152 @@ PyuTestCore.make_building_blocks = function (name, desc, tex, colortint, cgroups
   })
 end
 
-PyuTestCore.make_building_blocks("pyutest_core:grass", "Grass", {"grass.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:grass", "Grass", {"pyutest-grass.png"}, nil, {
   ground = 1,
   acid_vulnerable = 1,
   grass = 1
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:dark_grass", "Dark Grass", {"dark-grass.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:dark_grass", "Dark Grass", {"pyutest-dark-grass.png"}, nil, {
   ground = 1,
   acid_vulnerable = 1,
   grass = 1
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:swampy_grass", "Swampy Grass", {"swampy-grass.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:swampy_grass", "Swampy Grass", {"pyutest-swampy-grass.png"}, nil, {
   ground = 1,
   acid_vulnerable = 1,
   sugarcane_spawn_on = 1,
   grass = 1
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:savanna_grass", "Savanna Grass", {"savanna-grass.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:savanna_grass", "Savanna Grass", {"pyutest-savanna-grass.png"}, nil, {
   ground = 1,
   acid_vulnerable = 1,
   sugarcane_spawn_on = 1,
   grass = 1
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:aspen_grass", "Aspen Grass", {"aspen-grass.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:aspen_grass", "Aspen Grass", {"pyutest-aspen-grass.png"}, nil, {
   ground = 1,
   acid_vulnerable = 1,
   grass = 1
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:jungle_grass", "Jungle Grass", {"jungle-grass.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:jungle_grass", "Jungle Grass", {"pyutest-jungle-grass.png"}, nil, {
   ground = 1,
   acid_vulnerable = 1,
   grass = 1
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:dirt", "Dirt", {"dirt.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:dirt", "Dirt", {"pyutest-dirt.png"}, nil, {
   ground = 1,
   acid_vulnerable = 1
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:podzol", "Podzol", {"podzol.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:podzol", "Podzol", {"pyutest-podzol.png"}, nil, {
   ground = 1,
   acid_vulnerable = 1
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:stone", "Stone", {"stone.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:stone", "Stone", {"pyutest-stone.png"}, nil, {
   ground = 1,
   stone = 1,
   block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE,
 }, {is_ground_content = false})
 
-PyuTestCore.make_building_blocks("pyutest_core:snow", "Snow", {"snow.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:snow", "Snow", {"pyutest-snow.png"}, nil, {
   ground = 1,
   acid_vulnerable = 1
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:sand", "Sand", {"sand.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:sand", "Sand", {"pyutest-sand.png"}, nil, {
   ground = 1,
   acid_vulnerable = 1,
   falling_node = 1,
   sugarcane_spawn_on = 1
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:sandstone", "Sandstone", {"sandstone.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:sandstone", "Sandstone", {"pyutest-sandstone.png"}, nil, {
   ground = 1,
   acid_vulnerable = 1
 }, {is_ground_content = false})
 
-PyuTestCore.make_building_blocks("pyutest_core:ice", "Ice", {"ice.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:ice", "Ice", {"pyutest-ice.png"}, nil, {
   ground = 1,
   acid_vulnerable = 1,
   slippery = 4
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:mushroom", "Mushroom", {"mushroom.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:mushroom", "Mushroom", {"pyutest-mushroom.png"}, nil, {
   flammable = 1
 }, {is_ground_content = false})
-PyuTestCore.make_building_blocks("pyutest_core:mushroom_stem", "Mushroom Stem", {"mushroom-stem.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:mushroom_stem", "Mushroom Stem", {"pyutest-mushroom-stem.png"}, nil, {
   flammable = 1
 }, {is_ground_content = false})
-PyuTestCore.make_building_blocks("pyutest_core:mycelium", "Mycelium", {"mycelium.png"}, nil, {ground = 1})
-PyuTestCore.make_building_blocks("pyutest_core:molten_rock", "Molten Rock", {"molten-rock.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:mycelium", "Mycelium", {"pyutest-mycelium.png"}, nil, {ground = 1})
+PyuTestCore.make_building_blocks("pyutest_core:molten_rock", "Molten Rock", {"pyutest-molten-rock.png"}, nil, {
   ground = 1,
   block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE
 }, {is_ground_content = false})
 
-PyuTestCore.make_building_blocks("pyutest_core:basalt", "Basalt", {"basalt.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:basalt", "Basalt", {"pyutest-basalt.png"}, nil, {
   ground = 1,
   block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE
 }, {is_ground_content = false})
 
-PyuTestCore.make_building_blocks("pyutest_core:obsidian", "Obsidian", {"obsidian.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:obsidian", "Obsidian", {"pyutest-obsidian.png"}, nil, {
   block = PyuTestCore.BLOCK_BREAKABLE_VERYLONG
 }, {is_ground_content = false})
 
-PyuTestCore.make_building_blocks("pyutest_core:haybale", "Haybale", {"haybale-top-bottom.png", "haybale-top-bottom.png", "haybale.png"}, nil)
+PyuTestCore.make_building_blocks("pyutest_core:haybale", "Haybale", {
+    "pyutest-haybale-top-bottom.png",
+    "pyutest-haybale-top-bottom.png",
+    "pyutest-haybale.png"
+}, nil)
 
                             -- keeping old ID for backwards compatibility
 PyuTestCore.make_building_blocks("pyutest_core:crying_obsidian", "Enchanted Obsidian", {
-    "enchanted-obsidian.png"
+    "pyutest-enchanted-obsidian.png"
 }, nil, {
     block = PyuTestCore.BLOCK_BREAKABLE_VERYLONG
 }, {
     is_ground_content = false
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:brick", "Brick", {"bricks.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:brick", "Brick", {"pyutest-bricks.png"}, nil, {
     block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE
 }, {
     is_ground_content = false
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:stone_bricks", "Stone Bricks", {"stone-bricks.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:stone_bricks", "Stone Bricks", {"pyutest-stone-bricks.png"}, nil, {
     block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE
 }, {
     is_ground_content = false
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:slime", "Slime", {"slime.png"}, nil, {bouncy = 85})
+PyuTestCore.make_building_blocks("pyutest_core:slime", "Slime", {"pyutest-slime.png"}, nil, {bouncy = 85})
 
-PyuTestCore.make_building_blocks("pyutest_core:clay", "Clay", {"clay-block.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:clay", "Clay", {"pyutest-clay-block.png"}, nil, {
   acid_vulnerable = 1
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:gravel", "Gravel", {"gravel.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:gravel", "Gravel", {"pyutest-gravel.png"}, nil, {
   falling_node = 1,
   acid_vulnerable = 1
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:crystal_lantern", "Crystal Lantern", {"crystal-lantern.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:crystal_lantern", "Crystal Lantern", {"pyutest-crystal-lantern.png"}, nil, {
   block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE
 }, {
   light_source = minetest.LIGHT_MAX
 })
 
 PyuTestCore.make_building_blocks("pyutest_core:bone", "Bone", {
-    "bone-block-top-bottom.png",
-    "bone-block-top-bottom.png",
-    "bone-block.png"
+    "pyutest-bone-block-top-bottom.png",
+    "pyutest-bone-block-top-bottom.png",
+    "pyutest-bone-block.png"
 }, nil, {
   block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE
 })
@@ -329,7 +333,7 @@ PyuTestCore.make_node("pyutest_core:light", "Light", {
   block = PyuTestCore.BLOCK_BREAKABLE_INSTANT,
   light = 1
 }, {
-  "light.png"
+  "pyutest-light.png"
 }, {
   drawtype = "torchlike",
   walkable = false,
@@ -343,9 +347,9 @@ PyuTestCore.make_node("pyutest_core:torch", "Torch", {
   light = 1,
   attached_node = 1
 }, {
-  "torch.png",
-  "torch.png^[transform6",
-  "torch.png^[transform1"
+  "pyutest-torch.png",
+  "pyutest-torch.png^[transform6",
+  "pyutest-torch.png^[transform1"
 }, {
   light_source = minetest.LIGHT_MAX,
   walkable = false,
@@ -357,15 +361,11 @@ PyuTestCore.make_node("pyutest_core:torch", "Torch", {
 
 PyuTestCore.make_node("pyutest_core:sponge", "Sponge", {
   block = PyuTestCore.BLOCK_BREAKABLE_INSTANT
-}, {"sponge.png"}, {
-  on_timer = function(pos)
-
-  end
-})
+}, {"pyutest-sponge.png"})
 
 PyuTestCore.make_node("pyutest_core:glass", "Glass", {
   block = PyuTestCore.BLOCK_BREAKABLE_INSTANT
-}, {"glass.png"}, {
+}, {"pyutest-glass.png"}, {
   drawtype = "glasslike_framed",
   paramtype = "light",
   sunlight_propagates = true
@@ -374,16 +374,20 @@ PyuTestCore.make_node("pyutest_core:glass", "Glass", {
 PyuTestCore.make_node("pyutest_core:tree_sapling", "Tree Sapling", {
   block = PyuTestCore.BLOCK_BREAKABLE_INSTANT,
   flammable = 1
-}, {"sapling.png"}, {
+}, {
+    "pyutest-sapling.png"
+}, {
   drawtype = "plantlike",
   walkable = false,
   waving = 1,
   buildable_to = true,
   paramtype = "light",
   sunlight_propagates = true,
-  inventory_image = "sapling.png",
+  inventory_image = "pyutest-sapling.png",
 
   on_timer = function (pos)
+
+    -- FIXME: Update to new tree schematic names
     local trees = {
       "tree",
       "tree2",
@@ -410,10 +414,11 @@ PyuTestCore.make_node("pyutest_core:tree_sapling", "Tree Sapling", {
   end
 })
 
+-- FIXME: This has been in the game for a month, implement it already!
 PyuTestCore.make_node("pyutest_core:trapdoor", "Trapdoor", {
   block = PyuTestCore.BLOCK_BREAKABLE_CHOPPY,
   flammable = 1
-}, {"trapdoor.png"}, {
+}, {"pyutest-trapdoor.png"}, {
   drawtype = "nodebox",
   paramtype = "light",
   sunlight_propagates = true,
@@ -425,7 +430,7 @@ PyuTestCore.make_node("pyutest_core:trapdoor", "Trapdoor", {
 
 PyuTestCore.make_node("pyutest_core:contagious_acid", "Contagious Acid", {
   block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE,
-}, {"acid.png"}, {})
+}, {"pyutest-acid.png"}, {})
 
 PyuTestCore.make_node("pyutest_core:barrier", "Barrier", {
   block = PyuTestCore.BLOCK_BREAKABLE_FOREVER
@@ -434,13 +439,13 @@ PyuTestCore.make_node("pyutest_core:barrier", "Barrier", {
   walkable = true,
   paramtype = "light",
   sunlight_propagates = true,
-  inventory_image = "barrier.png",
-  wield_image = "barrier.png"
+  inventory_image = "pyutest-barrier.png",
+  wield_image = "pyutest-barrier.png"
 })
 
 PyuTestCore.make_node("pyutest_core:fire", "Fire", {
   block = PyuTestCore.BLOCK_BREAKABLE_INSTANT
-}, {"fire.png"}, {
+}, {"pyutest-fire.png"}, {
   drawtype = "firelike",
   walkable = false,
   buildable_to = true,
@@ -454,9 +459,9 @@ PyuTestCore.make_node("pyutest_core:fire", "Fire", {
 PyuTestCore.make_node("pyutest_core:tnt", "TNT", {
   block = PyuTestCore.BLOCK_BREAKABLE_INSTANT
 }, {
-  "tnt-top-bottom.png",
-  "tnt-top-bottom.png",
-  "tnt-side.png" -- Affects all other sides
+  "pyutest-tnt-top-bottom.png",
+  "pyutest-tnt-top-bottom.png",
+  "pyutest-tnt-side.png" -- Affects all other sides
 }, {
   on_rightclick = function (pos, _, clicker)
     local timer = minetest.get_node_timer(pos)
@@ -472,7 +477,7 @@ PyuTestCore.make_node("pyutest_core:tnt", "TNT", {
 
 PyuTestCore.make_node("pyutest_core:crate", "Crate", {
   block = PyuTestCore.BLOCK_BREAKABLE_CHOPPY
-}, {"crate.png"}, {
+}, {"pyutest-crate.png"}, {
   on_construct = function (pos)
     local meta = minetest.get_meta(pos)
     local inventory = meta:get_inventory()
@@ -506,7 +511,11 @@ PyuTestCore.make_node("pyutest_core:crate", "Crate", {
 
 PyuTestCore.make_node("pyutest_core:workbench", "Workbench", {
   block = PyuTestCore.BLOCK_BREAKABLE_CHOPPY
-}, {"workbench-top.png", "workbench-bottom.png", "workbench-sides.png"}, {
+}, {
+    "pyutest-workbench-top.png",
+    "pyutest-workbench-bottom.png",
+    "pyutest-workbench-sides.png"
+}, {
   on_rightclick = function(pos, node, clicker)
     minetest.show_formspec(clicker:get_player_name(), "pyutest_core:workbench", table.concat({
       "size[8,9]",
@@ -518,7 +527,7 @@ PyuTestCore.make_node("pyutest_core:workbench", "Workbench", {
 
 PyuTestCore.make_node("pyutest_core:ladder", "Ladder", {
   block = PyuTestCore.BLOCK_BREAKABLE_CHOPPY
-}, {"ladder.png"}, {
+}, {"pyutest-ladder.png"}, {
   drawtype = "signlike",
   paramtype = "light",
   walkable = false,
@@ -529,5 +538,5 @@ PyuTestCore.make_node("pyutest_core:ladder", "Ladder", {
   selection_box = {
     type = "wallmounted"
   },
-  inventory_image = "ladder.png"
+  inventory_image = "pyutest-ladder.png"
 })
diff --git a/mods/pyutest/pyutest_core/combat.lua b/mods/pyutest/pyutest_core/combat.lua
index 4b0a6b5..4a38955 100644
--- a/mods/pyutest/pyutest_core/combat.lua
+++ b/mods/pyutest/pyutest_core/combat.lua
@@ -14,7 +14,7 @@ PyuTestCore.make_sword = function (nsname, desc, texture, damage, durability, at
   })
 end
 
-PyuTestCore.make_sword("pyutest_core:wooden_sword", "Wooden Sword", "wooden-sword.png", 4, 200, 1.8)
-PyuTestCore.make_sword("pyutest_core:stone_sword", "Stone Sword", "stone-sword.png", 5, 450, 1.5)
-PyuTestCore.make_sword("pyutest_core:iron_sword", "Iron Sword", "iron-sword.png", 7, 750, 1.2)
-PyuTestCore.make_sword("pyutest_core:diamond_sword", "Diamond Sword", "diamond-sword.png", 12, 1200, 0.8)
+PyuTestCore.make_sword("pyutest_core:wooden_sword", "Wooden Sword", "pyutest-wooden-sword.png", 4, 200, 1.8)
+PyuTestCore.make_sword("pyutest_core:stone_sword", "Stone Sword", "pyutest-stone-sword.png", 5, 450, 1.5)
+PyuTestCore.make_sword("pyutest_core:iron_sword", "Iron Sword", "pyutest-iron-sword.png", 7, 750, 1.2)
+PyuTestCore.make_sword("pyutest_core:diamond_sword", "Diamond Sword", "pyutest-diamond-sword.png", 12, 1200, 0.8)
diff --git a/mods/pyutest/pyutest_core/electricity.lua b/mods/pyutest/pyutest_core/electricity.lua
index 8669f13..f48b47b 100644
--- a/mods/pyutest/pyutest_core/electricity.lua
+++ b/mods/pyutest/pyutest_core/electricity.lua
@@ -1,3 +1,5 @@
+-- TODO: Bring electricity back one day.
+
 PyuTestCore.ELECTRICITY_UPDATE_TIME = 0.1
 
 local function set_electrified(pos, value)
@@ -228,7 +230,7 @@ PyuTestCore.make_device("pyutest_core:freezer", "Freezer Device", "skyblue", "py
   PyuTestCore.dorange(pos, 3, function(p)
     local node = minetest.get_node_or_nil(p)
     if node == nil then return end
-    
+
     if minetest.get_item_group(node.name, "water") ~= 0 then
       minetest.set_node(p, {name = "pyutest_core:ice_block"})
     elseif minetest.get_item_group(node.name, "lava") ~= 0 then
diff --git a/mods/pyutest/pyutest_core/flowers.lua b/mods/pyutest/pyutest_core/flowers.lua
index 24d8b55..2e80d0e 100644
--- a/mods/pyutest/pyutest_core/flowers.lua
+++ b/mods/pyutest/pyutest_core/flowers.lua
@@ -31,23 +31,23 @@ PyuTestCore.make_flower = function (name, desc, texture, dye, add_to_registry, d
 end
 
 -- Plants from before the floral update
-PyuTestCore.make_flower("pyutest_core:rose", "Rose", "flower.png", "pyutest_core:red_dye", true)
-PyuTestCore.make_flower("pyutest_core:dandelion", "Dandelion", "flower2.png", "pyutest_core:yellow_dye", true)
-PyuTestCore.make_flower("pyutest_core:blue_daisy", "Blue Daisy", "flower3.png", "pyutest_core:blue_dye", true)
-PyuTestCore.make_flower("pyutest_core:lavender", "Lavender", "flower4.png", "pyutest_core:purple_dye", true)
+PyuTestCore.make_flower("pyutest_core:rose", "Rose", "pyutest-flower.png", "pyutest_core:red_dye", true)
+PyuTestCore.make_flower("pyutest_core:dandelion", "Dandelion", "pyutest-flower2.png", "pyutest_core:yellow_dye", true)
+PyuTestCore.make_flower("pyutest_core:blue_daisy", "Blue Daisy", "pyutest-flower3.png", "pyutest_core:blue_dye", true)
+PyuTestCore.make_flower("pyutest_core:lavender", "Lavender", "pyutest-flower4.png", "pyutest_core:purple_dye", true)
 
 minetest.register_alias("pyutest_core:flower", "pyutest_core:rose")
 minetest.register_alias("pyutest_core:flower2", "pyutest_core:dandelion")
 minetest.register_alias("pyutest_core:flower3", "pyutest_core:blue_daisy")
 minetest.register_alias("pyutest_core:flower4", "pyutest_core:lavender")
 
-PyuTestCore.make_flower("pyutest_core:deadbush", "Deadbush", "deadbush.png", "pyutest_core:brown_dye")
-PyuTestCore.make_flower("pyutest_core:grass_plant", "Grass", "grass-plant.png", "pyutest_core:green_dye")
-PyuTestCore.make_flower("pyutest_core:sugarcane", "Sugarcane", "sugarcane.png", "pyutest_core:green_dye", false, nil)
+PyuTestCore.make_flower("pyutest_core:deadbush", "Deadbush", "pyutest-deadbush.png", "pyutest_core:brown_dye")
+PyuTestCore.make_flower("pyutest_core:grass_plant", "Grass", "pyutest-grass-plant.png", "pyutest_core:green_dye")
+PyuTestCore.make_flower("pyutest_core:sugarcane", "Sugarcane", "pyutest-sugarcane.png", "pyutest_core:green_dye", false, nil)
 
 PyuTestCore.make_node("pyutest_core:lilypad", "Lily Pad", {
     block = PyuTestCore.BLOCK_BREAKABLE_INSTANT
-}, {"lilypad.png"}, {
+}, {"pyutest-lilypad.png"}, {
     drawtype = "nodebox",
     paramtype = "light",
     paramtype2 = "facedir",
@@ -60,15 +60,15 @@ PyuTestCore.make_node("pyutest_core:lilypad", "Lily Pad", {
 })
 
 -- Plants after the floral update
-PyuTestCore.make_flower("pyutest_core:maybell", "Maybell", "maybell.png", "pyutest_core:white_dye", true)
-PyuTestCore.make_flower("pyutest_core:orange_tulip", "Orange Tulip", "orange-tulip.png", "pyutest_core:orange_dye", true)
-PyuTestCore.make_flower("pyutest_core:black_rose", "Black Rose", "black-rose.png", "pyutest_core:black_dye", true)
+PyuTestCore.make_flower("pyutest_core:maybell", "Maybell", "pyutest-maybell.png", "pyutest_core:white_dye", true)
+PyuTestCore.make_flower("pyutest_core:orange_tulip", "Orange Tulip", "pyutest-orange-tulip.png", "pyutest_core:orange_dye", true)
+PyuTestCore.make_flower("pyutest_core:black_rose", "Black Rose", "pyutest-black-rose.png", "pyutest_core:black_dye", true)
 
 PyuTestCore.make_node("pyutest_core:vines", "Vines", {
     block = PyuTestCore.BLOCK_BREAKABLE_INSTANT,
     attached_node = 1,
     flammable = 1
-}, {"vines.png"}, {
+}, {"pyutest-vines.png"}, {
     drawtype = "signlike",
     paramtype = "light",
     walkable = false,
@@ -79,21 +79,21 @@ PyuTestCore.make_node("pyutest_core:vines", "Vines", {
     selection_box = {
       type = "wallmounted"
     },
-    inventory_image = "vines.png"
+    inventory_image = "pyutest-vines.png"
 })
 
-PyuTestCore.make_flower("pyutest_core:kelp", "Kelp", "kelp.png", "pyutest_core:green_dye", false, "plantlike_rooted", {
+PyuTestCore.make_flower("pyutest_core:kelp", "Kelp", "pyutest-kelp.png", "pyutest_core:green_dye", false, "plantlike_rooted", {
     paramtype2 = "leveled",
     place_param2 = 128,
-    wield_image = "kelp.png",
+    wield_image = "pyutest-kelp.png",
     special_tiles = {
       {
-        image = "kelp.png",
+        image = "pyutest-kelp.png",
         tileable_vertical = true
       },
     },
     tiles = {
-      "gravel.png"
+      "pyutest-gravel.png"
     },
 
     walkable = true
@@ -102,7 +102,7 @@ PyuTestCore.make_flower("pyutest_core:kelp", "Kelp", "kelp.png", "pyutest_core:g
 
 PyuTestCore.make_flower("pyutest_core:small_mushroom",
   "Small Mushroom",
-  "mushroom-small.png",
+  "pyutest-mushroom-small.png",
   "pyutest_core:red_dye",
   false, nil, {
     groups = {
diff --git a/mods/pyutest/pyutest_core/furnace.lua b/mods/pyutest/pyutest_core/furnace.lua
index addc732..902bf7c 100644
--- a/mods/pyutest/pyutest_core/furnace.lua
+++ b/mods/pyutest/pyutest_core/furnace.lua
@@ -18,12 +18,12 @@ end
 PyuTestCore.make_node("pyutest_core:furnace", "Furnace", {
   block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE
 }, {
-  "furnace-top-bottom.png",
-  "furnace-top-bottom.png",
-  "furnace-sides.png",
-  "furnace-sides.png",
-  "furnace-sides.png",
-  "furnace-front.png",
+  "pyutest-furnace-top-bottom.png",
+  "pyutest-furnace-top-bottom.png",
+  "pyutest-furnace-sides.png",
+  "pyutest-furnace-sides.png",
+  "pyutest-furnace-sides.png",
+  "pyutest-furnace-front.png",
 }, {
   is_ground_content = false,
   paramtype2 = "facedir",
@@ -42,7 +42,7 @@ PyuTestCore.make_node("pyutest_core:furnace", "Furnace", {
 
     local meta = minetest.get_meta(pos)
     local inv = meta:get_inventory()
-  
+
     local function smelt()
       local src = inv:get_stack("src", 1)
       local fuel = inv:get_stack("fuel", 1)
diff --git a/mods/pyutest/pyutest_core/items.lua b/mods/pyutest/pyutest_core/items.lua
index 86d72c1..ad3bd73 100644
--- a/mods/pyutest/pyutest_core/items.lua
+++ b/mods/pyutest/pyutest_core/items.lua
@@ -15,23 +15,23 @@ PyuTestCore.make_item = function (nsname, desc, groups, wield_image, extra_conf)
   minetest.register_craftitem(nsname, conf)
 end
 
-PyuTestCore.make_item("pyutest_core:stick", "Stick", {}, "stick.png")
+PyuTestCore.make_item("pyutest_core:stick", "Stick", {}, "pyutest-stick.png")
 
-PyuTestCore.make_item("pyutest_core:bone", "Bone", {}, "bone.png", {
+PyuTestCore.make_item("pyutest_core:bone", "Bone", {}, "pyutest-bone.png", {
   stack_max = 99
 })
 
-PyuTestCore.make_item("pyutest_core:gunpowder", "Gunpowder", {}, "powder.png", {
+PyuTestCore.make_item("pyutest_core:gunpowder", "Gunpowder", {}, "pyutest-powder.png", {
   color = "dimgray",
 })
 
-PyuTestCore.make_item("pyutest_core:ash", "Ash", {}, "powder.png", {
+PyuTestCore.make_item("pyutest_core:ash", "Ash", {}, "pyutest-powder.png", {
   color = "gray",
 })
 
-PyuTestCore.make_item("pyutest_core:sugar", "Sugar", {}, "powder.png")
+PyuTestCore.make_item("pyutest_core:sugar", "Sugar", {}, "pyutest-powder.png")
 
-PyuTestCore.make_item("pyutest_core:coin", "Coin", {}, "coin.png", {
+PyuTestCore.make_item("pyutest_core:coin", "Coin", {}, "pyutest-coin.png", {
   on_secondary_use = function (_, user)
     local pos = user:get_pos()
     minetest.sound_play({name = "coin", gain = 1}, {
@@ -41,15 +41,15 @@ PyuTestCore.make_item("pyutest_core:coin", "Coin", {}, "coin.png", {
   end
 })
 
-PyuTestCore.make_item("pyutest_core:wheat", "Wheat", {}, "wheat.png")
-PyuTestCore.make_item("pyutest_core:string", "String", {}, "string.png")
-PyuTestCore.make_item("pyutest_core:egg", "Egg", {}, "egg.png", {
+PyuTestCore.make_item("pyutest_core:wheat", "Wheat", {}, "pyutest-wheat.png")
+PyuTestCore.make_item("pyutest_core:string", "String", {}, "pyutest-string.png")
+PyuTestCore.make_item("pyutest_core:egg", "Egg", {}, "pyutest-egg.png", {
   color = "peachpuff"
 })
-PyuTestCore.make_item("pyutest_core:clay", "Clay Ball", {}, "clay.png")
-PyuTestCore.make_item("pyutest_core:glass_bottle", "Glass Bottle", {}, "glass-bottle.png", {
+PyuTestCore.make_item("pyutest_core:clay", "Clay Ball", {}, "pyutest-clay.png")
+PyuTestCore.make_item("pyutest_core:glass_bottle", "Glass Bottle", {}, "pyutest-glass-bottle.png", {
   stack_max = 16
 })
-PyuTestCore.make_item("pyutest_core:brick", "Brick", {}, "brick.png")
-PyuTestCore.make_item("pyutest_core:snowball", "Snowball", {}, "snowball.png")
-PyuTestCore.make_item("pyutest_core:bone", "Bone", {}, "bone.png")
+PyuTestCore.make_item("pyutest_core:brick", "Brick", {}, "pyutest-brick.png")
+PyuTestCore.make_item("pyutest_core:snowball", "Snowball", {}, "pyutest-snowball.png")
+PyuTestCore.make_item("pyutest_core:bone", "Bone", {}, "pyutest-bone.png")
diff --git a/mods/pyutest/pyutest_core/leaves.lua b/mods/pyutest/pyutest_core/leaves.lua
index 198983d..bbcf542 100644
--- a/mods/pyutest/pyutest_core/leaves.lua
+++ b/mods/pyutest/pyutest_core/leaves.lua
@@ -27,9 +27,9 @@ PyuTestCore.make_leaves = function (id, desc, tiles)
   })
 end
 
-PyuTestCore.make_leaves(nil, nil, {"leaves.png"})
-PyuTestCore.make_leaves("pyutest_core:snowy", "Snowy", {"snowy-leaves.png"})
-PyuTestCore.make_leaves("pyutest_core:cherry", "Cherry", {"cherry-leaves.png"})
-PyuTestCore.make_leaves("pyutest_core:dark", "Dark", {"dark-leaves.png"})
-PyuTestCore.make_leaves("pyutest_core:aspen", "Aspen", {"aspen-leaves.png"})
-PyuTestCore.make_leaves("pyutest_core:red_aspen", "Red Aspen", {"red-aspen-leaves.png"})
+PyuTestCore.make_leaves(nil, nil, {"pyutest-leaves.png"})
+PyuTestCore.make_leaves("pyutest_core:snowy", "Snowy", {"pyutest-snowy-leaves.png"})
+PyuTestCore.make_leaves("pyutest_core:cherry", "Cherry", {"pyutest-cherry-leaves.png"})
+PyuTestCore.make_leaves("pyutest_core:dark", "Dark", {"pyutest-dark-leaves.png"})
+PyuTestCore.make_leaves("pyutest_core:aspen", "Aspen", {"pyutest-aspen-leaves.png"})
+PyuTestCore.make_leaves("pyutest_core:red_aspen", "Red Aspen", {"pyutest-red-aspen-leaves.png"})
diff --git a/mods/pyutest/pyutest_core/liquid.lua b/mods/pyutest/pyutest_core/liquid.lua
index 42dde12..e507200 100644
--- a/mods/pyutest/pyutest_core/liquid.lua
+++ b/mods/pyutest/pyutest_core/liquid.lua
@@ -48,18 +48,18 @@ end
 
 PyuTestCore.make_liquid("pyutest_core:water", "Water", {
   water = 1
-}, "water.png", 1, {
+}, "pyutest-water.png", 1, {
   post_effect_color = {a=60, r=24.7, g=46.3, b=89.4},
   paramtype2 = "color",
 })
 
 PyuTestCore.make_liquid("pyutest_core:lava", "Lava", {
   lava = 1
-}, "lava.png", 5, {
+}, "pyutest-lava.png", 5, {
   damage_per_second = 2,
   light_source = 8
 })
-PyuTestCore.make_liquid("pyutest_core:oil", "Oil", {}, "oil.png", 3)
-PyuTestCore.make_liquid("pyutest_core:liquid_acid", "Acid", {}, "acid.png", 7, {
+PyuTestCore.make_liquid("pyutest_core:oil", "Oil", {}, "pyutest-oil.png", 3)
+PyuTestCore.make_liquid("pyutest_core:liquid_acid", "Acid", {}, "pyutest-acid.png", 7, {
   damage_per_second = 2
 })
diff --git a/mods/pyutest/pyutest_core/lootboxes.lua b/mods/pyutest/pyutest_core/lootboxes.lua
index 3808015..257e769 100644
--- a/mods/pyutest/pyutest_core/lootboxes.lua
+++ b/mods/pyutest/pyutest_core/lootboxes.lua
@@ -6,7 +6,7 @@ PyuTestCore.make_lootbox = function (name, dname, items)
       block = PyuTestCore.BLOCK_BREAKABLE_CHOPPY,
       not_in_creative_inventory = 1
     },
-    tiles = {"crate.png"},
+    tiles = {"pyutest-crate.png"},
     sounds = PyuTestCore.make_node_sounds(),
     on_rightclick = function (pos, _, clicker)
       if clicker == nil then return end
@@ -20,7 +20,8 @@ PyuTestCore.make_lootbox = function (name, dname, items)
         gain = 1
       })
       minetest.remove_node(pos)
-    end
+    end,
+    color = "green"
   })
 end
 
diff --git a/mods/pyutest/pyutest_core/magic.lua b/mods/pyutest/pyutest_core/magic.lua
index cffb689..8d74f45 100644
--- a/mods/pyutest/pyutest_core/magic.lua
+++ b/mods/pyutest/pyutest_core/magic.lua
@@ -1,4 +1,4 @@
-PyuTestCore.make_item("pyutest_core:magic_shards", "Magic Shards", {}, "magic-shards.png")
+PyuTestCore.make_item("pyutest_core:magic_shards", "Magic Shards", {}, "pyutest-magic-shards.png")
 minetest.override_item("pyutest_core:crying_obsidian_block", {
   drop = {
     max_items = 1,
@@ -20,7 +20,7 @@ PyuTestCore.make_spellbook = function (nsname, desc, color, craftitem, action)
     action = function(_, _, _)end
   end
 
-  PyuTestCore.make_item(nsname, desc, {}, "spellbook.png", {
+  PyuTestCore.make_item(nsname, desc, {}, "pyutest-spellbook.png", {
     stack_max = 1,
     color = color,
     on_use = function (itemstack, user, pointed_thing)
@@ -68,7 +68,7 @@ PyuTestCore.make_spellbook("pyutest_core:fire_spellbook", "Spellbook of Fire", "
 end)
 
 
-PyuTestCore.make_item("pyutest_core:enchanted_shard", "Enchanted Shard", {}, "shard.png", {
+PyuTestCore.make_item("pyutest_core:enchanted_shard", "Enchanted Shard", {}, "pyutest-shard.png", {
   color = "indigo",
 })
 
@@ -81,7 +81,7 @@ minetest.register_craft({
   }
 })
 
-PyuTestCore.make_tool("pyutest_core:enchanted_pickaxe", "Enchanted Pickaxe", {}, "enchanted-pickaxe.png", {
+PyuTestCore.make_tool("pyutest_core:enchanted_pickaxe", "Enchanted Pickaxe", {}, "pyutest-enchanted-pickaxe.png", {
   stack_max = 1,
   tool_capabilities = {
     groupcaps = {
@@ -112,7 +112,7 @@ minetest.register_craft({
   }
 })
 
-PyuTestCore.make_sword("pyutest_core:enchanted_sword", "Enchanted Sword", "enchanted-sword.png", 15, 3600, 0.6)
+PyuTestCore.make_sword("pyutest_core:enchanted_sword", "Enchanted Sword", "pyutest-enchanted-sword.png", 15, 3600, 0.6)
 
 
 minetest.register_craft({
diff --git a/mods/pyutest/pyutest_core/ores.lua b/mods/pyutest/pyutest_core/ores.lua
index 0da909b..6199fd7 100644
--- a/mods/pyutest/pyutest_core/ores.lua
+++ b/mods/pyutest/pyutest_core/ores.lua
@@ -1,10 +1,10 @@
-PyuTestCore.make_building_blocks("pyutest_core:granite", "Granite", {"granite.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:granite", "Granite", {"pyutest-granite.png"}, nil, {
   ground = 1,
   stone = 1,
   block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE
 })
 
-PyuTestCore.make_building_blocks("pyutest_core:andesite", "Andesite", {"andesite.png"}, nil, {
+PyuTestCore.make_building_blocks("pyutest_core:andesite", "Andesite", {"pyutest-andesite.png"}, nil, {
   ground = 1,
   stone = 1,
   block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE
@@ -123,7 +123,7 @@ PyuTestCore.make_ore = function (id, desc, ifix, idfix, btxt, itxt, color, y_max
     y_min = PyuTestCore_WorldBottom,
   })
 
-  PyuTestCore.make_building_blocks(id, desc, {"metal.png"}, color, {block = block_type}, bconf or {})
+  PyuTestCore.make_building_blocks(id, desc, {"pyutest-metal.png"}, color, {block = block_type}, bconf or {})
 
   local bid = id.."_block"
   minetest.register_craft({
@@ -144,17 +144,17 @@ PyuTestCore.make_ore = function (id, desc, ifix, idfix, btxt, itxt, color, y_max
 end
 
 -- Useful Ores
-PyuTestCore.make_ore("pyutest_core:coal", "Coal", "lump", "Lump", "ore-coal.png", "lump.png", {r = 32, g = 32, b = 32}, 48, 8, 2, PyuTestCore.BLOCK_BREAKABLE_MIDDLE)
-PyuTestCore.make_ore("pyutest_core:copper", "Copper", "ingot", "Ingot", "ore-copper.png", "ingot.png", "darkgoldenrod", 18, 11, 2, PyuTestCore.BLOCK_BREAKABLE_MIDDLE)
-PyuTestCore.make_ore("pyutest_core:tin", "Tin", "ingot", "Ingot", "ore-tin.png", "ingot.png", "#8e8591", 18, 11, 1, PyuTestCore.BLOCK_BREAKABLE_MIDDLE)
-PyuTestCore.make_ore("pyutest_core:iron", "Iron", "ingot", "Ingot", "ore-iron.png", "ingot.png", nil, 18, 11, 1)
-PyuTestCore.make_ore("pyutest_core:gold", "Gold", "ingot", "Ingot", "ore-gold.png", "ingot.png", "gold", -75, 15.5, 1)
-PyuTestCore.make_ore("pyutest_core:diamond", "Diamond", "shard", "Shard", "ore-diamond.png", "shard.png", "cyan", -90, 16.7, 1)
-PyuTestCore.make_ore("pyutest_core:emerald", "Emerald", "shard", "Shard", "ore-emerald.png", "shard.png", "seagreen", -120, 18.3, 1)
+PyuTestCore.make_ore("pyutest_core:coal", "Coal", "lump", "Lump", "pyutest-ore-coal.png", "pyutest-lump.png", {r = 32, g = 32, b = 32}, 48, 8, 2, PyuTestCore.BLOCK_BREAKABLE_MIDDLE)
+PyuTestCore.make_ore("pyutest_core:copper", "Copper", "ingot", "Ingot", "pyutest-ore-copper.png", "pyutest-ingot.png", "darkgoldenrod", 18, 11, 2, PyuTestCore.BLOCK_BREAKABLE_MIDDLE)
+PyuTestCore.make_ore("pyutest_core:tin", "Tin", "ingot", "Ingot", "pyutest-ore-tin.png", "pyutest-ingot.png", "#8e8591", 18, 11, 1, PyuTestCore.BLOCK_BREAKABLE_MIDDLE)
+PyuTestCore.make_ore("pyutest_core:iron", "Iron", "ingot", "Ingot", "pyutest-ore-iron.png", "pyutest-ingot.png", nil, 18, 11, 1)
+PyuTestCore.make_ore("pyutest_core:gold", "Gold", "ingot", "Ingot", "pyutest-ore-gold.png", "pyutest-ingot.png", "gold", -75, 15.5, 1)
+PyuTestCore.make_ore("pyutest_core:diamond", "Diamond", "shard", "Shard", "pyutest-ore-diamond.png", "pyutest-shard.png", "cyan", -90, 16.7, 1)
+PyuTestCore.make_ore("pyutest_core:emerald", "Emerald", "shard", "Shard", "pyutest-ore-emerald.png", "pyutest-shard.png", "seagreen", -120, 18.3, 1)
 
 -- Ores without any special uses
-PyuTestCore.make_ore("pyutest_core:zinc", "Zinc", "ingot", "Ingot", "ore-zinc.png", "ingot.png", "#bed3d4", 18, 13, 1)
-PyuTestCore.make_ore("pyutest_core:lapis_lazuli", "Lapis Lazuli", "lump", "Lump", "ore-lapis.png", "lump.png", "#3848AC", -25, 13.4, 1)
-PyuTestCore.make_ore("pyutest_core:amethyst_quartz", "Amethyst Quartz", "shard", "Shard", "ore-amethyst.png", "shard.png", "#9f7ba9", -50, 14.1, 1)
-PyuTestCore.make_ore("pyutest_core:pink_quartz", "Pink Quartz", "shard", "Shard", "ore-pink-quartz.png", "shard.png", "#dbafdc", -50, 14.1, 1)
-PyuTestCore.make_ore("pyutest_core:ruby", "Ruby", "shard", "Shard", "ore-ruby.png", "shard.png", "#992727", -75, 15.5, 1)
+PyuTestCore.make_ore("pyutest_core:zinc", "Zinc", "ingot", "Ingot", "pyutest-ore-zinc.png", "pyutest-ingot.png", "#bed3d4", 18, 13, 1)
+PyuTestCore.make_ore("pyutest_core:lapis_lazuli", "Lapis Lazuli", "lump", "Lump", "pyutest-ore-lapis.png", "pyutest-lump.png", "#3848AC", -25, 13.4, 1)
+PyuTestCore.make_ore("pyutest_core:amethyst_quartz", "Amethyst Quartz", "shard", "Shard", "pyutest-ore-amethyst.png", "pyutest-shard.png", "#9f7ba9", -50, 14.1, 1)
+PyuTestCore.make_ore("pyutest_core:pink_quartz", "Pink Quartz", "shard", "Shard", "pyutest-ore-pink-quartz.png", "pyutest-shard.png", "#dbafdc", -50, 14.1, 1)
+PyuTestCore.make_ore("pyutest_core:ruby", "Ruby", "shard", "Shard", "pyutest-ore-ruby.png", "pyutest-shard.png", "#992727", -75, 15.5, 1)
diff --git a/mods/pyutest/pyutest_core/player.lua b/mods/pyutest/pyutest_core/player.lua
index dc1513c..eb80644 100644
--- a/mods/pyutest/pyutest_core/player.lua
+++ b/mods/pyutest/pyutest_core/player.lua
@@ -47,7 +47,7 @@ end)
 -- player hand
 minetest.register_item(":", {
   type = "none",
-  wield_image = "hand.png"
+  wield_image = "pyutest-hand.png"
 })
 
 if minetest.is_creative_enabled("")  then
diff --git a/mods/pyutest/pyutest_core/tools.lua b/mods/pyutest/pyutest_core/tools.lua
index f7b6d7c..0573568 100644
--- a/mods/pyutest/pyutest_core/tools.lua
+++ b/mods/pyutest/pyutest_core/tools.lua
@@ -30,7 +30,7 @@ PyuTestCore.make_food = function (nsname, desc, wield_image, health_fill, extra_
   })
 end
 
-PyuTestCore.make_tool("pyutest_core:wooden_pickaxe", "Wooden Pickaxe", {}, "wooden-pickaxe.png", {
+PyuTestCore.make_tool("pyutest_core:wooden_pickaxe", "Wooden Pickaxe", {}, "pyutest-wooden-pickaxe.png", {
   stack_max = 1,
   tool_capabilities = {
     groupcaps = {
@@ -49,7 +49,7 @@ PyuTestCore.make_tool("pyutest_core:wooden_pickaxe", "Wooden Pickaxe", {}, "wood
   }
 })
 
-PyuTestCore.make_tool("pyutest_core:stone_pickaxe", "Stone Pickaxe", {}, "stone-pickaxe.png", {
+PyuTestCore.make_tool("pyutest_core:stone_pickaxe", "Stone Pickaxe", {}, "pyutest-stone-pickaxe.png", {
   stack_max = 1,
   tool_capabilities = {
     groupcaps = {
@@ -71,7 +71,7 @@ PyuTestCore.make_tool("pyutest_core:stone_pickaxe", "Stone Pickaxe", {}, "stone-
   }
 })
 
-PyuTestCore.make_tool("pyutest_core:iron_pickaxe", "Iron Pickaxe", {}, "iron-pickaxe.png", {
+PyuTestCore.make_tool("pyutest_core:iron_pickaxe", "Iron Pickaxe", {}, "pyutest-iron-pickaxe.png", {
   stack_max = 1,
   tool_capabilities = {
     groupcaps = {
@@ -93,7 +93,7 @@ PyuTestCore.make_tool("pyutest_core:iron_pickaxe", "Iron Pickaxe", {}, "iron-pic
   }
 })
 
-PyuTestCore.make_tool("pyutest_core:diamond_pickaxe", "Diamond Pickaxe", {}, "diamond-pickaxe.png", {
+PyuTestCore.make_tool("pyutest_core:diamond_pickaxe", "Diamond Pickaxe", {}, "pyutest-diamond-pickaxe.png", {
   stack_max = 1,
   tool_capabilities = {
     groupcaps = {
@@ -115,7 +115,7 @@ PyuTestCore.make_tool("pyutest_core:diamond_pickaxe", "Diamond Pickaxe", {}, "di
   }
 })
 
-PyuTestCore.make_item("pyutest_core:bomb", "Bomb", {}, "bomb.png", {
+PyuTestCore.make_item("pyutest_core:bomb", "Bomb", {}, "pyutest-bomb.png", {
   stack_max = 16,
   on_use = function (_, user)
     if user == nil then
@@ -130,7 +130,7 @@ PyuTestCore.make_item("pyutest_core:bomb", "Bomb", {}, "bomb.png", {
   end
 })
 
-PyuTestCore.make_item("pyutest_core:windball", "Windball", {}, "windball.png", {
+PyuTestCore.make_item("pyutest_core:windball", "Windball", {}, "pyutest-windball.png", {
   stack_max = 16,
   on_use = function (_, user)
     if user == nil then
@@ -156,6 +156,6 @@ PyuTestCore.make_item("pyutest_core:windball", "Windball", {}, "windball.png", {
 })
 
 
-PyuTestCore.make_food("pyutest_core:apple", "Apple", "apple.png", 5)
-PyuTestCore.make_food("pyutest_core:bread", "Bread", "bread.png", 3)
-PyuTestCore.make_food("pyutest_core:water_bottle", "Water Bottle", "water-bottle.png", 2)
+PyuTestCore.make_food("pyutest_core:apple", "Apple", "pyutest-apple.png", 5)
+PyuTestCore.make_food("pyutest_core:bread", "Bread", "pyutest-bread.png", 3)
+PyuTestCore.make_food("pyutest_core:water_bottle", "Water Bottle", "pyutest-water-bottle.png", 2)
diff --git a/mods/pyutest/pyutest_core/wood.lua b/mods/pyutest/pyutest_core/wood.lua
index 3bf9c97..7c4bf3f 100644
--- a/mods/pyutest/pyutest_core/wood.lua
+++ b/mods/pyutest/pyutest_core/wood.lua
@@ -42,49 +42,49 @@ PyuTestCore.make_wood = function (id, desc, ltiles, btiles)
 end
 
 PyuTestCore.make_wood("pyutest_core:wooden", "Oak", {
-  "log-top-bottom.png",
-  "log-top-bottom.png",
-  "log.png"
+  "pyutest-log-top-bottom.png",
+  "pyutest-log-top-bottom.png",
+  "pyutest-log.png"
 }, {
-  "wood.png"
+  "pyutest-wood.png"
 })
 
 PyuTestCore.make_wood("pyutest_core:savanna", "Savanna", {
-  "savanna-log-top-bottom.png",
-  "savanna-log-top-bottom.png",
-  "savanna-log.png"
+  "pyutest-savanna-log-top-bottom.png",
+  "pyutest-savanna-log-top-bottom.png",
+  "pyutest-savanna-log.png"
 }, {
-  "savanna-wood.png"
+  "pyutest-savanna-wood.png"
 })
 
 PyuTestCore.make_wood("pyutest_core:birch", "Birch", {
-  "birch-log-top-bottom.png",
-  "birch-log-top-bottom.png",
-  "birch-log.png"
+  "pyutest-birch-log-top-bottom.png",
+  "pyutest-birch-log-top-bottom.png",
+  "pyutest-birch-log.png"
 }, {
-  "birch-wood.png"
+  "pyutest-birch-wood.png"
 })
 
 PyuTestCore.make_wood("pyutest_core:cherry", "Cherry", {
-  "cherry-log-top-bottom.png",
-  "cherry-log-top-bottom.png",
-  "cherry-log.png"
+  "pyutest-cherry-log-top-bottom.png",
+  "pyutest-cherry-log-top-bottom.png",
+  "pyutest-cherry-log.png"
 }, {
-  "cherry-wood.png"
+  "pyutest-cherry-wood.png"
 })
 
 PyuTestCore.make_wood("pyutest_core:redwood", "Redwood", {
-  "redwood-log-top-bottom.png",
-  "redwood-log-top-bottom.png",
-  "redwood-log.png"
+  "pyutest-redwood-log-top-bottom.png",
+  "pyutest-redwood-log-top-bottom.png",
+  "pyutest-redwood-log.png"
 }, {
-  "redwood.png"
+  "pyutest-redwood.png"
 })
 
 PyuTestCore.make_wood("pyutest_core:jungle", "Jungle", {
-  "jungle-log-top-bottom.png",
-  "jungle-log-top-bottom.png",
-  "jungle-log.png"
+  "pyutest-jungle-log-top-bottom.png",
+  "pyutest-jungle-log-top-bottom.png",
+  "pyutest-jungle-log.png"
 }, {
-  "jungle-wood.png"
+  "pyutest-jungle-wood.png"
 })
diff --git a/mods/pyutest/pyutest_core/wool.lua b/mods/pyutest/pyutest_core/wool.lua
index e636d2a..41efdac 100644
--- a/mods/pyutest/pyutest_core/wool.lua
+++ b/mods/pyutest/pyutest_core/wool.lua
@@ -1,18 +1,18 @@
 PyuTestCore.make_colored_blocks = function(name, desc, color)
   PyuTestCore.make_building_blocks(name.."_wool", desc.." Wool", {
-    "wool.png"
+    "pyutest-wool.png"
   }, color or "white", {
     colored = 1
   })
 
   PyuTestCore.make_building_blocks(name.."_terracotta", desc .. " Terracotta", {
-    "terracotta.png"
+    "pyutest-terracotta.png"
   }, color or "white", {
       block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE,
       colored = 1
   })
 
-  PyuTestCore.make_item(name.."_dye", desc.." Dye", {}, "dye.png", {
+  PyuTestCore.make_item(name.."_dye", desc.." Dye", {}, "pyutest-dye.png", {
     color = color or "white"
   })
 
diff --git a/mods/pyutest/pyutest_mapgen/api.lua b/mods/pyutest/pyutest_mapgen/api.lua
index 5cd24e3..1b78a43 100644
--- a/mods/pyutest/pyutest_mapgen/api.lua
+++ b/mods/pyutest/pyutest_mapgen/api.lua
@@ -8,7 +8,7 @@ PyuTestMapgen.register_structure = function (name, schematic, def)
       not_in_creative_inventory = 1
     },
     tiles = {
-      "stick.png"
+      "pyutest-stick.png"
     },
     walkable = false,
     pointable = false,
diff --git a/mods/pyutest/pyutest_mobs/api.lua b/mods/pyutest/pyutest_mobs/api.lua
index 6c5cb57..41c5e67 100644
--- a/mods/pyutest/pyutest_mobs/api.lua
+++ b/mods/pyutest/pyutest_mobs/api.lua
@@ -21,7 +21,7 @@ PyuTestMobs.create_boss_egg = function(mob_id, desc, texture, addegg, no_creativ
   local cage_id = "pyutest_mobs:"..mob_name.."_spawn_cage"
   PyuTestCore.make_node(cage_id, desc:gsub("Spawn Egg", "") .. "Boss Spawner Cage", {
       block = PyuTestCore.BLOCK_BREAKABLE_LONG
-  }, {"cage.png"}, {
+  }, {"pyutest-cage.png"}, {
       drawtype = "glasslike",
       on_rightclick = function(pos)
         mobs:add_mob(vector.add(pos, vector.new(0, 1, 0)), {
diff --git a/mods/pyutest/pyutest_mobs/basic.lua b/mods/pyutest/pyutest_mobs/basic.lua
index fbec4bf..8f9414d 100644
--- a/mods/pyutest/pyutest_mobs/basic.lua
+++ b/mods/pyutest/pyutest_mobs/basic.lua
@@ -24,7 +24,7 @@ mobs:register_mob("pyutest_mobs:monster", {
   makes_footstep_sound = true,
 
   textures = {
-    "monster.png", "monster_back.png"
+    "pyutest-monster.png", "pyutest-monster_back.png"
   },
 
   drops = {
@@ -36,7 +36,7 @@ mobs:register_mob("pyutest_mobs:monster", {
     }
   }
 })
-mobs:register_egg("pyutest_mobs:monster", "Monster Spawn Egg", "egg.png^[multiply:darkgreen", 0)
+mobs:register_egg("pyutest_mobs:monster", "Monster Spawn Egg", "pyutest-egg.png^[multiply:darkgreen", 0)
 
 mobs:register_mob("pyutest_mobs:human", {
   type = "npc",
@@ -71,7 +71,7 @@ mobs:register_mob("pyutest_mobs:human", {
     }
   }
 })
-mobs:register_egg("pyutest_mobs:human", "Human Spawn Egg", "egg.png^[multiply:peachpuff", 0)
+mobs:register_egg("pyutest_mobs:human", "Human Spawn Egg", "pyutest-egg.png^[multiply:peachpuff", 0)
 
 mobs:register_mob("pyutest_mobs:mimic", {
   type = "monster",
@@ -91,12 +91,19 @@ mobs:register_mob("pyutest_mobs:mimic", {
   collisionbox = {
     -0.25, -0.5, -0.25, 0.25, 0.5, 0.25
   },
-  textures = {"crate.png", "crate.png", "crate.png", "crate.png", "crate.png", "crate.png"},
+  textures = {
+    "pyutest-crate.png",
+    "pyutest-crate.png",
+    "pyutest-crate.png",
+    "pyutest-crate.png",
+    "pyutest-crate.png",
+    "pyutest-crate.png"
+  },
   view_range = 12,
   blood_amount = PyuTestMobs.ENTITY_BLOOD_AMOUNT,
   reach = 2,
 })
-mobs:register_egg("pyutest_mobs:mimic", "Mimic Spawn Egg", "egg.png^[multiply:brown", 0)
+mobs:register_egg("pyutest_mobs:mimic", "Mimic Spawn Egg", "pyutest-egg.png^[multiply:brown", 0)
 
 mobs:register_mob("pyutest_mobs:firefly", {
   type = "animal",
@@ -115,8 +122,8 @@ mobs:register_mob("pyutest_mobs:firefly", {
   collisionbox = {
     -0.0, -0.0, -0.0, 0.0, 0.0, 0.0
   },
-  textures = {"firefly.png"},
+  textures = {"pyutest-firefly.png"},
   blood_amount = PyuTestMobs.ENTITY_BLOOD_AMOUNT,
   glow = 7,
 })
-mobs:register_egg("pyutest_mobs:firefly", "Firefly Spawn Egg", "egg.png^[multiply:yellow", 0)
+mobs:register_egg("pyutest_mobs:firefly", "Firefly Spawn Egg", "pyutest-egg.png^[multiply:yellow", 0)
diff --git a/mods/pyutest/pyutest_mobs/necromancer.lua b/mods/pyutest/pyutest_mobs/necromancer.lua
index 8e79c02..c8b2951 100644
--- a/mods/pyutest/pyutest_mobs/necromancer.lua
+++ b/mods/pyutest/pyutest_mobs/necromancer.lua
@@ -7,7 +7,7 @@ end
 mobs:register_arrow("pyutest_mobs:arrow_necroball", {
   visual = "sprite",
   visual_size = {x = 1, y = 1},
-  textures = {"necroball.png"},
+  textures = {"pyutest-necroball.png"},
   hit_player = necroball_hit_player,
   hit_mob = necroball_hit_player,
 
@@ -60,7 +60,7 @@ mobs:register_mob("pyutest_mobs:necromancer", {
     },
     makes_footstep_sound = true,
     textures = {
-      "necromancer.png", "necromancer_back.png"
+      "pyutest-necromancer.png", "pyutest-necromancer_back.png"
     },
     drops = {
       {
@@ -83,5 +83,5 @@ mobs:register_mob("pyutest_mobs:necromancer", {
     dogshoot_count2_max = 6,
 })
 PyuTestMobs.create_boss_egg("pyutest_mobs:necromancer", "Necromancer Spawn Egg",
-  "egg.png^[multiply:dimgray", 0, nil,
+  "pyutest-egg.png^[multiply:dimgray", 0, nil,
   "pyutest_core:bone")
diff --git a/mods/pyutest/pyutest_mobs/snowman.lua b/mods/pyutest/pyutest_mobs/snowman.lua
index dff71ff..9102137 100644
--- a/mods/pyutest/pyutest_mobs/snowman.lua
+++ b/mods/pyutest/pyutest_mobs/snowman.lua
@@ -7,7 +7,7 @@ end
 mobs:register_arrow("pyutest_mobs:arrow_snowball", {
   visual = "sprite",
   visual_size = {x = 1, y = 1},
-  textures = {"snowball.png"},
+  textures = {"pyutest-snowball.png"},
   hit_node = function (self, pos)
     PyuTestCore.create_explosion(pos, 1, false, 9, self.object, false)
   end,
@@ -53,7 +53,7 @@ mobs:register_mob("pyutest_mobs:snowman", {
   dogshoot_count2_max = 6,
 
   textures = {
-    "snowman.png", "snowman_back.png"
+    "pyutest-snowman.png", "pyutest-snowman_back.png"
   },
 
   drops = {
@@ -73,5 +73,5 @@ mobs:register_mob("pyutest_mobs:snowman", {
   }
 })
 PyuTestMobs.create_boss_egg("pyutest_mobs:snowman", "Snowman Spawn Egg",
-  "egg.png^[multiply:skyblue", 0, nil,
+  "pyutest-egg.png^[multiply:skyblue", 0, nil,
   "pyutest_core:snow_block")
diff --git a/mods/pyutest/pyutest_mobs/wind_warrior.lua b/mods/pyutest/pyutest_mobs/wind_warrior.lua
index e48cd6d..5e7e347 100644
--- a/mods/pyutest/pyutest_mobs/wind_warrior.lua
+++ b/mods/pyutest/pyutest_mobs/wind_warrior.lua
@@ -14,7 +14,7 @@ end
 mobs:register_arrow("pyutest_mobs:arrow_windball", {
   visual = "sprite",
   visual_size = {x = 1, y = 1},
-  textures = {"windball.png"},
+  textures = {"pyutest-windball.png"},
   hit_player = windball_hit_player,
   hit_mob = windball_hit_player,
   velocity = 9,
@@ -56,7 +56,7 @@ mobs:register_mob("pyutest_mobs:wind_warrior", {
   dogshoot_count2_max = 6,
 
   textures = {
-    "wind-warrior.png", "wind-warrior_back.png"
+    "pyutest-wind-warrior.png", "pyutest-wind-warrior_back.png"
   },
 
   drops = {
@@ -76,6 +76,6 @@ mobs:register_mob("pyutest_mobs:wind_warrior", {
   }
 })
 PyuTestMobs.create_boss_egg("pyutest_mobs:wind_warrior", "Wind Warrior Spawn Egg",
-  "egg.png^[multiply:white", 0, nil,
+  "pyutest-egg.png^[multiply:white", 0, nil,
   -- just a place holder until more wind-related items come.
   "pyutest_core:iron_ingot")
diff --git a/textures/default_wood.png b/textures/default_wood.png
deleted file mode 120000
index b00ae87..0000000
--- a/textures/default_wood.png
+++ /dev/null
@@ -1 +0,0 @@
-wood.png
\ No newline at end of file
diff --git a/textures/acid.png b/textures/pyutest-acid.png
similarity index 100%
rename from textures/acid.png
rename to textures/pyutest-acid.png
diff --git a/textures/andesite.png b/textures/pyutest-andesite.png
similarity index 100%
rename from textures/andesite.png
rename to textures/pyutest-andesite.png
diff --git a/textures/apple.png b/textures/pyutest-apple.png
similarity index 100%
rename from textures/apple.png
rename to textures/pyutest-apple.png
diff --git a/textures/aspen-grass.png b/textures/pyutest-aspen-grass.png
similarity index 100%
rename from textures/aspen-grass.png
rename to textures/pyutest-aspen-grass.png
diff --git a/textures/aspen-leaves.png b/textures/pyutest-aspen-leaves.png
similarity index 100%
rename from textures/aspen-leaves.png
rename to textures/pyutest-aspen-leaves.png
diff --git a/textures/barrier.png b/textures/pyutest-barrier.png
similarity index 100%
rename from textures/barrier.png
rename to textures/pyutest-barrier.png
diff --git a/textures/basalt.png b/textures/pyutest-basalt.png
similarity index 100%
rename from textures/basalt.png
rename to textures/pyutest-basalt.png
diff --git a/textures/birch-log-top-bottom.png b/textures/pyutest-birch-log-top-bottom.png
similarity index 100%
rename from textures/birch-log-top-bottom.png
rename to textures/pyutest-birch-log-top-bottom.png
diff --git a/textures/birch-log.png b/textures/pyutest-birch-log.png
similarity index 100%
rename from textures/birch-log.png
rename to textures/pyutest-birch-log.png
diff --git a/textures/birch-wood.png b/textures/pyutest-birch-wood.png
similarity index 100%
rename from textures/birch-wood.png
rename to textures/pyutest-birch-wood.png
diff --git a/textures/black-rose.png b/textures/pyutest-black-rose.png
similarity index 100%
rename from textures/black-rose.png
rename to textures/pyutest-black-rose.png
diff --git a/textures/blast.png b/textures/pyutest-blast.png
similarity index 100%
rename from textures/blast.png
rename to textures/pyutest-blast.png
diff --git a/textures/bomb.png b/textures/pyutest-bomb.png
similarity index 100%
rename from textures/bomb.png
rename to textures/pyutest-bomb.png
diff --git a/textures/bone-block-top-bottom.png b/textures/pyutest-bone-block-top-bottom.png
similarity index 100%
rename from textures/bone-block-top-bottom.png
rename to textures/pyutest-bone-block-top-bottom.png
diff --git a/textures/bone-block.png b/textures/pyutest-bone-block.png
similarity index 100%
rename from textures/bone-block.png
rename to textures/pyutest-bone-block.png
diff --git a/textures/bone.png b/textures/pyutest-bone.png
similarity index 100%
rename from textures/bone.png
rename to textures/pyutest-bone.png
diff --git a/textures/bread.png b/textures/pyutest-bread.png
similarity index 100%
rename from textures/bread.png
rename to textures/pyutest-bread.png
diff --git a/textures/brick.png b/textures/pyutest-brick.png
similarity index 100%
rename from textures/brick.png
rename to textures/pyutest-brick.png
diff --git a/textures/bricks.png b/textures/pyutest-bricks.png
similarity index 100%
rename from textures/bricks.png
rename to textures/pyutest-bricks.png
diff --git a/textures/cage.png b/textures/pyutest-cage.png
similarity index 100%
rename from textures/cage.png
rename to textures/pyutest-cage.png
diff --git a/textures/cherry-leaves.png b/textures/pyutest-cherry-leaves.png
similarity index 100%
rename from textures/cherry-leaves.png
rename to textures/pyutest-cherry-leaves.png
diff --git a/textures/cherry-log-top-bottom.png b/textures/pyutest-cherry-log-top-bottom.png
similarity index 100%
rename from textures/cherry-log-top-bottom.png
rename to textures/pyutest-cherry-log-top-bottom.png
diff --git a/textures/cherry-log.png b/textures/pyutest-cherry-log.png
similarity index 100%
rename from textures/cherry-log.png
rename to textures/pyutest-cherry-log.png
diff --git a/textures/cherry-wood.png b/textures/pyutest-cherry-wood.png
similarity index 100%
rename from textures/cherry-wood.png
rename to textures/pyutest-cherry-wood.png
diff --git a/textures/clay-block.png b/textures/pyutest-clay-block.png
similarity index 100%
rename from textures/clay-block.png
rename to textures/pyutest-clay-block.png
diff --git a/textures/clay.png b/textures/pyutest-clay.png
similarity index 100%
rename from textures/clay.png
rename to textures/pyutest-clay.png
diff --git a/textures/coin.png b/textures/pyutest-coin.png
similarity index 100%
rename from textures/coin.png
rename to textures/pyutest-coin.png
diff --git a/textures/crate.png b/textures/pyutest-crate.png
similarity index 100%
rename from textures/crate.png
rename to textures/pyutest-crate.png
diff --git a/textures/crystal-lantern.png b/textures/pyutest-crystal-lantern.png
similarity index 100%
rename from textures/crystal-lantern.png
rename to textures/pyutest-crystal-lantern.png
diff --git a/textures/dark-grass.png b/textures/pyutest-dark-grass.png
similarity index 100%
rename from textures/dark-grass.png
rename to textures/pyutest-dark-grass.png
diff --git a/textures/dark-leaves.png b/textures/pyutest-dark-leaves.png
similarity index 100%
rename from textures/dark-leaves.png
rename to textures/pyutest-dark-leaves.png
diff --git a/textures/deadbush.png b/textures/pyutest-deadbush.png
similarity index 100%
rename from textures/deadbush.png
rename to textures/pyutest-deadbush.png
diff --git a/textures/device.png b/textures/pyutest-device.png
similarity index 100%
rename from textures/device.png
rename to textures/pyutest-device.png
diff --git a/textures/diamond-pickaxe.png b/textures/pyutest-diamond-pickaxe.png
similarity index 100%
rename from textures/diamond-pickaxe.png
rename to textures/pyutest-diamond-pickaxe.png
diff --git a/textures/diamond-sword.png b/textures/pyutest-diamond-sword.png
similarity index 100%
rename from textures/diamond-sword.png
rename to textures/pyutest-diamond-sword.png
diff --git a/textures/dirt.png b/textures/pyutest-dirt.png
similarity index 100%
rename from textures/dirt.png
rename to textures/pyutest-dirt.png
diff --git a/textures/dye.png b/textures/pyutest-dye.png
similarity index 100%
rename from textures/dye.png
rename to textures/pyutest-dye.png
diff --git a/textures/egg.png b/textures/pyutest-egg.png
similarity index 100%
rename from textures/egg.png
rename to textures/pyutest-egg.png
diff --git a/textures/enchanted-obsidian.png b/textures/pyutest-enchanted-obsidian.png
similarity index 100%
rename from textures/enchanted-obsidian.png
rename to textures/pyutest-enchanted-obsidian.png
diff --git a/textures/enchanted-pickaxe.png b/textures/pyutest-enchanted-pickaxe.png
similarity index 100%
rename from textures/enchanted-pickaxe.png
rename to textures/pyutest-enchanted-pickaxe.png
diff --git a/textures/enchanted-sword.png b/textures/pyutest-enchanted-sword.png
similarity index 100%
rename from textures/enchanted-sword.png
rename to textures/pyutest-enchanted-sword.png
diff --git a/textures/fire.png b/textures/pyutest-fire.png
similarity index 100%
rename from textures/fire.png
rename to textures/pyutest-fire.png
diff --git a/textures/firefly.png b/textures/pyutest-firefly.png
similarity index 100%
rename from textures/firefly.png
rename to textures/pyutest-firefly.png
diff --git a/textures/flower.png b/textures/pyutest-flower.png
similarity index 100%
rename from textures/flower.png
rename to textures/pyutest-flower.png
diff --git a/textures/flower2.png b/textures/pyutest-flower2.png
similarity index 100%
rename from textures/flower2.png
rename to textures/pyutest-flower2.png
diff --git a/textures/flower3.png b/textures/pyutest-flower3.png
similarity index 100%
rename from textures/flower3.png
rename to textures/pyutest-flower3.png
diff --git a/textures/flower4.png b/textures/pyutest-flower4.png
similarity index 100%
rename from textures/flower4.png
rename to textures/pyutest-flower4.png
diff --git a/textures/furnace-front.png b/textures/pyutest-furnace-front.png
similarity index 100%
rename from textures/furnace-front.png
rename to textures/pyutest-furnace-front.png
diff --git a/textures/furnace-sides.png b/textures/pyutest-furnace-sides.png
similarity index 100%
rename from textures/furnace-sides.png
rename to textures/pyutest-furnace-sides.png
diff --git a/textures/furnace-top-bottom.png b/textures/pyutest-furnace-top-bottom.png
similarity index 100%
rename from textures/furnace-top-bottom.png
rename to textures/pyutest-furnace-top-bottom.png
diff --git a/textures/glass-bottle.png b/textures/pyutest-glass-bottle.png
similarity index 100%
rename from textures/glass-bottle.png
rename to textures/pyutest-glass-bottle.png
diff --git a/textures/glass.png b/textures/pyutest-glass.png
similarity index 100%
rename from textures/glass.png
rename to textures/pyutest-glass.png
diff --git a/textures/granite.png b/textures/pyutest-granite.png
similarity index 100%
rename from textures/granite.png
rename to textures/pyutest-granite.png
diff --git a/textures/grass-plant.png b/textures/pyutest-grass-plant.png
similarity index 100%
rename from textures/grass-plant.png
rename to textures/pyutest-grass-plant.png
diff --git a/textures/grass.png b/textures/pyutest-grass.png
similarity index 100%
rename from textures/grass.png
rename to textures/pyutest-grass.png
diff --git a/textures/gravel.png b/textures/pyutest-gravel.png
similarity index 100%
rename from textures/gravel.png
rename to textures/pyutest-gravel.png
diff --git a/textures/hand.png b/textures/pyutest-hand.png
similarity index 100%
rename from textures/hand.png
rename to textures/pyutest-hand.png
diff --git a/textures/haybale-top-bottom.png b/textures/pyutest-haybale-top-bottom.png
similarity index 100%
rename from textures/haybale-top-bottom.png
rename to textures/pyutest-haybale-top-bottom.png
diff --git a/textures/haybale.png b/textures/pyutest-haybale.png
similarity index 100%
rename from textures/haybale.png
rename to textures/pyutest-haybale.png
diff --git a/textures/ice.png b/textures/pyutest-ice.png
similarity index 100%
rename from textures/ice.png
rename to textures/pyutest-ice.png
diff --git a/textures/ingot.png b/textures/pyutest-ingot.png
similarity index 100%
rename from textures/ingot.png
rename to textures/pyutest-ingot.png
diff --git a/textures/iron-pickaxe.png b/textures/pyutest-iron-pickaxe.png
similarity index 100%
rename from textures/iron-pickaxe.png
rename to textures/pyutest-iron-pickaxe.png
diff --git a/textures/iron-sword.png b/textures/pyutest-iron-sword.png
similarity index 100%
rename from textures/iron-sword.png
rename to textures/pyutest-iron-sword.png
diff --git a/textures/jungle-grass.png b/textures/pyutest-jungle-grass.png
similarity index 100%
rename from textures/jungle-grass.png
rename to textures/pyutest-jungle-grass.png
diff --git a/textures/jungle-log-top-bottom.png b/textures/pyutest-jungle-log-top-bottom.png
similarity index 100%
rename from textures/jungle-log-top-bottom.png
rename to textures/pyutest-jungle-log-top-bottom.png
diff --git a/textures/jungle-log.png b/textures/pyutest-jungle-log.png
similarity index 100%
rename from textures/jungle-log.png
rename to textures/pyutest-jungle-log.png
diff --git a/textures/jungle-wood.png b/textures/pyutest-jungle-wood.png
similarity index 100%
rename from textures/jungle-wood.png
rename to textures/pyutest-jungle-wood.png
diff --git a/textures/kelp.png b/textures/pyutest-kelp.png
similarity index 100%
rename from textures/kelp.png
rename to textures/pyutest-kelp.png
diff --git a/textures/ladder.png b/textures/pyutest-ladder.png
similarity index 100%
rename from textures/ladder.png
rename to textures/pyutest-ladder.png
diff --git a/textures/lava.png b/textures/pyutest-lava.png
similarity index 100%
rename from textures/lava.png
rename to textures/pyutest-lava.png
diff --git a/textures/leaves.png b/textures/pyutest-leaves.png
similarity index 100%
rename from textures/leaves.png
rename to textures/pyutest-leaves.png
diff --git a/textures/light.png b/textures/pyutest-light.png
similarity index 100%
rename from textures/light.png
rename to textures/pyutest-light.png
diff --git a/textures/lilypad.png b/textures/pyutest-lilypad.png
similarity index 100%
rename from textures/lilypad.png
rename to textures/pyutest-lilypad.png
diff --git a/textures/log-top-bottom.png b/textures/pyutest-log-top-bottom.png
similarity index 100%
rename from textures/log-top-bottom.png
rename to textures/pyutest-log-top-bottom.png
diff --git a/textures/log.png b/textures/pyutest-log.png
similarity index 100%
rename from textures/log.png
rename to textures/pyutest-log.png
diff --git a/textures/lump.png b/textures/pyutest-lump.png
similarity index 100%
rename from textures/lump.png
rename to textures/pyutest-lump.png
diff --git a/textures/magic-shards.png b/textures/pyutest-magic-shards.png
similarity index 100%
rename from textures/magic-shards.png
rename to textures/pyutest-magic-shards.png
diff --git a/textures/maybell.png b/textures/pyutest-maybell.png
similarity index 100%
rename from textures/maybell.png
rename to textures/pyutest-maybell.png
diff --git a/textures/metal.png b/textures/pyutest-metal.png
similarity index 100%
rename from textures/metal.png
rename to textures/pyutest-metal.png
diff --git a/textures/molten-rock.png b/textures/pyutest-molten-rock.png
similarity index 100%
rename from textures/molten-rock.png
rename to textures/pyutest-molten-rock.png
diff --git a/textures/monster.png b/textures/pyutest-monster.png
similarity index 100%
rename from textures/monster.png
rename to textures/pyutest-monster.png
diff --git a/textures/monster_back.png b/textures/pyutest-monster_back.png
similarity index 100%
rename from textures/monster_back.png
rename to textures/pyutest-monster_back.png
diff --git a/textures/mushroom-small.png b/textures/pyutest-mushroom-small.png
similarity index 100%
rename from textures/mushroom-small.png
rename to textures/pyutest-mushroom-small.png
diff --git a/textures/mushroom-stem.png b/textures/pyutest-mushroom-stem.png
similarity index 100%
rename from textures/mushroom-stem.png
rename to textures/pyutest-mushroom-stem.png
diff --git a/textures/mushroom.png b/textures/pyutest-mushroom.png
similarity index 100%
rename from textures/mushroom.png
rename to textures/pyutest-mushroom.png
diff --git a/textures/mycelium.png b/textures/pyutest-mycelium.png
similarity index 100%
rename from textures/mycelium.png
rename to textures/pyutest-mycelium.png
diff --git a/textures/necroball.png b/textures/pyutest-necroball.png
similarity index 100%
rename from textures/necroball.png
rename to textures/pyutest-necroball.png
diff --git a/textures/necromancer.png b/textures/pyutest-necromancer.png
similarity index 100%
rename from textures/necromancer.png
rename to textures/pyutest-necromancer.png
diff --git a/textures/necromancer_back.png b/textures/pyutest-necromancer_back.png
similarity index 100%
rename from textures/necromancer_back.png
rename to textures/pyutest-necromancer_back.png
diff --git a/textures/obsidian.png b/textures/pyutest-obsidian.png
similarity index 100%
rename from textures/obsidian.png
rename to textures/pyutest-obsidian.png
diff --git a/textures/oil.png b/textures/pyutest-oil.png
similarity index 100%
rename from textures/oil.png
rename to textures/pyutest-oil.png
diff --git a/textures/orange-tulip.png b/textures/pyutest-orange-tulip.png
similarity index 100%
rename from textures/orange-tulip.png
rename to textures/pyutest-orange-tulip.png
diff --git a/textures/ore-amethyst.png b/textures/pyutest-ore-amethyst.png
similarity index 100%
rename from textures/ore-amethyst.png
rename to textures/pyutest-ore-amethyst.png
diff --git a/textures/ore-coal.png b/textures/pyutest-ore-coal.png
similarity index 100%
rename from textures/ore-coal.png
rename to textures/pyutest-ore-coal.png
diff --git a/textures/ore-copper.png b/textures/pyutest-ore-copper.png
similarity index 100%
rename from textures/ore-copper.png
rename to textures/pyutest-ore-copper.png
diff --git a/textures/ore-diamond.png b/textures/pyutest-ore-diamond.png
similarity index 100%
rename from textures/ore-diamond.png
rename to textures/pyutest-ore-diamond.png
diff --git a/textures/ore-emerald.png b/textures/pyutest-ore-emerald.png
similarity index 100%
rename from textures/ore-emerald.png
rename to textures/pyutest-ore-emerald.png
diff --git a/textures/ore-gold.png b/textures/pyutest-ore-gold.png
similarity index 100%
rename from textures/ore-gold.png
rename to textures/pyutest-ore-gold.png
diff --git a/textures/ore-iron.png b/textures/pyutest-ore-iron.png
similarity index 100%
rename from textures/ore-iron.png
rename to textures/pyutest-ore-iron.png
diff --git a/textures/ore-lapis.png b/textures/pyutest-ore-lapis.png
similarity index 100%
rename from textures/ore-lapis.png
rename to textures/pyutest-ore-lapis.png
diff --git a/textures/ore-pink-quartz.png b/textures/pyutest-ore-pink-quartz.png
similarity index 100%
rename from textures/ore-pink-quartz.png
rename to textures/pyutest-ore-pink-quartz.png
diff --git a/textures/ore-ruby.png b/textures/pyutest-ore-ruby.png
similarity index 100%
rename from textures/ore-ruby.png
rename to textures/pyutest-ore-ruby.png
diff --git a/textures/ore-tin.png b/textures/pyutest-ore-tin.png
similarity index 100%
rename from textures/ore-tin.png
rename to textures/pyutest-ore-tin.png
diff --git a/textures/ore-zinc.png b/textures/pyutest-ore-zinc.png
similarity index 100%
rename from textures/ore-zinc.png
rename to textures/pyutest-ore-zinc.png
diff --git a/textures/podzol.png b/textures/pyutest-podzol.png
similarity index 100%
rename from textures/podzol.png
rename to textures/pyutest-podzol.png
diff --git a/textures/powder.png b/textures/pyutest-powder.png
similarity index 100%
rename from textures/powder.png
rename to textures/pyutest-powder.png
diff --git a/textures/red-aspen-leaves.png b/textures/pyutest-red-aspen-leaves.png
similarity index 100%
rename from textures/red-aspen-leaves.png
rename to textures/pyutest-red-aspen-leaves.png
diff --git a/textures/redwood-log-top-bottom.png b/textures/pyutest-redwood-log-top-bottom.png
similarity index 100%
rename from textures/redwood-log-top-bottom.png
rename to textures/pyutest-redwood-log-top-bottom.png
diff --git a/textures/redwood-log.png b/textures/pyutest-redwood-log.png
similarity index 100%
rename from textures/redwood-log.png
rename to textures/pyutest-redwood-log.png
diff --git a/textures/redwood.png b/textures/pyutest-redwood.png
similarity index 100%
rename from textures/redwood.png
rename to textures/pyutest-redwood.png
diff --git a/textures/sand.png b/textures/pyutest-sand.png
similarity index 100%
rename from textures/sand.png
rename to textures/pyutest-sand.png
diff --git a/textures/sandstone.png b/textures/pyutest-sandstone.png
similarity index 100%
rename from textures/sandstone.png
rename to textures/pyutest-sandstone.png
diff --git a/textures/sapling.png b/textures/pyutest-sapling.png
similarity index 100%
rename from textures/sapling.png
rename to textures/pyutest-sapling.png
diff --git a/textures/savanna-grass.png b/textures/pyutest-savanna-grass.png
similarity index 100%
rename from textures/savanna-grass.png
rename to textures/pyutest-savanna-grass.png
diff --git a/textures/savanna-log-top-bottom.png b/textures/pyutest-savanna-log-top-bottom.png
similarity index 100%
rename from textures/savanna-log-top-bottom.png
rename to textures/pyutest-savanna-log-top-bottom.png
diff --git a/textures/savanna-log.png b/textures/pyutest-savanna-log.png
similarity index 100%
rename from textures/savanna-log.png
rename to textures/pyutest-savanna-log.png
diff --git a/textures/savanna-wood.png b/textures/pyutest-savanna-wood.png
similarity index 100%
rename from textures/savanna-wood.png
rename to textures/pyutest-savanna-wood.png
diff --git a/textures/shard.png b/textures/pyutest-shard.png
similarity index 100%
rename from textures/shard.png
rename to textures/pyutest-shard.png
diff --git a/textures/shiny-metal-overlay.png b/textures/pyutest-shiny-metal-overlay.png
similarity index 100%
rename from textures/shiny-metal-overlay.png
rename to textures/pyutest-shiny-metal-overlay.png
diff --git a/textures/slime.png b/textures/pyutest-slime.png
similarity index 100%
rename from textures/slime.png
rename to textures/pyutest-slime.png
diff --git a/textures/snow.png b/textures/pyutest-snow.png
similarity index 100%
rename from textures/snow.png
rename to textures/pyutest-snow.png
diff --git a/textures/snowball.png b/textures/pyutest-snowball.png
similarity index 100%
rename from textures/snowball.png
rename to textures/pyutest-snowball.png
diff --git a/textures/snowman.png b/textures/pyutest-snowman.png
similarity index 100%
rename from textures/snowman.png
rename to textures/pyutest-snowman.png
diff --git a/textures/snowman_back.png b/textures/pyutest-snowman_back.png
similarity index 100%
rename from textures/snowman_back.png
rename to textures/pyutest-snowman_back.png
diff --git a/textures/snowy-leaves.png b/textures/pyutest-snowy-leaves.png
similarity index 100%
rename from textures/snowy-leaves.png
rename to textures/pyutest-snowy-leaves.png
diff --git a/textures/spellbook.png b/textures/pyutest-spellbook.png
similarity index 100%
rename from textures/spellbook.png
rename to textures/pyutest-spellbook.png
diff --git a/textures/sponge.png b/textures/pyutest-sponge.png
similarity index 100%
rename from textures/sponge.png
rename to textures/pyutest-sponge.png
diff --git a/textures/stick.png b/textures/pyutest-stick.png
similarity index 100%
rename from textures/stick.png
rename to textures/pyutest-stick.png
diff --git a/textures/stone-bricks.png b/textures/pyutest-stone-bricks.png
similarity index 100%
rename from textures/stone-bricks.png
rename to textures/pyutest-stone-bricks.png
diff --git a/textures/stone-pickaxe.png b/textures/pyutest-stone-pickaxe.png
similarity index 100%
rename from textures/stone-pickaxe.png
rename to textures/pyutest-stone-pickaxe.png
diff --git a/textures/stone-sword.png b/textures/pyutest-stone-sword.png
similarity index 100%
rename from textures/stone-sword.png
rename to textures/pyutest-stone-sword.png
diff --git a/textures/stone.png b/textures/pyutest-stone.png
similarity index 100%
rename from textures/stone.png
rename to textures/pyutest-stone.png
diff --git a/textures/string.png b/textures/pyutest-string.png
similarity index 100%
rename from textures/string.png
rename to textures/pyutest-string.png
diff --git a/textures/sugarcane.png b/textures/pyutest-sugarcane.png
similarity index 100%
rename from textures/sugarcane.png
rename to textures/pyutest-sugarcane.png
diff --git a/textures/swampy-grass.png b/textures/pyutest-swampy-grass.png
similarity index 100%
rename from textures/swampy-grass.png
rename to textures/pyutest-swampy-grass.png
diff --git a/textures/terracotta.png b/textures/pyutest-terracotta.png
similarity index 100%
rename from textures/terracotta.png
rename to textures/pyutest-terracotta.png
diff --git a/textures/tnt-side.png b/textures/pyutest-tnt-side.png
similarity index 100%
rename from textures/tnt-side.png
rename to textures/pyutest-tnt-side.png
diff --git a/textures/tnt-top-bottom.png b/textures/pyutest-tnt-top-bottom.png
similarity index 100%
rename from textures/tnt-top-bottom.png
rename to textures/pyutest-tnt-top-bottom.png
diff --git a/textures/torch.png b/textures/pyutest-torch.png
similarity index 100%
rename from textures/torch.png
rename to textures/pyutest-torch.png
diff --git a/textures/trapdoor.png b/textures/pyutest-trapdoor.png
similarity index 100%
rename from textures/trapdoor.png
rename to textures/pyutest-trapdoor.png
diff --git a/textures/vines.png b/textures/pyutest-vines.png
similarity index 100%
rename from textures/vines.png
rename to textures/pyutest-vines.png
diff --git a/textures/water-bottle.png b/textures/pyutest-water-bottle.png
similarity index 100%
rename from textures/water-bottle.png
rename to textures/pyutest-water-bottle.png
diff --git a/textures/water.png b/textures/pyutest-water.png
similarity index 100%
rename from textures/water.png
rename to textures/pyutest-water.png
diff --git a/textures/water_bak.png b/textures/pyutest-water_bak.png
similarity index 100%
rename from textures/water_bak.png
rename to textures/pyutest-water_bak.png
diff --git a/textures/wheat.png b/textures/pyutest-wheat.png
similarity index 100%
rename from textures/wheat.png
rename to textures/pyutest-wheat.png
diff --git a/textures/wind-warrior.png b/textures/pyutest-wind-warrior.png
similarity index 100%
rename from textures/wind-warrior.png
rename to textures/pyutest-wind-warrior.png
diff --git a/textures/wind-warrior_back.png b/textures/pyutest-wind-warrior_back.png
similarity index 100%
rename from textures/wind-warrior_back.png
rename to textures/pyutest-wind-warrior_back.png
diff --git a/textures/windball.png b/textures/pyutest-windball.png
similarity index 100%
rename from textures/windball.png
rename to textures/pyutest-windball.png
diff --git a/textures/wire.png b/textures/pyutest-wire.png
similarity index 100%
rename from textures/wire.png
rename to textures/pyutest-wire.png
diff --git a/textures/wood.png b/textures/pyutest-wood.png
similarity index 100%
rename from textures/wood.png
rename to textures/pyutest-wood.png
diff --git a/textures/wooden-pickaxe.png b/textures/pyutest-wooden-pickaxe.png
similarity index 100%
rename from textures/wooden-pickaxe.png
rename to textures/pyutest-wooden-pickaxe.png
diff --git a/textures/wooden-sword.png b/textures/pyutest-wooden-sword.png
similarity index 100%
rename from textures/wooden-sword.png
rename to textures/pyutest-wooden-sword.png
diff --git a/textures/wool.png b/textures/pyutest-wool.png
similarity index 100%
rename from textures/wool.png
rename to textures/pyutest-wool.png
diff --git a/textures/workbench-bottom.png b/textures/pyutest-workbench-bottom.png
similarity index 100%
rename from textures/workbench-bottom.png
rename to textures/pyutest-workbench-bottom.png
diff --git a/textures/workbench-sides.png b/textures/pyutest-workbench-sides.png
similarity index 100%
rename from textures/workbench-sides.png
rename to textures/pyutest-workbench-sides.png
diff --git a/textures/workbench-top.png b/textures/pyutest-workbench-top.png
similarity index 100%
rename from textures/workbench-top.png
rename to textures/pyutest-workbench-top.png