Index: tests/concurrent/examples/boundedBufferEXT.cfa
===================================================================
--- tests/concurrent/examples/boundedBufferEXT.cfa	(revision fdf4efb2f3a19b3b5689c86eb0a72de59d827d72)
+++ tests/concurrent/examples/boundedBufferEXT.cfa	(revision 09f357ec00aefca93e05dd3cc0f865d2b3fe0881)
@@ -10,6 +10,6 @@
 // Created On       : Wed Apr 18 22:52:12 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 21 08:19:20 2019
-// Update Count     : 14
+// Last Modified On : Thu Jan 16 22:36:34 2020
+// Update Count     : 15
 //
 
@@ -37,5 +37,5 @@
 
 	void insert( Buffer(T) & mutex buffer, T elem ) with( buffer ) {
-		if ( count == BufferSize ) waitfor( remove, buffer );
+		if ( count == BufferSize ) waitfor( remove : buffer );
 		elements[back] = elem;
 		back = ( back + 1 ) % BufferSize;
@@ -44,5 +44,5 @@
 
 	T remove( Buffer(T) & mutex buffer ) with( buffer ) {
-		if ( count == 0 ) waitfor( insert, buffer );
+		if ( count == 0 ) waitfor( insert : buffer );
 		T elem = elements[front];
 		front = ( front + 1 ) % BufferSize;
Index: tests/concurrent/examples/boundedBufferTHREAD.cfa
===================================================================
--- tests/concurrent/examples/boundedBufferTHREAD.cfa	(revision fdf4efb2f3a19b3b5689c86eb0a72de59d827d72)
+++ tests/concurrent/examples/boundedBufferTHREAD.cfa	(revision 09f357ec00aefca93e05dd3cc0f865d2b3fe0881)
@@ -10,6 +10,6 @@
 // Created On       : Wed Apr 18 22:52:12 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 21 11:50:12 2019
-// Update Count     : 24
+// Last Modified On : Thu Jan 16 23:09:43 2020
+// Update Count     : 25
 //
 
@@ -44,10 +44,10 @@
 	void main( Buffer & buffer ) with( buffer ) {
 		for () {
-			waitfor( ^?{}, buffer ) {
+			waitfor( ^?{} : buffer ) {
 				break;
-			} or when ( count != 20 ) waitfor( insert, buffer ) {
+			} or when ( count != 20 ) waitfor( insert : buffer ) {
 				back = (back + 1) % 20;
 				count += 1;
-			} or when ( count != 0 ) waitfor( remove, buffer ) {
+			} or when ( count != 0 ) waitfor( remove : buffer ) {
 				front = (front + 1) % 20;
 				count -= 1;
Index: tests/concurrent/examples/gortn.cfa
===================================================================
--- tests/concurrent/examples/gortn.cfa	(revision fdf4efb2f3a19b3b5689c86eb0a72de59d827d72)
+++ tests/concurrent/examples/gortn.cfa	(revision 09f357ec00aefca93e05dd3cc0f865d2b3fe0881)
@@ -10,6 +10,6 @@
 // Created On       : Wed Feb 20 08:02:37 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 21 08:25:03 2019
-// Update Count     : 4
+// Last Modified On : Thu Jan 16 22:43:40 2020
+// Update Count     : 5
 // 
 
@@ -26,8 +26,8 @@
 void main( GoRtn & gortn ) with( gortn ) {
 	for () {
-		waitfor( mem1, gortn ) sout | i;
-		or waitfor( mem2, gortn ) sout | f;
-		or waitfor( mem3, gortn ) sout | m.i | m.j;
-		or waitfor( ^?{}, gortn ) break;
+		waitfor( mem1 : gortn ) sout | i;
+		or waitfor( mem2 : gortn ) sout | f;
+		or waitfor( mem3 : gortn ) sout | m.i | m.j;
+		or waitfor( ^?{} : gortn ) break;
 	}
 }