diff --git a/games/devtest/mods/testentities/callbacks.lua b/games/devtest/mods/callbacks/entities.lua
similarity index 91%
rename from games/devtest/mods/testentities/callbacks.lua
rename to games/devtest/mods/callbacks/entities.lua
index a212fbfbe..6a7f13d75 100644
--- a/games/devtest/mods/testentities/callbacks.lua
+++ b/games/devtest/mods/callbacks/entities.lua
@@ -22,10 +22,10 @@ local spos = function(self)
 end
 
 -- Callback test entity (all callbacks except on_step)
-minetest.register_entity("testentities:callback", {
+minetest.register_entity("callbacks:callback", {
 	initial_properties = {
 		visual = "upright_sprite",
-		textures = { "testentities_callback.png" },
+		textures = { "callbacks_callback_entity.png" },
 	},
 
 	on_activate = function(self, staticdata, dtime_s)
@@ -69,9 +69,9 @@ minetest.register_entity("testentities:callback", {
 })
 
 -- Only test on_step callback
-minetest.register_entity("testentities:callback_step", {
+minetest.register_entity("callbacks:callback_step", {
 	visual = "upright_sprite",
-	textures = { "testentities_callback_step.png" },
+	textures = { "callbacks_callback_entity_step.png" },
 	on_step = function(self, dtime)
 		message("on_step callback entity: on_step! pos="..spos(self).."; dtime="..dtime)
 	end,
diff --git a/games/devtest/mods/callbacks/init.lua b/games/devtest/mods/callbacks/init.lua
index c5b0984d5..8f719a3f8 100644
--- a/games/devtest/mods/callbacks/init.lua
+++ b/games/devtest/mods/callbacks/init.lua
@@ -1,2 +1,3 @@
 dofile(minetest.get_modpath("callbacks").."/items.lua")
 dofile(minetest.get_modpath("callbacks").."/nodes.lua")
+dofile(minetest.get_modpath("callbacks").."/entities.lua")
diff --git a/games/devtest/mods/testentities/textures/testentities_callback.png b/games/devtest/mods/callbacks/textures/callbacks_callback_entity.png
similarity index 100%
rename from games/devtest/mods/testentities/textures/testentities_callback.png
rename to games/devtest/mods/callbacks/textures/callbacks_callback_entity.png
diff --git a/games/devtest/mods/testentities/textures/testentities_callback_step.png b/games/devtest/mods/callbacks/textures/callbacks_callback_entity_step.png
similarity index 100%
rename from games/devtest/mods/testentities/textures/testentities_callback_step.png
rename to games/devtest/mods/callbacks/textures/callbacks_callback_entity_step.png
diff --git a/games/devtest/mods/testentities/init.lua b/games/devtest/mods/testentities/init.lua
index df8c72ea7..94d8d47c2 100644
--- a/games/devtest/mods/testentities/init.lua
+++ b/games/devtest/mods/testentities/init.lua
@@ -1,3 +1,2 @@
 dofile(minetest.get_modpath("testentities").."/visuals.lua")
 dofile(minetest.get_modpath("testentities").."/armor.lua")
-dofile(minetest.get_modpath("testentities").."/callbacks.lua")