Index: abi/include/abi/syscall.h
===================================================================
--- abi/include/abi/syscall.h	(revision f6ab787eddabe2ded4f3ba4e6efa7457e948e5f2)
+++ abi/include/abi/syscall.h	(revision 0c91cff933f97a7076e264d09bcbd815027707cd)
@@ -74,6 +74,7 @@
 	SYS_IPC_CONNECT_KBOX,
 	
-	SYS_EVENT_SUBSCRIBE,
-	SYS_EVENT_UNMASK,
+	SYS_IPC_EVENT_SUBSCRIBE,
+	SYS_IPC_EVENT_UNSUBSCRIBE,
+	SYS_IPC_EVENT_UNMASK,
 	
 	SYS_CAP_GRANT,
@@ -87,6 +88,7 @@
 	SYS_IOSPACE_ENABLE,
 	SYS_IOSPACE_DISABLE,
-	SYS_IRQ_REGISTER,
-	SYS_IRQ_UNREGISTER,
+	
+	SYS_IPC_IRQ_SUBSCRIBE,
+	SYS_IPC_IRQ_UNSUBSCRIBE,
 	
 	SYS_SYSINFO_GET_KEYS_SIZE,