diff --git a/TODO.txt b/TODO.txt
index 4f40d2e..f3e344a 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -2,5 +2,4 @@
 TODO:
 - add localization support
 - add support for unregistering ores via world path file
-- change API method names to "register_[replace/remove]_*"
 - use single json file for cleaning all types
diff --git a/api.lua b/api.lua
index 5fabbf0..622df35 100644
--- a/api.lua
+++ b/api.lua
@@ -26,7 +26,7 @@ end
 --- Registers an entity to be removed.
 --
 --  @tparam string src Entity technical name.
-function cleaner.remove_entity(src)
+function cleaner.register_entity_removal(src)
 	core.register_entity(":" .. src, {
 		on_activate = function(self, ...)
 			self.object:remove()
@@ -37,7 +37,7 @@ end
 --- Registers a node to be removed.
 --
 --  @tparam string src Node technical name.
-function cleaner.remove_node(src)
+function cleaner.register_node_removal(src)
 	core.register_node(":" .. src, {
 		groups = {to_remove=1},
 	})
@@ -47,7 +47,7 @@ end
 --
 --  @tparam string src Technical name of item to be replaced.
 --  @tparam string tgt Technical name of item to be used in place.
-function cleaner.replace_item(src, tgt)
+function cleaner.register_item_replacement(src, tgt)
 	replace_items[src] = tgt
 end
 
@@ -55,7 +55,7 @@ end
 --
 --  @tparam string src Technical name of node to be replaced.
 --  @tparam string tgt Technical name of node to be used in place.
-function cleaner.replace_node(src, tgt)
+function cleaner.register_node_replacement(src, tgt)
 	core.register_node(":" .. src, {
 		groups = {to_replace=1},
 	})
diff --git a/entities.lua b/entities.lua
index b47faed..b2b23af 100644
--- a/entities.lua
+++ b/entities.lua
@@ -46,5 +46,5 @@ end
 
 for _, e in ipairs(e_list.remove) do
 	cleaner.log("debug", "Cleaning entity: " .. e)
-	cleaner.remove_entity(e)
+	cleaner.register_entity_removal(e)
 end
diff --git a/items.lua b/items.lua
index 8972d64..5773212 100644
--- a/items.lua
+++ b/items.lua
@@ -26,7 +26,7 @@ if i_file then
 end
 
 for i_old, i_new in pairs(i_list.replace) do
-	cleaner.replace_item(i_old, i_new)
+	cleaner.register_item_replacement(i_old, i_new)
 end
 
 -- register actions for after server startup
diff --git a/nodes.lua b/nodes.lua
index a5cc699..c9d72b4 100644
--- a/nodes.lua
+++ b/nodes.lua
@@ -50,7 +50,7 @@ end
 
 for _, n in ipairs(n_list.remove) do
 	cleaner.log("debug", "Cleaning node: " .. n)
-	cleaner.remove_node(n)
+	cleaner.register_node_removal(n)
 end
 
 core.register_lbm({
@@ -64,7 +64,7 @@ core.register_lbm({
 
 for n_old, n_new in pairs(n_list.replace) do
 	cleaner.log("debug", "Replacing node \"" .. n_old .. "\" with \"" .. n_new .. "\"")
-	cleaner.replace_node(n_old, n_new)
+	cleaner.register_node_replacement(n_old, n_new)
 end
 
 core.register_lbm({