Index: generic/src/ddi/ddi.c
===================================================================
--- generic/src/ddi/ddi.c	(revision c7c0b89b6e6a42abfe99e8cb5d3d5882ffdeac6e)
+++ generic/src/ddi/ddi.c	(revision f3ac6360053576f070c57d84c51335e1bed6f4e0)
@@ -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);
 }
-