Index: uspace/lib/libc/generic/ipc.c
===================================================================
--- uspace/lib/libc/generic/ipc.c	(revision 27d293a00b593b6f5a44432241d1ea84ac4ad4e1)
+++ uspace/lib/libc/generic/ipc.c	(revision f57f8ea58fde79450cfca65fd2c8f15643d3fb1c)
@@ -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 f57f8ea58fde79450cfca65fd2c8f15643d3fb1c)
@@ -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 f57f8ea58fde79450cfca65fd2c8f15643d3fb1c)
@@ -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 f57f8ea58fde79450cfca65fd2c8f15643d3fb1c)
@@ -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
