Index: src/Validate/Autogen.cpp
===================================================================
--- src/Validate/Autogen.cpp	(revision c6b4432f5c6c6679b981f5a6bded51ad30ac00d9)
+++ src/Validate/Autogen.cpp	(revision 6ea85b222eba7c3bf49507b5e21dd4709cee46e8)
@@ -49,5 +49,5 @@
 
 // --------------------------------------------------------------------------
-struct AutogenerateRoutines_new final :
+struct AutogenerateRoutines final :
 		public ast::WithDeclsToAdd<>,
 		public ast::WithShortCircuiting {
@@ -232,5 +232,5 @@
 
 // --------------------------------------------------------------------------
-void AutogenerateRoutines_new::previsit( const ast::EnumDecl * enumDecl ) {
+void AutogenerateRoutines::previsit( const ast::EnumDecl * enumDecl ) {
 	// Must visit children (enum constants) to add them to the symbol table.
 	if ( !enumDecl->body ) return;
@@ -249,5 +249,5 @@
 }
 
-void AutogenerateRoutines_new::previsit( const ast::StructDecl * structDecl ) {
+void AutogenerateRoutines::previsit( const ast::StructDecl * structDecl ) {
 	visit_children = false;
 	if ( !structDecl->body ) return;
@@ -265,5 +265,5 @@
 }
 
-void AutogenerateRoutines_new::previsit( const ast::UnionDecl * unionDecl ) {
+void AutogenerateRoutines::previsit( const ast::UnionDecl * unionDecl ) {
 	visit_children = false;
 	if ( !unionDecl->body ) return;
@@ -282,5 +282,5 @@
 
 /// Generate ctor/dtors/assign for typedecls, e.g., otype T = int *;
-void AutogenerateRoutines_new::previsit( const ast::TypeDecl * typeDecl ) {
+void AutogenerateRoutines::previsit( const ast::TypeDecl * typeDecl ) {
 	if ( !typeDecl->base ) return;
 
@@ -290,10 +290,10 @@
 }
 
-void AutogenerateRoutines_new::previsit( const ast::TraitDecl * ) {
+void AutogenerateRoutines::previsit( const ast::TraitDecl * ) {
 	// Ensure that we don't add assignment ops for types defined as part of the trait
 	visit_children = false;
 }
 
-void AutogenerateRoutines_new::previsit( const ast::FunctionDecl * ) {
+void AutogenerateRoutines::previsit( const ast::FunctionDecl * ) {
 	// Track whether we're currently in a function.
 	// Can ignore function type idiosyncrasies, because function type can never
@@ -302,5 +302,5 @@
 }
 
-void AutogenerateRoutines_new::postvisit( const ast::FunctionDecl * ) {
+void AutogenerateRoutines::postvisit( const ast::FunctionDecl * ) {
 	functionNesting -= 1;
 }
@@ -521,5 +521,5 @@
 		const ast::Expr * src, const ast::ObjectDecl * field,
 		ast::FunctionDecl * func, SymTab::LoopDirection direction ) {
-	InitTweak::InitExpander_new srcParam( src );
+	InitTweak::InitExpander srcParam( src );
 	// Assign to destination.
 	ast::MemberExpr * dstSelect = new ast::MemberExpr(
@@ -795,5 +795,5 @@
 
 void autogenerateRoutines( ast::TranslationUnit & translationUnit ) {
-	ast::Pass<AutogenerateRoutines_new>::run( translationUnit );
+	ast::Pass<AutogenerateRoutines>::run( translationUnit );
 }