Index: uspace/lib/c/generic/ddi.c
===================================================================
--- uspace/lib/c/generic/ddi.c	(revision 8708be3b71f810c397b5d8fe39f63d6cff6f86fe)
+++ uspace/lib/c/generic/ddi.c	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -176,7 +176,7 @@
  *
  */
-int register_irq(int inr, int devno, int method, irq_code_t *ucode)
+int irq_register(int inr, int devno, int method, irq_code_t *ucode)
 {
-	return __SYSCALL4(SYS_REGISTER_IRQ, inr, devno, method,
+	return __SYSCALL4(SYS_IRQ_REGISTER, inr, devno, method,
 	    (sysarg_t) ucode);
 }
@@ -190,7 +190,7 @@
  *
  */
-int unregister_irq(int inr, int devno)
+int irq_unregister(int inr, int devno)
 {
-	return __SYSCALL2(SYS_UNREGISTER_IRQ, inr, devno);
+	return __SYSCALL2(SYS_IRQ_UNREGISTER, inr, devno);
 }
 
Index: uspace/lib/c/include/ddi.h
===================================================================
--- uspace/lib/c/include/ddi.h	(revision 8708be3b71f810c397b5d8fe39f63d6cff6f86fe)
+++ uspace/lib/c/include/ddi.h	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -53,6 +53,6 @@
 extern int pio_enable(void *, size_t, void **);
 
-extern int register_irq(int, int, int, irq_code_t *);
-extern int unregister_irq(int, int);
+extern int irq_register(int, int, int, irq_code_t *);
+extern int irq_unregister(int, int);
 
 #endif
Index: uspace/lib/drv/generic/driver.c
===================================================================
--- uspace/lib/drv/generic/driver.c	(revision 8708be3b71f810c397b5d8fe39f63d6cff6f86fe)
+++ uspace/lib/drv/generic/driver.c	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -198,5 +198,5 @@
 		pseudocode = &default_pseudocode;
 	
-	int res = register_irq(irq, dev->handle, ctx->id, pseudocode);
+	int res = irq_register(irq, dev->handle, ctx->id, pseudocode);
 	if (res != EOK) {
 		remove_interrupt_context(&interrupt_contexts, ctx);
@@ -211,5 +211,5 @@
 	interrupt_context_t *ctx = find_interrupt_context(&interrupt_contexts,
 	    dev, irq);
-	int res = unregister_irq(irq, dev->handle);
+	int res = irq_unregister(irq, dev->handle);
 	
 	if (ctx != NULL) {