Index: tests/concurrent/semaphore.cfa
===================================================================
--- tests/concurrent/semaphore.cfa	(revision f7f07f6686cd624c02ff4a6810ca823591ac8122)
+++ tests/concurrent/semaphore.cfa	(revision 8f1a99e18a889d2af43cbd1e5f77c6554f5c8009)
@@ -22,5 +22,5 @@
 
 void main(Blocker & this) {
-	$thread * me = active_thread();
+	thread$ * me = active_thread();
 	this.sum = 0;
 	for(num_blocks) {
@@ -45,5 +45,5 @@
 		or else {}
 
-		$thread * t = V(ben, false);
+		thread$ * t = V(ben, false);
 		if(t) {
 			this.sum += (unsigned)t;
Index: tests/concurrent/signal/block.cfa
===================================================================
--- tests/concurrent/signal/block.cfa	(revision f7f07f6686cd624c02ff4a6810ca823591ac8122)
+++ tests/concurrent/signal/block.cfa	(revision 8f1a99e18a889d2af43cbd1e5f77c6554f5c8009)
@@ -33,6 +33,6 @@
 
 monitor global_data_t {
-	$thread * last_thread;
-	$thread * last_signaller;
+	thread$ * last_thread;
+	thread$ * last_signaller;
 };
 
@@ -82,5 +82,5 @@
 	if( !is_empty( cond ) ) {
 
-		$thread * next = ( $thread * ) front( cond );
+		thread$ * next = ( thread$ * ) front( cond );
 
 		if( ! signal_block( cond ) ) {
Index: tests/concurrent/spinaphore.cfa
===================================================================
--- tests/concurrent/spinaphore.cfa	(revision f7f07f6686cd624c02ff4a6810ca823591ac8122)
+++ tests/concurrent/spinaphore.cfa	(revision 8f1a99e18a889d2af43cbd1e5f77c6554f5c8009)
@@ -21,7 +21,7 @@
 void main(Blocker & this);
 
-Blocker * from_thread($thread * t) {
+Blocker * from_thread(thread$ * t) {
 	Blocker & nullb = *(Blocker*)0p;
-	$thread & nullt = (thread&)nullb;
+	thread$ & nullt = (thread&)nullb;
 	uintptr_t offset  = (uintptr_t)&nullt;
 	uintptr_t address = ((uintptr_t)t) - offset;
@@ -30,5 +30,5 @@
 
 void main(Blocker & this) {
-	$thread * me = active_thread();
+	thread$ * me = active_thread();
 	Blocker * me1 = &this;
 	Blocker * me2 = from_thread(me);
@@ -51,5 +51,5 @@
 	unsigned me = (unsigned)(uintptr_t)&this;
 	for(num_unblocks) {
-		$thread * t = V(sem, false);
+		thread$ * t = V(sem, false);
 		Blocker * b = from_thread(t);
 		b->sum += me;
Index: tests/unified_locking/fast.cfa
===================================================================
--- tests/unified_locking/fast.cfa	(revision f7f07f6686cd624c02ff4a6810ca823591ac8122)
+++ tests/unified_locking/fast.cfa	(revision 8f1a99e18a889d2af43cbd1e5f77c6554f5c8009)
@@ -7,5 +7,5 @@
 struct MutexObj {
 	fast_lock l;
-	$thread * id;
+	thread$ * id;
 	uint32_t sum;
 };
@@ -21,5 +21,5 @@
 
 uint32_t cs() {
-	$thread * me = active_thread();
+	thread$ * me = active_thread();
 	uint32_t value;
 	lock(mo.l);
Index: tests/unified_locking/mcs.cfa
===================================================================
--- tests/unified_locking/mcs.cfa	(revision f7f07f6686cd624c02ff4a6810ca823591ac8122)
+++ tests/unified_locking/mcs.cfa	(revision 8f1a99e18a889d2af43cbd1e5f77c6554f5c8009)
@@ -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 f7f07f6686cd624c02ff4a6810ca823591ac8122)
+++ tests/unified_locking/thread_test.cfa	(revision 8f1a99e18a889d2af43cbd1e5f77c6554f5c8009)
@@ -40,10 +40,10 @@
     for (unsigned int i = 0; i < num_times; i++) {
         dowork(buffer, work_unlocked);
-        lock(curr_lock);
+        lock(*curr_lock);
         //printf("lock: %d %p ENTER\n", i, &curr_lock);
         //lock(norm_lock);
         dowork(buffer, work_locked);
         //printf("lock: %d %p LEAVE\n", i, &curr_lock);
-        unlock(curr_lock);
+        unlock(*curr_lock);
         //unlock(norm_lock);
         lck = rand() % lockCount;
@@ -65,5 +65,5 @@
             break;
         default:
-            break; 
+            break;
     }
 	processor p[threadCount];