Index: uspace/srv/kbd/generic/kbd.c
===================================================================
--- uspace/srv/kbd/generic/kbd.c	(revision 47a350ff35743ebcc45e185d8b5218aaf60d91ea)
+++ uspace/srv/kbd/generic/kbd.c	(revision 3f29834eb51939e4c9b85b216b52106b8ae5f5df)
@@ -60,5 +60,5 @@
 #define NAMESPACE  "hid_in"
 
-int phone2cons = -1;
+int client_phone = -1;
 
 /** Currently active modifiers. */
@@ -164,8 +164,8 @@
 	ev.c = layout[active_layout]->parse_ev(&ev);
 
-	async_msg_4(phone2cons, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
-}
-
-static void console_connection(ipc_callid_t iid, ipc_call_t *icall)
+	async_msg_4(client_phone, KBD_EVENT, ev.type, ev.key, ev.mods, ev.c);
+}
+
+static void client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
 	ipc_callid_t callid;
@@ -179,7 +179,7 @@
 		switch (IPC_GET_METHOD(call)) {
 		case IPC_M_PHONE_HUNGUP:
-			if (phone2cons != -1) {
-				ipc_hangup(phone2cons);
-				phone2cons = -1;
+			if (client_phone != -1) {
+				ipc_hangup(client_phone);
+				client_phone = -1;
 			}
 			
@@ -187,9 +187,9 @@
 			return;
 		case IPC_M_CONNECT_TO_ME:
-			if (phone2cons != -1) {
+			if (client_phone != -1) {
 				retval = ELIMIT;
 				break;
 			}
-			phone2cons = IPC_GET_ARG5(call);
+			client_phone = IPC_GET_ARG5(call);
 			retval = 0;
 			break;
@@ -238,5 +238,5 @@
 	
 	/* Register driver */
-	int rc = devmap_driver_register(NAME, console_connection);
+	int rc = devmap_driver_register(NAME, client_connection);
 	if (rc < 0) {
 		printf(NAME ": Unable to register driver (%d)\n", rc);