Index: tests/concurrency/unified_locking/locks.cfa
===================================================================
--- tests/concurrency/unified_locking/locks.cfa	(revision e1358c0ea59c560c010e5261b3e1fe2ac3ad8a2c)
+++ tests/concurrency/unified_locking/locks.cfa	(revision 31be464d5638b82a5f5521d37bad5005223dcb8c)
@@ -7,14 +7,14 @@
 
 multiple_acquisition_lock m;
-condition_variable( multiple_acquisition_lock ) c_m;
+cond_lock( multiple_acquisition_lock ) c_m;
 
 single_acquisition_lock s;
-condition_variable( single_acquisition_lock ) c_s;
+cond_lock( single_acquisition_lock ) c_s;
 
 owner_lock o;
-condition_variable( owner_lock ) c_o;
+cond_lock( owner_lock ) c_o;
 
 exp_backoff_then_block_lock l;
-condition_variable( exp_backoff_then_block_lock ) c_l;
+cond_lock( exp_backoff_then_block_lock ) c_l;
 
 fast_block_lock f;
Index: tests/concurrency/unified_locking/pthread_locks.cfa
===================================================================
--- tests/concurrency/unified_locking/pthread_locks.cfa	(revision e1358c0ea59c560c010e5261b3e1fe2ac3ad8a2c)
+++ tests/concurrency/unified_locking/pthread_locks.cfa	(revision 31be464d5638b82a5f5521d37bad5005223dcb8c)
@@ -12,5 +12,5 @@
 
 owner_lock l2;
-condition_variable( owner_lock ) c2;
+cond_lock( owner_lock ) c2;
 
 volatile int counter = 0;
Index: tests/concurrency/unified_locking/timeout_lock.cfa
===================================================================
--- tests/concurrency/unified_locking/timeout_lock.cfa	(revision e1358c0ea59c560c010e5261b3e1fe2ac3ad8a2c)
+++ tests/concurrency/unified_locking/timeout_lock.cfa	(revision 31be464d5638b82a5f5521d37bad5005223dcb8c)
@@ -7,5 +7,5 @@
 
 multiple_acquisition_lock m, n;
-condition_variable( multiple_acquisition_lock ) c_m, c_n;
+cond_lock( multiple_acquisition_lock ) c_m, c_n;
 
 const unsigned int NoOfTimes = 20;
@@ -73,8 +73,8 @@
 	processor p[2];
 	printf("Start Test 1: surface testing condition variable timeout routines\n");
-	wait( c_m, 1`ns );														// bool wait( condition_variable(L) & this, Duration duration );
-	wait( c_m, 10, 1`ns );													// bool wait( condition_variable(L) & this, uintptr_t info, Duration duration );
-	lock(m); wait( c_m, m, 1`ns ); unlock(m); 								// bool wait( condition_variable(L) & this, L & l, Duration duration );
-	lock(m); wait( c_m, m, 10, 1`ns ); unlock(m);							// bool wait( condition_variable(L) & this, L & l, uintptr_t info, Duration duration );
+	wait( c_m, 1`ns );														// bool wait( cond_lock(L) & this, Duration duration );
+	wait( c_m, 10, 1`ns );													// bool wait( cond_lock(L) & this, uintptr_t info, Duration duration );
+	lock(m); wait( c_m, m, 1`ns ); unlock(m); 								// bool wait( cond_lock(L) & this, L & l, Duration duration );
+	lock(m); wait( c_m, m, 10, 1`ns ); unlock(m);							// bool wait( cond_lock(L) & this, L & l, uintptr_t info, Duration duration );
 	printf("Done Test 1\n");