Index: tests/unified_locking/mcs.cfa
===================================================================
--- tests/unified_locking/mcs.cfa	(revision cf444b64a4a158958376dc2ab509245568729ad6)
+++ tests/unified_locking/mcs.cfa	(revision 6ff08d8fa68f653d45a0ec10f0c2b0d9842f1f2a)
@@ -7,5 +7,5 @@
 struct MutexObj {
 	mcs_lock l;
-	$thread * id;
+	thread$ * id;
 	size_t sum;
 };
@@ -21,5 +21,5 @@
 
 unsigned cs() {
-	$thread * me = active_thread();
+	thread$ * me = active_thread();
 	unsigned value = (unsigned)me;
 	mcs_node n;
Index: tests/unified_locking/thread_test.cfa
===================================================================
--- tests/unified_locking/thread_test.cfa	(revision cf444b64a4a158958376dc2ab509245568729ad6)
+++ tests/unified_locking/thread_test.cfa	(revision 6ff08d8fa68f653d45a0ec10f0c2b0d9842f1f2a)
@@ -69,5 +69,5 @@
             break;
         default:
-            break; 
+            break;
     }
 	processor p[threadCount];