Index: src/InitTweak/FixInit.cc
===================================================================
--- src/InitTweak/FixInit.cc	(revision eaa643064a39462e2d8c292cc2d60bdfba22887f)
+++ src/InitTweak/FixInit.cc	(revision 589a70bdeb3a95811f5c130296fd64d14e0c6498)
@@ -1163,7 +1163,7 @@
 
 			std::string fname = getFunctionName( appExpr );
-			if ( fname == function->get_name() ) {
+			if ( fname == function->name ) {
 				// call to same kind of function
-				Expression * firstParam = appExpr->get_args().front();
+				Expression * firstParam = appExpr->args.front();
 
 				if ( isThisExpression( firstParam, thisParam ) ) {
@@ -1174,6 +1174,6 @@
 					// if first parameter is a member expression on the this parameter,
 					// then remove the member from unhandled set.
-					if ( isThisExpression( memberExpr->get_aggregate(), thisParam ) ) {
-						unhandled.erase( memberExpr->get_member() );
+					if ( isThisExpression( memberExpr->aggregate, thisParam ) ) {
+						unhandled.erase( memberExpr->member );
 					}
 				}
Index: src/SymTab/Indexer.cc
===================================================================
--- src/SymTab/Indexer.cc	(revision eaa643064a39462e2d8c292cc2d60bdfba22887f)
+++ src/SymTab/Indexer.cc	(revision 589a70bdeb3a95811f5c130296fd64d14e0c6498)
@@ -499,5 +499,5 @@
 		makeWritable();
 
-		const std::string &id = decl->get_name();
+		const std::string &id = decl->name;
 		TypeTable::iterator existing = tables->typeTable.find( id );
 		if ( existing == tables->typeTable.end() ) {
@@ -532,5 +532,5 @@
 		makeWritable();
 
-		const std::string &id = decl->get_name();
+		const std::string &id = decl->name;
 		StructTable::iterator existing = tables->structTable.find( id );
 		if ( existing == tables->structTable.end() ) {
@@ -551,5 +551,5 @@
 		makeWritable();
 
-		const std::string &id = decl->get_name();
+		const std::string &id = decl->name;
 		EnumTable::iterator existing = tables->enumTable.find( id );
 		if ( existing == tables->enumTable.end() ) {
@@ -575,5 +575,5 @@
 		makeWritable();
 
-		const std::string &id = decl->get_name();
+		const std::string &id = decl->name;
 		UnionTable::iterator existing = tables->unionTable.find( id );
 		if ( existing == tables->unionTable.end() ) {
@@ -594,5 +594,5 @@
 		makeWritable();
 
-		const std::string &id = decl->get_name();
+		const std::string &id = decl->name;
 		TraitTable::iterator existing = tables->traitTable.find( id );
 		if ( existing == tables->traitTable.end() ) {
Index: src/prelude/prelude.cf
===================================================================
--- src/prelude/prelude.cf	(revision eaa643064a39462e2d8c292cc2d60bdfba22887f)
+++ src/prelude/prelude.cf	(revision 589a70bdeb3a95811f5c130296fd64d14e0c6498)
@@ -728,5 +728,4 @@
 forall( dtype DT ) void ?{}(	   volatile  DT *	   &,			DT * );
 forall( dtype DT ) void ?{}(	   volatile  DT *	   &,	    volatile	DT * );
-
 forall( dtype DT ) void ?{}( const volatile  DT *	   &,			DT * );
 forall( dtype DT ) void ?{}( const volatile  DT *	   &, const		DT * );