Index: uspace/app/klog/klog.c
===================================================================
--- uspace/app/klog/klog.c	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/app/klog/klog.c	(revision 215e375440748700b8ba4a90595039cbbd76cf85)
@@ -64,5 +64,5 @@
 	
 	mapping = as_get_mappable_page(PAGE_SIZE);
-	res = ipc_share_in_send_1_0(PHONE_NS, mapping, PAGE_SIZE,
+	res = ipc_share_in_start_1_0(PHONE_NS, mapping, PAGE_SIZE,
 	    SERVICE_MEM_KLOG);
 	if (res) {
Index: uspace/app/tester/devmap/devmap1.c
===================================================================
--- uspace/app/tester/devmap/devmap1.c	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/app/tester/devmap/devmap1.c	(revision 215e375440748700b8ba4a90595039cbbd76cf85)
@@ -143,5 +143,5 @@
 	req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer);
 
-	retval = ipc_data_write_send(phone, (char *)name, strlen(name) + 1); 
+	retval = ipc_data_write_start(phone, (char *)name, strlen(name) + 1); 
 
 	if (retval != EOK) {
@@ -176,5 +176,5 @@
 	    &answer);
 
-	retval = ipc_data_write_send(driver_phone, name, strlen(name) + 1); 
+	retval = ipc_data_write_start(driver_phone, name, strlen(name) + 1); 
 
 	if (retval != EOK) {
@@ -217,5 +217,5 @@
 	req = async_send_2(driver_phone, DEVMAP_DEVICE_REGISTER, 0, 0, &answer);
 
-	retval = ipc_data_write_send(driver_phone, (char *)name,
+	retval = ipc_data_write_start(driver_phone, (char *)name,
 	    strlen(name) + 1); 
 
Index: uspace/lib/libc/generic/ipc.c
===================================================================
--- uspace/lib/libc/generic/ipc.c	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/lib/libc/generic/ipc.c	(revision 215e375440748700b8ba4a90595039cbbd76cf85)
@@ -678,5 +678,5 @@
  * @return		Zero on success or a negative error code from errno.h.
  */
-int ipc_share_in_send(int phoneid, void *dst, size_t size, ipcarg_t arg,
+int ipc_share_in_start(int phoneid, void *dst, size_t size, ipcarg_t arg,
     int *flags)
 {
@@ -728,5 +728,5 @@
  * @return		Zero on success or a value from @ref errno.h on failure.
  */
-int ipc_share_in_deliver(ipc_callid_t callid, void *src, int flags)
+int ipc_share_in_finalize(ipc_callid_t callid, void *src, int flags)
 {
 	return ipc_answer_2(callid, EOK, (ipcarg_t) src, (ipcarg_t) flags);
@@ -741,5 +741,5 @@
  * @return		Zero on success or a negative error code from errno.h.
  */
-int ipc_share_out_send(int phoneid, void *src, int flags)
+int ipc_share_out_start(int phoneid, void *src, int flags)
 {
 	return ipc_call_sync_3_0(phoneid, IPC_M_SHARE_OUT, (ipcarg_t) src, 0,
@@ -788,5 +788,5 @@
  * @return		Zero on success or a value from @ref errno.h on failure.
  */
-int ipc_share_out_deliver(ipc_callid_t callid, void *dst)
+int ipc_share_out_finalize(ipc_callid_t callid, void *dst)
 {
 	return ipc_answer_1(callid, EOK, (ipcarg_t) dst);
@@ -802,5 +802,5 @@
  * @return		Zero on success or a negative error code from errno.h.
  */
-int ipc_data_read_send(int phoneid, void *dst, size_t size)
+int ipc_data_read_start(int phoneid, void *dst, size_t size)
 {
 	return ipc_call_sync_2_0(phoneid, IPC_M_DATA_READ, (ipcarg_t) dst,
@@ -848,5 +848,5 @@
  * @return		Zero on success or a value from @ref errno.h on failure.
  */
-int ipc_data_read_deliver(ipc_callid_t callid, void *src, size_t size)
+int ipc_data_read_finalize(ipc_callid_t callid, void *src, size_t size)
 {
 	return ipc_answer_2(callid, EOK, (ipcarg_t) src, (ipcarg_t) size);
@@ -861,5 +861,5 @@
  * @return		Zero on success or a negative error code from errno.h.
  */
-int ipc_data_write_send(int phoneid, void *src, size_t size)
+int ipc_data_write_start(int phoneid, void *src, size_t size)
 {
 	return ipc_call_sync_2_0(phoneid, IPC_M_DATA_WRITE, (ipcarg_t) src,
@@ -906,5 +906,5 @@
  * @return		Zero on success or a value from @ref errno.h on failure.
  */
-int ipc_data_write_deliver(ipc_callid_t callid, void *dst, size_t size)
+int ipc_data_write_finalize(ipc_callid_t callid, void *dst, size_t size)
 {
 	return ipc_answer_2(callid, EOK, (ipcarg_t) dst, (ipcarg_t) size);
Index: uspace/lib/libc/generic/time.c
===================================================================
--- uspace/lib/libc/generic/time.c	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/lib/libc/generic/time.c	(revision 215e375440748700b8ba4a90595039cbbd76cf85)
@@ -142,5 +142,5 @@
 		mapping = as_get_mappable_page(PAGE_SIZE);
 		/* Get the mapping of kernel clock */
-		res = ipc_share_in_send_1_1(PHONE_NS, mapping, PAGE_SIZE,
+		res = ipc_share_in_start_1_1(PHONE_NS, mapping, PAGE_SIZE,
 		    SERVICE_MEM_REALTIME, &rights);
 		if (res) {
Index: uspace/lib/libc/generic/vfs.c
===================================================================
--- uspace/lib/libc/generic/vfs.c	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/lib/libc/generic/vfs.c	(revision 215e375440748700b8ba4a90595039cbbd76cf85)
@@ -74,5 +74,5 @@
 	}
 	req = async_send_1(vfs_phone, VFS_MOUNT, dev_handle, NULL);
-	rc = ipc_data_write_send(vfs_phone, (void *)fs_name, strlen(fs_name));
+	rc = ipc_data_write_start(vfs_phone, (void *)fs_name, strlen(fs_name));
 	if (rc != EOK) {
 		async_wait_for(req, NULL);
@@ -81,5 +81,5 @@
 		return (int) rc;
 	}
-	rc = ipc_data_write_send(vfs_phone, (void *)mp, strlen(mp));
+	rc = ipc_data_write_start(vfs_phone, (void *)mp, strlen(mp));
 	if (rc != EOK) {
 		async_wait_for(req, NULL);
@@ -113,5 +113,5 @@
 	}
 	req = async_send_2(vfs_phone, VFS_OPEN, oflag, 0, &answer);
-	rc = ipc_data_write_send(vfs_phone, name, strlen(name));
+	rc = ipc_data_write_start(vfs_phone, name, strlen(name));
 	if (rc != EOK) {
 		async_wait_for(req, NULL);
@@ -144,5 +144,5 @@
 	}
 	req = async_send_1(vfs_phone, VFS_READ, fildes, &answer);
-	if (ipc_data_read_send(vfs_phone, (void *)buf, nbyte) != EOK) {
+	if (ipc_data_read_start(vfs_phone, (void *)buf, nbyte) != EOK) {
 		async_wait_for(req, NULL);
 		async_serialize_end();
@@ -174,5 +174,5 @@
 	}
 	req = async_send_1(vfs_phone, VFS_WRITE, fildes, &answer);
-	if (ipc_data_write_send(vfs_phone, (void *)buf, nbyte) != EOK) {
+	if (ipc_data_write_start(vfs_phone, (void *)buf, nbyte) != EOK) {
 		async_wait_for(req, NULL);
 		async_serialize_end();
Index: uspace/lib/libc/include/ipc/ipc.h
===================================================================
--- uspace/lib/libc/include/ipc/ipc.h	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/lib/libc/include/ipc/ipc.h	(revision 215e375440748700b8ba4a90595039cbbd76cf85)
@@ -264,28 +264,28 @@
 
 /*
- * User-friendly wrappers for ipc_share_in_send().
- */
-#define ipc_share_in_send_0_0(phoneid, dst, size) \
-    ipc_share_in_send((phoneid), (dst), (size), 0, NULL)
-#define ipc_share_in_send_0_1(phoneid, dst, size, flags) \
-    ipc_share_in_send((phoneid), (dst), (size), 0, (flags))
-#define ipc_share_in_send_1_0(phoneid, dst, size, arg) \
-    ipc_share_in_send((phoneid), (dst), (size), (arg), NULL)
-#define ipc_share_in_send_1_1(phoneid, dst, size, arg, flags) \
-    ipc_share_in_send((phoneid), (dst), (size), (arg), (flags))
-
-extern int ipc_share_in_send(int phoneid, void *dst, size_t size, ipcarg_t arg,
+ * User-friendly wrappers for ipc_share_in_start().
+ */
+#define ipc_share_in_start_0_0(phoneid, dst, size) \
+    ipc_share_in_start((phoneid), (dst), (size), 0, NULL)
+#define ipc_share_in_start_0_1(phoneid, dst, size, flags) \
+    ipc_share_in_start((phoneid), (dst), (size), 0, (flags))
+#define ipc_share_in_start_1_0(phoneid, dst, size, arg) \
+    ipc_share_in_start((phoneid), (dst), (size), (arg), NULL)
+#define ipc_share_in_start_1_1(phoneid, dst, size, arg, flags) \
+    ipc_share_in_start((phoneid), (dst), (size), (arg), (flags))
+
+extern int ipc_share_in_start(int phoneid, void *dst, size_t size, ipcarg_t arg,
     int *flags);
 extern int ipc_share_in_receive(ipc_callid_t *callid, size_t *size);
-extern int ipc_share_in_deliver(ipc_callid_t callid, void *src, int flags);
-extern int ipc_share_out_send(int phoneid, void *src, int flags);
+extern int ipc_share_in_finalize(ipc_callid_t callid, void *src, int flags);
+extern int ipc_share_out_start(int phoneid, void *src, int flags);
 extern int ipc_share_out_receive(ipc_callid_t *callid, size_t *size, int *flags);
-extern int ipc_share_out_deliver(ipc_callid_t callid, void *dst);
-extern int ipc_data_read_send(int phoneid, void *dst, size_t size);
+extern int ipc_share_out_finalize(ipc_callid_t callid, void *dst);
+extern int ipc_data_read_start(int phoneid, void *dst, size_t size);
 extern int ipc_data_read_receive(ipc_callid_t *callid, size_t *size);
-extern int ipc_data_read_deliver(ipc_callid_t callid, void *src, size_t size);
-extern int ipc_data_write_send(int phoneid, void *src, size_t size);
+extern int ipc_data_read_finalize(ipc_callid_t callid, void *src, size_t size);
+extern int ipc_data_write_start(int phoneid, void *src, size_t size);
 extern int ipc_data_write_receive(ipc_callid_t *callid, size_t *size);
-extern int ipc_data_write_deliver(ipc_callid_t callid, void *dst, size_t size);
+extern int ipc_data_write_finalize(ipc_callid_t callid, void *dst, size_t size);
 
 #endif
Index: uspace/lib/libfs/libfs.c
===================================================================
--- uspace/lib/libfs/libfs.c	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/lib/libfs/libfs.c	(revision 215e375440748700b8ba4a90595039cbbd76cf85)
@@ -72,5 +72,5 @@
 	 * Send our VFS info structure to VFS.
 	 */
-	int rc = ipc_data_write_send(vfs_phone, info, sizeof(*info)); 
+	int rc = ipc_data_write_start(vfs_phone, info, sizeof(*info)); 
 	if (rc != EOK) {
 		async_wait_for(req, NULL);
@@ -95,5 +95,5 @@
 	 * Request sharing the Path Lookup Buffer with VFS.
 	 */
-	rc = ipc_share_in_send_0_0(vfs_phone, reg->plb_ro, PLB_SIZE);
+	rc = ipc_share_in_start_0_0(vfs_phone, reg->plb_ro, PLB_SIZE);
 	if (rc) {
 		async_wait_for(req, NULL);
Index: uspace/srv/console/console.c
===================================================================
--- uspace/srv/console/console.c	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/srv/console/console.c	(revision 215e375440748700b8ba4a90595039cbbd76cf85)
@@ -538,5 +538,5 @@
 	    PROTO_READ | PROTO_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
 	if (!interbuffer) {
-		if (ipc_share_out_send(fb_info.phone, interbuffer,
+		if (ipc_share_out_start(fb_info.phone, interbuffer,
 		    AS_AREA_READ) != EOK) {
 			munmap(interbuffer,
Index: uspace/srv/console/gcons.c
===================================================================
--- uspace/srv/console/gcons.c	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/srv/console/gcons.c	(revision 215e375440748700b8ba4a90595039cbbd76cf85)
@@ -326,5 +326,5 @@
 	if (rc)
 		goto exit;
-	rc = ipc_share_out_send(fbphone, shm, PROTO_READ);
+	rc = ipc_share_out_start(fbphone, shm, PROTO_READ);
 	if (rc)
 		goto drop;
@@ -387,5 +387,5 @@
 	if (rc)
 		goto exit;
-	rc = ipc_share_out_send(fbphone, shm, PROTO_READ);
+	rc = ipc_share_out_start(fbphone, shm, PROTO_READ);
 	if (rc)
 		goto drop;
Index: uspace/srv/devmap/devmap.c
===================================================================
--- uspace/srv/devmap/devmap.c	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/srv/devmap/devmap.c	(revision 215e375440748700b8ba4a90595039cbbd76cf85)
@@ -234,5 +234,5 @@
 	 * Send confirmation to sender and get data into buffer.
 	 */
-	if (EOK != ipc_data_write_deliver(callid, driver->name, name_size)) {
+	if (EOK != ipc_data_write_finalize(callid, driver->name, name_size)) {
 		printf("Cannot read driver name.\n");
 		free(driver->name);
@@ -395,5 +395,5 @@
 	}
 	
-	ipc_data_write_deliver(callid, device->name, size);
+	ipc_data_write_finalize(callid, device->name, size);
 	device->name[size] = 0;
 
@@ -514,5 +514,6 @@
 	 * Send confirmation to sender and get data into buffer.
 	 */
-	if (EOK != (retval = ipc_data_write_deliver(callid, name, name_size))) {
+	if (EOK != (retval = ipc_data_write_finalize(callid, name,
+	    name_size))) {
 		ipc_answer_0(iid, EREFUSED);
 		return;
Index: uspace/srv/fs/tmpfs/tmpfs_ops.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision 215e375440748700b8ba4a90595039cbbd76cf85)
@@ -308,5 +308,5 @@
 
 	size_t bytes = max(0, min(dentry->size - pos, len));
-	(void) ipc_data_read_deliver(callid, dentry->data + pos, bytes);
+	(void) ipc_data_read_finalize(callid, dentry->data + pos, bytes);
 
 	/*
@@ -350,5 +350,5 @@
 	if (pos + len <= dentry->size) {
 		/* The file size is not changing. */
-		(void) ipc_data_write_deliver(callid, dentry->data + pos, len);
+		(void) ipc_data_write_finalize(callid, dentry->data + pos, len);
 		ipc_answer_1(rid, EOK, len);
 		return;
@@ -370,5 +370,5 @@
 	dentry->size += delta;
 	dentry->data = newdata;
-	(void) ipc_data_write_deliver(callid, dentry->data + pos, len);
+	(void) ipc_data_write_finalize(callid, dentry->data + pos, len);
 	ipc_answer_1(rid, EOK, len);
 }
Index: uspace/srv/rd/rd.c
===================================================================
--- uspace/srv/rd/rd.c	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/srv/rd/rd.c	(revision 215e375440748700b8ba4a90595039cbbd76cf85)
@@ -111,5 +111,5 @@
 			 * block.
 			 */
-			(void) ipc_share_out_deliver(callid, fs_va);
+			(void) ipc_share_out_finalize(callid, fs_va);
 		} else {
 			/*
Index: uspace/srv/vfs/vfs_mount.c
===================================================================
--- uspace/srv/vfs/vfs_mount.c	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/srv/vfs/vfs_mount.c	(revision 215e375440748700b8ba4a90595039cbbd76cf85)
@@ -107,5 +107,5 @@
 	 */
 	char fs_name[FS_NAME_MAXLEN + 1];
-	(void) ipc_data_write_deliver(callid, fs_name, size);
+	(void) ipc_data_write_finalize(callid, fs_name, size);
 	fs_name[size] = '\0';
 	
@@ -151,5 +151,5 @@
 	 * Deliver the mount point.
 	 */
-	(void) ipc_data_write_deliver(callid, buf, size);
+	(void) ipc_data_write_finalize(callid, buf, size);
 
 	/*
Index: uspace/srv/vfs/vfs_open.c
===================================================================
--- uspace/srv/vfs/vfs_open.c	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/srv/vfs/vfs_open.c	(revision 215e375440748700b8ba4a90595039cbbd76cf85)
@@ -83,5 +83,5 @@
 
 	int rc;
-	if ((rc = ipc_data_write_deliver(callid, path, size))) {
+	if ((rc = ipc_data_write_finalize(callid, path, size))) {
 		ipc_answer_0(rid, rc);
 		free(path);
Index: uspace/srv/vfs/vfs_register.c
===================================================================
--- uspace/srv/vfs/vfs_register.c	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/srv/vfs/vfs_register.c	(revision 215e375440748700b8ba4a90595039cbbd76cf85)
@@ -206,5 +206,5 @@
 	futex_initialize(&fs_info->phone_futex, 1);
 		
-	rc = ipc_data_write_deliver(callid, &fs_info->vfs_info, size);
+	rc = ipc_data_write_finalize(callid, &fs_info->vfs_info, size);
 	if (rc != EOK) {
 		dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",
@@ -300,5 +300,5 @@
 	 * Commit to read-only sharing the PLB with the client.
 	 */
-	(void) ipc_share_in_deliver(callid, plb,
+	(void) ipc_share_in_finalize(callid, plb,
 	    AS_AREA_READ | AS_AREA_CACHEABLE);