Index: uspace/lib/hound/src/protocol.c
===================================================================
--- uspace/lib/hound/src/protocol.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/lib/hound/src/protocol.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -384,5 +384,5 @@
  * @param arg (unused)
  */
-void hound_connection_handler(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
+void hound_connection_handler(cap_call_handle_t icall_handle, ipc_call_t *icall, void *arg)
 {
 	hound_context_id_t id;
@@ -394,7 +394,7 @@
 	/* Accept connection if there is a valid iface*/
 	if (server_iface) {
-		async_answer_0(iid, EOK);
+		async_answer_0(icall_handle, EOK);
 	} else {
-		async_answer_0(iid, ENOTSUP);
+		async_answer_0(icall_handle, ENOTSUP);
 		return;
 	}
@@ -402,10 +402,10 @@
 	while (1) {
 		ipc_call_t call;
-		cap_call_handle_t callid = async_get_call(&call);
+		cap_call_handle_t chandle = async_get_call(&call);
 		switch (IPC_GET_IMETHOD(call)) {
 		case IPC_M_HOUND_CONTEXT_REGISTER:
 			/* check interface functions */
 			if (!server_iface || !server_iface->add_context) {
-				async_answer_0(callid, ENOTSUP);
+				async_answer_0(chandle, ENOTSUP);
 				break;
 			}
@@ -416,5 +416,5 @@
 			ret = async_data_write_accept(&name, true, 0, 0, 0, 0);
 			if (ret != EOK) {
-				async_answer_0(callid, ret);
+				async_answer_0(chandle, ret);
 				break;
 			}
@@ -426,7 +426,7 @@
 			free(name);
 			if (ret != EOK) {
-				async_answer_0(callid, ret);
+				async_answer_0(chandle, ret);
 			} else {
-				async_answer_1(callid, EOK, CAP_HANDLE_RAW(id));
+				async_answer_1(chandle, EOK, CAP_HANDLE_RAW(id));
 			}
 			break;
@@ -434,5 +434,5 @@
 			/* check interface functions */
 			if (!server_iface || !server_iface->rem_context) {
-				async_answer_0(callid, ENOTSUP);
+				async_answer_0(chandle, ENOTSUP);
 				break;
 			}
@@ -442,10 +442,10 @@
 			ret = server_iface->rem_context(server_iface->server,
 			    id);
-			async_answer_0(callid, ret);
+			async_answer_0(chandle, ret);
 			break;
 		case IPC_M_HOUND_GET_LIST:
 			/* check interface functions */
 			if (!server_iface || !server_iface->get_list) {
-				async_answer_0(callid, ENOTSUP);
+				async_answer_0(chandle, ENOTSUP);
 				break;
 			}
@@ -475,5 +475,5 @@
 			if (count && !sizes)
 				ret = ENOMEM;
-			async_answer_1(callid, ret, count);
+			async_answer_1(chandle, ret, count);
 
 			/* We are done */
@@ -509,5 +509,5 @@
 			/* check interface functions */
 			if (!server_iface || !server_iface->connect) {
-				async_answer_0(callid, ENOTSUP);
+				async_answer_0(chandle, ENOTSUP);
 				break;
 			}
@@ -529,10 +529,10 @@
 			free(source);
 			free(sink);
-			async_answer_0(callid, ret);
+			async_answer_0(chandle, ret);
 			break;
 		case IPC_M_HOUND_DISCONNECT:
 			/* check interface functions */
 			if (!server_iface || !server_iface->disconnect) {
-				async_answer_0(callid, ENOTSUP);
+				async_answer_0(chandle, ENOTSUP);
 				break;
 			}
@@ -553,5 +553,5 @@
 			free(source);
 			free(sink);
-			async_answer_0(callid, ret);
+			async_answer_0(chandle, ret);
 			break;
 		case IPC_M_HOUND_STREAM_ENTER:
@@ -560,5 +560,5 @@
 			    || !server_iface->add_stream
 			    || !server_iface->rem_stream) {
-				async_answer_0(callid, ENOTSUP);
+				async_answer_0(chandle, ENOTSUP);
 				break;
 			}
@@ -579,5 +579,5 @@
 			    id, flags, f, bsize, &stream);
 			if (ret != EOK) {
-				async_answer_0(callid, ret);
+				async_answer_0(chandle, ret);
 				break;
 			}
@@ -586,5 +586,5 @@
 			if (rec) {
 				if(server_iface->stream_data_read) {
-					async_answer_0(callid, EOK);
+					async_answer_0(chandle, EOK);
 					/* start answering read calls */
 					hound_server_write_data(stream);
@@ -592,9 +592,9 @@
 					    server_iface->server, stream);
 				} else {
-					async_answer_0(callid, ENOTSUP);
+					async_answer_0(chandle, ENOTSUP);
 				}
 			} else {
 				if (server_iface->stream_data_write) {
-					async_answer_0(callid, EOK);
+					async_answer_0(chandle, EOK);
 					/* accept write calls */
 					hound_server_read_data(stream);
@@ -602,5 +602,5 @@
 					    server_iface->server, stream);
 				} else {
-					async_answer_0(callid, ENOTSUP);
+					async_answer_0(chandle, ENOTSUP);
 				}
 			}
