diff --git a/builtin/client/chatcommands.lua b/builtin/client/chatcommands.lua
index a563a6627..23aebebbc 100644
--- a/builtin/client/chatcommands.lua
+++ b/builtin/client/chatcommands.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/client/chatcommands.lua
-
 core.register_on_sending_chat_message(function(message)
 	if message:sub(1,2) == ".." then
 		return false
diff --git a/builtin/client/init.lua b/builtin/client/init.lua
index 8d01c99a4..1f83771ea 100644
--- a/builtin/client/init.lua
+++ b/builtin/client/init.lua
@@ -1,4 +1,3 @@
--- Minetest: builtin/client/init.lua
 local scriptpath = core.get_builtin_path()
 local clientpath = scriptpath.."client"..DIR_DELIM
 local commonpath = scriptpath.."common"..DIR_DELIM
diff --git a/builtin/common/after.lua b/builtin/common/after.lua
index 321e5ac9d..c116f1200 100644
--- a/builtin/common/after.lua
+++ b/builtin/common/after.lua
@@ -155,7 +155,7 @@ end
 
 function core.after(after, func, ...)
 	assert(tonumber(after) and not core.is_nan(after) and type(func) == "function",
-		"Invalid minetest.after invocation")
+		"Invalid core.after invocation")
 
 	local new_job = {
 		mod_origin = core.get_last_run_mod(),
diff --git a/builtin/common/chatcommands.lua b/builtin/common/chatcommands.lua
index 7a8a49558..7db84a5a9 100644
--- a/builtin/common/chatcommands.lua
+++ b/builtin/common/chatcommands.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/common/chatcommands.lua
-
 -- For server-side translations (if INIT == "game")
 -- Otherwise, use core.gettext
 local S = core.get_translator("__builtin")
diff --git a/builtin/common/filterlist.lua b/builtin/common/filterlist.lua
index 092d19fbc..c323a0d55 100644
--- a/builtin/common/filterlist.lua
+++ b/builtin/common/filterlist.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2013 sapier
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/common/item_s.lua b/builtin/common/item_s.lua
index 673c83877..5098ef4e6 100644
--- a/builtin/common/item_s.lua
+++ b/builtin/common/item_s.lua
@@ -1,4 +1,3 @@
--- Minetest: builtin/item_s.lua
 -- The distinction of what goes here is a bit tricky, basically it's everything
 -- that does not (directly or indirectly) need access to ServerEnvironment,
 -- Server or writable access to IGameDef on the engine side.
diff --git a/builtin/common/metatable.lua b/builtin/common/metatable.lua
index 40003d293..debc4d3c5 100644
--- a/builtin/common/metatable.lua
+++ b/builtin/common/metatable.lua
@@ -11,8 +11,8 @@ end
 core.known_metatables = known_metatables
 
 function core.register_async_metatable(...)
-	core.log("deprecated", "minetest.register_async_metatable is deprecated. " ..
-			"Use minetest.register_portable_metatable instead.")
+	core.log("deprecated", "core.register_async_metatable is deprecated. " ..
+			"Use core.register_portable_metatable instead.")
 	return core.register_portable_metatable(...)
 end
 
diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua
index d0942b2d2..ce4179f54 100644
--- a/builtin/common/misc_helpers.lua
+++ b/builtin/common/misc_helpers.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/misc_helpers.lua
-
 --------------------------------------------------------------------------------
 -- Localize functions to avoid table lookups (better performance).
 local string_sub, string_find = string.sub, string.find
diff --git a/builtin/common/serialize.lua b/builtin/common/serialize.lua
index 2ee2e5f02..146128e0c 100644
--- a/builtin/common/serialize.lua
+++ b/builtin/common/serialize.lua
@@ -204,18 +204,18 @@ local function dummy_func() end
 function core.deserialize(str, safe)
 	-- Backwards compatibility
 	if str == nil then
-		core.log("deprecated", "minetest.deserialize called with nil (expected string).")
+		core.log("deprecated", "core.deserialize called with nil (expected string).")
 		return nil, "Invalid type: Expected a string, got nil"
 	end
 	local t = type(str)
 	if t ~= "string" then
-		error(("minetest.deserialize called with %s (expected string)."):format(t))
+		error(("core.deserialize called with %s (expected string)."):format(t))
 	end
 
 	local func, err = loadstring(str)
 	if not func then return nil, err end
 
-	-- math.huge was serialized to inf and NaNs to nan by Lua in Minetest 5.6, so we have to support this here
+	-- math.huge was serialized to inf and NaNs to nan by Lua in engine version 5.6, so we have to support this here
 	local env = {inf = math_huge, nan = 0/0}
 	if safe then
 		env.loadstring = dummy_func
diff --git a/builtin/fstk/buttonbar.lua b/builtin/fstk/buttonbar.lua
index e53814751..ed478af82 100644
--- a/builtin/fstk/buttonbar.lua
+++ b/builtin/fstk/buttonbar.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2014 sapier
 --Copyright (C) 2023 Gregor Parzefall
 --
diff --git a/builtin/fstk/dialog.lua b/builtin/fstk/dialog.lua
index 991ec20ab..7043646a4 100644
--- a/builtin/fstk/dialog.lua
+++ b/builtin/fstk/dialog.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2014 sapier
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/fstk/tabview.lua b/builtin/fstk/tabview.lua
index 42fc9ac18..c88c4917a 100644
--- a/builtin/fstk/tabview.lua
+++ b/builtin/fstk/tabview.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2014 sapier
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/fstk/ui.lua b/builtin/fstk/ui.lua
index a3a8fed77..b5b95d0e4 100644
--- a/builtin/fstk/ui.lua
+++ b/builtin/fstk/ui.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2014 sapier
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/game/async.lua b/builtin/game/async.lua
index 469f179d7..fc286ef25 100644
--- a/builtin/game/async.lua
+++ b/builtin/game/async.lua
@@ -10,7 +10,7 @@ end
 
 function core.handle_async(func, callback, ...)
 	assert(type(func) == "function" and type(callback) == "function",
-		"Invalid minetest.handle_async invocation")
+		"Invalid core.handle_async invocation")
 	local args = {n = select("#", ...), ...}
 	local mod_origin = core.get_last_run_mod()
 
