Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c
===================================================================
--- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
@@ -69,5 +69,5 @@
 static s3c24xx_ts_t *ts;
 
-static void s3c24xx_ts_connection(cap_call_handle_t iid, ipc_call_t *icall,
+static void s3c24xx_ts_connection(cap_call_handle_t icall_handle, ipc_call_t *icall,
     void *arg);
 static void s3c24xx_ts_irq_handler(ipc_call_t *call, void *);
@@ -373,12 +373,12 @@
 
 /** Handle mouse client connection. */
-static void s3c24xx_ts_connection(cap_call_handle_t iid, ipc_call_t *icall,
+static void s3c24xx_ts_connection(cap_call_handle_t icall_handle, ipc_call_t *icall,
     void *arg)
 {
-	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)) {
@@ -388,5 +388,5 @@
 			}
 
-			async_answer_0(callid, EOK);
+			async_answer_0(chandle, EOK);
 			return;
 		}
@@ -397,9 +397,9 @@
 			if (ts->client_sess == NULL) {
 				ts->client_sess = sess;
-				async_answer_0(callid, EOK);
+				async_answer_0(chandle, EOK);
 			} else
-				async_answer_0(callid, ELIMIT);
+				async_answer_0(chandle, ELIMIT);
 		} else
-			async_answer_0(callid, EINVAL);
+			async_answer_0(chandle, EINVAL);
 	}
 }