Index: src/Concurrency/Keywords.cc
===================================================================
--- src/Concurrency/Keywords.cc	(revision 943bfad2c0b8d6d35a71ff04892a3d14825e9dc8)
+++ src/Concurrency/Keywords.cc	(revision e84ab3dadc96fd4dc82b5b0bc20cfe9b14f64259)
@@ -122,7 +122,7 @@
 	// 	int data;                                  int data;
 	// 	a_struct_t more_data;                      a_struct_t more_data;
-	//                                =>             $thread __thrd_d;
+	//                                =>             thread$ __thrd_d;
 	// };                                        };
-	//                                           static inline $thread * get_thread( MyThread * this ) { return &this->__thrd_d; }
+	//                                           static inline thread$ * get_thread( MyThread * this ) { return &this->__thrd_d; }
 	//
 	class ThreadKeyword final : public ConcurrentSueKeyword {
@@ -130,5 +130,5 @@
 
 	  	ThreadKeyword() : ConcurrentSueKeyword(
-			"$thread",
+			"thread$",
 			"__thrd",
 			"get_thread",
@@ -155,7 +155,7 @@
 	// 	int data;                                  int data;
 	// 	a_struct_t more_data;                      a_struct_t more_data;
-	//                                =>             $coroutine __cor_d;
+	//                                =>             coroutine$ __cor_d;
 	// };                                        };
-	//                                           static inline $coroutine * get_coroutine( MyCoroutine * this ) { return &this->__cor_d; }
+	//                                           static inline coroutine$ * get_coroutine( MyCoroutine * this ) { return &this->__cor_d; }
 	//
 	class CoroutineKeyword final : public ConcurrentSueKeyword {
@@ -163,5 +163,5 @@
 
 	  	CoroutineKeyword() : ConcurrentSueKeyword(
-			"$coroutine",
+			"coroutine$",
 			"__cor",
 			"get_coroutine",
@@ -190,7 +190,7 @@
 	// 	int data;                                  int data;
 	// 	a_struct_t more_data;                      a_struct_t more_data;
-	//                                =>             $monitor __mon_d;
+	//                                =>             monitor$ __mon_d;
 	// };                                        };
-	//                                           static inline $monitor * get_coroutine( MyMonitor * this ) { return &this->__cor_d; }
+	//                                           static inline monitor$ * get_coroutine( MyMonitor * this ) { return &this->__cor_d; }
 	//
 	class MonitorKeyword final : public ConcurrentSueKeyword {
@@ -198,5 +198,5 @@
 
 	  	MonitorKeyword() : ConcurrentSueKeyword(
-			"$monitor",
+			"monitor$",
 			"__mon",
 			"get_monitor",
@@ -230,8 +230,8 @@
 
 	  	GeneratorKeyword() : ConcurrentSueKeyword(
-			"$generator",
+			"generator$",
 			"__generator_state",
 			"get_generator",
-			"Unable to find builtin type $generator\n",
+			"Unable to find builtin type generator$\n",
 			"",
 			true,
@@ -292,5 +292,5 @@
 	//Handles mutex routines definitions :
 	// void foo( A * mutex a, B * mutex b,  int i ) {                  void foo( A * a, B * b,  int i ) {
-	// 	                                                                 $monitor * __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*/
@@ -333,5 +333,5 @@
 	//Handles mutex routines definitions :
 	// void foo( A * mutex a, B * mutex b,  int i ) {                  void foo( A * a, B * b,  int i ) {
-	// 	                                                                 $monitor * __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*/
@@ -449,5 +449,5 @@
 	Expression * ConcurrentSueKeyword::postmutate( KeywordCastExpr * cast ) {
 		if ( cast_target == cast->target ) {
-			// convert (thread &)t to ($thread &)*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 );
@@ -919,5 +919,5 @@
 	void MutexKeyword::postvisit(StructDecl* decl) {
 
-		if( decl->name == "$monitor" && decl->body ) {
+		if( decl->name == "monitor$" && decl->body ) {
 			assert( !monitor_decl );
 			monitor_decl = decl;
@@ -1020,5 +1020,5 @@
 		);
 
-		//$monitor * __monitors[] = { get_monitor(a), get_monitor(b) };
+		//monitor$ * __monitors[] = { get_monitor(a), get_monitor(b) };
 		body->push_front( new DeclStmt( monitors ) );
 	}
@@ -1117,5 +1117,5 @@
 		);
 
-		//$monitor * __monitors[] = { get_monitor(a), get_monitor(b) };
+		//monitor$ * __monitors[] = { get_monitor(a), get_monitor(b) };
 		body->push_front( new DeclStmt( monitors) );
 	}
@@ -1125,5 +1125,5 @@
 	//=============================================================================================
 	void ThreadStarter::previsit( StructDecl * decl ) {
-		if( decl->name == "$thread" && decl->body ) {
+		if( decl->name == "thread$" && decl->body ) {
 			assert( !thread_decl );
 			thread_decl = decl;