Index: tests/concurrent/signal/block.cfa
===================================================================
--- tests/concurrent/signal/block.cfa	(revision a50502128f8eabae54ded84a8ab9885411aad583)
+++ tests/concurrent/signal/block.cfa	(revision 959f6ad7be069ef347da6b078ecfa517f3653102)
@@ -33,6 +33,6 @@
 
 monitor global_data_t {
-	thread_desc * last_thread;
-	thread_desc * last_signaller;
+	$thread * last_thread;
+	$thread * last_signaller;
 };
 
@@ -82,5 +82,5 @@
 	if( !is_empty( cond ) ) {
 
-		thread_desc * next = front( cond );
+		$thread * next = front( cond );
 
 		if( ! signal_block( cond ) ) {