Index: uspace/drv/hid/adb-kbd/adb-kbd.c
===================================================================
--- uspace/drv/hid/adb-kbd/adb-kbd.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/hid/adb-kbd/adb-kbd.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -130,5 +130,5 @@
 }
 
-static void adb_kbd_events(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+static void adb_kbd_events(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
 	adb_kbd_t *kbd = (adb_kbd_t *) arg;
@@ -138,5 +138,5 @@
 
 		ipc_call_t call;
-		cap_call_handle_t callid = async_get_call(&call);
+		cap_call_handle_t chandle = async_get_call(&call);
 
 		errno_t retval = EOK;
@@ -154,5 +154,5 @@
 			retval = ENOENT;
 		}
-		async_answer_0(callid, retval);
+		async_answer_0(chandle, retval);
 	}
 }
@@ -190,7 +190,7 @@
 
 /** Handle client connection */
-static void adb_kbd_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
-{
-	cap_call_handle_t callid;
+static void adb_kbd_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+{
+	cap_call_handle_t chandle;
 	ipc_call_t call;
 	sysarg_t method;
@@ -200,15 +200,15 @@
 	 * Answer the first IPC_M_CONNECT_ME_TO call.
 	 */
-	async_answer_0(iid, EOK);
+	async_answer_0(icall_handle, EOK);
 
 	kbd = (adb_kbd_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg));
 
 	while (true) {
-		callid = async_get_call(&call);
+		chandle = async_get_call(&call);
 		method = IPC_GET_IMETHOD(call);
 
 		if (!method) {
 			/* The other side has hung up. */
-			async_answer_0(callid, EOK);
+			async_answer_0(chandle, EOK);
 			return;
 		}
@@ -218,7 +218,7 @@
 		if (sess != NULL) {
 			kbd->client_sess = sess;
-			async_answer_0(callid, EOK);
+			async_answer_0(chandle, EOK);
 		} else {
-			async_answer_0(callid, EINVAL);
+			async_answer_0(chandle, EINVAL);
 		}
 	}
Index: uspace/drv/hid/adb-mouse/adb-mouse.c
===================================================================
--- uspace/drv/hid/adb-mouse/adb-mouse.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/hid/adb-mouse/adb-mouse.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -88,5 +88,5 @@
 }
 
-static void adb_mouse_events(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+static void adb_mouse_events(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
 	adb_mouse_t *mouse = (adb_mouse_t *) arg;
@@ -95,5 +95,5 @@
 	while (true) {
 		ipc_call_t call;
-		cap_call_handle_t callid = async_get_call(&call);
+		cap_call_handle_t chandle = async_get_call(&call);
 
 		errno_t retval = EOK;
@@ -112,5 +112,5 @@
 		}
 
-		async_answer_0(callid, retval);
+		async_answer_0(chandle, retval);
 	}
 }
@@ -200,7 +200,7 @@
 
 /** Handle client connection */
