diff --git a/mods/uforun/init.lua b/mods/uforun/init.lua
index 02bcef6..7ef07c7 100644
--- a/mods/uforun/init.lua
+++ b/mods/uforun/init.lua
@@ -1,4 +1,8 @@
 uforun = {}
-dofile(minetest.get_modpath("uforun").."/player.lua")
-dofile(minetest.get_modpath("uforun").."/nodes.lua")
-dofile(minetest.get_modpath("uforun").."/mapgen.lua")
+
+local modpath = minetest.get_modpath("uforun")
+
+dofile(modpath.."/player.lua")
+dofile(modpath.."/nodes.lua")
+dofile(modpath.."/mapgen.lua")
+dofile(modpath.."/ufo.lua")
diff --git a/mods/ufo/textures/ufo_bottom.png b/mods/uforun/textures/uforun_ufo_bottom.png
similarity index 100%
rename from mods/ufo/textures/ufo_bottom.png
rename to mods/uforun/textures/uforun_ufo_bottom.png
diff --git a/mods/ufo/textures/ufo_side.png b/mods/uforun/textures/uforun_ufo_side.png
similarity index 100%
rename from mods/ufo/textures/ufo_side.png
rename to mods/uforun/textures/uforun_ufo_side.png
diff --git a/mods/ufo/textures/ufo_top.png b/mods/uforun/textures/uforun_ufo_top.png
similarity index 100%
rename from mods/ufo/textures/ufo_top.png
rename to mods/uforun/textures/uforun_ufo_top.png
diff --git a/mods/ufo/init.lua b/mods/uforun/ufo.lua
similarity index 92%
rename from mods/ufo/init.lua
rename to mods/uforun/ufo.lua
index 81d8c43..9f3e075 100644
--- a/mods/ufo/init.lua
+++ b/mods/uforun/ufo.lua
@@ -10,9 +10,9 @@ local function get_v(v)
 	return math.sqrt(v.x^2+v.z^2)
 end
 
-minetest.register_entity("ufo:ufo", {
+minetest.register_entity("uforun:ufo", {
 	visual = "wielditem",
-	textures = {"ufo:ufo"},
+	textures = {"uforun:ufo"},
 	visual_size = {x=0.667, y=0.667},
 	collisionbox = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
 	physical = true,
@@ -39,7 +39,7 @@ minetest.register_entity("ufo:ufo", {
 			self.removed = true
 			self.object:remove()
 			if not minetest.setting_getbool("creative_mode") then
-				puncher:get_inventory():add_item("main", "ufo:ufo")
+				puncher:get_inventory():add_item("main", "uforun:ufo")
 			end
 		end
 	end,
@@ -131,11 +131,11 @@ minetest.register_entity("ufo:ufo", {
 	end
 })
 
-minetest.register_node("ufo:ufo", {
+minetest.register_node("uforun:ufo", {
 	description = "UFO",
 	drawtype = "nodebox",
 	paramtype = "light",
-	tiles = {"ufo_top.png", "ufo_bottom.png", "ufo_side.png"},
+	tiles = {"uforun_ufo_top.png", "uforun_ufo_bottom.png", "uforun_ufo_side.png"},
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -147,7 +147,7 @@ minetest.register_node("ufo:ufo", {
 		if pointed_thing.type ~= "node" then
 			return
 		end
-		minetest.add_entity(pointed_thing.above, "ufo:ufo")
+		minetest.add_entity(pointed_thing.above, "uforun:ufo")
 		if not minetest.setting_getbool("creative_mode") then
 			itemstack:take_item()
 		end