Index: kernel/generic/src/ipc/sysipc.c
===================================================================
--- kernel/generic/src/ipc/sysipc.c	(revision 3115355436bd3be893ea7ad92686758cb9124a41)
+++ kernel/generic/src/ipc/sysipc.c	(revision 752ccee70526f37f204304e646f75b26bdfe2b07)
@@ -113,6 +113,6 @@
 {
 	switch (method) {
-	case IPC_M_AS_AREA_SEND:
-	case IPC_M_AS_AREA_RECV:
+	case IPC_M_SHARE_OUT:
+	case IPC_M_SHARE_IN:
 	case IPC_M_DATA_WRITE:
 	case IPC_M_DATA_READ:
@@ -142,6 +142,6 @@
 	case IPC_M_CONNECT_TO_ME:
 	case IPC_M_CONNECT_ME_TO:
-	case IPC_M_AS_AREA_SEND:
-	case IPC_M_AS_AREA_RECV:
+	case IPC_M_SHARE_OUT:
+	case IPC_M_SHARE_IN:
 	case IPC_M_DATA_WRITE:
 	case IPC_M_DATA_READ:
@@ -200,5 +200,5 @@
 			    &TASK->answerbox);
 		}
-	} else if (IPC_GET_METHOD(*olddata) == IPC_M_AS_AREA_SEND) {
+	} else if (IPC_GET_METHOD(*olddata) == IPC_M_SHARE_OUT) {
 		if (!IPC_GET_RETVAL(answer->data)) {
 			/* Accepted, handle as_area receipt */
@@ -219,5 +219,5 @@
 			return rc;
 		}
-	} else if (IPC_GET_METHOD(*olddata) == IPC_M_AS_AREA_RECV) {
+	} else if (IPC_GET_METHOD(*olddata) == IPC_M_SHARE_IN) {
 		if (!IPC_GET_RETVAL(answer->data)) { 
 			ipl_t ipl;
@@ -314,5 +314,5 @@
 		call->priv = newphid;
 		break;
-	case IPC_M_AS_AREA_SEND:
+	case IPC_M_SHARE_OUT:
 		size = as_area_get_size(IPC_GET_ARG1(call->data));
 		if (!size)