Index: longrun_tests/block.cfa
===================================================================
--- longrun_tests/block.cfa	(revision 850aff17345d3e7433f854ef3f1b65369f8016d8)
+++ longrun_tests/block.cfa	(revision 295ed2d1a77dc14592b96ef4518ad28c328d7a62)
@@ -1,1 +1,1 @@
-../tests/concurrent/signal/block.cfa
+../tests/concurrency/signal/block.cfa
Index: longrun_tests/coroutine.cfa
===================================================================
--- longrun_tests/coroutine.cfa	(revision 850aff17345d3e7433f854ef3f1b65369f8016d8)
+++ longrun_tests/coroutine.cfa	(revision 295ed2d1a77dc14592b96ef4518ad28c328d7a62)
@@ -1,1 +1,1 @@
-../tests/concurrent/coroutineYield.cfa
+../tests/concurrency/coroutineYield.cfa
Index: longrun_tests/disjoint.cfa
===================================================================
--- longrun_tests/disjoint.cfa	(revision 850aff17345d3e7433f854ef3f1b65369f8016d8)
+++ longrun_tests/disjoint.cfa	(revision 295ed2d1a77dc14592b96ef4518ad28c328d7a62)
@@ -1,1 +1,1 @@
-../tests/concurrent/signal/disjoint.cfa
+../tests/concurrency/signal/disjoint.cfa
Index: longrun_tests/locks.cfa
===================================================================
--- longrun_tests/locks.cfa	(revision 850aff17345d3e7433f854ef3f1b65369f8016d8)
+++ longrun_tests/locks.cfa	(revision 295ed2d1a77dc14592b96ef4518ad28c328d7a62)
@@ -7,11 +7,11 @@
 
 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;
 
 thread T_C_M_WS1 {};
Index: longrun_tests/preempt.cfa
===================================================================
--- longrun_tests/preempt.cfa	(revision 850aff17345d3e7433f854ef3f1b65369f8016d8)
+++ longrun_tests/preempt.cfa	(revision 295ed2d1a77dc14592b96ef4518ad28c328d7a62)
@@ -1,1 +1,1 @@
-../tests/concurrent/preempt.cfa
+../tests/concurrency/preempt.cfa
Index: longrun_tests/wait.cfa
===================================================================
--- longrun_tests/wait.cfa	(revision 850aff17345d3e7433f854ef3f1b65369f8016d8)
+++ longrun_tests/wait.cfa	(revision 295ed2d1a77dc14592b96ef4518ad28c328d7a62)
@@ -1,1 +1,1 @@
-../tests/concurrent/signal/wait.cfa
+../tests/concurrency/signal/wait.cfa