Index: init/init.c
===================================================================
--- init/init.c	(revision cdafab15602712d479cd0b4f0e3c5d73005f5958)
+++ init/init.c	(revision d3b8c1f31bda0f5c4dd95a66e1efc302fb697726)
@@ -95,10 +95,10 @@
 {
 	printf("Writing to good memory\n");
-	mremap(&_heap, 120000, 0);
+	as_area_resize(&_heap, 120000, 0);
 	printf("%P\n", ((char *)&_heap));
 	printf("%P\n", ((char *)&_heap) + 80000);
 	*(((char *)&_heap) + 80000) = 10;
 	printf("Making small\n");
-	mremap(&_heap, 16000, 0);
+	as_area_resize(&_heap, 16000, 0);
 	printf("Failing..\n");
 	*((&_heap) + 80000) = 10;
@@ -306,5 +306,5 @@
 //	test_slam();
 	
-	printf("Userspace task, taskid=%llX\n", get_task_id());
+	printf("Userspace task, taskid=%llX\n", task_get_id());
 
 	futex_initialize(&ftx, 1);
Index: libc/generic/mmap.c
===================================================================
--- libc/generic/mmap.c	(revision cdafab15602712d479cd0b4f0e3c5d73005f5958)
+++ libc/generic/mmap.c	(revision d3b8c1f31bda0f5c4dd95a66e1efc302fb697726)
@@ -30,5 +30,5 @@
 #include <unistd.h>
 
-/** mmap syscall
+/** Create address space area.
  *
  * @param address Virtual address where to place new address space area.
@@ -38,10 +38,10 @@
  * @return address on success, (void *) -1 otherwise.
  */
-void *mmap(void *address, size_t size, int flags)
+void *as_area_create(void *address, size_t size, int flags)
 {
-	return (void *) __SYSCALL3(SYS_MMAP, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags);
+	return (void *) __SYSCALL3(SYS_AS_AREA_CREATE, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags);
 }
 
-/** mremap syscall
+/** Resize address space area.
  *
  * @param address Virtual address pointing into already existing address space area.
@@ -51,7 +51,7 @@
  * @return address on success, (void *) -1 otherwise.
  */
-void *mremap(void *address, size_t size, int flags)
+void *as_area_resize(void *address, size_t size, int flags)
 {
-	return (void *) __SYSCALL3(SYS_MREMAP, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags);
+	return (void *) __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t ) address, (sysarg_t) size, (sysarg_t) flags);
 }
 
@@ -79,5 +79,5 @@
 		return NULL;
 
-	res = mremap(&_heap, heapsize + incr,0);
+	res = as_area_resize(&_heap, heapsize + incr,0);
 	if (!res)
 		return NULL;
Index: libc/generic/task.c
===================================================================
--- libc/generic/task.c	(revision cdafab15602712d479cd0b4f0e3c5d73005f5958)
+++ libc/generic/task.c	(revision d3b8c1f31bda0f5c4dd95a66e1efc302fb697726)
@@ -30,9 +30,9 @@
 #include <libc.h>
 
-task_id_t get_task_id(void)
+task_id_t task_get_id(void)
 {
 	task_id_t task_id;
 
-	(void) __SYSCALL1(SYS_GET_TASK_ID, (sysarg_t) &task_id);
+	(void) __SYSCALL1(SYS_TASK_GET_ID, (sysarg_t) &task_id);
 
 	return task_id;
Index: libc/include/task.h
===================================================================
--- libc/include/task.h	(revision cdafab15602712d479cd0b4f0e3c5d73005f5958)
+++ libc/include/task.h	(revision d3b8c1f31bda0f5c4dd95a66e1efc302fb697726)
@@ -34,5 +34,5 @@
 typedef uint64_t task_id_t;
 
-extern task_id_t get_task_id(void);
+extern task_id_t task_get_id(void);
 
 #endif
Index: libc/include/unistd.h
===================================================================
--- libc/include/unistd.h	(revision cdafab15602712d479cd0b4f0e3c5d73005f5958)
+++ libc/include/unistd.h	(revision d3b8c1f31bda0f5c4dd95a66e1efc302fb697726)
@@ -38,6 +38,6 @@
 extern ssize_t write(int fd, const void * buf, size_t count);
 extern void _exit(int status);
-void *mmap(void *address, size_t size, int flags);
-void *mremap(void *address, size_t size, int flags);
+void *as_area_create(void *address, size_t size, int flags);
+void *as_area_resize(void *address, size_t size, int flags);
 void *sbrk(ssize_t incr);