91 files changed, 242 insertions, 266 deletions

diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua
index 44048835d..68de378c6 100644
--- a/data/mods/default/init.lua
+++ b/data/mods/default/init.lua
@@ -47,7 +47,7 @@
 -- Textures
 -- --------
 -- Mods should generally prefix their textures with modname_, eg. given
--- the mod name "foomod", a texture could be called "foomod_superfurnace.png"
+-- the mod name "foomod", a texture could be called "default_foomod_superfurnace.png"
 --
 -- This is not crucial and a conflicting name will not corrupt maps.
 --
@@ -220,7 +220,7 @@
 --
 -- Tool definition:
 -- {
---     image = "tool_steelaxe.png",
+--     image = "default_tool_steelaxe.png",
 --     full_punch_interval = 1.0,
 --     basetime = 1.0,
 --     dt_weight = 0.5,
@@ -239,8 +239,8 @@
 --     name = "modname:somenode",
 --     drawtype = "normal",
 --     visual_scale = 1.0,
---     tile_images = {"unknown_block.png"},
---     inventory_image = "unknown_block.png",
+--     tile_images = {"default_unknown_block.png"},
+--     inventory_image = "default_unknown_block.png",
 --     special_materials = {
 --         {image="", backface_culling=true},
 --         {image="", backface_culling=true},
@@ -284,7 +284,7 @@
 --
 -- Craftitem definition options:
 -- minetest.register_craftitem("modname_name", {
---     image = "image.png",
+--     image = "default_image.png",
 --     stack_max = <maximum number of items in stack>,
 --     cookresult_itemstring = itemstring (result of cooking),
 --     furnace_cooktime = <cooking time>,
@@ -346,7 +346,7 @@ minetest.register_tool(":", {
 })
 
 minetest.register_tool("default:pick_wood", {
-	image = "tool_woodpick.png",
+	image = "default_tool_woodpick.png",
 	basetime = 2.0,
 	dt_weight = 0,
 	dt_crackiness = -0.5,
@@ -359,7 +359,7 @@ minetest.register_tool("default:pick_wood", {
 	dd_cuttability = 0,
 })
 minetest.register_tool("default:pick_stone", {
-	image = "tool_stonepick.png",
+	image = "default_tool_stonepick.png",
 	basetime = 1.5,
 	dt_weight = 0,
 	dt_crackiness = -0.5,
@@ -372,7 +372,7 @@ minetest.register_tool("default:pick_stone", {
 	dd_cuttability = 0,
 })
 minetest.register_tool("default:pick_steel", {
-	image = "tool_steelpick.png",
+	image = "default_tool_steelpick.png",
 	basetime = 1.0,
 	dt_weight = 0,
 	dt_crackiness = -0.5,
@@ -385,7 +385,7 @@ minetest.register_tool("default:pick_steel", {
 	dd_cuttability = 0,
 })
 minetest.register_tool("default:pick_mese", {
-	image = "tool_mesepick.png",
+	image = "default_tool_mesepick.png",
 	basetime = 0,
 	dt_weight = 0,
 	dt_crackiness = 0,
@@ -398,7 +398,7 @@ minetest.register_tool("default:pick_mese", {
 	dd_cuttability = 0,
 })
 minetest.register_tool("default:shovel_wood", {
-	image = "tool_woodshovel.png",
+	image = "default_tool_woodshovel.png",
 	basetime = 2.0,
 	dt_weight = 0.5,
 	dt_crackiness = 2,
@@ -411,7 +411,7 @@ minetest.register_tool("default:shovel_wood", {
 	dd_cuttability = 0,
 })
 minetest.register_tool("default:shovel_stone", {
-	image = "tool_stoneshovel.png",
+	image = "default_tool_stoneshovel.png",
 	basetime = 1.5,
 	dt_weight = 0.5,
 	dt_crackiness = 2,
@@ -424,7 +424,7 @@ minetest.register_tool("default:shovel_stone", {
 	dd_cuttability = 0,
 })
 minetest.register_tool("default:shovel_steel", {
-	image = "tool_steelshovel.png",
+	image = "default_tool_steelshovel.png",
 	basetime = 1.0,
 	dt_weight = 0.5,
 	dt_crackiness = 2,
@@ -437,7 +437,7 @@ minetest.register_tool("default:shovel_steel", {
 	dd_cuttability = 0,
 })
 minetest.register_tool("default:axe_wood", {
-	image = "tool_woodaxe.png",
+	image = "default_tool_woodaxe.png",
 	basetime = 2.0,
 	dt_weight = 0.5,
 	dt_crackiness = -0.2,
@@ -450,7 +450,7 @@ minetest.register_tool("default:axe_wood", {
 	dd_cuttability = 0,
 })
 minetest.register_tool("default:axe_stone", {
-	image = "tool_stoneaxe.png",
+	image = "default_tool_stoneaxe.png",
 	basetime = 1.5,
 	dt_weight = 0.5,
 	dt_crackiness = -0.2,
@@ -463,7 +463,7 @@ minetest.register_tool("default:axe_stone", {
 	dd_cuttability = 0,
 })
 minetest.register_tool("default:axe_steel", {
-	image = "tool_steelaxe.png",
+	image = "default_tool_steelaxe.png",
 	basetime = 1.0,
 	dt_weight = 0.5,
 	dt_crackiness = -0.2,
@@ -476,7 +476,7 @@ minetest.register_tool("default:axe_steel", {
 	dd_cuttability = 0,
 })
 minetest.register_tool("default:sword_wood", {
-	image = "tool_woodsword.png",
+	image = "default_tool_woodsword.png",
 	basetime = 3.0,
 	dt_weight = 3,
 	dt_crackiness = 0,
@@ -489,7 +489,7 @@ minetest.register_tool("default:sword_wood", {
 	dd_cuttability = 0,
 })
 minetest.register_tool("default:sword_stone", {
-	image = "tool_stonesword.png",
+	image = "default_tool_stonesword.png",
 	basetime = 2.5,
 	dt_weight = 3,
 	dt_crackiness = 0,
@@ -502,7 +502,7 @@ minetest.register_tool("default:sword_stone", {
 	dd_cuttability = 0,
 })
 minetest.register_tool("default:sword_steel", {
-	image = "tool_steelsword.png",
+	image = "default_tool_steelsword.png",
 	basetime = 2.0,
 	dt_weight = 3,
 	dt_crackiness = 0,
@@ -783,8 +783,8 @@ minetest.register_craft({
 --
 
 minetest.register_node("default:stone", {
-	tile_images = {"stone.png"},
-	inventory_image = minetest.inventorycube("stone.png"),
+	tile_images = {"default_stone.png"},
+	inventory_image = minetest.inventorycube("default_stone.png"),
 	paramtype = "mineral",
 	is_ground_content = true,
 	often_contains_mineral = true, -- Texture atlas hint
@@ -793,70 +793,70 @@ minetest.register_node("default:stone", {
 })
 
 minetest.register_node("default:dirt_with_grass", {
-	tile_images = {"grass.png", "mud.png", "mud.png^grass_side.png"},
-	inventory_image = minetest.inventorycube("mud.png^grass_side.png"),
+	tile_images = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
+	inventory_image = minetest.inventorycube("default_dirt.png^default_grass_side.png"),
 	is_ground_content = true,
 	material = minetest.digprop_dirtlike(1.0),
 	dug_item = 'node "dirt" 1',
 })
 
 minetest.register_node("default:dirt_with_grass_footsteps", {
-	tile_images = {"grass_footsteps.png", "mud.png", "mud.png^grass_side.png"},
-	inventory_image = "grass_footsteps.png",
+	tile_images = {"default_grass_footsteps.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
+	inventory_image = "default_grass_footsteps.png",
 	is_ground_content = true,
 	material = minetest.digprop_dirtlike(1.0),
 	dug_item = 'node "dirt" 1',
 })
 
 minetest.register_node("default:dirt", {
-	tile_images = {"mud.png"},
-	inventory_image = minetest.inventorycube("mud.png"),
+	tile_images = {"default_dirt.png"},
+	inventory_image = minetest.inventorycube("default_dirt.png"),
 	is_ground_content = true,
 	material = minetest.digprop_dirtlike(1.0),
 })
 
 minetest.register_node("default:sand", {
-	tile_images = {"sand.png"},
-	inventory_image = minetest.inventorycube("sand.png"),
+	tile_images = {"default_sand.png"},
+	inventory_image = minetest.inventorycube("default_sand.png"),
 	is_ground_content = true,
 	material = minetest.digprop_dirtlike(1.0),
 	cookresult_itemstring = 'node "glass" 1',
 })
 
 minetest.register_node("default:gravel", {
-	tile_images = {"gravel.png"},
-	inventory_image = minetest.inventorycube("gravel.png"),
+	tile_images = {"default_gravel.png"},
+	inventory_image = minetest.inventorycube("default_gravel.png"),
 	is_ground_content = true,
 	material = minetest.digprop_gravellike(1.0),
 })
 
 minetest.register_node("default:sandstone", {
-	tile_images = {"sandstone.png"},
-	inventory_image = minetest.inventorycube("sandstone.png"),
+	tile_images = {"default_sandstone.png"},
+	inventory_image = minetest.inventorycube("default_sandstone.png"),
 	is_ground_content = true,
 	material = minetest.digprop_dirtlike(1.0),  -- FIXME should this be stonelike?
 	dug_item = 'node "sand" 1',  -- FIXME is this intentional?
 })
 
 minetest.register_node("default:clay", {
-	tile_images = {"clay.png"},
-	inventory_image = minetest.inventorycube("clay.png"),
+	tile_images = {"default_clay.png"},
+	inventory_image = minetest.inventorycube("default_clay.png"),
 	is_ground_content = true,
 	material = minetest.digprop_dirtlike(1.0),
 	dug_item = 'craft "default:lump_of_clay" 4',
 })
 
 minetest.register_node("default:brick", {
-	tile_images = {"brick.png"},
-	inventory_image = minetest.inventorycube("brick.png"),
+	tile_images = {"default_brick.png"},
+	inventory_image = minetest.inventorycube("default_brick.png"),
 	is_ground_content = true,
 	material = minetest.digprop_stonelike(1.0),
 	dug_item = 'craft "default:clay_brick" 4',
 })
 
 minetest.register_node("default:tree", {
-	tile_images = {"tree_top.png", "tree_top.png", "tree.png"},
-	inventory_image = minetest.inventorycube("tree_top.png", "tree.png", "tree.png"),
+	tile_images = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
+	inventory_image = minetest.inventorycube("default_tree_top.png", "default_tree.png", "default_tree.png"),
 	is_ground_content = true,
 	material = minetest.digprop_woodlike(1.0),
 	cookresult_itemstring = 'craft "default:lump_of_coal" 1',
@@ -864,8 +864,8 @@ minetest.register_node("default:tree", {
 })
 
 minetest.register_node("default:jungletree", {
-	tile_images = {"jungletree_top.png", "jungletree_top.png", "jungletree.png"},
-	inventory_image = minetest.inventorycube("jungletree_top.png", "jungletree.png", "jungletree.png"),
+	tile_images = {"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"},
+	inventory_image = minetest.inventorycube("default_jungletree_top.png", "default_jungletree.png", "default_jungletree.png"),
 	is_ground_content = true,
 	material = minetest.digprop_woodlike(1.0),
 	cookresult_itemstring = 'craft "default:lump_of_coal" 1',
@@ -875,8 +875,8 @@ minetest.register_node("default:jungletree", {
 minetest.register_node("default:junglegrass", {
 	drawtype = "plantlike",
 	visual_scale = 1.3,
-	tile_images = {"junglegrass.png"},
-	inventory_image = "junglegrass.png",
+	tile_images = {"default_junglegrass.png"},
+	inventory_image = "default_junglegrass.png",
 	light_propagates = true,
 	paramtype = "light",
 	walkable = false,
@@ -887,8 +887,8 @@ minetest.register_node("default:junglegrass", {
 minetest.register_node("default:leaves", {
 	drawtype = "allfaces_optional",
 	visual_scale = 1.3,
-	tile_images = {"leaves.png"},
-	inventory_image = minetest.inventorycube("leaves.png"),
+	tile_images = {"default_leaves.png"},
+	inventory_image = minetest.inventorycube("default_leaves.png"),
 	light_propagates = true,
 	paramtype = "light",
 	material = minetest.digprop_leaveslike(1.0),
@@ -898,8 +898,8 @@ minetest.register_node("default:leaves", {
 })
 
 minetest.register_node("default:cactus", {
-	tile_images = {"cactus_top.png", "cactus_top.png", "cactus_side.png"},
-	inventory_image = minetest.inventorycube("cactus_top.png", "cactus_side.png", "cactus_side.png"),
+	tile_images = {"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"},
+	inventory_image = minetest.inventorycube("default_cactus_top.png", "default_cactus_side.png", "default_cactus_side.png"),
 	is_ground_content = true,
 	material = minetest.digprop_woodlike(0.75),
 	furnace_burntime = 15,
@@ -907,8 +907,8 @@ minetest.register_node("default:cactus", {
 
 minetest.register_node("default:papyrus", {
 	drawtype = "plantlike",
-	tile_images = {"papyrus.png"},
-	inventory_image = "papyrus.png",
+	tile_images = {"default_papyrus.png"},
+	inventory_image = "default_papyrus.png",
 	light_propagates = true,
 	paramtype = "light",
 	is_ground_content = true,
@@ -918,8 +918,8 @@ minetest.register_node("default:papyrus", {
 })
 
 minetest.register_node("default:bookshelf", {
-	tile_images = {"wood.png", "wood.png", "bookshelf.png"},
-	inventory_image = minetest.inventorycube("wood.png", "bookshelf.png", "bookshelf.png"),
+	tile_images = {"default_wood.png", "default_wood.png", "default_bookshelf.png"},
+	inventory_image = minetest.inventorycube("default_wood.png", "default_bookshelf.png", "default_bookshelf.png"),
 	is_ground_content = true,
 	material = minetest.digprop_woodlike(0.75),
 	furnace_burntime = 30,
@@ -927,8 +927,8 @@ minetest.register_node("default:bookshelf", {
 
 minetest.register_node("default:glass", {
 	drawtype = "glasslike",
-	tile_images = {"glass.png"},
-	inventory_image = minetest.inventorycube("glass.png"),
+	tile_images = {"default_glass.png"},
+	inventory_image = minetest.inventorycube("default_glass.png"),
 	light_propagates = true,
 	paramtype = "light",
 	sunlight_propagates = true,
@@ -938,8 +938,8 @@ minetest.register_node("default:glass", {
 
 minetest.register_node("default:fence_wooden", {
 	drawtype = "fencelike",
-	tile_images = {"wood.png"},
-	inventory_image = "fence.png",
+	tile_images = {"default_wood.png"},
+	inventory_image = "default_fence.png",
 	light_propagates = true,
 	paramtype = "light",
 	is_ground_content = true,
@@ -953,8 +953,8 @@ minetest.register_node("default:fence_wooden", {
 
 minetest.register_node("default:rail", {
 	drawtype = "raillike",
-	tile_images = {"rail.png", "rail_curved.png", "rail_t_junction.png", "rail_crossing.png"},
-	inventory_image = "rail.png",
+	tile_images = {"default_rail.png", "default_rail_curved.png", "default_rail_t_junction.png", "default_rail_crossing.png"},
+	inventory_image = "default_rail.png",
 	light_propagates = true,
 	paramtype = "light",
 	is_ground_content = true,
@@ -968,8 +968,8 @@ minetest.register_node("default:rail", {
 
 minetest.register_node("default:ladder", {
 	drawtype = "signlike",
-	tile_images = {"ladder.png"},
-	inventory_image = "ladder.png",
+	tile_images = {"default_ladder.png"},
+	inventory_image = "default_ladder.png",
 	light_propagates = true,
 	paramtype = "light",
 	is_ground_content = true,
@@ -994,32 +994,32 @@ minetest.register_node("default:coalstone", {
 })
 
 minetest.register_node("default:wood", {
-	tile_images = {"wood.png"},
-	inventory_image = minetest.inventorycube("wood.png"),
+	tile_images = {"default_wood.png"},
+	inventory_image = minetest.inventorycube("default_wood.png"),
 	is_ground_content = true,
 	furnace_burntime = 7,
 	material = minetest.digprop_woodlike(0.75),
 })
 
 minetest.register_node("default:mese", {
-	tile_images = {"mese.png"},
-	inventory_image = minetest.inventorycube("mese.png"),
+	tile_images = {"default_mese.png"},
+	inventory_image = minetest.inventorycube("default_mese.png"),
 	is_ground_content = true,
 	furnace_burntime = 30,
 	material = minetest.digprop_stonelike(0.5),
 })
 
 minetest.register_node("default:cloud", {
-	tile_images = {"cloud.png"},
-	inventory_image = minetest.inventorycube("cloud.png"),
+	tile_images = {"default_cloud.png"},
+	inventory_image = minetest.inventorycube("default_cloud.png"),
 	is_ground_content = true,
 })
 
 minetest.register_node("default:water_flowing", {
 	drawtype = "flowingliquid",
-	tile_images = {"water.png"},
+	tile_images = {"default_water.png"},
 	alpha = WATER_ALPHA,
-	inventory_image = minetest.inventorycube("water.png"),
+	inventory_image = minetest.inventorycube("default_water.png"),
 	paramtype = "light",
 	light_propagates = true,
 	walkable = false,
@@ -1032,16 +1032,16 @@ minetest.register_node("default:water_flowing", {
 	liquid_viscosity = WATER_VISC,
 	post_effect_color = {a=64, r=100, g=100, b=200},
 	special_materials = {
-		{image="water.png", backface_culling=false},
-		{image="water.png", backface_culling=true},
+		{image="default_water.png", backface_culling=false},
+		{image="default_water.png", backface_culling=true},
 	},
 })
 
 minetest.register_node("default:water_source", {
 	drawtype = "liquid",
-	tile_images = {"water.png"},
+	tile_images = {"default_water.png"},
 	alpha = WATER_ALPHA,
-	inventory_image = minetest.inventorycube("water.png"),
+	inventory_image = minetest.inventorycube("default_water.png"),
 	paramtype = "light",
 	light_propagates = true,
 	walkable = false,
@@ -1055,14 +1055,14 @@ minetest.register_node("default:water_source", {
 	post_effect_color = {a=64, r=100, g=100, b=200},
 	special_materials = {
 		-- New-style water source material (mostly unused)
-		{image="water.png", backface_culling=false},
+		{image="default_water.png", backface_culling=false},
 	},
 })
 
 minetest.register_node("default:lava_flowing", {
 	drawtype = "flowingliquid",
-	tile_images = {"lava.png"},
-	inventory_image = minetest.inventorycube("lava.png"),
+	tile_images = {"default_lava.png"},
+	inventory_image = minetest.inventorycube("default_lava.png"),
 	paramtype = "light",
 	light_propagates = false,
 	light_source = LIGHT_MAX - 1,
@@ -1077,15 +1077,15 @@ minetest.register_node("default:lava_flowing", {
 	damage_per_second = 4*2,
 	post_effect_color = {a=192, r=255, g=64, b=0},
 	special_materials = {
-		{image="lava.png", backface_culling=false},
-		{image="lava.png", backface_culling=true},
+		{image="default_lava.png", backface_culling=false},
+		{image="default_lava.png", backface_culling=true},
 	},
 })
 
 minetest.register_node("default:lava_source", {
 	drawtype = "liquid",
-	tile_images = {"lava.png"},
-	inventory_image = minetest.inventorycube("lava.png"),
+	tile_images = {"default_lava.png"},
+	inventory_image = minetest.inventorycube("default_lava.png"),
 	paramtype = "light",
 	light_propagates = false,
 	light_source = LIGHT_MAX - 1,
@@ -1101,15 +1101,15 @@ minetest.register_node("default:lava_source", {
 	post_effect_color = {a=192, r=255, g=64, b=0},
 	special_materials = {
 		-- New-style lava source material (mostly unused)
-		{image="lava.png", backface_culling=false},
+		{image="default_lava.png", backface_culling=false},
 	},
 	furnace_burntime = 60,
 })
 
 minetest.register_node("default:torch", {
 	drawtype = "torchlike",
-	tile_images = {"torch_on_floor.png", "torch_on_ceiling.png", "torch.png"},
-	inventory_image = "torch_on_floor.png",
+	tile_images = {"default_torch_on_floor.png", "default_torch_on_ceiling.png", "default_torch.png"},
+	inventory_image = "default_torch_on_floor.png",
 	paramtype = "light",
 	light_propagates = true,
 	sunlight_propagates = true,
@@ -1128,8 +1128,8 @@ minetest.register_node("default:torch", {
 
 minetest.register_node("default:sign_wall", {
 	drawtype = "signlike",
-	tile_images = {"sign_wall.png"},
-	inventory_image = "sign_wall.png",
+	tile_images = {"default_sign_wall.png"},
+	inventory_image = "default_sign_wall.png",
 	paramtype = "light",
 	light_propagates = true,
 	sunlight_propagates = true,
@@ -1147,68 +1147,68 @@ minetest.register_node("default:sign_wall", {
 })
 
 minetest.register_node("default:chest", {
-	tile_images = {"chest_top.png", "chest_top.png", "chest_side.png",
-		"chest_side.png", "chest_side.png", "chest_front.png"},
-	inventory_image = minetest.inventorycube("chest_top.png", "chest_front.png", "chest_side.png"),
+	tile_images = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
+		"default_chest_side.png", "default_chest_side.png", "default_chest_front.png"},
+	inventory_image = minetest.inventorycube("default_chest_top.png", "default_chest_front.png", "default_chest_side.png"),
 	paramtype = "facedir_simple",
-	metadata_name = "default:chest",
+	metadata_name = "chest",
 	material = minetest.digprop_woodlike(1.0),
 	furnace_burntime = 30,
 })
 
 minetest.register_node("default:chest_locked", {
-	tile_images = {"chest_top.png", "chest_top.png", "chest_side.png",
-		"chest_side.png", "chest_side.png", "chest_lock.png"},
-	inventory_image = minetest.inventorycube("chest_top.png", "chest_lock.png", "chest_side.png"),
+	tile_images = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
+		"default_chest_side.png", "default_chest_side.png", "default_chest_lock.png"},
+	inventory_image = minetest.inventorycube("default_chest_top.png", "default_chest_lock.png", "default_chest_side.png"),
 	paramtype = "facedir_simple",
-	metadata_name = "default:chest_locked",
+	metadata_name = "locked_chest",
 	material = minetest.digprop_woodlike(1.0),
 	furnace_burntime = 30,
 })
 
 minetest.register_node("default:furnace", {
-	tile_images = {"furnace_side.png", "furnace_side.png", "furnace_side.png",
-		"furnace_side.png", "furnace_side.png", "furnace_front.png"},
-	inventory_image = minetest.inventorycube("furnace_side.png", "furnace_front.png", "furnace_side.png"),
+	tile_images = {"default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png",
+		"default_furnace_side.png", "default_furnace_side.png", "default_furnace_front.png"},
+	inventory_image = minetest.inventorycube("default_furnace_side.png", "default_furnace_front.png", "default_furnace_side.png"),
 	paramtype = "facedir_simple",
-	metadata_name = "default:furnace",
+	metadata_name = "furnace",
 	material = minetest.digprop_stonelike(3.0),
 })
 
 minetest.register_node("default:cobble", {
-	tile_images = {"cobble.png"},
-	inventory_image = minetest.inventorycube("cobble.png"),
+	tile_images = {"default_cobble.png"},
+	inventory_image = minetest.inventorycube("default_cobble.png"),
 	is_ground_content = true,
 	cookresult_itemstring = 'node "stone" 1',
 	material = minetest.digprop_stonelike(0.9),
 })
 
 minetest.register_node("default:mossycobble", {
-	tile_images = {"mossycobble.png"},
-	inventory_image = minetest.inventorycube("mossycobble.png"),
+	tile_images = {"default_mossycobble.png"},
+	inventory_image = minetest.inventorycube("default_mossycobble.png"),
 	is_ground_content = true,
 	material = minetest.digprop_stonelike(0.8),
 })
 
 minetest.register_node("default:steelblock", {
-	tile_images = {"steel_block.png"},
-	inventory_image = minetest.inventorycube("steel_block.png"),
+	tile_images = {"default_steel_block.png"},
+	inventory_image = minetest.inventorycube("default_steel_block.png"),
 	is_ground_content = true,
 	material = minetest.digprop_stonelike(5.0),
 })
 
 minetest.register_node("default:nyancat", {
-	tile_images = {"nc_side.png", "nc_side.png", "nc_side.png",
-		"nc_side.png", "nc_back.png", "nc_front.png"},
-	inventory_image = "nc_front.png",
+	tile_images = {"default_nc_side.png", "default_nc_side.png", "default_nc_side.png",
+		"default_nc_side.png", "default_nc_back.png", "default_nc_front.png"},
+	inventory_image = "default_nc_front.png",
 	paramtype = "facedir_simple",
 	material = minetest.digprop_stonelike(3.0),
 	furnace_burntime = 1,
 })
 
 minetest.register_node("default:nyancat_rainbow", {
-	tile_images = {"nc_rb.png"},
-	inventory_image = "nc_rb.png",
+	tile_images = {"default_nc_rb.png"},
+	inventory_image = "default_nc_rb.png",
 	material = minetest.digprop_stonelike(3.0),
 	furnace_burntime = 1,
 })
@@ -1216,8 +1216,8 @@ minetest.register_node("default:nyancat_rainbow", {
 minetest.register_node("default:sapling", {
 	drawtype = "plantlike",
 	visual_scale = 1.0,
-	tile_images = {"sapling.png"},
-	inventory_image = "sapling.png",
+	tile_images = {"default_sapling.png"},
+	inventory_image = "default_sapling.png",
 	paramtype = "light",
 	light_propagates = true,
 	walkable = false,
@@ -1228,8 +1228,8 @@ minetest.register_node("default:sapling", {
 minetest.register_node("default:apple", {
 	drawtype = "plantlike",
 	visual_scale = 1.0,
-	tile_images = {"apple.png"},
-	inventory_image = "apple.png",
+	tile_images = {"default_apple.png"},
+	inventory_image = "default_apple.png",
 	paramtype = "light",
 	light_propagates = true,
 	sunlight_propagates = true,
@@ -1244,80 +1244,56 @@ minetest.register_node("default:apple", {
 --
 
 minetest.register_craftitem("default:stick", {
-	image = "stick.png",
+	image = "default_stick.png",
 	--furnace_burntime = ...,
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
 minetest.register_craftitem("default:paper", {
-	image = "paper.png",
+	image = "default_paper.png",
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
 minetest.register_craftitem("default:book", {
-	image = "book.png",
+	image = "default_book.png",
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
 minetest.register_craftitem("default:lump_of_coal", {
-	image = "lump_of_coal.png",
+	image = "default_lump_of_coal.png",
 	furnace_burntime = 40;
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
 minetest.register_craftitem("default:lump_of_iron", {
-	image = "lump_of_iron.png",
+	image = "default_lump_of_iron.png",
 	cookresult_itemstring = 'craft "default:steel_ingot" 1',
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
 minetest.register_craftitem("default:lump_of_clay", {
-	image = "lump_of_clay.png",
+	image = "default_lump_of_clay.png",
 	cookresult_itemstring = 'craft "default:clay_brick" 1',
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
 minetest.register_craftitem("default:steel_ingot", {
-	image = "steel_ingot.png",
+	image = "default_steel_ingot.png",
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
 minetest.register_craftitem("default:clay_brick", {
-	image = "clay_brick.png",
+	image = "default_clay_brick.png",
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
-minetest.register_craftitem("default:rat", {
-	image = "rat.png",
-	cookresult_itemstring = 'craft "cooked_rat" 1',
-	on_drop = function(item, dropper, pos)
-		minetest.env:add_rat(pos)
-		return true
-	end,
-})
-
-minetest.register_craftitem("default:cooked_rat", {
-	image = "cooked_rat.png",
-	cookresult_itemstring = 'craft "scorched_stuff" 1',
-	on_place_on_ground = minetest.craftitem_place_item,
-	on_use = minetest.craftitem_eat(6),
-})
-
 minetest.register_craftitem("default:scorched_stuff", {
-	image = "scorched_stuff.png",
+	image = "default_scorched_stuff.png",
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
-minetest.register_craftitem("default:firefly", {
-	image = "firefly.png",
-	on_drop = function(item, dropper, pos)
-		minetest.env:add_firefly(pos)
-		return true
-	end,
-})
-
 minetest.register_craftitem("default:apple", {
-	image = "apple.png",
+	image = "default_apple.png",
 	on_place_on_ground = minetest.craftitem_place_item,
 	on_use = minetest.craftitem_eat(4),
 })
@@ -1419,8 +1395,8 @@ function default.register_falling_node(nodename, texture)
 	})
 end
 
-default.register_falling_node("default:sand", "sand.png")
-default.register_falling_node("default:gravel", "gravel.png")
+default.register_falling_node("default:sand", "default_sand.png")
+default.register_falling_node("default:gravel", "default_gravel.png")
 
 --
 -- Global callbacks
diff --git a/data/mods/default/textures/apple.png b/data/mods/default/textures/default_apple.png
index 9593f28f6..9593f28f6 100644
--- a/data/mods/default/textures/apple.png
+++ b/data/mods/default/textures/default_apple.png
diff --git a/data/mods/default/textures/book.png b/data/mods/default/textures/default_book.png
index 176fb6aa9..176fb6aa9 100644
--- a/data/mods/default/textures/book.png
+++ b/data/mods/default/textures/default_book.png
diff --git a/data/mods/default/textures/bookshelf.png b/data/mods/default/textures/default_bookshelf.png
index 5ecc50ff3..5ecc50ff3 100644
--- a/data/mods/default/textures/bookshelf.png
+++ b/data/mods/default/textures/default_bookshelf.png
diff --git a/data/mods/default/textures/brick.png b/data/mods/default/textures/default_brick.png
index 32d77f347..32d77f347 100644
--- a/data/mods/default/textures/brick.png
+++ b/data/mods/default/textures/default_brick.png
diff --git a/data/mods/default/textures/cactus_side.png b/data/mods/default/textures/default_cactus_side.png
index fc479fde6..fc479fde6 100644
--- a/data/mods/default/textures/cactus_side.png
+++ b/data/mods/default/textures/default_cactus_side.png
diff --git a/data/mods/default/textures/cactus_top.png b/data/mods/default/textures/default_cactus_top.png
index f9e68df51..f9e68df51 100644
--- a/data/mods/default/textures/cactus_top.png
+++ b/data/mods/default/textures/default_cactus_top.png
diff --git a/data/mods/default/textures/chest_front.png b/data/mods/default/textures/default_chest_front.png
index c5628af94..c5628af94 100644
--- a/data/mods/default/textures/chest_front.png
+++ b/data/mods/default/textures/default_chest_front.png
diff --git a/data/mods/default/textures/chest_lock.png b/data/mods/default/textures/default_chest_lock.png
index ae038fae5..ae038fae5 100644
--- a/data/mods/default/textures/chest_lock.png
+++ b/data/mods/default/textures/default_chest_lock.png
diff --git a/data/mods/default/textures/chest_side.png b/data/mods/default/textures/default_chest_side.png
index 916dd784d..916dd784d 100644
--- a/data/mods/default/textures/chest_side.png
+++ b/data/mods/default/textures/default_chest_side.png
diff --git a/data/mods/default/textures/chest_top.png b/data/mods/default/textures/default_chest_top.png
index 58c79674d..58c79674d 100644
--- a/data/mods/default/textures/chest_top.png
+++ b/data/mods/default/textures/default_chest_top.png
diff --git a/data/mods/default/textures/clay.png b/data/mods/default/textures/default_clay.png
index 3557429d8..3557429d8 100644
--- a/data/mods/default/textures/clay.png
+++ b/data/mods/default/textures/default_clay.png
diff --git a/data/mods/default/textures/clay_brick.png b/data/mods/default/textures/default_clay_brick.png
index e36648e48..e36648e48 100644
--- a/data/mods/default/textures/clay_brick.png
+++ b/data/mods/default/textures/default_clay_brick.png
diff --git a/data/mods/default/textures/cloud.png b/data/mods/default/textures/default_cloud.png
index 24091a377..24091a377 100644
--- a/data/mods/default/textures/cloud.png
+++ b/data/mods/default/textures/default_cloud.png
diff --git a/data/mods/default/textures/cobble.png b/data/mods/default/textures/default_cobble.png
index 7d0447419..7d0447419 100644
--- a/data/mods/default/textures/cobble.png
+++ b/data/mods/default/textures/default_cobble.png
diff --git a/data/mods/default/textures/cooked_rat.png b/data/mods/default/textures/default_cooked_rat.png
index daad3be0d..daad3be0d 100644
--- a/data/mods/default/textures/cooked_rat.png
+++ b/data/mods/default/textures/default_cooked_rat.png
diff --git a/data/mods/default/textures/crack.png b/data/mods/default/textures/default_crack.png
index 499783982..499783982 100644
--- a/data/mods/default/textures/crack.png
+++ b/data/mods/default/textures/default_crack.png
diff --git a/data/mods/default/textures/mud.png b/data/mods/default/textures/default_dirt.png
index 7cb9c89a6..7cb9c89a6 100644
--- a/data/mods/default/textures/mud.png
+++ b/data/mods/default/textures/default_dirt.png
diff --git a/data/mods/default/textures/dungeon_master.png b/data/mods/default/textures/default_dungeon_master.png
index 3457c8228..3457c8228 100644
--- a/data/mods/default/textures/dungeon_master.png
+++ b/data/mods/default/textures/default_dungeon_master.png
diff --git a/data/mods/default/textures/fence.png b/data/mods/default/textures/default_fence.png
index 0b99f0eb5..0b99f0eb5 100644
--- a/data/mods/default/textures/fence.png
+++ b/data/mods/default/textures/default_fence.png
diff --git a/data/mods/default/textures/fireball.png b/data/mods/default/textures/default_fireball.png
index 523142850..523142850 100644
--- a/data/mods/default/textures/fireball.png
+++ b/data/mods/default/textures/default_fireball.png
diff --git a/data/mods/default/textures/furnace_front.png b/data/mods/default/textures/default_furnace_front.png
index 1620a27c3..1620a27c3 100644
--- a/data/mods/default/textures/furnace_front.png
+++ b/data/mods/default/textures/default_furnace_front.png
diff --git a/data/mods/default/textures/furnace_side.png b/data/mods/default/textures/default_furnace_side.png
index 63cb162fe..63cb162fe 100644
--- a/data/mods/default/textures/furnace_side.png
+++ b/data/mods/default/textures/default_furnace_side.png
diff --git a/data/mods/default/textures/glass.png b/data/mods/default/textures/default_glass.png
index ade0196fe..ade0196fe 100644
--- a/data/mods/default/textures/glass.png
+++ b/data/mods/default/textures/default_glass.png
diff --git a/data/mods/default/textures/grass.png b/data/mods/default/textures/default_grass.png
index 3610bb2bc..3610bb2bc 100644
--- a/data/mods/default/textures/grass.png
+++ b/data/mods/default/textures/default_grass.png
diff --git a/data/mods/default/textures/grass_footsteps.png b/data/mods/default/textures/default_grass_footsteps.png
index 57e063d8c..57e063d8c 100644
--- a/data/mods/default/textures/grass_footsteps.png
+++ b/data/mods/default/textures/default_grass_footsteps.png
diff --git a/data/mods/default/textures/grass_side.png b/data/mods/default/textures/default_grass_side.png
index 4f4f680be..4f4f680be 100644
--- a/data/mods/default/textures/grass_side.png
+++ b/data/mods/default/textures/default_grass_side.png
diff --git a/data/mods/default/textures/gravel.png b/data/mods/default/textures/default_gravel.png
index f08666ad9..f08666ad9 100644
--- a/data/mods/default/textures/gravel.png
+++ b/data/mods/default/textures/default_gravel.png
diff --git a/data/mods/default/textures/junglegrass.png b/data/mods/default/textures/default_junglegrass.png
index eea87c07c..eea87c07c 100644
--- a/data/mods/default/textures/junglegrass.png
+++ b/data/mods/default/textures/default_junglegrass.png
diff --git a/data/mods/default/textures/jungletree.png b/data/mods/default/textures/default_jungletree.png
index ccd20ac74..ccd20ac74 100644
--- a/data/mods/default/textures/jungletree.png
+++ b/data/mods/default/textures/default_jungletree.png
diff --git a/data/mods/default/textures/jungletree_top.png b/data/mods/default/textures/default_jungletree_top.png
index 2a9b51373..2a9b51373 100644
--- a/data/mods/default/textures/jungletree_top.png
+++ b/data/mods/default/textures/default_jungletree_top.png
diff --git a/data/mods/default/textures/ladder.png b/data/mods/default/textures/default_ladder.png
index 11056359d..11056359d 100644
--- a/data/mods/default/textures/ladder.png
+++ b/data/mods/default/textures/default_ladder.png
diff --git a/data/mods/default/textures/lava.png b/data/mods/default/textures/default_lava.png
index cb02ada13..cb02ada13 100644
--- a/data/mods/default/textures/lava.png
+++ b/data/mods/default/textures/default_lava.png
diff --git a/data/mods/default/textures/leaves.png b/data/mods/default/textures/default_leaves.png
index 7a25126e9..7a25126e9 100644
--- a/data/mods/default/textures/leaves.png
+++ b/data/mods/default/textures/default_leaves.png
diff --git a/data/mods/default/textures/lump_of_clay.png b/data/mods/default/textures/default_lump_of_clay.png
index be0bab9d7..be0bab9d7 100644
--- a/data/mods/default/textures/lump_of_clay.png
+++ b/data/mods/default/textures/default_lump_of_clay.png
diff --git a/data/mods/default/textures/lump_of_coal.png b/data/mods/default/textures/default_lump_of_coal.png
index bad901efa..bad901efa 100644
--- a/data/mods/default/textures/lump_of_coal.png
+++ b/data/mods/default/textures/default_lump_of_coal.png
diff --git a/data/mods/default/textures/lump_of_iron.png b/data/mods/default/textures/default_lump_of_iron.png
index edb931018..edb931018 100644
--- a/data/mods/default/textures/lump_of_iron.png
+++ b/data/mods/default/textures/default_lump_of_iron.png
diff --git a/data/mods/default/textures/mese.png b/data/mods/default/textures/default_mese.png
index 4c876cdc5..4c876cdc5 100644
--- a/data/mods/default/textures/mese.png
+++ b/data/mods/default/textures/default_mese.png
diff --git a/data/mods/default/textures/mineral_coal.png b/data/mods/default/textures/default_mineral_coal.png
index 3ff9692fb..3ff9692fb 100644
--- a/data/mods/default/textures/mineral_coal.png
+++ b/data/mods/default/textures/default_mineral_coal.png
diff --git a/data/mods/default/textures/mineral_iron.png b/data/mods/default/textures/default_mineral_iron.png
index 51b15d95d..51b15d95d 100644
--- a/data/mods/default/textures/mineral_iron.png
+++ b/data/mods/default/textures/default_mineral_iron.png
diff --git a/data/mods/default/textures/mossycobble.png b/data/mods/default/textures/default_mossycobble.png
index fad1b33ff..fad1b33ff 100644
--- a/data/mods/default/textures/mossycobble.png
+++ b/data/mods/default/textures/default_mossycobble.png
diff --git a/data/mods/default/textures/nc_back.png b/data/mods/default/textures/default_nc_back.png
index f09f41658..f09f41658 100644
--- a/data/mods/default/textures/nc_back.png
+++ b/data/mods/default/textures/default_nc_back.png
diff --git a/data/mods/default/textures/nc_front.png b/data/mods/default/textures/default_nc_front.png
index cad9edab1..cad9edab1 100644
--- a/data/mods/default/textures/nc_front.png
+++ b/data/mods/default/textures/default_nc_front.png
diff --git a/data/mods/default/textures/nc_rb.png b/data/mods/default/textures/default_nc_rb.png
index 7ebc9930d..7ebc9930d 100644
--- a/data/mods/default/textures/nc_rb.png
+++ b/data/mods/default/textures/default_nc_rb.png
diff --git a/data/mods/default/textures/nc_side.png b/data/mods/default/textures/default_nc_side.png
index f954045fb..f954045fb 100644
--- a/data/mods/default/textures/nc_side.png
+++ b/data/mods/default/textures/default_nc_side.png
diff --git a/data/mods/default/textures/paper.png b/data/mods/default/textures/default_paper.png
index ae5c06bc6..ae5c06bc6 100644
--- a/data/mods/default/textures/paper.png
+++ b/data/mods/default/textures/default_paper.png
diff --git a/data/mods/default/textures/papyrus.png b/data/mods/default/textures/default_papyrus.png
index bf0dec7fe..bf0dec7fe 100644
--- a/data/mods/default/textures/papyrus.png
+++ b/data/mods/default/textures/default_papyrus.png
diff --git a/data/mods/default/textures/rail.png b/data/mods/default/textures/default_rail.png
index 18176d9f3..18176d9f3 100644
--- a/data/mods/default/textures/rail.png
+++ b/data/mods/default/textures/default_rail.png
diff --git a/data/mods/default/textures/rail_crossing.png b/data/mods/default/textures/default_rail_crossing.png
index 984640577..984640577 100644
--- a/data/mods/default/textures/rail_crossing.png
+++ b/data/mods/default/textures/default_rail_crossing.png
diff --git a/data/mods/default/textures/rail_curved.png b/data/mods/default/textures/default_rail_curved.png
index 62afa3d2b..62afa3d2b 100644
--- a/data/mods/default/textures/rail_curved.png
+++ b/data/mods/default/textures/default_rail_curved.png
diff --git a/data/mods/default/textures/rail_t_junction.png b/data/mods/default/textures/default_rail_t_junction.png
index 9985f63cd..9985f63cd 100644
--- a/data/mods/default/textures/rail_t_junction.png
+++ b/data/mods/default/textures/default_rail_t_junction.png
diff --git a/data/mods/default/textures/sand.png b/data/mods/default/textures/default_sand.png
index 15101a7eb..15101a7eb 100644
--- a/data/mods/default/textures/sand.png
+++ b/data/mods/default/textures/default_sand.png
diff --git a/data/mods/default/textures/sandstone.png b/data/mods/default/textures/default_sandstone.png
index c4759b4d0..c4759b4d0 100644
--- a/data/mods/default/textures/sandstone.png
+++ b/data/mods/default/textures/default_sandstone.png
diff --git a/data/mods/default/textures/sapling.png b/data/mods/default/textures/default_sapling.png
index 73f502306..73f502306 100644
--- a/data/mods/default/textures/sapling.png
+++ b/data/mods/default/textures/default_sapling.png
diff --git a/data/mods/default/textures/scorched_stuff.png b/data/mods/default/textures/default_scorched_stuff.png
index 9ced2fbe8..9ced2fbe8 100644
--- a/data/mods/default/textures/scorched_stuff.png
+++ b/data/mods/default/textures/default_scorched_stuff.png
diff --git a/data/mods/default/textures/sign.png b/data/mods/default/textures/default_sign.png
index 2e0b3cbef..2e0b3cbef 100644
--- a/data/mods/default/textures/sign.png
+++ b/data/mods/default/textures/default_sign.png
diff --git a/data/mods/default/textures/sign_back.png b/data/mods/default/textures/default_sign_back.png
index 779e4bc2c..779e4bc2c 100644
--- a/data/mods/default/textures/sign_back.png
+++ b/data/mods/default/textures/default_sign_back.png
diff --git a/data/mods/default/textures/sign_wall.png b/data/mods/default/textures/default_sign_wall.png
index 06eac1ee9..06eac1ee9 100644
--- a/data/mods/default/textures/sign_wall.png
+++ b/data/mods/default/textures/default_sign_wall.png
diff --git a/data/mods/default/textures/steel_block.png b/data/mods/default/textures/default_steel_block.png
index 8e2020081..8e2020081 100644
--- a/data/mods/default/textures/steel_block.png
+++ b/data/mods/default/textures/default_steel_block.png
diff --git a/data/mods/default/textures/steel_ingot.png b/data/mods/default/textures/default_steel_ingot.png
index f6c9414e7..f6c9414e7 100644
--- a/data/mods/default/textures/steel_ingot.png
+++ b/data/mods/default/textures/default_steel_ingot.png
diff --git a/data/mods/default/textures/stick.png b/data/mods/default/textures/default_stick.png
index 2d31797f0..2d31797f0 100644
--- a/data/mods/default/textures/stick.png
+++ b/data/mods/default/textures/default_stick.png
diff --git a/data/mods/default/textures/stone.png b/data/mods/default/textures/default_stone.png
index cad0dbe2b..cad0dbe2b 100644
--- a/data/mods/default/textures/stone.png
+++ b/data/mods/default/textures/default_stone.png
diff --git a/data/mods/default/textures/tnt_bottom.png b/data/mods/default/textures/default_tnt_bottom.png
index 8ba2fca0b..8ba2fca0b 100644
--- a/data/mods/default/textures/tnt_bottom.png
+++ b/data/mods/default/textures/default_tnt_bottom.png
diff --git a/data/mods/default/textures/tnt_side.png b/data/mods/default/textures/default_tnt_side.png
index d9a2bc4eb..d9a2bc4eb 100644
--- a/data/mods/default/textures/tnt_side.png
+++ b/data/mods/default/textures/default_tnt_side.png
diff --git a/data/mods/default/textures/tnt_top.png b/data/mods/default/textures/default_tnt_top.png
index a84ffc9af..a84ffc9af 100644
--- a/data/mods/default/textures/tnt_top.png
+++ b/data/mods/default/textures/default_tnt_top.png
diff --git a/data/mods/default/textures/tool_mesepick.png b/data/mods/default/textures/default_tool_mesepick.png
index a1f3812e0..a1f3812e0 100644
--- a/data/mods/default/textures/tool_mesepick.png
+++ b/data/mods/default/textures/default_tool_mesepick.png
diff --git a/data/mods/default/textures/tool_steelaxe.png b/data/mods/default/textures/default_tool_steelaxe.png
index 0ad23c93b..0ad23c93b 100644
--- a/data/mods/default/textures/tool_steelaxe.png
+++ b/data/mods/default/textures/default_tool_steelaxe.png
diff --git a/data/mods/default/textures/tool_steelpick.png b/data/mods/default/textures/default_tool_steelpick.png
index 7982dafeb..7982dafeb 100644
--- a/data/mods/default/textures/tool_steelpick.png
+++ b/data/mods/default/textures/default_tool_steelpick.png
diff --git a/data/mods/default/textures/tool_steelshovel.png b/data/mods/default/textures/default_tool_steelshovel.png
index ed8413846..ed8413846 100644
--- a/data/mods/default/textures/tool_steelshovel.png
+++ b/data/mods/default/textures/default_tool_steelshovel.png
diff --git a/data/mods/default/textures/tool_steelsword.png b/data/mods/default/textures/default_tool_steelsword.png
index a74581238..a74581238 100644
--- a/data/mods/default/textures/tool_steelsword.png
+++ b/data/mods/default/textures/default_tool_steelsword.png
diff --git a/data/mods/default/textures/tool_stoneaxe.png b/data/mods/default/textures/default_tool_stoneaxe.png
index 698ac918f..698ac918f 100644
--- a/data/mods/default/textures/tool_stoneaxe.png
+++ b/data/mods/default/textures/default_tool_stoneaxe.png
diff --git a/data/mods/default/textures/tool_stonepick.png b/data/mods/default/textures/default_tool_stonepick.png
index b34de6f32..b34de6f32 100644
--- a/data/mods/default/textures/tool_stonepick.png
+++ b/data/mods/default/textures/default_tool_stonepick.png
diff --git a/data/mods/default/textures/tool_stoneshovel.png b/data/mods/default/textures/default_tool_stoneshovel.png
index ba5243101..ba5243101 100644
--- a/data/mods/default/textures/tool_stoneshovel.png
+++ b/data/mods/default/textures/default_tool_stoneshovel.png
diff --git a/data/mods/default/textures/tool_stonesword.png b/data/mods/default/textures/default_tool_stonesword.png
index 8f8191f92..8f8191f92 100644
--- a/data/mods/default/textures/tool_stonesword.png
+++ b/data/mods/default/textures/default_tool_stonesword.png
diff --git a/data/mods/default/textures/tool_woodaxe.png b/data/mods/default/textures/default_tool_woodaxe.png
index 3daa4af72..3daa4af72 100644
--- a/data/mods/default/textures/tool_woodaxe.png
+++ b/data/mods/default/textures/default_tool_woodaxe.png
diff --git a/data/mods/default/textures/tool_woodpick.png b/data/mods/default/textures/default_tool_woodpick.png
index ea728cca3..ea728cca3 100644
--- a/data/mods/default/textures/tool_woodpick.png
+++ b/data/mods/default/textures/default_tool_woodpick.png
diff --git a/data/mods/default/textures/tool_woodshovel.png b/data/mods/default/textures/default_tool_woodshovel.png
index 649ab4c38..649ab4c38 100644
--- a/data/mods/default/textures/tool_woodshovel.png
+++ b/data/mods/default/textures/default_tool_woodshovel.png
diff --git a/data/mods/default/textures/tool_woodsword.png b/data/mods/default/textures/default_tool_woodsword.png
index d6c6be325..d6c6be325 100644
--- a/data/mods/default/textures/tool_woodsword.png
+++ b/data/mods/default/textures/default_tool_woodsword.png
diff --git a/data/mods/default/textures/torch.png b/data/mods/default/textures/default_torch.png
index 7a953c222..7a953c222 100644
--- a/data/mods/default/textures/torch.png
+++ b/data/mods/default/textures/default_torch.png
diff --git a/data/mods/default/textures/torch_on_ceiling.png b/data/mods/default/textures/default_torch_on_ceiling.png
index 6965d380e..6965d380e 100644
--- a/data/mods/default/textures/torch_on_ceiling.png
+++ b/data/mods/default/textures/default_torch_on_ceiling.png
diff --git a/data/mods/default/textures/torch_on_floor.png b/data/mods/default/textures/default_torch_on_floor.png
index 76d1dd5ac..76d1dd5ac 100644
--- a/data/mods/default/textures/torch_on_floor.png
+++ b/data/mods/default/textures/default_torch_on_floor.png
diff --git a/data/mods/default/textures/tree.png b/data/mods/default/textures/default_tree.png
index 65abfc243..65abfc243 100644
--- a/data/mods/default/textures/tree.png
+++ b/data/mods/default/textures/default_tree.png
diff --git a/data/mods/default/textures/tree_top.png b/data/mods/default/textures/default_tree_top.png
index 2cdd94f80..2cdd94f80 100644
--- a/data/mods/default/textures/tree_top.png
+++ b/data/mods/default/textures/default_tree_top.png
diff --git a/data/mods/default/textures/treeprop.png b/data/mods/default/textures/default_treeprop.png
index 77ea4d6d4..77ea4d6d4 100644
--- a/data/mods/default/textures/treeprop.png
+++ b/data/mods/default/textures/default_treeprop.png
diff --git a/data/mods/default/textures/water.png b/data/mods/default/textures/default_water.png
index e5f8cdc25..e5f8cdc25 100644
--- a/data/mods/default/textures/water.png
+++ b/data/mods/default/textures/default_water.png
diff --git a/data/mods/default/textures/wood.png b/data/mods/default/textures/default_wood.png
index 57c1d7c12..57c1d7c12 100644
--- a/data/mods/default/textures/wood.png
+++ b/data/mods/default/textures/default_wood.png
diff --git a/data/mods/legacy/init.lua b/data/mods/legacy/init.lua
index f3bae81ff..e95f0e6ef 100644
--- a/data/mods/legacy/init.lua
+++ b/data/mods/legacy/init.lua
@@ -12,7 +12,7 @@ LIGHT_MAX = 14
 --
 
 minetest.register_tool(":WPick", {
-	image = "tool_woodpick.png",
+	image = "default_tool_woodpick.png",
 	basetime = 2.0,
 	dt_weight = 0,
 	dt_crackiness = -0.5,
@@ -25,7 +25,7 @@ minetest.register_tool(":WPick", {
 	dd_cuttability = 0,
 })
 minetest.register_tool(":STPick", {
-	image = "tool_stonepick.png",
+	image = "default_tool_stonepick.png",
 	basetime = 1.5,
 	dt_weight = 0,
 	dt_crackiness = -0.5,
@@ -38,7 +38,7 @@ minetest.register_tool(":STPick", {
 	dd_cuttability = 0,
 })
 minetest.register_tool(":SteelPick", {
-	image = "tool_steelpick.png",
+	image = "default_tool_steelpick.png",
 	basetime = 1.0,
 	dt_weight = 0,
 	dt_crackiness = -0.5,
@@ -51,7 +51,7 @@ minetest.register_tool(":SteelPick", {
 	dd_cuttability = 0,
 })
 minetest.register_tool(":MesePick", {
-	image = "tool_mesepick.png",
+	image = "default_tool_mesepick.png",
 	basetime = 0,
 	dt_weight = 0,
 	dt_crackiness = 0,
@@ -64,7 +64,7 @@ minetest.register_tool(":MesePick", {
 	dd_cuttability = 0,
 })
 minetest.register_tool(":WShovel", {
-	image = "tool_woodshovel.png",
+	image = "default_tool_woodshovel.png",
 	basetime = 2.0,
 	dt_weight = 0.5,
 	dt_crackiness = 2,
@@ -77,7 +77,7 @@ minetest.register_tool(":WShovel", {
 	dd_cuttability = 0,
 })
 minetest.register_tool(":STShovel", {
-	image = "tool_stoneshovel.png",
+	image = "default_tool_stoneshovel.png",
 	basetime = 1.5,
 	dt_weight = 0.5,
 	dt_crackiness = 2,
@@ -90,7 +90,7 @@ minetest.register_tool(":STShovel", {
 	dd_cuttability = 0,
 })
 minetest.register_tool(":SteelShovel", {
-	image = "tool_steelshovel.png",
+	image = "default_tool_steelshovel.png",
 	basetime = 1.0,
 	dt_weight = 0.5,
 	dt_crackiness = 2,
@@ -103,7 +103,7 @@ minetest.register_tool(":SteelShovel", {
 	dd_cuttability = 0,
 })
 minetest.register_tool(":WAxe", {
-	image = "tool_woodaxe.png",
+	image = "default_tool_woodaxe.png",
 	basetime = 2.0,
 	dt_weight = 0.5,
 	dt_crackiness = -0.2,
@@ -116,7 +116,7 @@ minetest.register_tool(":WAxe", {
 	dd_cuttability = 0,
 })
 minetest.register_tool(":STAxe", {
-	image = "tool_stoneaxe.png",
+	image = "default_tool_stoneaxe.png",
 	basetime = 1.5,
 	dt_weight = 0.5,
 	dt_crackiness = -0.2,
@@ -129,7 +129,7 @@ minetest.register_tool(":STAxe", {
 	dd_cuttability = 0,
 })
 minetest.register_tool(":SteelAxe", {
-	image = "tool_steelaxe.png",
+	image = "default_tool_steelaxe.png",
 	basetime = 1.0,
 	dt_weight = 0.5,
 	dt_crackiness = -0.2,
@@ -142,7 +142,7 @@ minetest.register_tool(":SteelAxe", {
 	dd_cuttability = 0,
 })
 minetest.register_tool(":WSword", {
-	image = "tool_woodsword.png",
+	image = "default_tool_woodsword.png",
 	basetime = 3.0,
 	dt_weight = 3,
 	dt_crackiness = 0,
@@ -155,7 +155,7 @@ minetest.register_tool(":WSword", {
 	dd_cuttability = 0,
 })
 minetest.register_tool(":STSword", {
-	image = "tool_stonesword.png",
+	image = "default_tool_stonesword.png",
 	basetime = 2.5,
 	dt_weight = 3,
 	dt_crackiness = 0,
@@ -168,7 +168,7 @@ minetest.register_tool(":STSword", {
 	dd_cuttability = 0,
 })
 minetest.register_tool(":SteelSword", {
-	image = "tool_steelsword.png",
+	image = "default_tool_steelsword.png",
 	basetime = 2.0,
 	dt_weight = 3,
 	dt_crackiness = 0,
@@ -450,8 +450,8 @@ minetest.register_craft({
 --
 
 minetest.register_node(":stone", {
-	tile_images = {"stone.png"},
-	inventory_image = minetest.inventorycube("stone.png"),
+	tile_images = {"default_stone.png"},
+	inventory_image = minetest.inventorycube("default_stone.png"),
 	paramtype = "mineral",
 	is_ground_content = true,
 	often_contains_mineral = true, -- Texture atlas hint
@@ -460,90 +460,90 @@ minetest.register_node(":stone", {
 })
 
 minetest.register_node(":dirt_with_grass", {
-	tile_images = {"grass.png", "mud.png", "mud.png^grass_side.png"},
-	inventory_image = minetest.inventorycube("mud.png^grass_side.png"),
+	tile_images = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
+	inventory_image = minetest.inventorycube("default_dirt.png^default_grass_side.png"),
 	is_ground_content = true,
 	material = minetest.digprop_dirtlike(1.0),
 	dug_item = 'node "dirt" 1',
 })
 
 minetest.register_node(":dirt_with_grass_footsteps", {
-	tile_images = {"grass_footsteps.png", "mud.png", "mud.png^grass_side.png"},
-	inventory_image = "grass_footsteps.png",
+	tile_images = {"default_grass_footsteps.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
+	inventory_image = "default_grass_footsteps.png",
 	is_ground_content = true,
 	material = minetest.digprop_dirtlike(1.0),
 	dug_item = 'node "dirt" 1',
 })
 
 minetest.register_node(":dirt", {
-	tile_images = {"mud.png"},
-	inventory_image = minetest.inventorycube("mud.png"),
+	tile_images = {"default_dirt.png"},
+	inventory_image = minetest.inventorycube("default_dirt.png"),
 	is_ground_content = true,
 	material = minetest.digprop_dirtlike(1.0),
 })
 
 minetest.register_node(":sand", {
-	tile_images = {"sand.png"},
-	inventory_image = minetest.inventorycube("sand.png"),
+	tile_images = {"default_sand.png"},
+	inventory_image = minetest.inventorycube("default_sand.png"),
 	is_ground_content = true,
 	material = minetest.digprop_dirtlike(1.0),
-	cookresult_itemstring = 'node "glass" 1',
+	cookresult_itemstring = 'node "default:glass" 1',
 })
 
 minetest.register_node(":gravel", {
-	tile_images = {"gravel.png"},
-	inventory_image = minetest.inventorycube("gravel.png"),
+	tile_images = {"default_gravel.png"},
+	inventory_image = minetest.inventorycube("default_gravel.png"),
 	is_ground_content = true,
 	material = minetest.digprop_gravellike(1.0),
 })
 
 minetest.register_node(":sandstone", {
-	tile_images = {"sandstone.png"},
-	inventory_image = minetest.inventorycube("sandstone.png"),
+	tile_images = {"default_sandstone.png"},
+	inventory_image = minetest.inventorycube("default_sandstone.png"),
 	is_ground_content = true,
 	material = minetest.digprop_dirtlike(1.0),
 	dug_item = 'node "sand" 1',
 })
 
 minetest.register_node(":clay", {
-	tile_images = {"clay.png"},
-	inventory_image = minetest.inventorycube("clay.png"),
+	tile_images = {"default_clay.png"},
+	inventory_image = minetest.inventorycube("default_clay.png"),
 	is_ground_content = true,
 	material = minetest.digprop_dirtlike(1.0),
 	dug_item = 'craft "lump_of_clay" 4',
 })
 
 minetest.register_node(":brick", {
-	tile_images = {"brick.png"},
-	inventory_image = minetest.inventorycube("brick.png"),
+	tile_images = {"default_brick.png"},
+	inventory_image = minetest.inventorycube("default_brick.png"),
 	is_ground_content = true,
 	material = minetest.digprop_stonelike(1.0),
 	dug_item = 'craft "clay_brick" 4',
 })
 
 minetest.register_node(":tree", {
-	tile_images = {"tree_top.png", "tree_top.png", "tree.png"},
-	inventory_image = minetest.inventorycube("tree_top.png", "tree.png", "tree.png"),
+	tile_images = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
+	inventory_image = minetest.inventorycube("default_tree_top.png", "default_tree.png", "default_tree.png"),
 	is_ground_content = true,
 	material = minetest.digprop_woodlike(1.0),
-	cookresult_itemstring = 'craft "lump_of_coal" 1',
+	cookresult_itemstring = 'craft "default:lump_of_coal" 1',
 	furnace_burntime = 30,
 })
 
 minetest.register_node(":jungletree", {
-	tile_images = {"jungletree_top.png", "jungletree_top.png", "jungletree.png"},
-	inventory_image = minetest.inventorycube("jungletree_top.png", "jungletree.png", "jungletree.png"),
+	tile_images = {"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"},
+	inventory_image = minetest.inventorycube("default_jungletree_top.png", "default_jungletree.png", "default_jungletree.png"),
 	is_ground_content = true,
 	material = minetest.digprop_woodlike(1.0),
-	cookresult_itemstring = 'craft "lump_of_coal" 1',
+	cookresult_itemstring = 'craft "default:lump_of_coal" 1',
 	furnace_burntime = 30,
 })
 
 minetest.register_node(":junglegrass", {
 	drawtype = "plantlike",
 	visual_scale = 1.3,
-	tile_images = {"junglegrass.png"},
-	inventory_image = "junglegrass.png",
+	tile_images = {"default_junglegrass.png"},
+	inventory_image = "default_junglegrass.png",
 	light_propagates = true,
 	paramtype = "light",
 	walkable = false,
@@ -554,19 +554,19 @@ minetest.register_node(":junglegrass", {
 minetest.register_node(":leaves", {
 	drawtype = "allfaces_optional",
 	visual_scale = 1.3,
-	tile_images = {"leaves.png"},
-	inventory_image = minetest.inventorycube("leaves.png"),
+	tile_images = {"default_leaves.png"},
+	inventory_image = minetest.inventorycube("default_leaves.png"),
 	light_propagates = true,
 	paramtype = "light",
 	material = minetest.digprop_leaveslike(1.0),
-	extra_dug_item = 'node "sapling" 1',
+	extra_dug_item = 'node "default:sapling" 1',
 	extra_dug_item_rarity = 20,
 	furnace_burntime = 1,
 })
 
 minetest.register_node(":cactus", {
-	tile_images = {"cactus_top.png", "cactus_top.png", "cactus_side.png"},
-	inventory_image = minetest.inventorycube("cactus_top.png", "cactus_side.png", "cactus_side.png"),
+	tile_images = {"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"},
+	inventory_image = minetest.inventorycube("default_cactus_top.png", "default_cactus_side.png", "default_cactus_side.png"),
 	is_ground_content = true,
 	material = minetest.digprop_woodlike(0.75),
 	furnace_burntime = 15,
@@ -574,8 +574,8 @@ minetest.register_node(":cactus", {
 
 minetest.register_node(":papyrus", {
 	drawtype = "plantlike",
-	tile_images = {"papyrus.png"},
-	inventory_image = "papyrus.png",
+	tile_images = {"default_papyrus.png"},
+	inventory_image = "default_papyrus.png",
 	light_propagates = true,
 	paramtype = "light",
 	is_ground_content = true,
@@ -585,8 +585,8 @@ minetest.register_node(":papyrus", {
 })
 
 minetest.register_node(":bookshelf", {
-	tile_images = {"wood.png", "wood.png", "bookshelf.png"},
-	inventory_image = minetest.inventorycube("wood.png", "bookshelf.png", "bookshelf.png"),
+	tile_images = {"default_wood.png", "default_wood.png", "default_bookshelf.png"},
+	inventory_image = minetest.inventorycube("default_wood.png", "default_bookshelf.png", "default_bookshelf.png"),
 	is_ground_content = true,
 	material = minetest.digprop_woodlike(0.75),
 	furnace_burntime = 30,
@@ -594,8 +594,8 @@ minetest.register_node(":bookshelf", {
 
 minetest.register_node(":glass", {
 	drawtype = "glasslike",
-	tile_images = {"glass.png"},
-	inventory_image = minetest.inventorycube("glass.png"),
+	tile_images = {"default_glass.png"},
+	inventory_image = minetest.inventorycube("default_glass.png"),
 	light_propagates = true,
 	paramtype = "light",
 	sunlight_propagates = true,
@@ -605,8 +605,8 @@ minetest.register_node(":glass", {
 
 minetest.register_node(":wooden_fence", {
 	drawtype = "fencelike",
-	tile_images = {"wood.png"},
-	inventory_image = "fence.png",
+	tile_images = {"default_wood.png"},
+	inventory_image = "default_fence.png",
 	light_propagates = true,
 	paramtype = "light",
 	is_ground_content = true,
@@ -620,8 +620,8 @@ minetest.register_node(":wooden_fence", {
 
 minetest.register_node(":rail", {
 	drawtype = "raillike",
-	tile_images = {"rail.png", "rail_curved.png", "rail_t_junction.png", "rail_crossing.png"},
-	inventory_image = "rail.png",
+	tile_images = {"default_rail.png", "default_rail_curved.png", "default_rail_t_junction.png", "default_rail_crossing.png"},
+	inventory_image = "default_rail.png",
 	light_propagates = true,
 	paramtype = "light",
 	is_ground_content = true,
@@ -635,8 +635,8 @@ minetest.register_node(":rail", {
 
 minetest.register_node(":ladder", {
 	drawtype = "signlike",
-	tile_images = {"ladder.png"},
-	inventory_image = "ladder.png",
+	tile_images = {"default_ladder.png"},
+	inventory_image = "default_ladder.png",
 	light_propagates = true,
 	paramtype = "light",
 	is_ground_content = true,
@@ -661,32 +661,32 @@ minetest.register_node(":coalstone", {
 })
 
 minetest.register_node(":wood", {
-	tile_images = {"wood.png"},
-	inventory_image = minetest.inventorycube("wood.png"),
+	tile_images = {"default_wood.png"},
+	inventory_image = minetest.inventorycube("default_wood.png"),
 	is_ground_content = true,
 	furnace_burntime = 7,
 	material = minetest.digprop_woodlike(0.75),
 })
 
 minetest.register_node(":mese", {
-	tile_images = {"mese.png"},
-	inventory_image = minetest.inventorycube("mese.png"),
+	tile_images = {"default_mese.png"},
+	inventory_image = minetest.inventorycube("default_mese.png"),
 	is_ground_content = true,
 	furnace_burntime = 30,
 	material = minetest.digprop_stonelike(0.5),
 })
 
 minetest.register_node(":cloud", {
-	tile_images = {"cloud.png"},
-	inventory_image = minetest.inventorycube("cloud.png"),
+	tile_images = {"default_cloud.png"},
+	inventory_image = minetest.inventorycube("default_cloud.png"),
 	is_ground_content = true,
 })
 
 minetest.register_node(":water_flowing", {
 	drawtype = "flowingliquid",
-	tile_images = {"water.png"},
+	tile_images = {"default_water.png"},
 	alpha = WATER_ALPHA,
-	inventory_image = minetest.inventorycube("water.png"),
+	inventory_image = minetest.inventorycube("default_water.png"),
 	paramtype = "light",
 	light_propagates = true,
 	walkable = false,
@@ -699,16 +699,16 @@ minetest.register_node(":water_flowing", {
 	liquid_viscosity = WATER_VISC,
 	post_effect_color = {a=64, r=100, g=100, b=200},
 	special_materials = {
-		{image="water.png", backface_culling=false},
-		{image="water.png", backface_culling=true},
+		{image="default_water.png", backface_culling=false},
+		{image="default_water.png", backface_culling=true},
 	},
 })
 
 minetest.register_node(":water_source", {
 	drawtype = "liquid",
-	tile_images = {"water.png"},
+	tile_images = {"default_water.png"},
 	alpha = WATER_ALPHA,
-	inventory_image = minetest.inventorycube("water.png"),
+	inventory_image = minetest.inventorycube("default_water.png"),
 	paramtype = "light",
 	light_propagates = true,
 	walkable = false,
@@ -722,14 +722,14 @@ minetest.register_node(":water_source", {
 	post_effect_color = {a=64, r=100, g=100, b=200},
 	special_materials = {
 		-- New-style water source material (mostly unused)
-		{image="water.png", backface_culling=false},
+		{image="default_water.png", backface_culling=false},
 	},
 })
 
 minetest.register_node(":lava_flowing", {
 	drawtype = "flowingliquid",
-	tile_images = {"lava.png"},
-	inventory_image = minetest.inventorycube("lava.png"),
+	tile_images = {"default_lava.png"},
+	inventory_image = minetest.inventorycube("default_lava.png"),
 	paramtype = "light",
 	light_propagates = false,
 	light_source = LIGHT_MAX - 1,
@@ -744,15 +744,15 @@ minetest.register_node(":lava_flowing", {
 	damage_per_second = 4*2,
 	post_effect_color = {a=192, r=255, g=64, b=0},
 	special_materials = {
-		{image="lava.png", backface_culling=false},
-		{image="lava.png", backface_culling=true},
+		{image="default_lava.png", backface_culling=false},
+		{image="default_lava.png", backface_culling=true},
 	},
 })
 
 minetest.register_node(":lava_source", {
 	drawtype = "liquid",
-	tile_images = {"lava.png"},
-	inventory_image = minetest.inventorycube("lava.png"),
+	tile_images = {"default_lava.png"},
+	inventory_image = minetest.inventorycube("default_lava.png"),
 	paramtype = "light",
 	light_propagates = false,
 	light_source = LIGHT_MAX - 1,
@@ -768,15 +768,15 @@ minetest.register_node(":lava_source", {
 	post_effect_color = {a=192, r=255, g=64, b=0},
 	special_materials = {
 		-- New-style lava source material (mostly unused)
-		{image="lava.png", backface_culling=false},
+		{image="default_lava.png", backface_culling=false},
 	},
 	furnace_burntime = 60,
 })
 
 minetest.register_node(":torch", {
 	drawtype = "torchlike",
-	tile_images = {"torch_on_floor.png", "torch_on_ceiling.png", "torch.png"},
-	inventory_image = "torch_on_floor.png",
+	tile_images = {"default_torch_on_floor.png", "default_torch_on_ceiling.png", "default_torch.png"},
+	inventory_image = "default_torch_on_floor.png",
 	paramtype = "light",
 	light_propagates = true,
 	sunlight_propagates = true,
@@ -795,8 +795,8 @@ minetest.register_node(":torch", {
 
 minetest.register_node(":sign_wall", {
 	drawtype = "signlike",
-	tile_images = {"sign_wall.png"},
-	inventory_image = "sign_wall.png",
+	tile_images = {"default_sign_wall.png"},
+	inventory_image = "default_sign_wall.png",
 	paramtype = "light",
 	light_propagates = true,
 	sunlight_propagates = true,
@@ -814,9 +814,9 @@ minetest.register_node(":sign_wall", {
 })
 
 minetest.register_node(":chest", {
-	tile_images = {"chest_top.png", "chest_top.png", "chest_side.png",
-		"chest_side.png", "chest_side.png", "chest_front.png"},
-	inventory_image = minetest.inventorycube("chest_top.png", "chest_front.png", "chest_side.png"),
+	tile_images = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
+		"default_chest_side.png", "default_chest_side.png", "default_chest_front.png"},
+	inventory_image = minetest.inventorycube("default_chest_top.png", "default_chest_front.png", "default_chest_side.png"),
 	paramtype = "facedir_simple",
 	metadata_name = "chest",
 	material = minetest.digprop_woodlike(1.0),
@@ -824,9 +824,9 @@ minetest.register_node(":chest", {
 })
 
 minetest.register_node(":locked_chest", {
-	tile_images = {"chest_top.png", "chest_top.png", "chest_side.png",
-		"chest_side.png", "chest_side.png", "chest_lock.png"},
-	inventory_image = minetest.inventorycube("chest_top.png", "chest_lock.png", "chest_side.png"),
+	tile_images = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
+		"default_chest_side.png", "default_chest_side.png", "default_chest_lock.png"},
+	inventory_image = minetest.inventorycube("default_chest_top.png", "default_chest_lock.png", "default_chest_side.png"),
 	paramtype = "facedir_simple",
 	metadata_name = "locked_chest",
 	material = minetest.digprop_woodlike(1.0),
@@ -834,48 +834,48 @@ minetest.register_node(":locked_chest", {
 })
 
 minetest.register_node(":furnace", {
-	tile_images = {"furnace_side.png", "furnace_side.png", "furnace_side.png",
-		"furnace_side.png", "furnace_side.png", "furnace_front.png"},
-	inventory_image = minetest.inventorycube("furnace_side.png", "furnace_front.png", "furnace_side.png"),
+	tile_images = {"default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png",
+		"default_furnace_side.png", "default_furnace_side.png", "default_furnace_front.png"},
+	inventory_image = minetest.inventorycube("default_furnace_side.png", "default_furnace_front.png", "default_furnace_side.png"),
 	paramtype = "facedir_simple",
 	metadata_name = "furnace",
 	material = minetest.digprop_stonelike(3.0),
 })
 
 minetest.register_node(":cobble", {
-	tile_images = {"cobble.png"},
-	inventory_image = minetest.inventorycube("cobble.png"),
+	tile_images = {"default_cobble.png"},
+	inventory_image = minetest.inventorycube("default_cobble.png"),
 	is_ground_content = true,
-	cookresult_itemstring = 'node "stone" 1',
+	cookresult_itemstring = 'node "default:stone" 1',
 	material = minetest.digprop_stonelike(0.9),
 })
 
 minetest.register_node(":mossycobble", {
-	tile_images = {"mossycobble.png"},
-	inventory_image = minetest.inventorycube("mossycobble.png"),
+	tile_images = {"default_mossycobble.png"},
+	inventory_image = minetest.inventorycube("default_mossycobble.png"),
 	is_ground_content = true,
 	material = minetest.digprop_stonelike(0.8),
 })
 
 minetest.register_node(":steelblock", {
-	tile_images = {"steel_block.png"},
-	inventory_image = minetest.inventorycube("steel_block.png"),
+	tile_images = {"default_steel_block.png"},
+	inventory_image = minetest.inventorycube("default_steel_block.png"),
 	is_ground_content = true,
 	material = minetest.digprop_stonelike(5.0),
 })
 
 minetest.register_node(":nyancat", {
-	tile_images = {"nc_side.png", "nc_side.png", "nc_side.png",
-		"nc_side.png", "nc_back.png", "nc_front.png"},
-	inventory_image = "nc_front.png",
+	tile_images = {"default_nc_side.png", "default_nc_side.png", "default_nc_side.png",
+		"default_nc_side.png", "default_nc_back.png", "default_nc_front.png"},
+	inventory_image = "default_nc_front.png",
 	paramtype = "facedir_simple",
 	material = minetest.digprop_stonelike(3.0),
 	furnace_burntime = 1,
 })
 
 minetest.register_node(":nyancat_rainbow", {
-	tile_images = {"nc_rb.png"},
-	inventory_image = "nc_rb.png",
+	tile_images = {"default_nc_rb.png"},
+	inventory_image = "default_nc_rb.png",
 	material = minetest.digprop_stonelike(3.0),
 	furnace_burntime = 1,
 })
@@ -883,8 +883,8 @@ minetest.register_node(":nyancat_rainbow", {
 minetest.register_node(":sapling", {
 	drawtype = "plantlike",
 	visual_scale = 1.0,
-	tile_images = {"sapling.png"},
-	inventory_image = "sapling.png",
+	tile_images = {"default_sapling.png"},
+	inventory_image = "default_sapling.png",
 	paramtype = "light",
 	light_propagates = true,
 	walkable = false,
@@ -895,8 +895,8 @@ minetest.register_node(":sapling", {
 minetest.register_node(":apple", {
 	drawtype = "plantlike",
 	visual_scale = 1.0,
-	tile_images = {"apple.png"},
-	inventory_image = "apple.png",
+	tile_images = {"default_apple.png"},
+	inventory_image = "default_apple.png",
 	paramtype = "light",
 	light_propagates = true,
 	sunlight_propagates = true,
@@ -912,46 +912,46 @@ minetest.register_node(":apple", {
 --
 
 minetest.register_craftitem(":Stick", {
-	image = "stick.png",
+	image = "default_stick.png",
 	--furnace_burntime = ...,
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
 minetest.register_craftitem(":paper", {
-	image = "paper.png",
+	image = "default_paper.png",
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
 minetest.register_craftitem(":book", {
-	image = "book.png",
+	image = "default_book.png",
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
 minetest.register_craftitem(":lump_of_coal", {
-	image = "lump_of_coal.png",
+	image = "default_lump_of_coal.png",
 	furnace_burntime = 40;
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
 minetest.register_craftitem(":lump_of_iron", {
-	image = "lump_of_iron.png",
-	cookresult_itemstring = 'craft "steel_ingot" 1',
+	image = "default_lump_of_iron.png",
+	cookresult_itemstring = 'craft "default:steel_ingot" 1',
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
 minetest.register_craftitem(":lump_of_clay", {
-	image = "lump_of_clay.png",
-	cookresult_itemstring = 'craft "clay_brick" 1',
+	image = "default_lump_of_clay.png",
+	cookresult_itemstring = 'craft "default:clay_brick" 1',
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
 minetest.register_craftitem(":steel_ingot", {
-	image = "steel_ingot.png",
+	image = "default_steel_ingot.png",
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
 minetest.register_craftitem(":clay_brick", {
-	image = "clay_brick.png",
+	image = "default_clay_brick.png",
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
@@ -972,7 +972,7 @@ minetest.register_craftitem(":cooked_rat", {
 })
 
 minetest.register_craftitem(":scorched_stuff", {
-	image = "scorched_stuff.png",
+	image = "default_scorched_stuff.png",
 	on_place_on_ground = minetest.craftitem_place_item,
 })
 
@@ -985,13 +985,13 @@ minetest.register_craftitem(":firefly", {
 })
 
 minetest.register_craftitem(":apple", {
-	image = "apple.png",
+	image = "default_apple.png",
 	on_place_on_ground = minetest.craftitem_place_item,
 	on_use = minetest.craftitem_eat(4),
 })
 
 minetest.register_craftitem(":apple_iron", {
-	image = "apple_iron.png",
+	image = "default_apple_iron.png",
 	on_place_on_ground = minetest.craftitem_place_item,
 	on_use = minetest.craftitem_eat(8),
 })
@@ -1000,8 +1000,8 @@ minetest.register_craftitem(":apple_iron", {
 -- Falling stuff
 --
 
-default.register_falling_node("sand", "sand.png")
-default.register_falling_node("gravel", "gravel.png")
+default.register_falling_node("sand", "default_sand.png")
+default.register_falling_node("gravel", "default_gravel.png")
 
 --
 -- Global callbacks
diff --git a/data/mods/default/textures/firefly.png b/data/mods/legacy/textures/firefly.png
index 40df7fa1c..40df7fa1c 100644
--- a/data/mods/default/textures/firefly.png
+++ b/data/mods/legacy/textures/firefly.png
diff --git a/data/mods/default/textures/oerkki1.png b/data/mods/legacy/textures/oerkki1.png
index 33cbac9e7..33cbac9e7 100644
--- a/data/mods/default/textures/oerkki1.png
+++ b/data/mods/legacy/textures/oerkki1.png
diff --git a/data/mods/default/textures/oerkki1_damaged.png b/data/mods/legacy/textures/oerkki1_damaged.png
index 9b777387c..9b777387c 100644
--- a/data/mods/default/textures/oerkki1_damaged.png
+++ b/data/mods/legacy/textures/oerkki1_damaged.png
diff --git a/data/mods/default/textures/rat.png b/data/mods/legacy/textures/rat.png
index d1a0e2ae2..d1a0e2ae2 100644
--- a/data/mods/default/textures/rat.png
+++ b/data/mods/legacy/textures/rat.png