Index: src/Concurrency/Keywords.cc
===================================================================
--- src/Concurrency/Keywords.cc	(revision a8078eef84a4a1ff1e577a67991ee2e0f64210a2)
+++ src/Concurrency/Keywords.cc	(revision e15683e5523420a94333395f6e1948e3beaa66c5)
@@ -88,7 +88,7 @@
 	// 	int data;                                  int data;
 	// 	a_struct_t more_data;                      a_struct_t more_data;
-	//                                =>             thread_desc __thrd_d;
+	//                                =>             $thread __thrd_d;
 	// };                                        };
-	//                                           static inline thread_desc * get_thread( MyThread * this ) { return &this->__thrd_d; }
+	//                                           static inline $thread * get_thread( MyThread * this ) { return &this->__thrd_d; }
 	//
 	class ThreadKeyword final : public ConcurrentSueKeyword {
@@ -96,5 +96,5 @@
 
 	  	ThreadKeyword() : ConcurrentSueKeyword(
-			"thread_desc",
+			"$thread",
 			"__thrd",
 			"get_thread",
@@ -120,7 +120,7 @@
 	// 	int data;                                  int data;
 	// 	a_struct_t more_data;                      a_struct_t more_data;
-	//                                =>             coroutine_desc __cor_d;
+	//                                =>             $coroutine __cor_d;
 	// };                                        };
-	//                                           static inline coroutine_desc * get_coroutine( MyCoroutine * this ) { return &this->__cor_d; }
+	//                                           static inline $coroutine * get_coroutine( MyCoroutine * this ) { return &this->__cor_d; }
 	//
 	class CoroutineKeyword final : public ConcurrentSueKeyword {
@@ -128,5 +128,5 @@
 
 	  	CoroutineKeyword() : ConcurrentSueKeyword(
-			"coroutine_desc",
+			"$coroutine",
 			"__cor",
 			"get_coroutine",
@@ -152,7 +152,7 @@
 	// 	int data;                                  int data;
 	// 	a_struct_t more_data;                      a_struct_t more_data;
-	//                                =>             monitor_desc __mon_d;
+	//                                =>             $monitor __mon_d;
 	// };                                        };
-	//                                           static inline monitor_desc * get_coroutine( MyMonitor * this ) { return &this->__cor_d; }
+	//                                           static inline $monitor * get_coroutine( MyMonitor * this ) { return &this->__cor_d; }
 	//
 	class MonitorKeyword final : public ConcurrentSueKeyword {
@@ -160,5 +160,5 @@
 
 	  	MonitorKeyword() : ConcurrentSueKeyword(
-			"monitor_desc",
+			"$monitor",
 			"__mon",
 			"get_monitor",
@@ -182,5 +182,5 @@
 	//Handles mutex routines definitions :
 	// void foo( A * mutex a, B * mutex b,  int i ) {                  void foo( A * a, B * b,  int i ) {
-	// 	                                                                 monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };
+	// 	                                                                 $monitor * __monitors[] = { get_monitor(a), get_monitor(b) };
 	// 	                                                                 monitor_guard_t __guard = { __monitors, 2 };
 	//    /*Some code*/                                       =>           /*Some code*/
@@ -221,5 +221,5 @@
 	//Handles mutex routines definitions :
 	// void foo( A * mutex a, B * mutex b,  int i ) {                  void foo( A * a, B * b,  int i ) {
-	// 	                                                                 monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };
+	// 	                                                                 $monitor * __monitors[] = { get_monitor(a), get_monitor(b) };
 	// 	                                                                 monitor_guard_t __guard = { __monitors, 2 };
 	//    /*Some code*/                                       =>           /*Some code*/
@@ -306,5 +306,5 @@
 	Expression * ConcurrentSueKeyword::postmutate( KeywordCastExpr * cast ) {
 		if ( cast_target == cast->target ) {
-			// convert (thread &)t to (thread_desc &)*get_thread(t), etc.
+			// convert (thread &)t to ($thread &)*get_thread(t), etc.
 			if( !type_decl ) SemanticError( cast, context_error );
 			if( !dtor_decl ) SemanticError( cast, context_error );
@@ -516,5 +516,5 @@
 	void MutexKeyword::postvisit(StructDecl* decl) {
 
-		if( decl->name == "monitor_desc" && decl->body ) {
+		if( decl->name == "$monitor" && decl->body ) {
 			assert( !monitor_decl );
 			monitor_decl = decl;
@@ -612,5 +612,5 @@
 		);
 
-		//monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };
+		//$monitor * __monitors[] = { get_monitor(a), get_monitor(b) };
 		body->push_front( new DeclStmt( monitors) );
 	}
@@ -673,5 +673,5 @@
 		);
 
-		//monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };
+		//$monitor * __monitors[] = { get_monitor(a), get_monitor(b) };
 		body->push_front( new DeclStmt( monitors) );
 	}
@@ -681,5 +681,5 @@
 	//=============================================================================================
 	void ThreadStarter::previsit( StructDecl * decl ) {
-		if( decl->name == "thread_desc" && decl->body ) {
+		if( decl->name == "$thread" && decl->body ) {
 			assert( !thread_decl );
 			thread_decl = decl;
Index: src/Concurrency/Waitfor.cc
===================================================================
--- src/Concurrency/Waitfor.cc	(revision a8078eef84a4a1ff1e577a67991ee2e0f64210a2)
+++ src/Concurrency/Waitfor.cc	(revision e15683e5523420a94333395f6e1948e3beaa66c5)
@@ -244,5 +244,5 @@
 			decl_mask = decl;
 		}
-		else if( decl->name == "monitor_desc" ) {
+		else if( decl->name == "$monitor" ) {
 			assert( !decl_monitor );
 			decl_monitor = decl;