Index: kernel/generic/include/ddi/ddi_arg.h
===================================================================
--- kernel/generic/include/ddi/ddi_arg.h	(revision d17820854e406c9977513db9625c4799425e911c)
+++ kernel/generic/include/ddi/ddi_arg.h	(revision 5a8b2a2e58c0aff599e30b00eed3a773ff644968)
@@ -36,5 +36,5 @@
 #define KERN_DDI_ARG_H_
 
-/** Structure encapsulating arguments for SYS_MAP_PHYSMEM syscall. */
+/** Structure encapsulating arguments for SYS_PHYSMEM_MAP syscall. */
 typedef struct {
 	unsigned long long task_id;	/** ID of the destination task. */
Index: kernel/generic/include/syscall/syscall.h
===================================================================
--- kernel/generic/include/syscall/syscall.h	(revision d17820854e406c9977513db9625c4799425e911c)
+++ kernel/generic/include/syscall/syscall.h	(revision 5a8b2a2e58c0aff599e30b00eed3a773ff644968)
@@ -60,5 +60,5 @@
 	SYS_CAP_GRANT,
 	SYS_CAP_REVOKE,
-	SYS_MAP_PHYSMEM,
+	SYS_PHYSMEM_MAP,
 	SYS_IOSPACE_ENABLE,
 	SYS_PREEMPT_CONTROL,
Index: kernel/generic/src/ddi/ddi.c
===================================================================
--- kernel/generic/src/ddi/ddi.c	(revision d17820854e406c9977513db9625c4799425e911c)
+++ kernel/generic/src/ddi/ddi.c	(revision 5a8b2a2e58c0aff599e30b00eed3a773ff644968)
@@ -152,5 +152,5 @@
 }
 
-/** Wrapper for SYS_MAP_PHYSMEM syscall.
+/** Wrapper for SYS_PHYSMEM_MAP syscall.
  *
  * @param phys_base Physical base address to map
Index: uspace/fb/ega.c
===================================================================
--- uspace/fb/ega.c	(revision d17820854e406c9977513db9625c4799425e911c)
+++ uspace/fb/ega.c	(revision 5a8b2a2e58c0aff599e30b00eed3a773ff644968)
@@ -314,5 +314,5 @@
 	scr_addr = as_get_mappable_page(sz);
 
-	map_physmem(ega_ph_addr, scr_addr, ALIGN_UP(sz,PAGE_SIZE)>>PAGE_WIDTH,
+	physmem_map(ega_ph_addr, scr_addr, ALIGN_UP(sz, PAGE_SIZE) >> PAGE_WIDTH,
 		    AS_AREA_READ | AS_AREA_WRITE);
 
Index: uspace/fb/fb.c
===================================================================
--- uspace/fb/fb.c	(revision d17820854e406c9977513db9625c4799425e911c)
+++ uspace/fb/fb.c	(revision 5a8b2a2e58c0aff599e30b00eed3a773ff644968)
@@ -1285,5 +1285,5 @@
 	fb_addr = as_get_mappable_page(asz);
 	
-	map_physmem(fb_ph_addr, fb_addr, ALIGN_UP(asz, PAGE_SIZE) >> PAGE_WIDTH,
+	physmem_map(fb_ph_addr, fb_addr, ALIGN_UP(asz, PAGE_SIZE) >> PAGE_WIDTH,
 		    AS_AREA_READ | AS_AREA_WRITE);
 
Index: uspace/libc/generic/ddi.c
===================================================================
--- uspace/libc/generic/ddi.c	(revision d17820854e406c9977513db9625c4799425e911c)
+++ uspace/libc/generic/ddi.c	(revision 5a8b2a2e58c0aff599e30b00eed3a773ff644968)
@@ -51,7 +51,7 @@
  *	   was some problem in creating address space area.
  */
-int map_physmem(void *pf, void *vp, unsigned long pages, int flags)
+int physmem_map(void *pf, void *vp, unsigned long pages, int flags)
 {
-	return __SYSCALL4(SYS_MAP_PHYSMEM, (sysarg_t) pf, (sysarg_t) vp, pages, flags);
+	return __SYSCALL4(SYS_PHYSMEM_MAP, (sysarg_t) pf, (sysarg_t) vp, pages, flags);
 }
 
Index: uspace/libc/include/ddi.h
===================================================================
--- uspace/libc/include/ddi.h	(revision d17820854e406c9977513db9625c4799425e911c)
+++ uspace/libc/include/ddi.h	(revision 5a8b2a2e58c0aff599e30b00eed3a773ff644968)
@@ -38,5 +38,5 @@
 #include <task.h>
 
-extern int map_physmem(void *pf, void *vp, unsigned long pages, int flags);
+extern int physmem_map(void *pf, void *vp, unsigned long pages, int flags);
 extern int iospace_enable(task_id_t id, void *ioaddr, unsigned long size);
 extern int preemption_control(int enable);
Index: uspace/ns/ns.c
===================================================================
--- uspace/ns/ns.c	(revision d17820854e406c9977513db9625c4799425e911c)
+++ uspace/ns/ns.c	(revision 5a8b2a2e58c0aff599e30b00eed3a773ff644968)
@@ -95,7 +95,7 @@
 		}
 		*addr = as_get_mappable_page(PAGE_SIZE);
-		map_physmem(ph_addr, *addr, 1, AS_AREA_READ | AS_AREA_CACHEABLE);
-	}
-	ipc_answer_fast(callid, 0, (ipcarg_t)*addr, AS_AREA_READ);
+		physmem_map(ph_addr, *addr, 1, AS_AREA_READ | AS_AREA_CACHEABLE);
+	}
+	ipc_answer_fast(callid, 0, (ipcarg_t) *addr, AS_AREA_READ);
 }
 
Index: uspace/rd/rd.c
===================================================================
--- uspace/rd/rd.c	(revision d17820854e406c9977513db9625c4799425e911c)
+++ uspace/rd/rd.c	(revision 5a8b2a2e58c0aff599e30b00eed3a773ff644968)
@@ -80,5 +80,5 @@
 	void * rd_addr = as_get_mappable_page(rd_size);
 	
-	map_physmem(rd_ph_addr, rd_addr, ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
+	physmem_map(rd_ph_addr, rd_addr, ALIGN_UP(rd_size, PAGE_SIZE) >> PAGE_WIDTH, AS_AREA_READ | AS_AREA_WRITE);
 	
 	return true;