Index: uspace/srv/vfs/vfs_ipc.c
===================================================================
--- uspace/srv/vfs/vfs_ipc.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
+++ uspace/srv/vfs/vfs_ipc.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
@@ -35,5 +35,5 @@
 #include <vfs/canonify.h>
 
-static void vfs_in_clone(cap_call_handle_t rid, ipc_call_t *request)
+static void vfs_in_clone(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	int oldfd = IPC_GET_ARG1(*request);
@@ -43,8 +43,8 @@
 	int outfd = -1;
 	errno_t rc = vfs_op_clone(oldfd, newfd, desc, &outfd);
-	async_answer_1(rid, rc, outfd);
-}
-
-static void vfs_in_fsprobe(cap_call_handle_t rid, ipc_call_t *request)
+	async_answer_1(req_handle, rc, outfd);
+}
+
+static void vfs_in_fsprobe(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	service_id_t service_id = (service_id_t) IPC_GET_ARG1(*request);
@@ -62,10 +62,10 @@
 	    FS_NAME_MAXLEN, 0, NULL);
 	if (rc != EOK) {
-		async_answer_0(rid, rc);
+		async_answer_0(req_handle, rc);
 		return;
 	}
 
 	rc = vfs_op_fsprobe(fs_name, service_id, &info);
-	async_answer_0(rid, rc);
+	async_answer_0(req_handle, rc);
 	if (rc != EOK)
 		goto out;
@@ -83,5 +83,5 @@
 }
 
-static void vfs_in_fstypes(cap_call_handle_t rid, ipc_call_t *request)
+static void vfs_in_fstypes(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	cap_call_handle_t chandle;
@@ -92,10 +92,10 @@
 	rc = vfs_get_fstypes(&fstypes);
 	if (rc != EOK) {
-		async_answer_0(rid, ENOMEM);
+		async_answer_0(req_handle, ENOMEM);
 		return;
 	}
 
 	/* Send size of the data */
-	async_answer_1(rid, EOK, fstypes.size);
+	async_answer_1(req_handle, EOK, fstypes.size);
 
 	/* Now we should get a read request */
@@ -111,5 +111,5 @@
 }
 
-static void vfs_in_mount(cap_call_handle_t rid, ipc_call_t *request)
+static void vfs_in_mount(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	int mpfd = IPC_GET_ARG1(*request);
@@ -132,5 +132,5 @@
 	    MAX_MNTOPTS_LEN, 0, NULL);
 	if (rc != EOK) {
-		async_answer_0(rid, rc);
+		async_answer_0(req_handle, rc);
 		return;
 	}
@@ -143,5 +143,5 @@
 	if (rc != EOK) {
 		free(opts);
-		async_answer_0(rid, rc);
+		async_answer_0(req_handle, rc);
 		return;
 	}
@@ -150,5 +150,5 @@
 	rc = vfs_op_mount(mpfd, service_id, flags, instance, opts, fs_name,
 	     &outfd);
-	async_answer_1(rid, rc, outfd);
+	async_answer_1(req_handle, rc, outfd);
 
 	free(opts);
@@ -156,5 +156,5 @@
 }
 
-static void vfs_in_open(cap_call_handle_t rid, ipc_call_t *request)
+static void vfs_in_open(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	int fd = IPC_GET_ARG1(*request);
@@ -162,15 +162,15 @@
 
 	errno_t rc = vfs_op_open(fd, mode);
-	async_answer_0(rid, rc);
-}
-
-static void vfs_in_put(cap_call_handle_t rid, ipc_call_t *request)
+	async_answer_0(req_handle, rc);
+}
+
+static void vfs_in_put(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	int fd = IPC_GET_ARG1(*request);
 	errno_t rc = vfs_op_put(fd);
-	async_answer_0(rid, rc);
-}
-
-static void vfs_in_read(cap_call_handle_t rid, ipc_call_t *request)
+	async_answer_0(req_handle, rc);
+}
+
+static void vfs_in_read(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	int fd = IPC_GET_ARG1(*request);
@@ -180,8 +180,8 @@
 	size_t bytes = 0;
 	errno_t rc = vfs_op_read(fd, pos, &bytes);
-	async_answer_1(rid, rc, bytes);
-}
-
-static void vfs_in_rename(cap_call_handle_t rid, ipc_call_t *request)
+	async_answer_1(req_handle, rc, bytes);
+}
+
+static void vfs_in_rename(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	/* The common base directory. */
@@ -219,5 +219,5 @@
 
 out:
-	async_answer_0(rid, rc);
+	async_answer_0(req_handle, rc);
 
 	if (old)
@@ -227,35 +227,35 @@
 }
 
