Index: uspace/srv/hid/output/output.c
===================================================================
--- uspace/srv/hid/output/output.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/srv/hid/output/output.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
@@ -78,5 +78,5 @@
 }
 
-static void srv_yield(cap_call_handle_t iid, ipc_call_t *icall)
+static void srv_yield(cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
 	errno_t ret = EOK;
@@ -90,8 +90,8 @@
 	}
 
-	async_answer_0(iid, ret);
-}
-
-static void srv_claim(cap_call_handle_t iid, ipc_call_t *icall)
+	async_answer_0(icall_handle, ret);
+}
+
+static void srv_claim(cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
 	errno_t ret = EOK;
@@ -105,8 +105,8 @@
 	}
 
-	async_answer_0(iid, ret);
-}
-
-static void srv_get_dimensions(cap_call_handle_t iid, ipc_call_t *icall)
+	async_answer_0(icall_handle, ret);
+}
+
+static void srv_get_dimensions(cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
 	sysarg_t cols = MAX_COLS;
@@ -118,8 +118,8 @@
 	}
 
-	async_answer_2(iid, EOK, cols, rows);
-}
-
-static void srv_get_caps(cap_call_handle_t iid, ipc_call_t *icall)
+	async_answer_2(icall_handle, EOK, cols, rows);
+}
+
+static void srv_get_caps(cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
 	console_caps_t caps = 0;
@@ -131,8 +131,8 @@
 	}
 
-	async_answer_1(iid, EOK, caps);
-}
-
-static frontbuf_t *resolve_frontbuf(sysarg_t handle, cap_call_handle_t iid)
+	async_answer_1(icall_handle, EOK, caps);
+}
+
+static frontbuf_t *resolve_frontbuf(sysarg_t handle, cap_call_handle_t icall_handle)
 {
 	frontbuf_t *frontbuf = NULL;
@@ -145,5 +145,5 @@
 
 	if (frontbuf == NULL) {
-		async_answer_0(iid, ENOENT);
+		async_answer_0(icall_handle, ENOENT);
 		return NULL;
 	}
@@ -152,9 +152,9 @@
 }
 
-static void srv_frontbuf_create(cap_call_handle_t iid, ipc_call_t *icall)
+static void srv_frontbuf_create(cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
 	frontbuf_t *frontbuf = (frontbuf_t *) malloc(sizeof(frontbuf_t));
 	if (frontbuf == NULL) {
-		async_answer_0(iid, ENOMEM);
+		async_answer_0(icall_handle, ENOMEM);
 		return;
 	}
@@ -162,26 +162,26 @@
 	link_initialize(&frontbuf->link);
 
-	cap_call_handle_t callid;
-	if (!async_share_out_receive(&callid, &frontbuf->size,
+	cap_call_handle_t chandle;
+	if (!async_share_out_receive(&chandle, &frontbuf->size,
 	    &frontbuf->flags)) {
 		free(frontbuf);
-		async_answer_0(iid, EINVAL);
-		return;
-	}
-
-	errno_t rc = async_share_out_finalize(callid, &frontbuf->data);
+		async_answer_0(icall_handle, EINVAL);
+		return;
+	}
+
+	errno_t rc = async_share_out_finalize(chandle, &frontbuf->data);
 	if ((rc != EOK) || (frontbuf->data == AS_MAP_FAILED)) {
 		free(frontbuf);
-		async_answer_0(iid, ENOMEM);
+		async_answer_0(icall_handle, ENOMEM);
 		return;
 	}
 
 	list_append(&frontbuf->link, &frontbufs);
-	async_answer_1(iid, EOK, (sysarg_t) frontbuf);
-}
-
-static void srv_frontbuf_destroy(cap_call_handle_t iid, ipc_call_t *icall)
-{
-	frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), iid);
+	async_answer_1(icall_handle, EOK, (sysarg_t) frontbuf);
+}
+
+static void srv_frontbuf_destroy(cap_call_handle_t icall_handle, ipc_call_t *icall)
+{
+	frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), icall_handle);
 	if (frontbuf == NULL)
 		return;
@@ -191,10 +191,10 @@
 	free(frontbuf);
 
-	async_answer_0(iid, EOK);
-}
-
-static void srv_cursor_update(cap_call_handle_t iid, ipc_call_t *icall)
-{
-	frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), iid);
+	async_answer_0(icall_handle, EOK);
+}
+
+static void srv_cursor_update(cap_call_handle_t icall_handle, ipc_call_t *icall)
+{
+	frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), icall_handle);
 	if (frontbuf == NULL)
 		return;
@@ -223,8 +223,8 @@
 	}
 
