Index: src/AST/Pass.impl.hpp
===================================================================
--- src/AST/Pass.impl.hpp	(revision cdacb73965c73d168fb3ac61512562df788e2f39)
+++ src/AST/Pass.impl.hpp	(revision e00c22feb84a430a60c57638aabf2d3f11f8c449)
@@ -423,5 +423,5 @@
 		}
 		catch( SemanticErrorException &e ) {
-			if (__pass::onError (visitor.core, *i, 0))
+			if (__pass::on_error (visitor.core, *i, 0))
 				errors.append( e );
 		}
Index: src/AST/Pass.proto.hpp
===================================================================
--- src/AST/Pass.proto.hpp	(revision cdacb73965c73d168fb3ac61512562df788e2f39)
+++ src/AST/Pass.proto.hpp	(revision e00c22feb84a430a60c57638aabf2d3f11f8c449)
@@ -270,9 +270,9 @@
 
 	template< typename core_t >
-	static bool onError (core_t &, ptr<Decl> &, long) { return true; }
-
-	template< typename core_t >
-	static auto onError (core_t & core, ptr<Decl> & decl, int) -> decltype(core.onError(decl)) {
-		return core.onError(decl); 
+	static bool on_error (core_t &, ptr<Decl> &, long) { return true; }
+
+	template< typename core_t >
+	static auto on_error (core_t & core, ptr<Decl> & decl, int) -> decltype(core.on_error(decl)) {
+		return core.on_error(decl); 
 	}
 
Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision cdacb73965c73d168fb3ac61512562df788e2f39)
+++ src/ResolvExpr/Resolver.cc	(revision e00c22feb84a430a60c57638aabf2d3f11f8c449)
@@ -1289,5 +1289,5 @@
 		void beginScope() { managedTypes.beginScope(); }
 		void endScope() { managedTypes.endScope(); }
-		bool onError(ast::ptr<ast::Decl> & decl);
+		bool on_error(ast::ptr<ast::Decl> & decl);
 	};
 	// size_t Resolver_new::traceId = Stats::Heap::new_stacktrace_id("Resolver");
@@ -2068,5 +2068,5 @@
 
 	// suppress error on autogen functions and mark invalid autogen as deleted.
-	bool Resolver_new::onError(ast::ptr<ast::Decl> & decl) {
+	bool Resolver_new::on_error(ast::ptr<ast::Decl> & decl) {
 		if (auto functionDecl = decl.as<ast::FunctionDecl>()) {
 			// xxx - can intrinsic gen ever fail?
