Index: uspace/drv/char/i8042/i8042.c
===================================================================
--- uspace/drv/char/i8042/i8042.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/char/i8042/i8042.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -414,13 +414,13 @@
 /** Handle data requests.
  *
- * @param id   callid
+ * @param id   chandle
  * @param call IPC request.
  * @param arg  ddf_fun_t function.
  */
-void i8042_char_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+void i8042_char_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
 	i8042_port_t *port = ddf_fun_data_get((ddf_fun_t *)arg);
 
-	chardev_conn(iid, icall, &port->cds);
+	chardev_conn(icall_handle, icall, &port->cds);
 }
 
Index: uspace/drv/char/msim-con/msim-con.c
===================================================================
--- uspace/drv/char/msim-con/msim-con.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/char/msim-con/msim-con.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -217,5 +217,5 @@
 
 /** Character device connection handler. */
-static void msim_con_connection(cap_call_handle_t iid, ipc_call_t *icall,
+static void msim_con_connection(cap_call_handle_t icall_handle, ipc_call_t *icall,
     void *arg)
 {
@@ -223,5 +223,5 @@
 	    ddf_fun_get_dev((ddf_fun_t *) arg));
 
-	chardev_conn(iid, icall, &con->cds);
+	chardev_conn(icall_handle, icall, &con->cds);
 }
 
Index: uspace/drv/char/ns8250/ns8250.c
===================================================================
--- uspace/drv/char/ns8250/ns8250.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/char/ns8250/ns8250.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -1068,5 +1068,5 @@
  * Configure the parameters of the serial communication.
  */
-static void ns8250_default_handler(chardev_srv_t *srv, cap_call_handle_t callid,
+static void ns8250_default_handler(chardev_srv_t *srv, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
@@ -1080,5 +1080,5 @@
 		ns8250_get_props(ns8250->dev, &baud_rate, &parity, &word_length,
 		    &stop_bits);
-		async_answer_4(callid, EOK, baud_rate, parity, word_length,
+		async_answer_4(chandle, EOK, baud_rate, parity, word_length,
 		    stop_bits);
 		break;
@@ -1091,17 +1091,17 @@
 		ret = ns8250_set_props(ns8250->dev, baud_rate, parity, word_length,
 		    stop_bits);
-		async_answer_0(callid, ret);
+		async_answer_0(chandle, ret);
 		break;
 
 	default:
-		async_answer_0(callid, ENOTSUP);
-	}
-}
-
-void ns8250_char_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+		async_answer_0(chandle, ENOTSUP);
+	}
+}
+
+void ns8250_char_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
 	ns8250_t *ns8250 = fun_ns8250((ddf_fun_t *)arg);
 
-	chardev_conn(iid, icall, &ns8250->cds);
+	chardev_conn(icall_handle, icall, &ns8250->cds);
 }
 
Index: uspace/drv/char/pl050/pl050.c
===================================================================
--- uspace/drv/char/pl050/pl050.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/char/pl050/pl050.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -286,9 +286,9 @@
 }
 
-void pl050_char_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+void pl050_char_conn(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
 	pl050_t *pl050 = pl050_from_fun((ddf_fun_t *)arg);
 
-	chardev_conn(iid, icall, &pl050->cds);
+	chardev_conn(icall_handle, icall, &pl050->cds);
 }
 
Index: uspace/drv/char/ski-con/ski-con.c
===================================================================
--- uspace/drv/char/ski-con/ski-con.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/char/ski-con/ski-con.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -255,5 +255,5 @@
 
 /** Character device connection handler. */
-static void ski_con_connection(cap_call_handle_t iid, ipc_call_t *icall,
+static void ski_con_connection(cap_call_handle_t icall_handle, ipc_call_t *icall,
     void *arg)
 {
@@ -261,5 +261,5 @@
 	    ddf_fun_get_dev((ddf_fun_t *) arg));
 
-	chardev_conn(iid, icall, &con->cds);
+	chardev_conn(icall_handle, icall, &con->cds);
 }
 
Index: uspace/drv/char/sun4v-con/sun4v-con.c
===================================================================
--- uspace/drv/char/sun4v-con/sun4v-con.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/char/sun4v-con/sun4v-con.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -180,5 +180,5 @@
 
 /** Character device connection handler. */
-static void sun4v_con_connection(cap_call_handle_t iid, ipc_call_t *icall,
+static void sun4v_con_connection(cap_call_handle_t icall_handle, ipc_call_t *icall,
     void *arg)
 {
@@ -186,5 +186,5 @@
 	    ddf_fun_get_dev((ddf_fun_t *) arg));
 
-	chardev_conn(iid, icall, &con->cds);
+	chardev_conn(icall_handle, icall, &con->cds);
 }