Index: abi/include/syscall.h
===================================================================
--- abi/include/syscall.h	(revision 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ abi/include/syscall.h	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -88,6 +88,6 @@
 	SYS_DMAMEM_UNMAP,
 	SYS_IOSPACE_ENABLE,
-	SYS_REGISTER_IRQ,
-	SYS_UNREGISTER_IRQ,
+	SYS_IRQ_REGISTER,
+	SYS_IRQ_UNREGISTER,
 	
 	SYS_SYSINFO_GET_VAL_TYPE,
Index: kernel/generic/include/ipc/sysipc.h
===================================================================
--- kernel/generic/include/ipc/sysipc.h	(revision 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ kernel/generic/include/ipc/sysipc.h	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -56,6 +56,6 @@
     unsigned int);
 extern sysarg_t sys_ipc_hangup(sysarg_t);
-extern sysarg_t sys_register_irq(inr_t, devno_t, sysarg_t, irq_code_t *);
-extern sysarg_t sys_unregister_irq(inr_t, devno_t);
+extern sysarg_t sys_irq_register(inr_t, devno_t, sysarg_t, irq_code_t *);
+extern sysarg_t sys_irq_unregister(inr_t, devno_t);
 
 #ifdef __32_BITS__
Index: kernel/generic/src/ipc/sysipc.c
===================================================================
--- kernel/generic/src/ipc/sysipc.c	(revision 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ kernel/generic/src/ipc/sysipc.c	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -1185,5 +1185,5 @@
  *
  */
-sysarg_t sys_register_irq(inr_t inr, devno_t devno, sysarg_t imethod,
+sysarg_t sys_irq_register(inr_t inr, devno_t devno, sysarg_t imethod,
     irq_code_t *ucode)
 {
@@ -1202,5 +1202,5 @@
  *
  */
-sysarg_t sys_unregister_irq(inr_t inr, devno_t devno)
+sysarg_t sys_irq_unregister(inr_t inr, devno_t devno)
 {
 	if (!(cap_get(TASK) & CAP_IRQ_REG))
Index: kernel/generic/src/syscall/syscall.c
===================================================================
--- kernel/generic/src/syscall/syscall.c	(revision 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ kernel/generic/src/syscall/syscall.c	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -179,6 +179,6 @@
 	(syshandler_t) sys_dmamem_unmap,
 	(syshandler_t) sys_iospace_enable,
-	(syshandler_t) sys_register_irq,
-	(syshandler_t) sys_unregister_irq,
+	(syshandler_t) sys_irq_register,
+	(syshandler_t) sys_irq_unregister,
 	
 	/* Sysinfo syscalls. */
Index: uspace/app/trace/syscalls.c
===================================================================
--- uspace/app/trace/syscalls.c	(revision 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ uspace/app/trace/syscalls.c	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -72,6 +72,6 @@
     [SYS_PHYSMEM_MAP] = { "physmem_map",		4,	V_ERRNO },
     [SYS_IOSPACE_ENABLE] = { "iospace_enable",		1,	V_ERRNO },
-    [SYS_REGISTER_IRQ] = { "register_irq",	4,	V_ERRNO },
-    [SYS_UNREGISTER_IRQ] = { "unregister_irq",	2,	V_ERRNO },
+    [SYS_IRQ_REGISTER] = { "irq_register",	4,	V_ERRNO },
+    [SYS_IRQ_UNREGISTER] = { "irq_unregister",	2,	V_ERRNO },
 
     [SYS_SYSINFO_GET_VAL_TYPE] = { "sysinfo_get_val_type",		2,	V_INTEGER },
Index: uspace/lib/c/generic/ddi.c
===================================================================
--- uspace/lib/c/generic/ddi.c	(revision 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ 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 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ 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 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ 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) {
Index: uspace/srv/hid/input/port/gxemul.c
===================================================================
--- uspace/srv/hid/input/port/gxemul.c	(revision 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ uspace/srv/hid/input/port/gxemul.c	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -90,5 +90,5 @@
 	async_set_interrupt_received(gxemul_irq_handler);
 	gxemul_cmds[0].addr = (void *) addr;
-	register_irq(inr, device_assign_devno(), 0, &gxemul_kbd);
+	irq_register(inr, device_assign_devno(), 0, &gxemul_kbd);
 	return 0;
 }
Index: uspace/srv/hid/input/port/msim.c
===================================================================
--- uspace/srv/hid/input/port/msim.c	(revision 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ uspace/srv/hid/input/port/msim.c	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -89,5 +89,5 @@
 	msim_cmds[0].addr = (void *) vaddr;
 	async_set_interrupt_received(msim_irq_handler);
-	register_irq(inr, device_assign_devno(), 0, &msim_kbd);
+	irq_register(inr, device_assign_devno(), 0, &msim_kbd);
 	
 	return 0;
Index: uspace/srv/hid/input/port/ns16550.c
===================================================================
--- uspace/srv/hid/input/port/ns16550.c	(revision 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ uspace/srv/hid/input/port/ns16550.c	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -135,5 +135,5 @@
 	
 	async_set_interrupt_received(ns16550_irq_handler);
-	register_irq(inr, device_assign_devno(), inr, &ns16550_kbd);
+	irq_register(inr, device_assign_devno(), inr, &ns16550_kbd);
 	
 	return pio_enable((void *) ns16550_physical, 8, &vaddr);
Index: uspace/srv/hid/input/port/pl050.c
===================================================================
--- uspace/srv/hid/input/port/pl050.c	(revision 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ uspace/srv/hid/input/port/pl050.c	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -117,5 +117,5 @@
 	
 	async_set_interrupt_received(pl050_irq_handler);
-	register_irq(inr, device_assign_devno(), 0, &pl050_kbd);
+	irq_register(inr, device_assign_devno(), 0, &pl050_kbd);
 	
 	return 0;
Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c
===================================================================
--- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -139,5 +139,5 @@
 
 	async_set_interrupt_received(s3c24xx_ts_irq_handler);
-	register_irq(inr, device_assign_devno(), 0, &ts_irq_code);
+	irq_register(inr, device_assign_devno(), 0, &ts_irq_code);
 
 	s3c24xx_ts_wait_for_int_mode(ts, updn_down);
Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.c
===================================================================
--- uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -275,5 +275,5 @@
 	cuda_irq_code.cmds[0].addr = (void *) &((cuda_t *) instance->cuda_kernel)->ifr;
 	async_set_interrupt_received(cuda_irq_handler);
-	register_irq(10, device_assign_devno(), 0, &cuda_irq_code);
+	irq_register(10, device_assign_devno(), 0, &cuda_irq_code);
 
 	/* Enable SR interrupt. */
Index: uspace/srv/hw/char/i8042/i8042.c
===================================================================
--- uspace/srv/hw/char/i8042/i8042.c	(revision 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ uspace/srv/hw/char/i8042/i8042.c	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -197,6 +197,6 @@
 	i8042_kbd.cmds[0].addr = (void *) &((i8042_t *) i8042_kernel)->status;
 	i8042_kbd.cmds[3].addr = (void *) &((i8042_t *) i8042_kernel)->data;
-	register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd);
-	register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd);
+	irq_register(inr_a, device_assign_devno(), 0, &i8042_kbd);
+	irq_register(inr_b, device_assign_devno(), 0, &i8042_kbd);
 	printf("%s: registered for interrupts %" PRIun " and %" PRIun "\n",
 	    NAME, inr_a, inr_b);
Index: uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c
===================================================================
--- uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c	(revision 1761268c1ab1e57b9fa5694aead0b2e9952761b6)
+++ uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c	(revision f044e96c50752824a763e9b11ea00b026e7c0772)
@@ -194,5 +194,5 @@
 	async_set_interrupt_received(s3c24xx_uart_irq_handler);
 
-	register_irq(inr, device_assign_devno(), 0, &uart_irq_code);
+	irq_register(inr, device_assign_devno(), 0, &uart_irq_code);
 
 	/* Enable FIFO, Tx trigger level: empty, Rx trigger level: 1 byte. */