diff --git a/examples/pong.c b/examples/pong.c
index 76f7f6b..6b738cc 100644
--- a/examples/pong.c
+++ b/examples/pong.c
@@ -69,7 +69,7 @@ void interactive ()
 		printf ("msg to send: ");
 		fflush (stdout);
 
-		TEST_IPC_WAIT_EVENT_Q (ipc_events_loop (ctx, &event, &timer), EXIT_FAILURE);
+		TEST_IPC_WAIT_EVENT_Q (ipc_wait_event (ctx, &event, &timer), EXIT_FAILURE);
 		switch (event.type) {
 		case IPC_EVENT_TYPE_EXTRA_SOCKET:
 			{
diff --git a/examples/pongd.c b/examples/pongd.c
index fb108fe..6b9e307 100644
--- a/examples/pongd.c
+++ b/examples/pongd.c
@@ -45,7 +45,7 @@ void main_loop ()
 	while (1) {
 		// ipc_wait_event provides one event at a time
 		// warning: event->m is free'ed if not NULL
-		TEST_IPC_WAIT_EVENT_Q (ipc_events_loop (ctx, &event, &timer), EXIT_FAILURE);
+		TEST_IPC_WAIT_EVENT_Q (ipc_wait_event (ctx, &event, &timer), EXIT_FAILURE);
 
 		switch (event.type) {
 		case IPC_EVENT_TYPE_CONNECTION:
diff --git a/examples/pongspam.c b/examples/pongspam.c
index 8969011..2f9cb42 100644
--- a/examples/pongspam.c
+++ b/examples/pongspam.c
@@ -62,7 +62,7 @@ void interactive ()
 		printf ("msg to send: ");
 		fflush (stdout);
 
-		TEST_IPC_WAIT_EVENT_Q (ipc_events_loop (ctx, &event, &timer), EXIT_FAILURE);
+		TEST_IPC_WAIT_EVENT_Q (ipc_wait_event (ctx, &event, &timer), EXIT_FAILURE);
 
 		switch (event.type) {
 		case IPC_EVENT_TYPE_TIMER:{
diff --git a/examples/simple-tcpd.c b/examples/simple-tcpd.c
index 2824a85..7a8074e 100644
--- a/examples/simple-tcpd.c
+++ b/examples/simple-tcpd.c
@@ -165,7 +165,7 @@ void main_loop (int argc, char **argv)
 		// warning: event->m is free'ed if not NULL
 
 		ipc_ctx_print (ctx);
-		TEST_IPC_WAIT_EVENT_Q (ipc_events_loop (ctx, &event, &timer), EXIT_FAILURE);
+		TEST_IPC_WAIT_EVENT_Q (ipc_wait_event (ctx, &event, &timer), EXIT_FAILURE);
 
 		switch (event.type) {
 		case IPC_EVENT_TYPE_TIMER:{
diff --git a/tests/func_01_connection_establishmentd.c b/tests/func_01_connection_establishmentd.c
index d466745..3ad7ff1 100644
--- a/tests/func_01_connection_establishmentd.c
+++ b/tests/func_01_connection_establishmentd.c
@@ -23,7 +23,7 @@ int main(int argc, char * argv[])
 	printf ("func 01 - service polling...\n");
 
 	// listen only for a single client
-	TEST_IPC_Q(ipc_events_loop (&ctx, &event, &timer), EXIT_FAILURE);
+	TEST_IPC_Q(ipc_wait_event (&ctx, &event, &timer), EXIT_FAILURE);
 
 	switch (event.type) {
 		case IPC_EVENT_TYPE_TIMER : {
diff --git a/tests/func_02_pong.c b/tests/func_02_pong.c
index 00c2cdc..98c80af 100644
--- a/tests/func_02_pong.c
+++ b/tests/func_02_pong.c
@@ -56,7 +56,7 @@ void interactive ()
     while (1) {
         printf ("msg to send: ");
         fflush (stdout);
-		TEST_IPC_Q(ipc_events_loop (&ctx, &event, &timer), EXIT_FAILURE);
+		TEST_IPC_Q(ipc_wait_event (&ctx, &event, &timer), EXIT_FAILURE);
 
 		switch (event.type) {
 			case IPC_EVENT_TYPE_TIMER: {
diff --git a/tests/func_02_pongd.c b/tests/func_02_pongd.c
index 4271539..5349082 100644
--- a/tests/func_02_pongd.c
+++ b/tests/func_02_pongd.c
@@ -27,7 +27,7 @@ void main_loop ()
     while(1) {
 		// ipc_wait_event provides one event at a time
 		// warning: event->m is free'ed if not NULL
-		ret = ipc_events_loop (ctx, &event, &timer);
+		ret = ipc_wait_event (ctx, &event, &timer);
 		if (ret.error_code != IPC_ERROR_NONE && ret.error_code != IPC_ERROR_CLOSED_RECIPIENT) {
 			PRINTERR(ret,"service poll event");
 
diff --git a/tests/func_03_multiple-communications-client.c b/tests/func_03_multiple-communications-client.c
index d23fc46..c659acf 100644
--- a/tests/func_03_multiple-communications-client.c
+++ b/tests/func_03_multiple-communications-client.c
@@ -35,7 +35,7 @@ void read_message (struct ipc_ctx *ctx)
 	// ctx, index, message
 	TEST_IPC_Q(ipc_read (ctx, 0 /* only one server here */, &m), EXIT_FAILURE);
 
-	ipc_events_loop (ctx, &event, &timer);
+	ipc_wait_event (ctx, &event, &timer);
 
 	switch (event.type) {
 		case IPC_EVENT_TYPE_MESSAGE : {
diff --git a/tests/func_03_multiple-communications-server.c b/tests/func_03_multiple-communications-server.c
index cefdac2..688d839 100644
--- a/tests/func_03_multiple-communications-server.c
+++ b/tests/func_03_multiple-communications-server.c
@@ -24,7 +24,7 @@ int main_loop(int argc, char * argv[])
 	printf ("func 01 - service polling...\n");
 	// listen only for a single client
 	while (1) {
-		TEST_IPC_WAIT_EVENT_Q (ipc_events_loop (&ctx, &event, &timer), EXIT_FAILURE);
+		TEST_IPC_WAIT_EVENT_Q (ipc_wait_event (&ctx, &event, &timer), EXIT_FAILURE);
 
 		switch (event.type) {
 			case IPC_EVENT_TYPE_TIMER : {