diff --git a/src/kernel/libroot/os/area.c b/src/kernel/libroot/os/area.c
index a4c83ad7b9..bb28838a91 100644
--- a/src/kernel/libroot/os/area.c
+++ b/src/kernel/libroot/os/area.c
@@ -17,26 +17,24 @@ create_area(const char *name, void **address, uint32 addressSpec, size_t size,
 
 
 area_id
-clone_area(const char *name, void **dest_addr, uint32 addr_spec,
-	uint32 protection, area_id source)
+clone_area(const char *name, void **address, uint32 addressSpec,
+	uint32 protection, area_id sourceArea)
 {
-	// ToDo: Not 100% sure about the REGION_PRIVATE_MAP
-	return sys_vm_clone_region(name, dest_addr, addr_spec, source, REGION_PRIVATE_MAP, protection);
+	return _kern_clone_area(name, address, addressSpec, protection, sourceArea);
 }
 
 
 area_id
 find_area(const char *name)
 {
-	return sys_find_region_by_name(name);
+	return _kern_find_area(name);
 }
 
 
 area_id
-area_for(void *addr)
+area_for(void *address)
 {
-	// ToDo: implement area_for()
-	return B_ERROR;
+	return _kern_area_for(address);
 }
 
 
@@ -50,16 +48,14 @@ delete_area(area_id id)
 status_t
 resize_area(area_id id, size_t newSize)
 {
-	// ToDo: implement resize_area()
-	return B_ERROR;
+	return _kern_resize_area(id, newSize);
 }
 
 
 status_t
 set_area_protection(area_id id, uint32 protection)
 {
-	// ToDo: implement set_area_protection()
-	return B_ERROR;
+	return _kern_set_area_protection(id, protection);
 }
 
 
@@ -69,17 +65,16 @@ _get_area_info(area_id id, area_info *areaInfo, size_t size)
 	// size is not yet used, but may, if area_info changes
 	(void)size;
 
-	return sys_vm_get_region_info(id, (void *)areaInfo);
+	return _kern_get_area_info(id, areaInfo);
 }
 
 
 status_t
-_get_next_area_info(team_id team, int32 *cookie, area_info *ainfo, size_t size)
+_get_next_area_info(team_id team, int32 *cookie, area_info *areaInfo, size_t size)
 {
 	// size is not yet used, but may, if area_info changes
 	(void)size;
 
-	// ToDo: implement _get_next_area_info()
-	return B_ERROR;
+	return _kern_get_next_area_info(team, cookie, areaInfo);
 }
 
diff --git a/src/kernel/libroot/os/syscalls.S b/src/kernel/libroot/os/syscalls.S
index fa9beab8f7..2711325b8b 100644
--- a/src/kernel/libroot/os/syscalls.S
+++ b/src/kernel/libroot/os/syscalls.S
@@ -110,6 +110,8 @@ SYSCALL2(sys_get_thread_info, 88)
 SYSCALL3(sys_get_next_thread_info, 89)
 SYSCALL2(sys_get_team_info, 90)
 SYSCALL2(sys_get_next_team_info, 91)
+SYSCALL1(sys_kill_team, 39)
+SYSCALL0(sys_get_current_team_id, 40)
 
 /* image calls */
 SYSCALL2(sys_register_image, 114)
@@ -124,13 +126,15 @@ SYSCALL2(sys_stop_notifying, 120)
 
 /* VM calls */
 SYSCALL6(_kern_create_area, 29)
-SYSCALL6(sys_vm_clone_region, 30)
+SYSCALL5(_kern_clone_area, 30)
 SYSCALL9(sys_vm_map_file, 31)
 SYSCALL1(_kern_delete_area, 32)
-SYSCALL2(sys_vm_get_region_info, 33)
-SYSCALL1(sys_find_region_by_name, 34)
-SYSCALL1(sys_kill_team, 39)
-SYSCALL0(sys_get_current_team_id, 40)
+SYSCALL2(_kern_get_area_info, 33)
+SYSCALL1(_kern_find_area, 34)
+SYSCALL3(_kern_get_next_area_info, 122)
+SYSCALL2(_kern_set_area_protection, 123)
+SYSCALL2(_kern_resize_area, 124)
+SYSCALL1(_kern_area_for, 125)
 
 /* port syscalls */
 SYSCALL2(sys_port_create, 43)