Index: src/ControlStruct/ExceptTranslate.cc
===================================================================
--- src/ControlStruct/ExceptTranslate.cc	(revision 1fbeebd0b18f95d9f936b45c68389756be3ba23b)
+++ src/ControlStruct/ExceptTranslate.cc	(revision 12d2dc8fad3691528e0f541fe5bd38046cdc9877)
@@ -211,5 +211,5 @@
 			ThrowStmt *throwStmt ) {
 		// __throw_terminate( `throwStmt->get_name()` ); }
-		return create_given_throw( "__cfaehm__throw_terminate", throwStmt );
+		return create_given_throw( "__cfaabi_ehm__throw_terminate", throwStmt );
 	}
 
@@ -232,5 +232,5 @@
 			) ) );
 		result->push_back( new ExprStmt(
-			new UntypedExpr( new NameExpr( "__cfaehm__rethrow_terminate" ) )
+			new UntypedExpr( new NameExpr( "__cfaabi_ehm__rethrow_terminate" ) )
 			) );
 		delete throwStmt;
@@ -241,5 +241,5 @@
 			ThrowStmt *throwStmt ) {
 		// __throw_resume( `throwStmt->get_name` );
-		return create_given_throw( "__cfaehm__throw_resume", throwStmt );
+		return create_given_throw( "__cfaabi_ehm__throw_resume", throwStmt );
 	}
 
@@ -309,5 +309,5 @@
 			local_except->get_attributes().push_back( new Attribute(
 				"cleanup",
-				{ new NameExpr( "__cfaehm__cleanup_terminate" ) }
+				{ new NameExpr( "__cfaabi_ehm__cleanup_terminate" ) }
 				) );
 
@@ -430,8 +430,8 @@
 			FunctionDecl * terminate_catch,
 			FunctionDecl * terminate_match ) {
-		// { __cfaehm__try_terminate(`try`, `catch`, `match`); }
+		// { __cfaabi_ehm__try_terminate(`try`, `catch`, `match`); }
 
 		UntypedExpr * caller = new UntypedExpr( new NameExpr(
-			"__cfaehm__try_terminate" ) );
+			"__cfaabi_ehm__try_terminate" ) );
 		std::list<Expression *>& args = caller->get_args();
 		args.push_back( nameOf( try_wrapper ) );
@@ -487,8 +487,8 @@
 
 		// struct __try_resume_node __resume_node
-		//  	__attribute__((cleanup( __cfaehm__try_resume_cleanup )));
+		//  	__attribute__((cleanup( __cfaabi_ehm__try_resume_cleanup )));
 		// ** unwinding of the stack here could cause problems **
 		// ** however I don't think that can happen currently **
-		// __cfaehm__try_resume_setup( &__resume_node, resume_handler );
+		// __cfaabi_ehm__try_resume_setup( &__resume_node, resume_handler );
 
 		std::list< Attribute * > attributes;
@@ -496,5 +496,5 @@
 			std::list< Expression * > attr_params;
 			attr_params.push_back( new NameExpr(
-				"__cfaehm__try_resume_cleanup" ) );
+				"__cfaabi_ehm__try_resume_cleanup" ) );
 			attributes.push_back( new Attribute( "cleanup", attr_params ) );
 		}
@@ -515,5 +515,5 @@
 
 		UntypedExpr *setup = new UntypedExpr( new NameExpr(
-			"__cfaehm__try_resume_setup" ) );
+			"__cfaabi_ehm__try_resume_setup" ) );
 		setup->get_args().push_back( new AddressExpr( nameOf( obj ) ) );
 		setup->get_args().push_back( nameOf( resume_handler ) );
@@ -540,5 +540,5 @@
 	ObjectDecl * ExceptionMutatorCore::create_finally_hook(
 			FunctionDecl * finally_wrapper ) {
-		// struct __cfaehm__cleanup_hook __finally_hook
+		// struct __cfaabi_ehm__cleanup_hook __finally_hook
 		//   	__attribute__((cleanup( finally_wrapper )));
 
@@ -594,12 +594,12 @@
 			// Skip children?
 			return;
-		} else if ( structDecl->get_name() == "__cfaehm__base_exception_t" ) {
+		} else if ( structDecl->get_name() == "__cfaabi_ehm__base_exception_t" ) {
 			assert( nullptr == except_decl );
 			except_decl = structDecl;
 			init_func_types();
-		} else if ( structDecl->get_name() == "__cfaehm__try_resume_node" ) {
+		} else if ( structDecl->get_name() == "__cfaabi_ehm__try_resume_node" ) {
 			assert( nullptr == node_decl );
 			node_decl = structDecl;
-		} else if ( structDecl->get_name() == "__cfaehm__cleanup_hook" ) {
+		} else if ( structDecl->get_name() == "__cfaabi_ehm__cleanup_hook" ) {
 			assert( nullptr == hook_decl );
 			hook_decl = structDecl;