diff --git a/mods/boxes/init.lua b/mods/boxes/init.lua
index 7fc2a42..47bdd0b 100644
--- a/mods/boxes/init.lua
+++ b/mods/boxes/init.lua
@@ -590,12 +590,13 @@ minetest.register_globalstep(function(dtime)
 	end
 end)
 
-function boxes.start_box(player, box_data)
+function boxes.open_box(player, box_id)
 	local name = player:get_player_name()
 	if players_in_boxes[name] ~= nil then
 		return
 	end
 
+	local box_data = db.box_get_data(box_id)
 	local box = boxes.read_box(box_data)
 	local lobby_spawn = boxes.read_box(entry_lobby_data)
 	local lobby_exit = boxes.read_box(exit_lobby_data)
@@ -629,7 +630,7 @@ function boxes.start_box(player, box_data)
 	boxes.open_exit(player)
 end
 
-function boxes.end_box(player)
+function boxes.close_box(player)
 	local name = player:get_player_name()
 	if players_in_boxes[name] == nil then
 		return
@@ -642,7 +643,7 @@ function boxes.end_box(player)
 end
 
 minetest.register_on_leaveplayer(function(player)
-	boxes.end_box(player)
+	boxes.close_box(player)
 end)
 
 minetest.register_chatcommand("enter", {
@@ -659,7 +660,7 @@ minetest.register_chatcommand("enter", {
 		if not data then
 			return
 		end
-		boxes.start_box(player, data)
+		boxes.open_box(player, id)
 	end,
 })
 
@@ -669,7 +670,7 @@ minetest.register_chatcommand("leave", {
 	privs = {server = true},
 	func = function(name, param)
 		local player = minetest.get_player_by_name(name)
-		boxes.end_box(player)
+		boxes.close_box(player)
 	end,
 })