diff --git a/mods/castle/init.lua b/mods/castle/init.lua
deleted file mode 100644
index a394677..0000000
--- a/mods/castle/init.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-dofile(minetest.get_modpath("castle").."/town_item.lua")
-dofile(minetest.get_modpath("castle").."/shields_decor.lua")
diff --git a/mods/castle/LICENSE b/mods/tutorial_castle/LICENSE
similarity index 100%
rename from mods/castle/LICENSE
rename to mods/tutorial_castle/LICENSE
diff --git a/mods/castle/README.txt b/mods/tutorial_castle/README.txt
similarity index 100%
rename from mods/castle/README.txt
rename to mods/tutorial_castle/README.txt
diff --git a/mods/tutorial_castle/init.lua b/mods/tutorial_castle/init.lua
new file mode 100644
index 0000000..58aa822
--- /dev/null
+++ b/mods/tutorial_castle/init.lua
@@ -0,0 +1,5 @@
+dofile(minetest.get_modpath("tutorial_castle").."/town_item.lua")
+dofile(minetest.get_modpath("tutorial_castle").."/shields_decor.lua")
+
+minetest.register_alias("castle:light", "tutorial_castle:light")
+minetest.register_alias("castle:shield_2", "tutorial_castle:shield_2")
diff --git a/mods/castle/locale/de.txt b/mods/tutorial_castle/locale/de.txt
similarity index 100%
rename from mods/castle/locale/de.txt
rename to mods/tutorial_castle/locale/de.txt
diff --git a/mods/castle/locale/el.txt b/mods/tutorial_castle/locale/el.txt
similarity index 100%
rename from mods/castle/locale/el.txt
rename to mods/tutorial_castle/locale/el.txt
diff --git a/mods/castle/locale/es.txt b/mods/tutorial_castle/locale/es.txt
similarity index 100%
rename from mods/castle/locale/es.txt
rename to mods/tutorial_castle/locale/es.txt
diff --git a/mods/castle/locale/fr.txt b/mods/tutorial_castle/locale/fr.txt
similarity index 100%
rename from mods/castle/locale/fr.txt
rename to mods/tutorial_castle/locale/fr.txt
diff --git a/mods/castle/locale/id.txt b/mods/tutorial_castle/locale/id.txt
similarity index 100%
rename from mods/castle/locale/id.txt
rename to mods/tutorial_castle/locale/id.txt
diff --git a/mods/castle/locale/it.txt b/mods/tutorial_castle/locale/it.txt
similarity index 100%
rename from mods/castle/locale/it.txt
rename to mods/tutorial_castle/locale/it.txt
diff --git a/mods/castle/locale/nl.txt b/mods/tutorial_castle/locale/nl.txt
similarity index 100%
rename from mods/castle/locale/nl.txt
rename to mods/tutorial_castle/locale/nl.txt
diff --git a/mods/castle/locale/template.txt b/mods/tutorial_castle/locale/template.txt
similarity index 100%
rename from mods/castle/locale/template.txt
rename to mods/tutorial_castle/locale/template.txt
diff --git a/mods/castle/mod.conf b/mods/tutorial_castle/mod.conf
similarity index 70%
rename from mods/castle/mod.conf
rename to mods/tutorial_castle/mod.conf
index 4780f85..3701399 100644
--- a/mods/castle/mod.conf
+++ b/mods/tutorial_castle/mod.conf
@@ -1,3 +1,3 @@
-name = castle
+name = tutorial_castle
 depends = tutorial_default
 optional_depends = intllib
diff --git a/mods/castle/shields_decor.lua b/mods/tutorial_castle/shields_decor.lua
similarity index 94%
rename from mods/castle/shields_decor.lua
rename to mods/tutorial_castle/shields_decor.lua
index 4df88c6..ff77a7b 100644
--- a/mods/castle/shields_decor.lua
+++ b/mods/tutorial_castle/shields_decor.lua
@@ -6,7 +6,7 @@ else
   S = function ( s ) return s end
 end
 
-minetest.register_node("castle:shield_2",{
+minetest.register_node("tutorial_castle:shield_2",{
 	description = S("mounted shield"),
 	tiles = {"castle_shield_side_2.png", "castle_shield_side_2.png", "castle_shield_side_2.png", "castle_shield_side_2.png", "castle_shield_back.png", "castle_shield_front_2.png"},
 	drawtype="nodebox",
diff --git a/mods/castle/textures/castle_shield_back.png b/mods/tutorial_castle/textures/castle_shield_back.png
similarity index 100%
rename from mods/castle/textures/castle_shield_back.png
rename to mods/tutorial_castle/textures/castle_shield_back.png
diff --git a/mods/castle/textures/castle_shield_front_2.png b/mods/tutorial_castle/textures/castle_shield_front_2.png
similarity index 100%
rename from mods/castle/textures/castle_shield_front_2.png
rename to mods/tutorial_castle/textures/castle_shield_front_2.png
diff --git a/mods/castle/textures/castle_shield_side_2.png b/mods/tutorial_castle/textures/castle_shield_side_2.png
similarity index 100%
rename from mods/castle/textures/castle_shield_side_2.png
rename to mods/tutorial_castle/textures/castle_shield_side_2.png
diff --git a/mods/castle/textures/castle_street_light.png b/mods/tutorial_castle/textures/castle_street_light.png
similarity index 100%
rename from mods/castle/textures/castle_street_light.png
rename to mods/tutorial_castle/textures/castle_street_light.png
diff --git a/mods/castle/town_item.lua b/mods/tutorial_castle/town_item.lua
similarity index 88%
rename from mods/castle/town_item.lua
rename to mods/tutorial_castle/town_item.lua
index ede840a..c256ed0 100644
--- a/mods/castle/town_item.lua
+++ b/mods/tutorial_castle/town_item.lua
@@ -6,7 +6,7 @@ else
   S = function ( s ) return s end
 end
 
-minetest.register_node("castle:light",{
+minetest.register_node("tutorial_castle:light",{
 	drawtype = "glasslike",
 	description = S("light block"),
 	sunlight_propagates = true,