Index: uspace/drv/hid/xtkbd/xtkbd.c
===================================================================
--- uspace/drv/hid/xtkbd/xtkbd.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/drv/hid/xtkbd/xtkbd.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
@@ -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;
 	}