-	async_answer_0(iid, EOK);
-}
-
-static void srv_set_style(cap_call_handle_t iid, ipc_call_t *icall)
+	async_answer_0(icall_handle, EOK);
+}
+
+static void srv_set_style(cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
 	list_foreach(outdevs, link, outdev_t, dev) {
@@ -234,8 +234,8 @@
 	}
 
-	async_answer_0(iid, EOK);
-}
-
-static void srv_set_color(cap_call_handle_t iid, ipc_call_t *icall)
+	async_answer_0(icall_handle, EOK);
+}
+
+static void srv_set_color(cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
 	list_foreach(outdevs, link, outdev_t, dev) {
@@ -249,8 +249,8 @@
 	}
 
-	async_answer_0(iid, EOK);
-}
-
-static void srv_set_rgb_color(cap_call_handle_t iid, ipc_call_t *icall)
+	async_answer_0(icall_handle, EOK);
+}
+
+static void srv_set_rgb_color(cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
 	list_foreach(outdevs, link, outdev_t, dev) {
@@ -260,5 +260,5 @@
 	}
 
-	async_answer_0(iid, EOK);
+	async_answer_0(icall_handle, EOK);
 }
 
@@ -302,7 +302,7 @@
 }
 
-static void srv_update(cap_call_handle_t iid, ipc_call_t *icall)
-{
-	frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), iid);
+static void srv_update(cap_call_handle_t icall_handle, ipc_call_t *icall)
+{
+	frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), icall_handle);
 	if (frontbuf == NULL)
 		return;
@@ -349,10 +349,10 @@
 
 
-	async_answer_0(iid, EOK);
-}
-
-static void srv_damage(cap_call_handle_t iid, ipc_call_t *icall)
-{
-	frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), iid);
+	async_answer_0(icall_handle, EOK);
+}
+
+static void srv_damage(cap_call_handle_t icall_handle, ipc_call_t *icall)
+{
+	frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), icall_handle);
 	if (frontbuf == NULL)
 		return;
@@ -388,18 +388,18 @@
 
 	}
-	async_answer_0(iid, EOK);
-}
-
-static void client_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+	async_answer_0(icall_handle, EOK);
+}
+
+static void client_connection(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
 	/* Accept the connection */
-	async_answer_0(iid, EOK);
+	async_answer_0(icall_handle, EOK);
 
 	while (true) {
 		ipc_call_t call;
-		cap_call_handle_t callid = async_get_call(&call);
+		cap_call_handle_t chandle = async_get_call(&call);
 
 		if (!IPC_GET_IMETHOD(call)) {
-			async_answer_0(callid, EOK);
+			async_answer_0(chandle, EOK);
 			break;
 		}
@@ -407,44 +407,44 @@
 		switch (IPC_GET_IMETHOD(call)) {
 		case OUTPUT_YIELD:
-			srv_yield(callid, &call);
+			srv_yield(chandle, &call);
 			break;
 		case OUTPUT_CLAIM:
-			srv_claim(callid, &call);
+			srv_claim(chandle, &call);
 			break;
 		case OUTPUT_GET_DIMENSIONS:
-			srv_get_dimensions(callid, &call);
+			srv_get_dimensions(chandle, &call);
 			break;
 		case OUTPUT_GET_CAPS:
-			srv_get_caps(callid, &call);
+			srv_get_caps(chandle, &call);
 			break;
 
 		case OUTPUT_FRONTBUF_CREATE:
-			srv_frontbuf_create(callid, &call);
+			srv_frontbuf_create(chandle, &call);
 			break;
 		case OUTPUT_FRONTBUF_DESTROY:
-			srv_frontbuf_destroy(callid, &call);
+			srv_frontbuf_destroy(chandle, &call);
 			break;
 
 		case OUTPUT_CURSOR_UPDATE:
-			srv_cursor_update(callid, &call);
+			srv_cursor_update(chandle, &call);
 			break;
 		case OUTPUT_SET_STYLE:
-			srv_set_style(callid, &call);
+			srv_set_style(chandle, &call);
 			break;
 		case OUTPUT_SET_COLOR:
-			srv_set_color(callid, &call);
+			srv_set_color(chandle, &call);
 			break;
 		case OUTPUT_SET_RGB_COLOR:
-			srv_set_rgb_color(callid, &call);
+			srv_set_rgb_color(chandle, &call);
 			break;
 		case OUTPUT_UPDATE:
-			srv_update(callid, &call);
+			srv_update(chandle, &call);
 			break;
 		case OUTPUT_DAMAGE:
-			srv_damage(callid, &call);
+			srv_damage(chandle, &call);
 			break;
 
 		default:
-			async_answer_0(callid, EINVAL);
+			async_answer_0(chandle, EINVAL);
 		}
 	}