Index: uspace/lib/c/generic/async.c
===================================================================
--- uspace/lib/c/generic/async.c	(revision 9af1c61b92a35908b9af07874373f345e922fede)
+++ uspace/lib/c/generic/async.c	(revision 6fb8b2c38282012b1154d0e8fa18bbd84a81caec)
@@ -1338,5 +1338,5 @@
 	
 	/* Kernel notification */
-	if ((chandle == CAP_NIL) && (call->flags & IPC_CALLID_NOTIFICATION)) {
+	if ((chandle == CAP_NIL) && (call->flags & IPC_CALL_NOTIF)) {
 		fibril_t *fibril = (fibril_t *) __tcb_get()->fibril_data;
 		unsigned oldsw = fibril->switches;
@@ -1497,5 +1497,5 @@
 		}
 
-		if (call.flags & IPC_CALLID_ANSWERED)
+		if (call.flags & IPC_CALL_ANSWERED)
 			continue;
 
Index: uspace/lib/c/generic/ipc.c
===================================================================
--- uspace/lib/c/generic/ipc.c	(revision 9af1c61b92a35908b9af07874373f345e922fede)
+++ uspace/lib/c/generic/ipc.c	(revision 6fb8b2c38282012b1154d0e8fa18bbd84a81caec)
@@ -264,5 +264,5 @@
 	
 	/* Handle received answers */
-	if ((chandle == CAP_NIL) && (call->flags & IPC_CALLID_ANSWERED))
+	if ((chandle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED))
 		handle_answer(call);
 	
@@ -295,5 +295,5 @@
 	do {
 		chandle = ipc_wait_cycle(call, usec, SYNCH_FLAGS_NONE);
-	} while ((chandle == CAP_NIL) && (call->flags & IPC_CALLID_ANSWERED));
+	} while ((chandle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
 	
 	return chandle;
@@ -317,5 +317,5 @@
 		chandle = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT,
 		    SYNCH_FLAGS_NON_BLOCKING);
-	} while ((chandle == CAP_NIL) && (call->flags & IPC_CALLID_ANSWERED));
+	} while ((chandle == CAP_NIL) && (call->flags & IPC_CALL_ANSWERED));
 	
 	return chandle;