Index: uspace/srv/devmap/devmap.c
===================================================================
--- uspace/srv/devmap/devmap.c	(revision 5c786d177c5354b44d4e3fa8f52182f680d515c1)
+++ uspace/srv/devmap/devmap.c	(revision 36d852c81b0cd5dc20eb486f72e3451ade4780a2)
@@ -203,5 +203,5 @@
 	 * Get driver name
 	 */
-	if (!ipc_data_receive(&callid, NULL, &name_size)) {
+	if (!ipc_data_write_receive(&callid, NULL, &name_size)) {
 		printf("Unexpected request.\n");
 		free(driver);
@@ -234,5 +234,5 @@
 	 * Send confirmation to sender and get data into buffer.
 	 */
-	if (EOK != ipc_data_deliver(callid, driver->name, name_size)) {
+	if (EOK != ipc_data_write_deliver(callid, driver->name, name_size)) {
 		printf("Cannot read driver name.\n");
 		free(driver->name);
@@ -369,5 +369,5 @@
 	
 	/* Get device name */
-	if (!ipc_data_receive(&callid, NULL, &size)) {
+	if (!ipc_data_write_receive(&callid, NULL, &size)) {
 		free(device);
 		printf("Cannot read device name.\n");
@@ -395,5 +395,5 @@
 	}
 	
-	ipc_data_deliver(callid, device->name, size);
+	ipc_data_write_deliver(callid, device->name, size);
 	device->name[size] = 0;
 
@@ -490,5 +490,5 @@
 	 * read the name itself until the buffer is allocated).
 	 */
-	if (!ipc_data_receive(&callid, NULL, &name_size)) {
+	if (!ipc_data_write_receive(&callid, NULL, &name_size)) {
 		ipc_answer_0(callid, EREFUSED);
 		ipc_answer_0(iid, EREFUSED);
@@ -514,5 +514,5 @@
 	 * Send confirmation to sender and get data into buffer.
 	 */
-	if (EOK != (retval = ipc_data_deliver(callid, name, name_size))) {
+	if (EOK != (retval = ipc_data_write_deliver(callid, name, name_size))) {
 		ipc_answer_0(iid, EREFUSED);
 		return;
@@ -567,5 +567,5 @@
 	sending must be initiated by client
 
-	int rc = ipc_data_send(phone, device->name, name_size); 
+	int rc = ipc_data_write_send(phone, device->name, name_size); 
 	if (rc != EOK) {
 		async_wait_for(req, NULL);
Index: uspace/srv/vfs/vfs_mount.c
===================================================================
--- uspace/srv/vfs/vfs_mount.c	(revision 5c786d177c5354b44d4e3fa8f52182f680d515c1)
+++ uspace/srv/vfs/vfs_mount.c	(revision 36d852c81b0cd5dc20eb486f72e3451ade4780a2)
@@ -87,5 +87,5 @@
 	 * system.
 	 */
-	if (!ipc_data_receive(&callid, NULL, &size)) {
+	if (!ipc_data_write_receive(&callid, NULL, &size)) {
 		ipc_answer_0(callid, EINVAL);
 		ipc_answer_0(rid, EINVAL);
@@ -107,5 +107,5 @@
 	 */
 	char fs_name[FS_NAME_MAXLEN + 1];
-	(void) ipc_data_deliver(callid, fs_name, size);
+	(void) ipc_data_write_deliver(callid, fs_name, size);
 	fs_name[size] = '\0';
 	
@@ -123,5 +123,5 @@
 	 * Now, we want the client to send us the mount point.
 	 */
-	if (!ipc_data_receive(&callid, NULL, &size)) {
+	if (!ipc_data_write_receive(&callid, NULL, &size)) {
 		ipc_answer_0(callid, EINVAL);
 		ipc_answer_0(rid, EINVAL);
@@ -151,5 +151,5 @@
 	 * Deliver the mount point.
 	 */
-	(void) ipc_data_deliver(callid, buf, size);
+	(void) ipc_data_write_deliver(callid, buf, size);
 
 	/*
Index: uspace/srv/vfs/vfs_open.c
===================================================================
--- uspace/srv/vfs/vfs_open.c	(revision 5c786d177c5354b44d4e3fa8f52182f680d515c1)
+++ uspace/srv/vfs/vfs_open.c	(revision 36d852c81b0cd5dc20eb486f72e3451ade4780a2)
@@ -62,5 +62,5 @@
 	ipc_callid_t callid;
 
-	if (!ipc_data_receive(&callid, NULL, &size)) {
+	if (!ipc_data_write_receive(&callid, NULL, &size)) {
 		ipc_answer_0(callid, EINVAL);
 		ipc_answer_0(rid, EINVAL);
@@ -83,5 +83,5 @@
 
 	int rc;
-	if ((rc = ipc_data_deliver(callid, path, size))) {
+	if ((rc = ipc_data_write_deliver(callid, path, size))) {
 		ipc_answer_0(rid, rc);
 		free(path);
Index: uspace/srv/vfs/vfs_register.c
===================================================================
--- uspace/srv/vfs/vfs_register.c	(revision 5c786d177c5354b44d4e3fa8f52182f680d515c1)
+++ uspace/srv/vfs/vfs_register.c	(revision 36d852c81b0cd5dc20eb486f72e3451ade4780a2)
@@ -165,5 +165,5 @@
 	 * VFS info structure from the client FS.
 	 */
-	if (!ipc_data_receive(&callid, NULL, &size)) {
+	if (!ipc_data_write_receive(&callid, NULL, &size)) {
 		/*
 		 * The client doesn't obey the same protocol as we do.
@@ -206,5 +206,5 @@
 	futex_initialize(&fs_info->phone_futex, 1);
 		
-	rc = ipc_data_deliver(callid, &fs_info->vfs_info, size);
+	rc = ipc_data_write_deliver(callid, &fs_info->vfs_info, size);
 	if (rc != EOK) {
 		dprintf("Failed to deliver the VFS info into our AS, rc=%d.\n",