Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision 9feb34b1fca12748b7d48737024da48e342f5c07)
+++ src/ResolvExpr/Resolver.cc	(revision c86b08de42d13ee7646e48f36c60ff65633dc0ea)
@@ -1730,10 +1730,10 @@
 
 			// Find all candidates for a function in canonical form
-			funcFinder.find( clause.target_func, ResolvMode::withAdjustment() );
+			funcFinder.find( clause.target, ResolvMode::withAdjustment() );
 
 			if ( funcFinder.candidates.empty() ) {
 				stringstream ss;
 				ss << "Use of undeclared indentifier '";
-				ss << clause.target_func.strict_as< ast::NameExpr >()->name;
+				ss << clause.target.strict_as< ast::NameExpr >()->name;
 				ss << "' in call to waitfor";
 				SemanticError( stmt->location, ss.str() );
@@ -1922,5 +1922,5 @@
 			auto clause2 = new ast::WaitForClause( clause.location );
 
-			clause2->target_func = funcCandidates.front()->expr;
+			clause2->target = funcCandidates.front()->expr;
 
 			clause2->target_args.reserve( clause.target_args.size() );
@@ -1945,5 +1945,5 @@
 
 			// Resolve the conditions as if it were an IfStmt, statements normally
-			clause2->cond = findSingleExpression( clause.cond, context );
+			clause2->when_cond = findSingleExpression( clause.when_cond, context );
 			clause2->stmt = clause.stmt->accept( *visitor );