@@ -609,8 +609,8 @@
 		case IPC_M_HOUND_STREAM_DRAIN:
 			/* Stream exit/drain is only allowed in stream context*/
-			async_answer_0(callid, EINVAL);
+			async_answer_0(chandle, EINVAL);
 			break;
 		default:
-			async_answer_0(callid, ENOTSUP);
+			async_answer_0(chandle, ENOTSUP);
 			return;
 		}
@@ -624,10 +624,10 @@
 static void hound_server_read_data(void *stream)
 {
-	cap_call_handle_t callid;
+	cap_call_handle_t chandle;
 	ipc_call_t call;
 	size_t size = 0;
 	errno_t ret_answer = EOK;
 	/* accept data write or drain */
-	while (async_data_write_receive_call(&callid, &call, &size)
+	while (async_data_write_receive_call(&chandle, &call, &size)
 	    || (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN)) {
 		/* check drain first */
@@ -636,5 +636,5 @@
 			if (server_iface->drain_stream)
 				ret = server_iface->drain_stream(stream);
-			async_answer_0(callid, ret);
+			async_answer_0(chandle, ret);
 			continue;
 		}
@@ -642,5 +642,5 @@
 		/* there was an error last time */
 		if (ret_answer != EOK) {
-			async_answer_0(callid, ret_answer);
+			async_answer_0(chandle, ret_answer);
 			continue;
 		}
@@ -648,8 +648,8 @@
 		char *buffer = malloc(size);
 		if (!buffer) {
-			async_answer_0(callid, ENOMEM);
+			async_answer_0(chandle, ENOMEM);
 			continue;
 		}
-		const errno_t ret = async_data_write_finalize(callid, buffer, size);
+		const errno_t ret = async_data_write_finalize(chandle, buffer, size);
 		if (ret == EOK) {
 			/* push data to stream */
@@ -661,5 +661,5 @@
 	    ? EOK : EINVAL;
 
-	async_answer_0(callid, ret);
+	async_answer_0(chandle, ret);
 }
 
@@ -671,10 +671,10 @@
 {
 
-	cap_call_handle_t callid;
+	cap_call_handle_t chandle;
 	ipc_call_t call;
 	size_t size = 0;
 	errno_t ret_answer = EOK;
 	/* accept data read and drain */
-	while (async_data_read_receive_call(&callid, &call, &size)
+	while (async_data_read_receive_call(&chandle, &call, &size)
 	    || (IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_DRAIN)) {
 		/* drain does not make much sense but it is allowed */
@@ -683,15 +683,15 @@
 			if (server_iface->drain_stream)
 				ret = server_iface->drain_stream(stream);
-			async_answer_0(callid, ret);
+			async_answer_0(chandle, ret);
 			continue;
 		}
 		/* there was an error last time */
 		if (ret_answer != EOK) {
-			async_answer_0(callid, ret_answer);
+			async_answer_0(chandle, ret_answer);
 			continue;
 		}
 		char *buffer = malloc(size);
 		if (!buffer) {
-			async_answer_0(callid, ENOMEM);
+			async_answer_0(chandle, ENOMEM);
 			continue;
 		}
@@ -699,5 +699,5 @@
 		if (ret == EOK) {
 			ret_answer =
-			    async_data_read_finalize(callid, buffer, size);
+			    async_data_read_finalize(chandle, buffer, size);
 		}
 	}
@@ -705,5 +705,5 @@
 	    ? EOK : EINVAL;
 
-	async_answer_0(callid, ret);
+	async_answer_0(chandle, ret);
 }