Index: arch/amd64/src/ddi/ddi.c
===================================================================
--- arch/amd64/src/ddi/ddi.c	(revision 1f41004e9a0a9a316de7e3cbe422a0eba21f4946)
+++ arch/amd64/src/ddi/ddi.c	(revision 24f3874a4a82af6978a92f03e6b9dee9674ab008)
@@ -47,5 +47,5 @@
  * @return 0 on success or an error code from errno.h.
  */
-int ddi_enable_iospace_arch(task_t *task, __address ioaddr, size_t size)
+int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size)
 {
 	count_t bits;
Index: arch/ia32/src/ddi/ddi.c
===================================================================
--- arch/ia32/src/ddi/ddi.c	(revision 1f41004e9a0a9a316de7e3cbe422a0eba21f4946)
+++ arch/ia32/src/ddi/ddi.c	(revision 24f3874a4a82af6978a92f03e6b9dee9674ab008)
@@ -47,5 +47,5 @@
  * @return 0 on success or an error code from errno.h.
  */
-int ddi_enable_iospace_arch(task_t *task, __address ioaddr, size_t size)
+int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size)
 {
 	count_t bits;
Index: arch/ia64/src/ddi/ddi.c
===================================================================
--- arch/ia64/src/ddi/ddi.c	(revision 1f41004e9a0a9a316de7e3cbe422a0eba21f4946)
+++ arch/ia64/src/ddi/ddi.c	(revision 24f3874a4a82af6978a92f03e6b9dee9674ab008)
@@ -42,5 +42,5 @@
  * @return 0 on success or an error code from errno.h.
  */
-int ddi_enable_iospace_arch(task_t *task, __address ioaddr, size_t size)
+int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size)
 {
 	return 0;
Index: arch/mips32/src/ddi/ddi.c
===================================================================
--- arch/mips32/src/ddi/ddi.c	(revision 1f41004e9a0a9a316de7e3cbe422a0eba21f4946)
+++ arch/mips32/src/ddi/ddi.c	(revision 24f3874a4a82af6978a92f03e6b9dee9674ab008)
@@ -45,5 +45,5 @@
  * @return 0 on success or an error code from errno.h.
  */
-int ddi_enable_iospace_arch(task_t *task, __address ioaddr, size_t size)
+int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size)
 {
 	return 0;
Index: arch/ppc32/src/ddi/ddi.c
===================================================================
--- arch/ppc32/src/ddi/ddi.c	(revision 1f41004e9a0a9a316de7e3cbe422a0eba21f4946)
+++ arch/ppc32/src/ddi/ddi.c	(revision 24f3874a4a82af6978a92f03e6b9dee9674ab008)
@@ -42,5 +42,5 @@
  * @return 0 on success or an error code from errno.h.
  */
-int ddi_enable_iospace_arch(task_t *task, __address ioaddr, size_t size)
+int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size)
 {
 	return 0;
Index: arch/ppc64/src/ddi/ddi.c
===================================================================
--- arch/ppc64/src/ddi/ddi.c	(revision 1f41004e9a0a9a316de7e3cbe422a0eba21f4946)
+++ arch/ppc64/src/ddi/ddi.c	(revision 24f3874a4a82af6978a92f03e6b9dee9674ab008)
@@ -42,5 +42,5 @@
  * @return 0 on success or an error code from errno.h.
  */
-int ddi_enable_iospace_arch(task_t *task, __address ioaddr, size_t size)
+int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size)
 {
 	return 0;
Index: arch/sparc64/src/ddi/ddi.c
===================================================================
--- arch/sparc64/src/ddi/ddi.c	(revision 1f41004e9a0a9a316de7e3cbe422a0eba21f4946)
+++ arch/sparc64/src/ddi/ddi.c	(revision 24f3874a4a82af6978a92f03e6b9dee9674ab008)
@@ -42,5 +42,5 @@
  * @return 0 on success or an error code from errno.h.
  */
-int ddi_enable_iospace_arch(task_t *task, __address ioaddr, size_t size)
+int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size)
 {
 	return 0;
Index: generic/include/ddi/ddi.h
===================================================================
--- generic/include/ddi/ddi.h	(revision 1f41004e9a0a9a316de7e3cbe422a0eba21f4946)
+++ generic/include/ddi/ddi.h	(revision 24f3874a4a82af6978a92f03e6b9dee9674ab008)
@@ -34,6 +34,6 @@
 #include <typedefs.h>
 
-extern __native sys_map_physmem(ddi_memarg_t *uspace_mem_arg);
-extern __native sys_enable_iospace(ddi_ioarg_t *uspace_io_arg);
+extern __native sys_physmem_map(ddi_memarg_t *uspace_mem_arg);
+extern __native sys_iospace_enable(ddi_ioarg_t *uspace_io_arg);
 
 /*
@@ -42,5 +42,5 @@
 extern __native ddi_int_control_arch(__native enable, __native *flags);
 extern __native ddi_int_control(__native enable, __native *flags);
-extern int ddi_enable_iospace_arch(task_t *task, __address ioaddr, size_t size);
+extern int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size);
 
 #endif
Index: generic/include/mm/as.h
===================================================================
--- generic/include/mm/as.h	(revision 1f41004e9a0a9a316de7e3cbe422a0eba21f4946)
+++ generic/include/mm/as.h	(revision 24f3874a4a82af6978a92f03e6b9dee9674ab008)
@@ -113,5 +113,5 @@
 extern as_t *as_create(int flags);
 extern as_area_t *as_area_create(as_t *as, int flags, size_t size, __address base);
-extern __address as_remap(as_t *as, __address address, size_t size, int flags);
+extern __address as_area_resize(as_t *as, __address address, size_t size, int flags);
 extern void as_set_mapping(as_t *as, __address page, __address frame);
 extern int as_page_fault(__address page);
Index: generic/include/proc/task.h
===================================================================
--- generic/include/proc/task.h	(revision 1f41004e9a0a9a316de7e3cbe422a0eba21f4946)
+++ generic/include/proc/task.h	(revision 24f3874a4a82af6978a92f03e6b9dee9674ab008)
@@ -68,5 +68,5 @@
 #endif
 
-extern __native sys_get_task_id(task_id_t *uspace_task_id);
+extern __native sys_task_get_id(task_id_t *uspace_task_id);
 
 #endif
Index: generic/include/syscall/syscall.h
===================================================================
--- generic/include/syscall/syscall.h	(revision 1f41004e9a0a9a316de7e3cbe422a0eba21f4946)
+++ generic/include/syscall/syscall.h	(revision 24f3874a4a82af6978a92f03e6b9dee9674ab008)
@@ -36,9 +36,11 @@
 	SYS_THREAD_CREATE,
 	SYS_THREAD_EXIT,
+	SYS_TASK_GET_ID,
 	SYS_FUTEX_SLEEP,
 	SYS_FUTEX_WAKEUP,
-	SYS_MMAP,
-	SYS_MREMAP,
-	SYS_GET_TASK_ID,
+	SYS_AS_AREA_CREATE,
+	SYS_AS_AREA_RESIZE,
+	SYS_AS_AREA_SHARE_APPROVE,
+	SYS_AS_AREA_SHARE_PERFORM,
 	SYS_IPC_CALL_SYNC_FAST,
 	SYS_IPC_CALL_SYNC,
Index: generic/src/ddi/ddi.c
===================================================================
--- generic/src/ddi/ddi.c	(revision 1f41004e9a0a9a316de7e3cbe422a0eba21f4946)
+++ generic/src/ddi/ddi.c	(revision 24f3874a4a82af6978a92f03e6b9dee9674ab008)
@@ -51,5 +51,5 @@
  *	   there was a problem in creating address space area.
  */
-static int ddi_map_physmem(task_id_t id, __address pf, __address vp, count_t pages, bool writable)
+static int ddi_physmem_map(task_id_t id, __address pf, __address vp, count_t pages, bool writable)
 {
 	ipl_t ipl;
@@ -121,5 +121,5 @@
  *	   ENOENT if there is no task matching the specified ID.
  */
-static int ddi_enable_iospace(task_id_t id, __address ioaddr, size_t size)
+static int ddi_iospace_enable(task_id_t id, __address ioaddr, size_t size)
 {
 	ipl_t ipl;
@@ -159,5 +159,5 @@
 	spinlock_unlock(&tasks_lock);
 
-	rc = ddi_enable_iospace_arch(t, ioaddr, size);
+	rc = ddi_iospace_enable_arch(t, ioaddr, size);
 	
 	spinlock_unlock(&t->lock);
@@ -172,10 +172,10 @@
  * @return 0 on success, otherwise it returns error code found in errno.h
  */ 
-__native sys_map_physmem(ddi_memarg_t *uspace_mem_arg)
+__native sys_physmem_map(ddi_memarg_t *uspace_mem_arg)
 {
 	ddi_memarg_t arg;
 	
 	copy_from_uspace(&arg, uspace_mem_arg, sizeof(ddi_memarg_t));
-	return (__native) ddi_map_physmem((task_id_t) arg.task_id, ALIGN_DOWN((__address) arg.phys_base, FRAME_SIZE),
+	return (__native) ddi_physmem_map((task_id_t) arg.task_id, ALIGN_DOWN((__address) arg.phys_base, FRAME_SIZE),
 					  ALIGN_DOWN((__address) arg.virt_base, PAGE_SIZE), (count_t) arg.pages,
 					  (bool) arg.writable);
@@ -188,10 +188,10 @@
  * @return 0 on success, otherwise it returns error code found in errno.h
  */ 
-__native sys_enable_iospace(ddi_ioarg_t *uspace_io_arg)
+__native sys_iospace_enable(ddi_ioarg_t *uspace_io_arg)
 {
 	ddi_ioarg_t arg;
 	
 	copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t));
-	return (__native) ddi_enable_iospace((task_id_t) arg.task_id, (__address) arg.ioaddr, (size_t) arg.size);
+	return (__native) ddi_iospace_enable((task_id_t) arg.task_id, (__address) arg.ioaddr, (size_t) arg.size);
 }
 
@@ -202,3 +202,2 @@
 	return ddi_int_control_arch(enable, flags);
 }
-
Index: generic/src/mm/as.c
===================================================================
--- generic/src/mm/as.c	(revision 1f41004e9a0a9a316de7e3cbe422a0eba21f4946)
+++ generic/src/mm/as.c	(revision 24f3874a4a82af6978a92f03e6b9dee9674ab008)
@@ -431,5 +431,5 @@
  * @return address on success, (__address) -1 otherwise.
  */ 
-__address as_remap(as_t *as, __address address, size_t size, int flags)
+__address as_area_resize(as_t *as, __address address, size_t size, int flags)
 {
 	as_area_t *area = NULL;
Index: generic/src/proc/task.c
===================================================================
--- generic/src/proc/task.c	(revision 1f41004e9a0a9a316de7e3cbe422a0eba21f4946)
+++ generic/src/proc/task.c	(revision 24f3874a4a82af6978a92f03e6b9dee9674ab008)
@@ -164,5 +164,5 @@
  * @return Always returns 0.
  */
-__native sys_get_task_id(task_id_t *uspace_task_id)
+__native sys_task_get_id(task_id_t *uspace_task_id)
 {
 	/*
Index: generic/src/syscall/syscall.c
===================================================================
--- generic/src/syscall/syscall.c	(revision 1f41004e9a0a9a316de7e3cbe422a0eba21f4946)
+++ generic/src/syscall/syscall.c	(revision 24f3874a4a82af6978a92f03e6b9dee9674ab008)
@@ -52,5 +52,5 @@
 }
 
-static __native sys_mmap(void *address, size_t size, int flags)
+static __native sys_as_area_create(void *address, size_t size, int flags)
 {
 	if (as_area_create(AS, flags, size, (__address) address))
@@ -60,7 +60,17 @@
 }
 
-static __native sys_mremap(void *address, size_t size, int flags)
+static __native sys_as_area_resize(void *address, size_t size, int flags)
 {
-	return as_remap(AS, (__address) address, size, 0);
+	return as_area_resize(AS, (__address) address, size, 0);
+}
+
+static __native sys_as_area_share_approve()
+{
+	return 0;
+}
+
+static __native sys_as_area_share_perform()
+{
+	return 0;
 }
 
@@ -86,9 +96,11 @@
 	sys_thread_create,
 	sys_thread_exit,
+	sys_task_get_id,
 	sys_futex_sleep_timeout,
 	sys_futex_wakeup,
-	sys_mmap,
-	sys_mremap,
-	sys_get_task_id,
+	sys_as_area_create,
+	sys_as_area_resize,
+	sys_as_area_share_approve,
+	sys_as_area_share_perform,
 	sys_ipc_call_sync_fast,
 	sys_ipc_call_sync,
@@ -100,5 +112,5 @@
 	sys_ipc_wait_for_call,
 	sys_ipc_hangup,
-	sys_map_physmem,
-	sys_enable_iospace
+	sys_physmem_map,
+	sys_iospace_enable
 };