Index: libcfa/src/concurrency/locks.cfa
===================================================================
--- libcfa/src/concurrency/locks.cfa	(revision 6b33e891da6ed781bdcec69c5dfdd3cb8a9d0e44)
+++ libcfa/src/concurrency/locks.cfa	(revision 75f888e777f59649e6879f104df2db36690debd5)
@@ -246,9 +246,9 @@
 	struct alarm_node_wrap {
 		alarm_node_t alarm_node;
-		condition_variable(L) * cond;
+		cond_lock(L) * cond;
 		info_thread(L) * info_thd;
 	};
 
-	void ?{}( alarm_node_wrap(L) & this, Duration alarm, Duration period, Alarm_Callback callback, condition_variable(L) * c, info_thread(L) * i ) {
+	void ?{}( alarm_node_wrap(L) & this, Duration alarm, Duration period, Alarm_Callback callback, cond_lock(L) * c, info_thread(L) * i ) {
 		this.alarm_node{ callback, alarm, period };
 		this.cond = c;
@@ -259,5 +259,5 @@
 
 	static void timeout_handler ( alarm_node_wrap(L) & this ) with( this ) {
-		// This condition_variable member is called from the kernel, and therefore, cannot block, but it can spin.
+		// This cond_lock member is called from the kernel, and therefore, cannot block, but it can spin.
 		lock( cond->lock __cfaabi_dbg_ctx2 );
 
@@ -323,5 +323,5 @@
 	//-----------------------------------------------------------------------------
 	// condition variable
-	void ?{}( condition_variable(L) & this ){
+	void ?{}( cond_lock(L) & this ){
 		this.lock{};
 		this.blocked_threads{};
@@ -329,7 +329,7 @@
 	}
 
-	void ^?{}( condition_variable(L) & this ){ }
-
-	static void process_popped( condition_variable(L) & this, info_thread(L) & popped ) with( this ) {
+	void ^?{}( cond_lock(L) & this ){ }
+
+	static void process_popped( cond_lock(L) & this, info_thread(L) & popped ) with( this ) {
 		if (&popped != 0p) {
 			popped.signalled = true;
@@ -345,5 +345,5 @@
 	}
 
-	bool notify_one( condition_variable(L) & this ) with( this ) {
+	bool notify_one( cond_lock(L) & this ) with( this ) {
 		lock( lock __cfaabi_dbg_ctx2 );
 		bool ret = ! isEmpty( blocked_threads );
@@ -353,5 +353,5 @@
 	}
 
-	bool notify_all( condition_variable(L) & this ) with(this) {
+	bool notify_all( cond_lock(L) & this ) with(this) {
 		lock( lock __cfaabi_dbg_ctx2 );
 		bool ret = ! isEmpty( blocked_threads );
@@ -363,9 +363,9 @@
 	}
 
-	uintptr_t front( condition_variable(L) & this ) with(this) {
+	uintptr_t front( cond_lock(L) & this ) with(this) {
 		return isEmpty( blocked_threads ) ? NULL : first( blocked_threads ).info;
 	}
 
-	bool empty( condition_variable(L) & this ) with(this) {
+	bool empty( cond_lock(L) & this ) with(this) {
 		lock( lock __cfaabi_dbg_ctx2 );
 		bool ret = isEmpty( blocked_threads );
@@ -374,7 +374,7 @@
 	}
 
-	int counter( condition_variable(L) & this ) with(this) { return count; }
-
-	static void enqueue_thread( condition_variable(L) & this, info_thread(L) * i ) with(this) {
+	int counter( cond_lock(L) & this ) with(this) { return count; }
+
+	static void enqueue_thread( cond_lock(L) & this, info_thread(L) * i ) with(this) {
 		// add info_thread to waiting queue
 		insert_last( blocked_threads, *i );
@@ -393,5 +393,5 @@
 
 	// helper for wait()'s' with no timeout
-	static void queue_info_thread( condition_variable(L) & this, info_thread(L) & i ) with(this) {
+	static void queue_info_thread( cond_lock(L) & this, info_thread(L) & i ) with(this) {
 		lock( lock __cfaabi_dbg_ctx2 );
 		enqueue_thread( this, &i );
@@ -412,5 +412,5 @@
 
 	// helper for wait()'s' with a timeout
-	static void queue_info_thread_timeout( condition_variable(L) & this, info_thread(L) & info, Duration t, Alarm_Callback callback ) with(this) {
+	static void queue_info_thread_timeout( cond_lock(L) & this, info_thread(L) & info, Duration t, Alarm_Callback callback ) with(this) {
 		lock( lock __cfaabi_dbg_ctx2 );
 		enqueue_thread( this, &info );
@@ -434,13 +434,13 @@
 		return i.signalled;
 
-	void wait( condition_variable(L) & this ) with(this) { WAIT( 0, 0p ) }
-	void wait( condition_variable(L) & this, uintptr_t info ) with(this) { WAIT( info, 0p ) }
-	void wait( condition_variable(L) & this, L & l  ) with(this) { WAIT( 0, &l ) }
-	void wait( condition_variable(L) & this, L & l, uintptr_t info ) with(this) { WAIT( info, &l ) }
-
-	bool wait( condition_variable(L) & this, Duration duration ) with(this) { WAIT_TIME( 0 , 0p , duration ) }
-	bool wait( condition_variable(L) & this, uintptr_t info, Duration duration ) with(this) { WAIT_TIME( info, 0p , duration ) }
-	bool wait( condition_variable(L) & this, L & l, Duration duration  ) with(this) { WAIT_TIME( 0 , &l , duration ) }
-	bool wait( condition_variable(L) & this, L & l, uintptr_t info, Duration duration ) with(this) { WAIT_TIME( info, &l , duration ) }
+	void wait( cond_lock(L) & this ) with(this) { WAIT( 0, 0p ) }
+	void wait( cond_lock(L) & this, uintptr_t info ) with(this) { WAIT( info, 0p ) }
+	void wait( cond_lock(L) & this, L & l  ) with(this) { WAIT( 0, &l ) }
+	void wait( cond_lock(L) & this, L & l, uintptr_t info ) with(this) { WAIT( info, &l ) }
+
+	bool wait( cond_lock(L) & this, Duration duration ) with(this) { WAIT_TIME( 0 , 0p , duration ) }
+	bool wait( cond_lock(L) & this, uintptr_t info, Duration duration ) with(this) { WAIT_TIME( info, 0p , duration ) }
+	bool wait( cond_lock(L) & this, L & l, Duration duration  ) with(this) { WAIT_TIME( 0 , &l , duration ) }
+	bool wait( cond_lock(L) & this, L & l, uintptr_t info, Duration duration ) with(this) { WAIT_TIME( info, &l , duration ) }
 
 	//-----------------------------------------------------------------------------