Index: benchmark/readyQ/transfer.cfa
===================================================================
--- benchmark/readyQ/transfer.cfa	(revision b7d94ac5737a4c841871096ccb6bf5567f53423c)
+++ benchmark/readyQ/transfer.cfa	(revision e49b6f5e7fc5e6264cb734f9692629463478f932)
@@ -14,5 +14,5 @@
 bool exhaust = false;
 
-$thread * the_main;
+thread$ * the_main;
 
 thread __attribute__((aligned(128))) MyThread {
Index: benchmark/size/size.cfa
===================================================================
--- benchmark/size/size.cfa	(revision b7d94ac5737a4c841871096ccb6bf5567f53423c)
+++ benchmark/size/size.cfa	(revision e49b6f5e7fc5e6264cb734f9692629463478f932)
@@ -2,7 +2,7 @@
 
 int main(){
-	printf("Coroutine : %zu bytes\n", sizeof( $coroutine ));
-	printf("Monitor   : %zu bytes\n", sizeof( $monitor   ));
-	printf("Thread    : %zu bytes\n", sizeof( $thread    ));
+	printf("Coroutine : %zu bytes\n", sizeof( coroutine$ ));
+	printf("Monitor   : %zu bytes\n", sizeof( monitor$   ));
+	printf("Thread    : %zu bytes\n", sizeof( thread$    ));
 	printf("Processor : %zu bytes\n", sizeof( processor  ));
 	printf("Cluster   : %zu bytes\n", sizeof( cluster    ));