Index: src/InitTweak/FixInit.cc
===================================================================
--- src/InitTweak/FixInit.cc	(revision 64ac636b5de5a469279d560f5378e5e32e271eec)
+++ src/InitTweak/FixInit.cc	(revision 946bcca6a3c077ba095be8710e19a6c1c7d5f7a4)
@@ -10,6 +10,6 @@
 // Created On       : Wed Jan 13 16:29:30 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 08:08:04 2017
-// Update Count     : 67
+// Last Modified On : Fri Mar 17 09:13:47 2017
+// Update Count     : 71
 //
 
@@ -434,5 +434,5 @@
 			env->apply( result );
 			ObjectDecl * tmp = new ObjectDecl( tempNamer.newName(), Type::StorageClasses(), LinkageSpec::C, 0, result, 0 );
-			tmp->get_type()->set_isConst( false );
+			tmp->get_type()->set_const( false );
 
 			// create and resolve copy constructor
@@ -480,8 +480,8 @@
 				env->apply( result );
 				ObjectDecl * ret = new ObjectDecl( retNamer.newName(), Type::StorageClasses(), LinkageSpec::C, 0, result, 0 );
-				ret->get_type()->set_isConst( false );
+				ret->get_type()->set_const( false );
 				impCpCtorExpr->get_returnDecls().push_back( ret );
 				CP_CTOR_PRINT( std::cerr << "makeCtorDtor for a return" << std::endl; )
-				if ( ! result->get_isLvalue() ) {
+				if ( ! result->get_lvalue() ) {
 					// destructing lvalue returns is bad because it can cause multiple destructor calls to the same object - the returned object is not a temporary
 					destructRet( ret, impCpCtorExpr );
@@ -503,5 +503,5 @@
 				env->apply( result );
 				ObjectDecl * ret = new ObjectDecl( retNamer.newName(), Type::StorageClasses(), LinkageSpec::C, 0, result, 0 );
-				ret->get_type()->set_isConst( false );
+				ret->get_type()->set_const( false );
 				stmtExpr->get_returnDecls().push_front( ret );
 
@@ -584,5 +584,5 @@
 
 				Expression * retExpr = new CommaExpr( assign, new VariableExpr( returnDecl ) );
-				if ( callExpr->get_result()->get_isLvalue() ) {
+				if ( callExpr->get_result()->get_lvalue() ) {
 					// lvalue returning functions are funny. Lvalue.cc inserts a *? in front of any lvalue returning
 					// non-intrinsic function. Add an AddressExpr to the call to negate the derefence and change the
Index: src/InitTweak/GenInit.cc
===================================================================
--- src/InitTweak/GenInit.cc	(revision 64ac636b5de5a469279d560f5378e5e32e271eec)
+++ src/InitTweak/GenInit.cc	(revision 946bcca6a3c077ba095be8710e19a6c1c7d5f7a4)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 16 08:01:25 2017
-// Update Count     : 181
+// Last Modified On : Fri Mar 17 09:12:36 2017
+// Update Count     : 183
 //
 
@@ -143,5 +143,5 @@
 		// is being returned
 		// Note: under the assumption that assignments return *this, checking for ?=? here is an optimization, since it shouldn't be necessary to copy construct `this`. This is a temporary optimization until reference types are added, at which point this should be removed, along with the analogous optimization in copy constructor generation.
-		if ( returnStmt->get_expr() && returnVals.size() == 1 && funcName != "?=?" && ! returnVals.front()->get_type()->get_isLvalue() ) {
+		if ( returnStmt->get_expr() && returnVals.size() == 1 && funcName != "?=?" && ! returnVals.front()->get_type()->get_lvalue() ) {
 			// explicitly construct the return value using the return expression and the retVal object
 			assertf( returnVals.front()->get_name() != "", "Function %s has unnamed return value\n", funcName.c_str() );
@@ -195,5 +195,5 @@
 
 			ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageClasses, LinkageSpec::C, 0, SymTab::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );
-			arrayDimension->get_type()->set_isConst( true );
+			arrayDimension->get_type()->set_const( true );
 
 			arrayType->set_dimension( new VariableExpr( arrayDimension ) );