Index: uspace/drv/bus/adb/cuda_adb/cuda_adb.c
===================================================================
--- uspace/drv/bus/adb/cuda_adb/cuda_adb.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/bus/adb/cuda_adb/cuda_adb.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
@@ -198,21 +198,22 @@
 
 /** Device connection handler */
-static void cuda_dev_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+static void cuda_dev_connection(cap_call_handle_t icall_handle,
+    ipc_call_t *icall, void *arg)
 {
 	adb_dev_t *dev = (adb_dev_t *) ddf_fun_data_get((ddf_fun_t *) arg);
-	cap_call_handle_t callid;
+	cap_call_handle_t chandle;
 	ipc_call_t call;
 	sysarg_t method;
 
 	/* Answer the IPC_M_CONNECT_ME_TO call. */
-	async_answer_0(iid, EOK);
+	async_answer_0(icall_handle, EOK);
 
 	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;
 		}
@@ -222,7 +223,7 @@
 		if (sess != NULL) {
 			dev->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/bus/usb/vhc/conndev.c
===================================================================
--- uspace/drv/bus/usb/vhc/conndev.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/bus/usb/vhc/conndev.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
@@ -90,8 +90,8 @@
  *
  * @param fun Device 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,
+void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
     ipc_call_t *icall)
 {
@@ -104,10 +104,10 @@
 		errno_t rc = vhc_virtdev_plug(vhc, callback, &plugged_device_handle);
 		if (rc != EOK) {
-			async_answer_0(icallid, rc);
+			async_answer_0(icall_handle, rc);
 			async_hangup(callback);
 			return;
 		}
 
-		async_answer_0(icallid, EOK);
+		async_answer_0(icall_handle, EOK);
 
 		receive_device_name(callback);
@@ -116,5 +116,5 @@
 		    plugged_device_name, plugged_device_handle);
 	} else
-		async_answer_0(icallid, EINVAL);
+		async_answer_0(icall_handle, EINVAL);
 }
 
Index: uspace/drv/bus/usb/vhc/vhcd.h
===================================================================
--- uspace/drv/bus/usb/vhc/vhcd.h	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/bus/usb/vhc/vhcd.h	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
@@ -88,5 +88,5 @@
 
 void on_client_close(ddf_fun_t *fun);
-void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icallid,
+void default_connection_handler(ddf_fun_t *fun, cap_call_handle_t icall_handle,
     ipc_call_t *icall);