-static void adb_mouse_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
-{
-	cap_call_handle_t callid;
+static void adb_mouse_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
+{
+	cap_call_handle_t chandle;
 	ipc_call_t call;
 	sysarg_t method;
@@ -210,15 +210,15 @@
 	 * Answer the first IPC_M_CONNECT_ME_TO call.
 	 */
-	async_answer_0(iid, EOK);
+	async_answer_0(icall_handle, EOK);
 
 	mouse = (adb_mouse_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg));
 
 	while (true) {
-		callid = async_get_call(&call);
+		chandle = async_get_call(&call);
 		method = IPC_GET_IMETHOD(call);
 
 		if (!method) {
 			/* The other side has hung up. */
-			async_answer_0(callid, EOK);
+			async_answer_0(chandle, EOK);
 			return;
 		}
@@ -228,7 +228,7 @@
 		if (sess != NULL) {
 			mouse->client_sess = sess;
-			async_answer_0(callid, EOK);
+			async_answer_0(chandle, EOK);
 		} else {
-			async_answer_0(callid, EINVAL);
+			async_answer_0(chandle, EINVAL);
 		}
 	}
Index: uspace/drv/hid/atkbd/atkbd.c
===================================================================
--- uspace/drv/hid/atkbd/atkbd.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/hid/atkbd/atkbd.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -293,10 +293,10 @@
  *
  * @param fun     Device function handling the call.
- * @param icallid Call id.
+ * @param icall_handle Call id.
  * @param icall   Call data.
  *
  */
 static void default_connection_handler(ddf_fun_t *fun,
-    cap_call_handle_t icallid, ipc_call_t *icall)
+    cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
 	const sysarg_t method = IPC_GET_IMETHOD(*icall);
@@ -306,5 +306,5 @@
 	switch (method) {
 	case KBDEV_SET_IND:
-		async_answer_0(icallid, ENOTSUP);
+		async_answer_0(icall_handle, ENOTSUP);
 		break;
 	/*
@@ -319,5 +319,5 @@
 			ddf_msg(LVL_WARN,
 			    "Failed creating callback session");
-			async_answer_0(icallid, EAGAIN);
+			async_answer_0(icall_handle, EAGAIN);
 			break;
 		}
@@ -326,8 +326,8 @@
 			kbd->client_sess = sess;
 			ddf_msg(LVL_DEBUG, "Set client session");
-			async_answer_0(icallid, EOK);
+			async_answer_0(icall_handle, EOK);
 		} else {
 			ddf_msg(LVL_ERROR, "Client session already set");
-			async_answer_0(icallid, ELIMIT);
+			async_answer_0(icall_handle, ELIMIT);
 		}
 
@@ -335,5 +335,5 @@
 	default:
 		ddf_msg(LVL_ERROR, "Unknown method: %d.", (int)method);
-		async_answer_0(icallid, EINVAL);
+		async_answer_0(icall_handle, EINVAL);
 		break;
 	}
Index: uspace/drv/hid/ps2mouse/ps2mouse.c
===================================================================
--- uspace/drv/hid/ps2mouse/ps2mouse.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/hid/ps2mouse/ps2mouse.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -400,9 +400,9 @@
  *
  * @param fun Device function handling the call.
- * @param icallid Call id.
+ * @param icall_handle Call id.
  * @param icall Call data.
  */
 void default_connection_handler(ddf_fun_t *fun,
-    cap_call_handle_t icallid, ipc_call_t *icall)
+    cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
 	const sysarg_t method = IPC_GET_IMETHOD(*icall);
@@ -419,5 +419,5 @@
 			ddf_msg(LVL_WARN,
 			    "Failed creating client callback session");
-			async_answer_0(icallid, EAGAIN);
+			async_answer_0(icall_handle, EAGAIN);
 			break;
 		}
@@ -425,13 +425,13 @@
 			mouse->client_sess = sess;
 			ddf_msg(LVL_DEBUG, "Set client session");
-			async_answer_0(icallid, EOK);
+			async_answer_0(icall_handle, EOK);
 		} else {
 			ddf_msg(LVL_ERROR, "Client session already set");
-			async_answer_0(icallid, ELIMIT);
+			async_answer_0(icall_handle, ELIMIT);
 		}
 		break;
 	default:
 		ddf_msg(LVL_ERROR, "Unknown method: %d.", (int)method);
-		async_answer_0(icallid, EINVAL);
+		async_answer_0(icall_handle, EINVAL);
 		break;
 	}
Index: uspace/drv/hid/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/hid/usbhid/kbd/kbddev.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/hid/usbhid/kbd/kbddev.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -157,9 +157,9 @@
  *
  * @param fun Device function handling the call.
- * @param icallid Call id.
+ * @param icall_handle Call id.
  * @param icall Call data.
  */
 static void default_connection_handler(ddf_fun_t *fun,
-    cap_call_handle_t icallid, ipc_call_t *icall)
+    cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
 	const sysarg_t method = IPC_GET_IMETHOD(*icall);
@@ -171,5 +171,5 @@
 		kbd_dev->mods = IPC_GET_ARG1(*icall);
 		usb_kbd_set_led(kbd_dev->hid_dev, kbd_dev);
-		async_answer_0(icallid, EOK);
+		async_answer_0(icall_handle, EOK);
 		break;
 	/* This might be ugly but async_callback_receive_start makes no
@@ -181,5 +181,5 @@
 			usb_log_warning(
 			    "Failed to create start console session.\n");
-			async_answer_0(icallid, EAGAIN);
+			async_answer_0(icall_handle, EAGAIN);
 			break;
 		}
@@ -187,9 +187,9 @@
 			kbd_dev->client_sess = sess;
 			usb_log_debug("%s: OK", __FUNCTION__);
-			async_answer_0(icallid, EOK);
+			async_answer_0(icall_handle, EOK);
 		} else {
 			usb_log_error("%s: console session already set",
 			   __FUNCTION__);
-			async_answer_0(icallid, ELIMIT);
+			async_answer_0(icall_handle, ELIMIT);
 		}
 		break;
@@ -197,5 +197,5 @@
 			usb_log_error("%s: Unknown method: %d.",
 			    __FUNCTION__, (int) method);
-			async_answer_0(icallid, EINVAL);
+			async_answer_0(icall_handle, EINVAL);
 			break;
 	}
Index: uspace/drv/hid/usbhid/mouse/mousedev.c
===================================================================
--- uspace/drv/hid/usbhid/mouse/mousedev.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/hid/usbhid/mouse/mousedev.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -110,9 +110,9 @@
  *
  * @param fun Device function handling the call.
- * @param icallid Call id.
+ * @param icall_handle Call id.
  * @param icall Call data.
  */
 static void default_connection_handler(ddf_fun_t *fun,
-    cap_call_handle_t icallid, ipc_call_t *icall)
+    cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
 	usb_mouse_t *mouse_dev = ddf_fun_data_get(fun);
