Index: tests/concurrent/examples/boundedBufferEXT.cfa
===================================================================
--- tests/concurrent/examples/boundedBufferEXT.cfa	(revision 66812dd99f2cc97ee7d08f95d6b009fa64a41a6b)
+++ tests/concurrent/examples/boundedBufferEXT.cfa	(revision c08c3cfa1e4a6930d362550049713d2d3fd7ed43)
@@ -24,5 +24,5 @@
 enum { BufferSize = 50 };
 
-forall( otype T ) {
+forall( T ) {
 	monitor Buffer {
 		int front, back, count;
Index: tests/concurrent/examples/boundedBufferINT.cfa
===================================================================
--- tests/concurrent/examples/boundedBufferINT.cfa	(revision 66812dd99f2cc97ee7d08f95d6b009fa64a41a6b)
+++ tests/concurrent/examples/boundedBufferINT.cfa	(revision c08c3cfa1e4a6930d362550049713d2d3fd7ed43)
@@ -24,5 +24,5 @@
 enum { BufferSize = 50 };
 
-forall( otype T ) {
+forall( T ) {
 	monitor Buffer {
 		condition full, empty;
Index: tests/concurrent/examples/quickSort.generic.cfa
===================================================================
--- tests/concurrent/examples/quickSort.generic.cfa	(revision 66812dd99f2cc97ee7d08f95d6b009fa64a41a6b)
+++ tests/concurrent/examples/quickSort.generic.cfa	(revision c08c3cfa1e4a6930d362550049713d2d3fd7ed43)
@@ -21,5 +21,5 @@
 #include <string.h>										// strcmp
 
-forall( otype T | { int ?<?( T, T ); } ) {
+forall( T | { int ?<?( T, T ); } ) {
 	thread Quicksort {
 		T * values;										// communication variables