diff -r 88f73ee1c46f -r 2c416334579c util/events.lua
--- a/util/events.lua	Wed Dec 30 20:24:11 2009 +0000
+++ b/util/events.lua	Thu Dec 31 02:39:40 2009 +0000
@@ -47,13 +47,13 @@
 			_rebuild_index(event);
 		end
 	end;
-	local function add_plugin(plugin)
-		for event, handler in pairs(plugin) do
+	local function add_handlers(handlers)
+		for event, handler in pairs(handlers) do
 			add_handler(event, handler);
 		end
 	end;
-	local function remove_plugin(plugin)
-		for event, handler in pairs(plugin) do
+	local function remove_handlers(handlers)
+		for event, handler in pairs(handlers) do
 			remove_handler(event, handler);
 		end
 	end;