diff --git a/console-server.c b/console-server.c
index 5c5d5f0..0ed358d 100644
--- a/console-server.c
+++ b/console-server.c
@@ -336,7 +336,7 @@
 
 }
 
-struct poller *console_register_poller(struct console *console,
+struct poller *console_poller_register(struct console *console,
 		struct handler *handler, poller_fn_t poller_fn,
 		int fd, int events, void *data)
 {
@@ -372,7 +372,7 @@
 	return poller;
 }
 
-void console_unregister_poller(struct console *console,
+void console_poller_unregister(struct console *console,
 		struct poller *poller)
 {
 	int i;
@@ -445,7 +445,7 @@
 		for (i = 0; i < console->n_pollers; i++) {
 			poller = console->pollers[i];
 			if (poller->remove) {
-				console_unregister_poller(console, poller);
+				console_poller_unregister(console, poller);
 				removed = true;
 				break;
 			}