Index: tools/gdb/utils-gdb.py
===================================================================
--- tools/gdb/utils-gdb.py	(revision 6abcb4d27ed4ea63b609aee343548dd4f3159285)
+++ tools/gdb/utils-gdb.py	(revision 86fc350b0fed75cdbddd02c1dea171034661f0c8)
@@ -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))