Index: src/Concurrency/Waitfor.cc
===================================================================
--- src/Concurrency/Waitfor.cc	(revision e84ab3dadc96fd4dc82b5b0bc20cfe9b14f64259)
+++ src/Concurrency/Waitfor.cc	(revision 8f1a99e18a889d2af43cbd1e5f77c6554f5c8009)
@@ -244,5 +244,5 @@
 			decl_mask = decl;
 		}
-		else if( decl->name == "$monitor" ) {
+		else if( decl->name == "monitor$" ) {
 			assert( !decl_monitor );
 			decl_monitor = decl;
Index: src/ResolvExpr/AlternativeFinder.cc
===================================================================
--- src/ResolvExpr/AlternativeFinder.cc	(revision e84ab3dadc96fd4dc82b5b0bc20cfe9b14f64259)
+++ src/ResolvExpr/AlternativeFinder.cc	(revision 8f1a99e18a889d2af43cbd1e5f77c6554f5c8009)
@@ -1302,5 +1302,5 @@
 
 		try {
-			// Attempt 1 : turn (thread&)X into ($thread&)X.__thrd
+			// Attempt 1 : turn (thread&)X into (thread$&)X.__thrd
 			// Clone is purely for memory management
 			std::unique_ptr<Expression> tech1 { new UntypedMemberExpr(new NameExpr(castExpr->concrete_target.field), castExpr->arg->clone()) };
@@ -1313,5 +1313,5 @@
 		} catch(SemanticErrorException & ) {}
 
-		// Fallback : turn (thread&)X into ($thread&)get_thread(X)
+		// Fallback : turn (thread&)X into (thread$&)get_thread(X)
 		std::unique_ptr<Expression> fallback { UntypedExpr::createDeref( new UntypedExpr(new NameExpr(castExpr->concrete_target.getter), { castExpr->arg->clone() })) };
 		// don't prune here, since it's guaranteed all alternatives will have the same type
Index: src/ResolvExpr/CandidateFinder.cpp
===================================================================
--- src/ResolvExpr/CandidateFinder.cpp	(revision e84ab3dadc96fd4dc82b5b0bc20cfe9b14f64259)
+++ src/ResolvExpr/CandidateFinder.cpp	(revision 8f1a99e18a889d2af43cbd1e5f77c6554f5c8009)
@@ -1180,5 +1180,5 @@
 
 			try {
-				// Attempt 1 : turn (thread&)X into ($thread&)X.__thrd
+				// Attempt 1 : turn (thread&)X into (thread$&)X.__thrd
 				// Clone is purely for memory management
 				std::unique_ptr<const ast::Expr> tech1 { new ast::UntypedMemberExpr(loc, new ast::NameExpr(loc, castExpr->concrete_target.field), castExpr->arg) };
@@ -1191,5 +1191,5 @@
 			} catch(SemanticErrorException & ) {}
 
-			// Fallback : turn (thread&)X into ($thread&)get_thread(X)
+			// Fallback : turn (thread&)X into (thread$&)get_thread(X)
 			std::unique_ptr<const ast::Expr> fallback { ast::UntypedExpr::createDeref(loc,  new ast::UntypedExpr(loc, new ast::NameExpr(loc, castExpr->concrete_target.getter), { castExpr->arg })) };
 			// don't prune here, since it's guaranteed all alternatives will have the same type