diff --git a/builtin/game/auth.lua b/builtin/game/auth.lua
index e45520e27..54ca68eab 100644
--- a/builtin/game/auth.lua
+++ b/builtin/game/auth.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/auth.lua
-
 --
 -- Builtin authentication handler
 --
@@ -95,11 +93,11 @@ core.builtin_auth_handler = {
 		for priv, value in pairs(privileges) do
 			-- Warnings for improper API usage
 			if value == false then
-				core.log('deprecated', "`false` value given to `minetest.set_player_privs`, "..
+				core.log('deprecated', "`false` value given to `core.set_player_privs`, "..
 						"this is almost certainly a bug, "..
 						"granting a privilege rather than revoking it")
 			elseif value ~= true then
-				core.log('deprecated', "non-`true` value given to `minetest.set_player_privs`")
+				core.log('deprecated', "non-`true` value given to `core.set_player_privs`")
 			end
 			-- Run grant callbacks
 			if prev_privs[priv] == nil then
@@ -196,7 +194,7 @@ function core.change_player_privs(name, changes)
 		elseif change == false then
 			privs[priv] = nil
 		else
-			error("non-bool value given to `minetest.change_player_privs`")
+			error("non-bool value given to `core.change_player_privs`")
 		end
 	end
 	core.set_player_privs(name, privs)
diff --git a/builtin/game/chat.lua b/builtin/game/chat.lua
index b7e2aea50..69c657194 100644
--- a/builtin/game/chat.lua
+++ b/builtin/game/chat.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/game/chat.lua
-
 local S = core.get_translator("__builtin")
 
 -- Helper function that implements search and replace without pattern matching
diff --git a/builtin/game/constants.lua b/builtin/game/constants.lua
index 54eeea50f..ff9b43ad3 100644
--- a/builtin/game/constants.lua
+++ b/builtin/game/constants.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/constants.lua
-
 --
 -- Constants values for use with the Lua API
 --
diff --git a/builtin/game/deprecated.lua b/builtin/game/deprecated.lua
index c5c7848f5..87b785995 100644
--- a/builtin/game/deprecated.lua
+++ b/builtin/game/deprecated.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/deprecated.lua
-
 --
 -- EnvRef
 --
@@ -35,9 +33,9 @@ local settings = core.settings
 
 local function setting_proxy(name)
 	return function(...)
-		core.log("deprecated", "WARNING: minetest.setting_* "..
+		core.log("deprecated", "WARNING: core.setting_* "..
 			"functions are deprecated.  "..
-			"Use methods on the minetest.settings object.")
+			"Use methods on the core.settings object.")
 		return settings[name](settings, ...)
 	end
 end
diff --git a/builtin/game/detached_inventory.lua b/builtin/game/detached_inventory.lua
index 8eed00391..2d48c18ed 100644
--- a/builtin/game/detached_inventory.lua
+++ b/builtin/game/detached_inventory.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/detached_inventory.lua
-
 core.detached_inventories = {}
 
 local create_detached_inventory_raw = core.create_detached_inventory_raw
diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua
index 33473091d..bb6ca1a64 100644
--- a/builtin/game/falling.lua
+++ b/builtin/game/falling.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/item.lua
-
 local builtin_shared = ...
 local SCALE = 0.667
 
diff --git a/builtin/game/features.lua b/builtin/game/features.lua
index 10884497c..88ec282c3 100644
--- a/builtin/game/features.lua
+++ b/builtin/game/features.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/features.lua
-
 core.features = {
 	glasslike_framed = true,
 	nodebox_as_selectionbox = true,
diff --git a/builtin/game/item.lua b/builtin/game/item.lua
index 8b79d2d71..cc9be44af 100644
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/item.lua
-
 local builtin_shared = ...
 
 local function copy_pointed_thing(pointed_thing)
diff --git a/builtin/game/item_entity.lua b/builtin/game/item_entity.lua
index b7b291c43..59626e96d 100644
--- a/builtin/game/item_entity.lua
+++ b/builtin/game/item_entity.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/item_entity.lua
-
 function core.spawn_item(pos, item)
 	-- Take item in any format
 	local stack = ItemStack(item)
diff --git a/builtin/game/misc.lua b/builtin/game/misc.lua
index 25e19ddb0..390870de1 100644
--- a/builtin/game/misc.lua
+++ b/builtin/game/misc.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/misc.lua
-
 local S = core.get_translator("__builtin")
 
 --
diff --git a/builtin/game/misc_s.lua b/builtin/game/misc_s.lua
index 440e52d81..90092952d 100644
--- a/builtin/game/misc_s.lua
+++ b/builtin/game/misc_s.lua
@@ -1,4 +1,3 @@
--- Minetest: builtin/misc_s.lua
 -- The distinction of what goes here is a bit tricky, basically it's everything
 -- that does not (directly or indirectly) need access to ServerEnvironment,
 -- Server or writable access to IGameDef on the engine side.
diff --git a/builtin/game/privileges.lua b/builtin/game/privileges.lua
index 2ff4c093c..b2eadd36b 100644
--- a/builtin/game/privileges.lua
+++ b/builtin/game/privileges.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/privileges.lua
-
 local S = core.get_translator("__builtin")
 
 --
diff --git a/builtin/game/register.lua b/builtin/game/register.lua
index 3d99a6925..3e4b9be96 100644
--- a/builtin/game/register.lua
+++ b/builtin/game/register.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/register.lua
-
 local builtin_shared = ...
 local S = core.get_translator("__builtin")
 
diff --git a/builtin/game/static_spawn.lua b/builtin/game/static_spawn.lua
index fae23eab0..5b834310f 100644
--- a/builtin/game/static_spawn.lua
+++ b/builtin/game/static_spawn.lua
@@ -1,5 +1,3 @@
--- Minetest: builtin/static_spawn.lua
-
 local static_spawnpoint_string = core.settings:get("static_spawnpoint")
 if static_spawnpoint_string and
 		static_spawnpoint_string ~= "" and
diff --git a/builtin/game/tests/test_moveaction.lua b/builtin/game/tests/test_moveaction.lua
index 476579348..a3cbc021f 100644
--- a/builtin/game/tests/test_moveaction.lua
+++ b/builtin/game/tests/test_moveaction.lua
@@ -35,7 +35,7 @@ end
 local log = function(...) end
 --local log = print
 
-minetest.register_allow_player_inventory_action(function(_, action, inv, info)
+core.register_allow_player_inventory_action(function(_, action, inv, info)
 	log("\tallow " .. action, info.count or info.stack:to_string())
 
 	if action == "move" then
@@ -69,7 +69,7 @@ minetest.register_allow_player_inventory_action(function(_, action, inv, info)
 	return -- Unlimited
 end)
 
-minetest.register_on_player_inventory_action(function(_, action, inv, info)
+core.register_on_player_inventory_action(function(_, action, inv, info)
 	log("\ton " .. action, info.count or info.stack:to_string())
 
 	if action == "take" or action == "put" then
diff --git a/builtin/init.lua b/builtin/init.lua
index 415087a54..83e8a1df0 100644
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -1,5 +1,5 @@
 --
--- This file contains built-in stuff in Minetest implemented in Lua.
+-- This file contains built-in stuff in Luanti implemented in Lua.
 --
 -- It is always loaded and executed after registration of the C API,
 -- before loading and running any mods.
diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua
index 16c5c9d95..d9edd745b 100644
--- a/builtin/mainmenu/common.lua
+++ b/builtin/mainmenu/common.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2014 sapier
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/content/contentdb.lua b/builtin/mainmenu/content/contentdb.lua
index 5d6d6c482..1c09ac9c4 100644
--- a/builtin/mainmenu/content/contentdb.lua
+++ b/builtin/mainmenu/content/contentdb.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2018-24 rubenwardy
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/content/dlg_contentdb.lua b/builtin/mainmenu/content/dlg_contentdb.lua
index 7e17ed315..c05bb804a 100644
--- a/builtin/mainmenu/content/dlg_contentdb.lua
+++ b/builtin/mainmenu/content/dlg_contentdb.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2018-20 rubenwardy
 --
 --This program is free software; you can redistribute it and/or modify
@@ -487,7 +487,7 @@ end
 
 local function handle_events(event)
 	if event == "DialogShow" then
-		-- Don't show the "MINETEST" header behind the dialog.
+		-- Don't show the header image behind the dialog.
 		mm_game_theme.set_engine(true)
 
 		-- If ContentDB is already loaded, auto-install packages here.
diff --git a/builtin/mainmenu/content/dlg_install.lua b/builtin/mainmenu/content/dlg_install.lua
index 3f43bd23c..ef201f56a 100644
--- a/builtin/mainmenu/content/dlg_install.lua
+++ b/builtin/mainmenu/content/dlg_install.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2018-24 rubenwardy
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/content/dlg_overwrite.lua b/builtin/mainmenu/content/dlg_overwrite.lua
index 7967cb48c..5baaa5cd2 100644
--- a/builtin/mainmenu/content/dlg_overwrite.lua
+++ b/builtin/mainmenu/content/dlg_overwrite.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2018-24 rubenwardy
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/content/dlg_package.lua b/builtin/mainmenu/content/dlg_package.lua
index 404e950c4..4eb465236 100644
--- a/builtin/mainmenu/content/dlg_package.lua
+++ b/builtin/mainmenu/content/dlg_package.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2018-24 rubenwardy
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/content/init.lua b/builtin/mainmenu/content/init.lua
index 00eac681b..dbf4cc888 100644
--- a/builtin/mainmenu/content/init.lua
+++ b/builtin/mainmenu/content/init.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2023 rubenwardy
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/content/pkgmgr.lua b/builtin/mainmenu/content/pkgmgr.lua
index 5a4aa6c17..986d80398 100644
--- a/builtin/mainmenu/content/pkgmgr.lua
+++ b/builtin/mainmenu/content/pkgmgr.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2013 sapier
 --
 --This program is free software; you can redistribute it and/or modify
@@ -840,7 +840,7 @@ function pkgmgr.get_contentdb_id(content)
 		return content.author:lower() .. "/" .. content.name
 	end
 
-	-- Until Minetest 5.8.0, Minetest Game was bundled with Minetest.
+	-- Until version 5.8.0, Minetest Game was bundled with the engine.
 	-- Unfortunately, the bundled MTG was not versioned (missing "release"
 	-- field in game.conf).
 	-- Therefore, we consider any installation of MTG that is not versioned,
diff --git a/builtin/mainmenu/content/screenshots.lua b/builtin/mainmenu/content/screenshots.lua
index 161f33104..718666085 100644
--- a/builtin/mainmenu/content/screenshots.lua
+++ b/builtin/mainmenu/content/screenshots.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2023-24 rubenwardy
 --
 --This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@ function get_screenshot(package, screenshot_url, level)
 		return defaulttexturedir .. "no_screenshot.png"
 	end
 
-	-- Minetest only supports png and jpg
+	-- Luanti only supports png and jpg
 	local ext = get_file_extension(screenshot_url)
 	if ext ~= "png" and ext ~= "jpg" then
 		screenshot_url = screenshot_url:sub(0, -#ext - 1) .. "png"
diff --git a/builtin/mainmenu/content/tests/pkgmgr_spec.lua b/builtin/mainmenu/content/tests/pkgmgr_spec.lua
index ccadde38c..8870bb68f 100644
--- a/builtin/mainmenu/content/tests/pkgmgr_spec.lua
+++ b/builtin/mainmenu/content/tests/pkgmgr_spec.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2022 rubenwardy
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/content/update_detector.lua b/builtin/mainmenu/content/update_detector.lua
index 1f8672bba..4d0c1196b 100644
--- a/builtin/mainmenu/content/update_detector.lua
+++ b/builtin/mainmenu/content/update_detector.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2023 rubenwardy
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/dlg_config_world.lua b/builtin/mainmenu/dlg_config_world.lua
index a8c5221de..cb5cdd635 100644
--- a/builtin/mainmenu/dlg_config_world.lua
+++ b/builtin/mainmenu/dlg_config_world.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2013 sapier
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua
index 772025a25..4844c85fe 100644
--- a/builtin/mainmenu/dlg_create_world.lua
+++ b/builtin/mainmenu/dlg_create_world.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2014 sapier
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/dlg_delete_content.lua b/builtin/mainmenu/dlg_delete_content.lua
index 98e15bf01..a36bcb2d7 100644
--- a/builtin/mainmenu/dlg_delete_content.lua
+++ b/builtin/mainmenu/dlg_delete_content.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2014 sapier
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/dlg_delete_world.lua b/builtin/mainmenu/dlg_delete_world.lua
index 67c0612bd..531b4927d 100644
--- a/builtin/mainmenu/dlg_delete_world.lua
+++ b/builtin/mainmenu/dlg_delete_world.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2014 sapier
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/dlg_register.lua b/builtin/mainmenu/dlg_register.lua
index a7658249c..88a449ae3 100644
--- a/builtin/mainmenu/dlg_register.lua
+++ b/builtin/mainmenu/dlg_register.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2022 rubenwardy
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/dlg_reinstall_mtg.lua b/builtin/mainmenu/dlg_reinstall_mtg.lua
index 685847024..85bdedf7b 100644
--- a/builtin/mainmenu/dlg_reinstall_mtg.lua
+++ b/builtin/mainmenu/dlg_reinstall_mtg.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2023 Gregor Parzefall
 --
 --This program is free software; you can redistribute it and/or modify
@@ -68,15 +68,15 @@ end
 local function get_formspec(dialogdata)
 	local markup = table.concat({
 		"<big>", fgettext("Minetest Game is no longer installed by default"), "</big>\n",
-		fgettext("For a long time, the Minetest engine shipped with a default game called \"Minetest Game\". " ..
-				"Since Minetest 5.8.0, Minetest ships without a default game."), "\n",
+		fgettext("For a long time, Luanti shipped with a default game called \"Minetest Game\". " ..
+				"Since version 5.8.0, Luanti ships without a default game."), "\n",
 		fgettext("If you want to continue playing in your Minetest Game worlds, you need to reinstall Minetest Game."),
 	})
 
 	return table.concat({
 		"formspec_version[6]",
 		"size[12.8,7]",
-		"hypertext[0.375,0.375;12.05,5.2;text;", minetest.formspec_escape(markup), "]",
+		"hypertext[0.375,0.375;12.05,5.2;text;", core.formspec_escape(markup), "]",
 		"container[0.375,5.825]",
 		"style[dismiss;bgcolor=red]",
 		"button[0,0;4,0.8;dismiss;", fgettext("Dismiss"), "]",
@@ -114,7 +114,7 @@ local function eventhandler(event)
 		return true
 	elseif event == "MenuQuit" then
 		-- Don't allow closing the dialog with ESC, but still allow exiting
-		-- Minetest.
+		-- Luanti
 		core.close()
 		return true
 	end
diff --git a/builtin/mainmenu/dlg_rename_modpack.lua b/builtin/mainmenu/dlg_rename_modpack.lua
index 884140eb3..09df92d25 100644
--- a/builtin/mainmenu/dlg_rename_modpack.lua
+++ b/builtin/mainmenu/dlg_rename_modpack.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2014 sapier
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/dlg_version_info.lua b/builtin/mainmenu/dlg_version_info.lua
index 483cd30bd..b3b7481e3 100644
--- a/builtin/mainmenu/dlg_version_info.lua
+++ b/builtin/mainmenu/dlg_version_info.lua
@@ -1,5 +1,5 @@
 --[[
-Minetest
+Luanti
 Copyright (C) 2018-2020 SmallJoker, 2022 rubenwardy
 
 This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/game_theme.lua b/builtin/mainmenu/game_theme.lua
index 993a48c1e..7c6408157 100644
--- a/builtin/mainmenu/game_theme.lua
+++ b/builtin/mainmenu/game_theme.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2013 sapier
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua
index dd35334c2..fc237e158 100644
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2014 sapier
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/serverlistmgr.lua b/builtin/mainmenu/serverlistmgr.lua
index 601b42110..1b69d7a55 100644
--- a/builtin/mainmenu/serverlistmgr.lua
+++ b/builtin/mainmenu/serverlistmgr.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2020 rubenwardy
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/settings/components.lua b/builtin/mainmenu/settings/components.lua
index 79253558b..64cd27c3c 100644
--- a/builtin/mainmenu/settings/components.lua
+++ b/builtin/mainmenu/settings/components.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2022 rubenwardy
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/settings/dlg_change_mapgen_flags.lua b/builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
index 570d184da..31dd40bd8 100644
--- a/builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
+++ b/builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2015 PilzAdam
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/settings/dlg_settings.lua b/builtin/mainmenu/settings/dlg_settings.lua
index 602d6894f..57e5a1300 100644
--- a/builtin/mainmenu/settings/dlg_settings.lua
+++ b/builtin/mainmenu/settings/dlg_settings.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2022 rubenwardy
 --
 --This program is free software; you can redistribute it and/or modify
@@ -743,7 +743,7 @@ end
 
 local function eventhandler(event)
 	if event == "DialogShow" then
-		-- Don't show the "MINETEST" header behind the dialog.
+		-- Don't show the header image behind the dialog.
 		mm_game_theme.set_engine(true)
 		return true
 	end
diff --git a/builtin/mainmenu/settings/generate_from_settingtypes.lua b/builtin/mainmenu/settings/generate_from_settingtypes.lua
index e18b2c2d6..198037776 100644
--- a/builtin/mainmenu/settings/generate_from_settingtypes.lua
+++ b/builtin/mainmenu/settings/generate_from_settingtypes.lua
@@ -13,7 +13,7 @@ local minetest_example_header = [[
 #    ../minetest.conf
 #    ../../minetest.conf
 #    Any other path can be chosen by passing the path as a parameter
-#    to the program, eg. "minetest.exe --config ../minetest.conf.example".
+#    to the program, eg. "luanti.exe --config ../minetest.conf.example".
 
 #    Further documentation:
 #    https://wiki.minetest.net/
diff --git a/builtin/mainmenu/settings/init.lua b/builtin/mainmenu/settings/init.lua
index 4541468c1..c8615ba34 100644
--- a/builtin/mainmenu/settings/init.lua
+++ b/builtin/mainmenu/settings/init.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2022 rubenwardy
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/settings/settingtypes.lua b/builtin/mainmenu/settings/settingtypes.lua
index eacd96d09..e763535a9 100644
--- a/builtin/mainmenu/settings/settingtypes.lua
+++ b/builtin/mainmenu/settings/settingtypes.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2015 PilzAdam
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/settings/shader_warning_component.lua b/builtin/mainmenu/settings/shader_warning_component.lua
index d1de0cd4a..b227bcee3 100644
--- a/builtin/mainmenu/settings/shader_warning_component.lua
+++ b/builtin/mainmenu/settings/shader_warning_component.lua
@@ -1,4 +1,4 @@
--- Minetest
+-- Luanti
 -- SPDX-License-Identifier: LGPL-2.1-or-later
 
 return {
diff --git a/builtin/mainmenu/settings/shadows_component.lua b/builtin/mainmenu/settings/shadows_component.lua
index 93c071bf7..2ca03b71b 100644
--- a/builtin/mainmenu/settings/shadows_component.lua
+++ b/builtin/mainmenu/settings/shadows_component.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2021-2 x2048
 --Copyright (C) 2022-3 rubenwardy
 --
diff --git a/builtin/mainmenu/tab_about.lua b/builtin/mainmenu/tab_about.lua
index 627ccb4ca..a038db9bc 100644
--- a/builtin/mainmenu/tab_about.lua
+++ b/builtin/mainmenu/tab_about.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2013 sapier
 --
 --This program is free software; you can redistribute it and/or modify
@@ -79,7 +79,7 @@ return {
 			"button[0.1,3.4;5.3,0.5;label_button;" ..
 			core.formspec_escape(version.project .. " " .. version.string) .. "]" ..
 			"button_url[1.5,4.1;2.5,0.8;homepage;luanti.org;https://www.luanti.org/]" ..
-			"hypertext[5.5,0.25;9.75,6.6;credits;" .. minetest.formspec_escape(hypertext) .. "]"
+			"hypertext[5.5,0.25;9.75,6.6;credits;" .. core.formspec_escape(hypertext) .. "]"
 
 		-- Render information
 		local active_renderer_info = fgettext("Active renderer:") .. " " ..
diff --git a/builtin/mainmenu/tab_content.lua b/builtin/mainmenu/tab_content.lua
index 9cfb96d54..cd384c905 100644
--- a/builtin/mainmenu/tab_content.lua
+++ b/builtin/mainmenu/tab_content.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2014 sapier
 --Copyright (C) 2018 rubenwardy <rw@rubenwardy.com>
 --
diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua
index 2789431b9..083f9a50a 100644
--- a/builtin/mainmenu/tab_local.lua
+++ b/builtin/mainmenu/tab_local.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2014 sapier
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua
index d93f45dcf..8674d908a 100644
--- a/builtin/mainmenu/tab_online.lua
+++ b/builtin/mainmenu/tab_online.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2014 sapier
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/profiler/init.lua b/builtin/profiler/init.lua
index 7f63dfaea..f5b4b7c7e 100644
--- a/builtin/profiler/init.lua
+++ b/builtin/profiler/init.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2016 T4im
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/profiler/instrumentation.lua b/builtin/profiler/instrumentation.lua
index c4feda7b4..e012f07a0 100644
--- a/builtin/profiler/instrumentation.lua
+++ b/builtin/profiler/instrumentation.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2016 T4im
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/profiler/reporter.lua b/builtin/profiler/reporter.lua
index 2e24a1fe0..7bc1b235d 100644
--- a/builtin/profiler/reporter.lua
+++ b/builtin/profiler/reporter.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2016 T4im
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/profiler/sampling.lua b/builtin/profiler/sampling.lua
index 4b53399a5..16d6c2012 100644
--- a/builtin/profiler/sampling.lua
+++ b/builtin/profiler/sampling.lua
@@ -1,4 +1,4 @@
---Minetest
+--Luanti
 --Copyright (C) 2016 T4im
 --
 --This program is free software; you can redistribute it and/or modify
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 3e23cd9c5..ec739b700 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -199,7 +199,7 @@ virtual_joystick_triggers_aux1 (Virtual joystick triggers Aux1 button) bool fals
 #      Easy to use and well-known from other games that shall not be named.
 #
 #    * long_tap
-#      Known from the classic Minetest mobile controls.
+#      Known from the classic Luanti mobile controls.
 #      Combat is more or less impossible.
 #
 #    Requires: touchscreen
@@ -764,7 +764,7 @@ chat_font_size (Chat font size) int 0 0 72
 #    The URL for the content repository
 contentdb_url (ContentDB URL) string https://content.minetest.net
 
-#    If enabled and you have ContentDB packages installed, Minetest may contact ContentDB to
+#    If enabled and you have ContentDB packages installed, Luanti may contact ContentDB to
 #    check for package updates when opening the mainmenu.
 contentdb_enable_updates_indicator (Enable updates available indicator on content tab) bool true
 
@@ -772,7 +772,7 @@ contentdb_enable_updates_indicator (Enable updates available indicator on conten
 #    "nonfree" can be used to hide packages which do not qualify as 'free software',
 #    as defined by the Free Software Foundation.
 #    You can also specify content ratings.
-#    These flags are independent from Minetest versions,
+#    These flags are independent from Luanti versions,
 #    so see a full list at https://content.minetest.net/help/content_flags/
 contentdb_flag_blacklist (ContentDB Flag Blacklist) string nonfree, desktop_default
 
@@ -795,7 +795,7 @@ serverlist_url (Serverlist URL) string servers.minetest.net
 #    If disabled, new accounts will be registered automatically when logging in.
 enable_split_login_register (Enable split login/register) bool true
 
-#    URL to JSON file which provides information about the newest Minetest release.
+#    URL to JSON file which provides information about the newest Luanti release.
 #    If this is empty the engine will never check for updates.
 update_information_url (Update information URL) string https://www.minetest.net/release_info.json
 
@@ -809,7 +809,7 @@ name (Admin name) string
 [**Serverlist and MOTD]
 
 #    Name of the server, to be displayed when players join and in the serverlist.
-server_name (Server name) string Minetest server
+server_name (Server name) string Luanti server
 
 #    Description of server, to be displayed when players join and in the serverlist.
 server_description (Server description) string mine here
@@ -856,7 +856,7 @@ strict_protocol_version_checking (Strict protocol checking) bool false
 #    Older clients are compatible in the sense that they will not crash when connecting
 #    to new servers, but they may not support all new features that you are expecting.
 #    This allows for more fine-grained control than strict_protocol_version_checking.
-#    Minetest still enforces its own internal minimum, and enabling
+#    Luanti still enforces its own internal minimum, and enabling
 #    strict_protocol_version_checking will effectively override this.
 protocol_version_min (Protocol version minimum) int 1 1 65535
 
@@ -1805,7 +1805,7 @@ instrument.lbm (Loading Block Modifiers) bool true
 instrument.chatcommand (Chat commands) bool true
 
 #    Instrument global callback functions on registration.
-#    (anything you pass to a minetest.register_*() function)
+#    (anything you pass to a core.register_*() function)
 instrument.global_callback (Global callbacks) bool true
 
 #    Instrument builtin.
@@ -1873,7 +1873,7 @@ enable_mesh_cache (Mesh cache) bool false
 mesh_generation_interval (Mapblock mesh generation delay) int 0 0 50
 
 #    Number of threads to use for mesh generation.
-#    Value of 0 (default) will let Minetest autodetect the number of available threads.
+#    Value of 0 (default) will let Luanti autodetect the number of available threads.
 mesh_generation_threads (Mapblock mesh generation threads) int 0 0 8
 
 #    True = 256
@@ -2007,7 +2007,7 @@ lighting_boost_spread (Light curve boost spread) float 0.2 0.0 0.4
 [**Networking]
 
 #    Prometheus listener address.
-#    If Minetest is compiled with ENABLE_PROMETHEUS option enabled,
+#    If Luanti is compiled with ENABLE_PROMETHEUS option enabled,
 #    enable metrics listener for Prometheus on that address.
 #    Metrics can be fetched on http://127.0.0.1:30000/metrics
 prometheus_listener_address (Prometheus listener address) string 127.0.0.1:30000
@@ -2214,7 +2214,7 @@ curl_file_download_timeout (cURL file download timeout) int 300000 5000 21474836
 #    Adjust the detected display density, used for scaling UI elements.
 display_density_factor (Display Density Scaling Factor) float 1 0.5 5.0
 
-#    Windows systems only: Start Minetest with the command line window in the background.
+#    Windows systems only: Start Luanti with the command line window in the background.
 #    Contains the same information as the file debug.txt (default name).
 enable_console (Enable console window) bool false