Index: libcfa/src/concurrency/monitor.hfa
===================================================================
--- libcfa/src/concurrency/monitor.hfa	(revision 50b88854c78d94229d63df8d800995aebc5797b4)
+++ libcfa/src/concurrency/monitor.hfa	(revision 5c9b20cdbd8f11c2e3b1817c4e65a16c5f1e9a65)
@@ -23,9 +23,9 @@
 
 trait is_monitor(dtype T) {
-	monitor_desc * get_monitor( T & );
+	$monitor * get_monitor( T & );
 	void ^?{}( T & mutex );
 };
 
-static inline void ?{}(monitor_desc & this) with( this ) {
+static inline void ?{}($monitor & this) with( this ) {
 	lock{};
 	entry_queue{};
@@ -39,21 +39,21 @@
 }
 
-static inline void ^?{}(monitor_desc & ) {}
+static inline void ^?{}($monitor & ) {}
 
 struct monitor_guard_t {
-	monitor_desc ** 	m;
+	$monitor ** 	m;
 	__lock_size_t   	count;
 	__monitor_group_t prev;
 };
 
-void ?{}( monitor_guard_t & this, monitor_desc ** m, __lock_size_t count, void (*func)() );
+void ?{}( monitor_guard_t & this, $monitor ** m, __lock_size_t count, void (*func)() );
 void ^?{}( monitor_guard_t & this );
 
 struct monitor_dtor_guard_t {
-	monitor_desc *    m;
+	$monitor *    m;
 	__monitor_group_t prev;
 };
 
-void ?{}( monitor_dtor_guard_t & this, monitor_desc ** m, void (*func)() );
+void ?{}( monitor_dtor_guard_t & this, $monitor ** m, void (*func)() );
 void ^?{}( monitor_dtor_guard_t & this );
 
@@ -72,5 +72,5 @@
 
 	// The monitor this criterion concerns
-	monitor_desc * target;
+	$monitor * target;
 
 	// The parent node to which this criterion belongs
@@ -87,5 +87,5 @@
 struct __condition_node_t {
 	// Thread that needs to be woken when all criteria are met
-	thread_desc * waiting_thread;
+	$thread * waiting_thread;
 
 	// Array of criteria (Criterions are contiguous in memory)
@@ -106,7 +106,7 @@
 }
 
-void ?{}(__condition_node_t & this, thread_desc * waiting_thread, __lock_size_t count, uintptr_t user_info );
+void ?{}(__condition_node_t & this, $thread * waiting_thread, __lock_size_t count, uintptr_t user_info );
 void ?{}(__condition_criterion_t & this );
-void ?{}(__condition_criterion_t & this, monitor_desc * target, __condition_node_t * owner );
+void ?{}(__condition_criterion_t & this, $monitor * target, __condition_node_t * owner );
 
 struct condition {
@@ -115,5 +115,5 @@
 
 	// Array of monitor pointers (Monitors are NOT contiguous in memory)
-	monitor_desc ** monitors;
+	$monitor ** monitors;
 
 	// Number of monitors in the array