-static void vfs_in_resize(cap_call_handle_t rid, ipc_call_t *request)
+static void vfs_in_resize(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	int fd = IPC_GET_ARG1(*request);
 	int64_t size = MERGE_LOUP32(IPC_GET_ARG2(*request), IPC_GET_ARG3(*request));
 	errno_t rc = vfs_op_resize(fd, size);
-	async_answer_0(rid, rc);
-}
-
-static void vfs_in_stat(cap_call_handle_t rid, ipc_call_t *request)
+	async_answer_0(req_handle, rc);
+}
+
+static void vfs_in_stat(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	int fd = IPC_GET_ARG1(*request);
 	errno_t rc = vfs_op_stat(fd);
-	async_answer_0(rid, rc);
-}
-
-static void vfs_in_statfs(cap_call_handle_t rid, ipc_call_t *request)
+	async_answer_0(req_handle, rc);
+}
+
+static void vfs_in_statfs(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	int fd = (int) IPC_GET_ARG1(*request);
 
 	errno_t rc = vfs_op_statfs(fd);
-	async_answer_0(rid, rc);
-}
-
-static void vfs_in_sync(cap_call_handle_t rid, ipc_call_t *request)
+	async_answer_0(req_handle, rc);
+}
+
+static void vfs_in_sync(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	int fd = IPC_GET_ARG1(*request);
 	errno_t rc = vfs_op_sync(fd);
-	async_answer_0(rid, rc);
-}
-
-static void vfs_in_unlink(cap_call_handle_t rid, ipc_call_t *request)
+	async_answer_0(req_handle, rc);
+}
+
+static void vfs_in_unlink(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	int parentfd = IPC_GET_ARG1(*request);
@@ -267,23 +267,23 @@
 		rc = vfs_op_unlink(parentfd, expectfd, path);
 
-	async_answer_0(rid, rc);
-}
-
-static void vfs_in_unmount(cap_call_handle_t rid, ipc_call_t *request)
+	async_answer_0(req_handle, rc);
+}
+
+static void vfs_in_unmount(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	int mpfd = IPC_GET_ARG1(*request);
 	errno_t rc = vfs_op_unmount(mpfd);
-	async_answer_0(rid, rc);
-}
-
-static void vfs_in_wait_handle(cap_call_handle_t rid, ipc_call_t *request)
+	async_answer_0(req_handle, rc);
+}
+
+static void vfs_in_wait_handle(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	bool high_fd = IPC_GET_ARG1(*request);
 	int fd = -1;
 	errno_t rc = vfs_op_wait_handle(high_fd, &fd);
-	async_answer_1(rid, rc, fd);
-}
-
-static void vfs_in_walk(cap_call_handle_t rid, ipc_call_t *request)
+	async_answer_1(req_handle, rc, fd);
+}
+
+static void vfs_in_walk(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	/*
@@ -301,8 +301,8 @@
 		free(path);
 	}
-	async_answer_1(rid, rc, fd);
-}
-
-static void vfs_in_write(cap_call_handle_t rid, ipc_call_t *request)
+	async_answer_1(req_handle, rc, fd);
+}
+
+static void vfs_in_write(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	int fd = IPC_GET_ARG1(*request);
@@ -312,5 +312,5 @@
 	size_t bytes = 0;
 	errno_t rc = vfs_op_write(fd, pos, &bytes);
-	async_answer_1(rid, rc, bytes);
+	async_answer_1(req_handle, rc, bytes);
 }
 
Index: uspace/srv/vfs/vfs_pager.c
===================================================================
--- uspace/srv/vfs/vfs_pager.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
+++ uspace/srv/vfs/vfs_pager.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
@@ -42,5 +42,5 @@
 #include <as.h>
 
-void vfs_page_in(cap_call_handle_t rid, ipc_call_t *request)
+void vfs_page_in(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	aoff64_t offset = IPC_GET_ARG1(*request);
@@ -55,5 +55,5 @@
 
 	if (page == AS_MAP_FAILED) {
-		async_answer_0(rid, ENOMEM);
+		async_answer_0(req_handle, ENOMEM);
 		return;
 	}
@@ -78,5 +78,5 @@
 	} while (total < page_size);
 
-	async_answer_1(rid, rc, (sysarg_t) page);
+	async_answer_1(req_handle, rc, (sysarg_t) page);
 
 	/*
Index: uspace/srv/vfs/vfs_register.c
===================================================================
--- uspace/srv/vfs/vfs_register.c	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
+++ uspace/srv/vfs/vfs_register.c	(revision eed4139909f4e93017245a6736941de6564db9fe)
@@ -108,9 +108,9 @@
 /** VFS_REGISTER protocol function.
  *
- * @param rid     Hash of the call with the request.
- * @param request Call structure with the request.
- *
- */
-void vfs_register(cap_call_handle_t rid, ipc_call_t *request)
+ * @param req_handle  Call handle of the request.
+ * @param request     Call structure with the request.
+ *
+ */
+void vfs_register(cap_call_handle_t req_handle, ipc_call_t *request)
 {
 	dprintf("Processing VFS_REGISTER request received from %zx.\n",
@@ -124,5 +124,5 @@
 		dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",
 		    rc);
-		async_answer_0(rid, rc);
+		async_answer_0(req_handle, rc);
 		return;
 	}
@@ -134,5 +134,5 @@
 	if (!fs_info) {
 		dprintf("Could not allocate memory for FS info.\n");
-		async_answer_0(rid, ENOMEM);
+		async_answer_0(req_handle, ENOMEM);
 		return;
 	}
@@ -146,5 +146,5 @@
 	if (!vfs_info_sane(&fs_info->vfs_info)) {
 		free(fs_info);
-		async_answer_0(rid, EINVAL);
+		async_answer_0(req_handle, EINVAL);
 		return;
 	}
@@ -163,5 +163,5 @@
 		fibril_mutex_unlock(&fs_list_lock);
 		free(fs_info);
-		async_answer_0(rid, EEXIST);
+		async_answer_0(req_handle, EEXIST);
 		return;
 	}
@@ -184,5 +184,5 @@
 		fibril_mutex_unlock(&fs_list_lock);
 		free(fs_info);
-		async_answer_0(rid, EINVAL);
+		async_answer_0(req_handle, EINVAL);
 		return;
 	}
@@ -203,5 +203,5 @@
 		free(fs_info);
 		async_answer_0(chandle, EINVAL);
-		async_answer_0(rid, EINVAL);
+		async_answer_0(req_handle, EINVAL);
 		return;
 	}
@@ -217,5 +217,5 @@
 		free(fs_info);
 		async_answer_0(chandle, EINVAL);
-		async_answer_0(rid, EINVAL);
+		async_answer_0(req_handle, EINVAL);
 		return;
 	}
@@ -235,5 +235,5 @@
 	 */
 	fs_info->fs_handle = (fs_handle_t) atomic_postinc(&fs_handle_next);
-	async_answer_1(rid, EOK, (sysarg_t) fs_info->fs_handle);
+	async_answer_1(req_handle, EOK, (sysarg_t) fs_info->fs_handle);
 
 	fibril_condvar_broadcast(&fs_list_cv);