@@ -120,5 +120,5 @@
 	if (mouse_dev == NULL) {
 		usb_log_debug("%s: Missing parameters.", __FUNCTION__);
-		async_answer_0(icallid, EINVAL);
+		async_answer_0(icall_handle, EINVAL);
 		return;
 	}
@@ -135,14 +135,14 @@
 			usb_log_debug("Console session to %s set ok (%p).",
 			    ddf_fun_get_name(fun), sess);
-			async_answer_0(icallid, EOK);
+			async_answer_0(icall_handle, EOK);
 		} else {
 			usb_log_error("Console session to %s already set.",
 			    ddf_fun_get_name(fun));
-			async_answer_0(icallid, ELIMIT);
+			async_answer_0(icall_handle, ELIMIT);
 			async_hangup(sess);
 		}
 	} else {
 		usb_log_debug("%s: Invalid function.", __FUNCTION__);
-		async_answer_0(icallid, EINVAL);
+		async_answer_0(icall_handle, EINVAL);
 	}
 }
Index: uspace/drv/hid/usbhid/multimedia/multimedia.c
===================================================================
--- uspace/drv/hid/usbhid/multimedia/multimedia.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/hid/usbhid/multimedia/multimedia.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -81,9 +81,9 @@
  *
  * @param fun Device function handling the call.
- * @param icallid Call id.
+ * @param icall_handle Call id.
  * @param icall Call data.
  */
 static void default_connection_handler(ddf_fun_t *fun,
-    cap_call_handle_t icallid, ipc_call_t *icall)
+    cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
 	usb_log_debug(NAME " default_connection_handler()");
@@ -98,9 +98,9 @@
 			usb_log_debug(NAME " Saved session to console: %p",
 			    sess);
-			async_answer_0(icallid, EOK);
+			async_answer_0(icall_handle, EOK);
 		} else
-			async_answer_0(icallid, ELIMIT);
+			async_answer_0(icall_handle, ELIMIT);
 	} else
-		async_answer_0(icallid, EINVAL);
+		async_answer_0(icall_handle, EINVAL);
 }
 
Index: uspace/drv/hid/xtkbd/xtkbd.c
===================================================================
--- uspace/drv/hid/xtkbd/xtkbd.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/hid/xtkbd/xtkbd.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -329,10 +329,10 @@
  *
  * @param fun     Device function handling the call.
- * @param icallid Call id.
+ * @param icall_handle Call id.
  * @param icall   Call data.
  *
  */
 static void default_connection_handler(ddf_fun_t *fun,
-    cap_call_handle_t icallid, ipc_call_t *icall)
+    cap_call_handle_t icall_handle, ipc_call_t *icall)
 {
 	const sysarg_t method = IPC_GET_IMETHOD(*icall);
@@ -357,10 +357,10 @@
 		errno_t rc = chardev_write(kbd->chardev, &cmds[0], 1, &nwr);
 		if (rc != EOK) {
-			async_answer_0(icallid, rc);
+			async_answer_0(icall_handle, rc);
 			break;
 		}
 
 		rc = chardev_write(kbd->chardev, &cmds[1], 1, &nwr);
-		async_answer_0(icallid, rc);
+		async_answer_0(icall_handle, rc);
 		break;
 	/*
@@ -375,5 +375,5 @@
 			ddf_msg(LVL_WARN,
 			    "Failed creating callback session");
-			async_answer_0(icallid, EAGAIN);
+			async_answer_0(icall_handle, EAGAIN);
 			break;
 		}
@@ -382,8 +382,8 @@
 			kbd->client_sess = sess;
 			ddf_msg(LVL_DEBUG, "Set client session");
-			async_answer_0(icallid, EOK);
+			async_answer_0(icall_handle, EOK);
 		} else {
 			ddf_msg(LVL_ERROR, "Client session already set");
-			async_answer_0(icallid, ELIMIT);
+			async_answer_0(icall_handle, ELIMIT);
 		}
 
@@ -391,5 +391,5 @@
 	default:
 		ddf_msg(LVL_ERROR, "Unknown method: %d.", (int)method);
-		async_answer_0(icallid, EINVAL);
+		async_answer_0(icall_handle, EINVAL);
 		break;
 	}