Index: uspace/app/kio/kio.c
===================================================================
--- uspace/app/kio/kio.c	(revision 593e0237afd3144ed94431340aab1dd29fc7f612)
+++ uspace/app/kio/kio.c	(revision 88205440caa3e827197cd095139acca02b989d5e)
@@ -39,5 +39,4 @@
 #include <as.h>
 #include <ddi.h>
-#include <event.h>
 #include <errno.h>
 #include <str_error.h>
@@ -149,5 +148,6 @@
  *
  */
-static void notification_received(ipc_callid_t callid, ipc_call_t *call)
+static void kio_notification_handler(ipc_callid_t callid, ipc_call_t *call,
+    void *arg)
 {
 	/*
@@ -181,5 +181,5 @@
 		producer(kio_stored, kio + offset);
 	
-	event_unmask(EVENT_KIO);
+	async_event_unmask(EVENT_KIO);
 	fibril_mutex_unlock(&mtx);
 }
@@ -214,6 +214,5 @@
 	
 	prodcons_initialize(&pc);
-	async_set_interrupt_received(notification_received);
-	rc = event_subscribe(EVENT_KIO, 0);
+	rc = async_event_subscribe(EVENT_KIO, kio_notification_handler, NULL);
 	if (rc != EOK) {
 		fprintf(stderr, "%s: Unable to register kio notifications\n",
@@ -233,8 +232,8 @@
 		fprintf(stderr, "%s: Could not create input\n", NAME);
 		return ENOMEM;
-	}	
+	}
 
 	fibril_add_ready(fid);
-	event_unmask(EVENT_KIO);
+	async_event_unmask(EVENT_KIO);
 	kio_update();
 	
@@ -251,7 +250,7 @@
 		free(str);
 	}
- 
+
 	if (rc == ENOENT)
-		rc = EOK;	
+		rc = EOK;
 
 	return EOK;
Index: uspace/app/trace/syscalls.c
===================================================================
--- uspace/app/trace/syscalls.c	(revision 593e0237afd3144ed94431340aab1dd29fc7f612)
+++ uspace/app/trace/syscalls.c	(revision 88205440caa3e827197cd095139acca02b989d5e)
@@ -65,5 +65,7 @@
     [SYS_IPC_HANGUP] = { "ipc_hangup",			1,	V_ERRNO },
 
-    [SYS_EVENT_SUBSCRIBE] = { "event_subscribe",	2,	V_ERRNO },
+    [SYS_IPC_EVENT_SUBSCRIBE] = { "ipc_event_subscribe",	2,	V_ERRNO },
+    [SYS_IPC_EVENT_UNSUBSCRIBE] = { "ipc_event_unsubscribe",	1,	V_ERRNO },
+    [SYS_IPC_EVENT_UNMASK] = { "ipc_event_unmask",	1,	V_ERRNO },
 
     [SYS_CAP_GRANT] = { "cap_grant",			2,	V_ERRNO },
@@ -71,6 +73,7 @@
     [SYS_PHYSMEM_MAP] = { "physmem_map",		4,	V_ERRNO },
     [SYS_IOSPACE_ENABLE] = { "iospace_enable",		1,	V_ERRNO },
-    [SYS_IRQ_REGISTER] = { "irq_register",	4,	V_ERRNO },
-    [SYS_IRQ_UNREGISTER] = { "irq_unregister",	2,	V_ERRNO },
+
+    [SYS_IPC_IRQ_SUBSCRIBE] = { "ipc_irq_subscribe",	4,	V_ERRNO },
+    [SYS_IPC_IRQ_UNSUBSCRIBE] = { "ipc_irq_unsubscribe",	2,	V_ERRNO },
 
     [SYS_SYSINFO_GET_VAL_TYPE] = { "sysinfo_get_val_type",		2,	V_INTEGER },