Index: src/Parser/DeclarationNode.cc
===================================================================
--- src/Parser/DeclarationNode.cc	(revision c5d7701933b319f37bdfd125567ff5ffc52d83ef)
+++ src/Parser/DeclarationNode.cc	(revision 704d11e2ffdbb692fc9273100ec7d9ce249c179c)
@@ -1003,5 +1003,5 @@
 					* out++ = dwt;
 				} else if ( StructDecl * agg = dynamic_cast< StructDecl * >( decl ) ) {
-					StructInstType * inst = new StructInstType( Type::Qualifiers(), agg->get_name() );
+					StructInstType * inst = new StructInstType( Type::Qualifiers(), agg->name );
 					auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
 					obj->location = cur->location;
@@ -1009,5 +1009,5 @@
 					delete agg;
 				} else if ( UnionDecl * agg = dynamic_cast< UnionDecl * >( decl ) ) {
-					UnionInstType * inst = new UnionInstType( Type::Qualifiers(), agg->get_name() );
+					UnionInstType * inst = new UnionInstType( Type::Qualifiers(), agg->name );
 					auto obj = new ObjectDecl( "", Type::StorageClasses(), linkage, nullptr, inst, nullptr );
 					obj->location = cur->location;
Index: src/Parser/TypeData.cc
===================================================================
--- src/Parser/TypeData.cc	(revision c5d7701933b319f37bdfd125567ff5ffc52d83ef)
+++ src/Parser/TypeData.cc	(revision 704d11e2ffdbb692fc9273100ec7d9ce249c179c)
@@ -893,10 +893,10 @@
 	assert( td->kind == TypeData::Function );
 	FunctionType * ft = new FunctionType( buildQualifiers( td ), ! td->function.params || td->function.params->hasEllipsis );
-	buildList( td->function.params, ft->get_parameters() );
-	buildForall( td->forall, ft->get_forall() );
+	buildList( td->function.params, ft->parameters );
+	buildForall( td->forall, ft->forall );
 	if ( td->base ) {
 		switch ( td->base->kind ) {
 		  case TypeData::Tuple:
-			buildList( td->base->tuple, ft->get_returnVals() );
+			buildList( td->base->tuple, ft->returnVals );
 			break;
 		  default: