Index: tools/gdb/utils-gdb.py
===================================================================
--- tools/gdb/utils-gdb.py	(revision dd2e0844f350ba633ca5c15d9d940c08870e3d13)
+++ tools/gdb/utils-gdb.py	(revision 47e413b844386f690a29347c83ac8c87d044fcb8)
@@ -53,5 +53,5 @@
 	return CfaTypes(cluster_ptr = gdb.lookup_type('struct cluster').pointer(),
 		processor_ptr = gdb.lookup_type('struct processor').pointer(),
-		thread_ptr = gdb.lookup_type('struct $thread').pointer(),
+		thread_ptr = gdb.lookup_type('struct thread$').pointer(),
 		int_ptr = gdb.lookup_type('int').pointer(),
 		thread_state = gdb.lookup_type('enum __Coroutine_State'),
@@ -163,8 +163,8 @@
 
 def thread_for_pthread(pthrd):
-	return tls_for_pthread(pthrd)['_X11this_threadVPS7$thread_1']
+	return tls_for_pthread(pthrd)['_X11this_threadVPS7thread$_1']
 
 def thread_for_proc(proc):
-	return tls_for_proc(proc)['_X11this_threadVPS7$thread_1']
+	return tls_for_proc(proc)['_X11this_threadVPS7thread$_1']
 
 
@@ -216,5 +216,5 @@
 
 		cfa_t = get_cfa_types()
-		root = cluster['_X7threadsS8__dllist_S7$thread__1']['_X4headPY15__TYPE_generic__1'].cast(cfa_t.thread_ptr)
+		root = cluster['_X7threadsS8__dllist_S7thread$__1']['_X4headPY15__TYPE_generic__1'].cast(cfa_t.thread_ptr)
 
 		if root == 0x0 or root.address == 0x0:
@@ -313,5 +313,5 @@
 		))
 		tls = tls_for_proc( processor )
-		thrd = tls['_X11this_threadVPS7$thread_1']
+		thrd = tls['_X11this_threadVPS7thread$_1']
 		if thrd != 0x0:
 			tname = '{} {}'.format(thrd['self_cor']['name'].string(), str(thrd))
Index: tools/vscode/uwaterloo.cforall-0.1.0/syntaxes/cfa.tmLanguage.json
===================================================================
--- tools/vscode/uwaterloo.cforall-0.1.0/syntaxes/cfa.tmLanguage.json	(revision dd2e0844f350ba633ca5c15d9d940c08870e3d13)
+++ tools/vscode/uwaterloo.cforall-0.1.0/syntaxes/cfa.tmLanguage.json	(revision 47e413b844386f690a29347c83ac8c87d044fcb8)
@@ -206,5 +206,5 @@
 					"patterns": [
 							{ "match": "(\\b|^|\\s)(void|bool|char|short|int|long|signed|unsigned|float|double)(\\b|$|\\s)", "name": "storage.type.built-in.primitive.cfa"},
-							{ "match": "(\\b|^|\\s)(zero_t|one_t|size_t|ssize_t|intptr_t|uintptr_t|\\$thread|\\$coroutine|\\$generator|\\$monitor)(\\b|$|\\s)", "name": "storage.type.built-in.cfa"},
+							{ "match": "(\\b|^|\\s)(zero_t|one_t|size_t|ssize_t|intptr_t|uintptr_t|thread\\$|coroutine\\$|generator\\$|monitor\\$)(\\b|$|\\s)", "name": "storage.type.built-in.cfa"},
 							{ "match": "(\\b|^|\\s)(extern|static|inline|volatile|const|thread_local)(\\b|$|\\s)", "name": "storage.modifier.cfa"}
 					]