Index: uspace/srv/fs/tmpfs/tmpfs_ops.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision fd57745cd4811832fa23ba1cef7638038244f2b5)
@@ -484,8 +484,8 @@
 	 * Receive the read request.
 	 */
-	cap_call_handle_t callid;
+	cap_call_handle_t chandle;
 	size_t size;
-	if (!async_data_read_receive(&callid, &size)) {
-		async_answer_0(callid, EINVAL);
+	if (!async_data_read_receive(&chandle, &size)) {
+		async_answer_0(chandle, EINVAL);
 		return EINVAL;
 	}
@@ -494,5 +494,5 @@
 	if (nodep->type == TMPFS_FILE) {
 		bytes = min(nodep->size - pos, size);
-		(void) async_data_read_finalize(callid, nodep->data + pos,
+		(void) async_data_read_finalize(chandle, nodep->data + pos,
 		    bytes);
 	} else {
@@ -510,5 +510,5 @@
 
 		if (lnk == NULL) {
-			async_answer_0(callid, ENOENT);
+			async_answer_0(chandle, ENOENT);
 			return ENOENT;
 		}
@@ -516,5 +516,5 @@
 		dentryp = list_get_instance(lnk, tmpfs_dentry_t, link);
 
-		(void) async_data_read_finalize(callid, dentryp->name,
+		(void) async_data_read_finalize(chandle, dentryp->name,
 		    str_size(dentryp->name) + 1);
 		bytes = 1;
@@ -547,8 +547,8 @@
 	 * Receive the write request.
 	 */
-	cap_call_handle_t callid;
+	cap_call_handle_t chandle;
 	size_t size;
-	if (!async_data_write_receive(&callid, &size)) {
-		async_answer_0(callid, EINVAL);
+	if (!async_data_write_receive(&chandle, &size)) {
+		async_answer_0(chandle, EINVAL);
 		return EINVAL;
 	}
@@ -559,5 +559,5 @@
 	if (pos + size <= nodep->size) {
 		/* The file size is not changing. */
-		(void) async_data_write_finalize(callid, nodep->data + pos,
+		(void) async_data_write_finalize(chandle, nodep->data + pos,
 		    size);
 		goto out;
@@ -573,5 +573,5 @@
 	void *newdata = realloc(nodep->data, nodep->size + delta);
 	if (!newdata) {
-		async_answer_0(callid, ENOMEM);
+		async_answer_0(chandle, ENOMEM);
 		size = 0;
 		goto out;
@@ -581,5 +581,5 @@
 	nodep->size += delta;
 	nodep->data = newdata;
-	(void) async_data_write_finalize(callid, nodep->data + pos, size);
+	(void) async_data_write_finalize(chandle, nodep->data + pos, size);
 
 out: