Index: libcfa/src/exception.h
===================================================================
--- libcfa/src/exception.h	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ libcfa/src/exception.h	(revision 7030dab75c493bbd89de53cb88e496019c794ff4)
@@ -9,7 +9,7 @@
 // Author           : Andrew Beach
 // Created On       : Mon Jun 26 15:11:00 2017
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 22 18:11:15 2018
-// Update Count     : 8
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Mar 27 10:16:00 2020
+// Update Count     : 9
 //
 
@@ -21,28 +21,28 @@
 #endif
 
-struct __cfaabi_ehm__base_exception_t;
-typedef struct __cfaabi_ehm__base_exception_t exception_t;
-struct __cfaabi_ehm__base_exception_t_vtable {
-	const struct __cfaabi_ehm__base_exception_t_vtable * parent;
+struct __cfaehm_base_exception_t;
+typedef struct __cfaehm_base_exception_t exception_t;
+struct __cfaehm_base_exception_t_vtable {
+	const struct __cfaehm_base_exception_t_vtable * parent;
 	size_t size;
-	void (*copy)(struct __cfaabi_ehm__base_exception_t *this,
-	             struct __cfaabi_ehm__base_exception_t * other);
-	void (*free)(struct __cfaabi_ehm__base_exception_t *this);
-	const char * (*msg)(struct __cfaabi_ehm__base_exception_t *this);
+	void (*copy)(struct __cfaehm_base_exception_t *this,
+	             struct __cfaehm_base_exception_t * other);
+	void (*free)(struct __cfaehm_base_exception_t *this);
+	const char * (*msg)(struct __cfaehm_base_exception_t *this);
 };
-struct __cfaabi_ehm__base_exception_t {
-	struct __cfaabi_ehm__base_exception_t_vtable const * virtual_table;
+struct __cfaehm_base_exception_t {
+	struct __cfaehm_base_exception_t_vtable const * virtual_table;
 };
-extern struct __cfaabi_ehm__base_exception_t_vtable
-	___cfaabi_ehm__base_exception_t_vtable_instance;
+extern struct __cfaehm_base_exception_t_vtable
+	___cfaehm_base_exception_t_vtable_instance;
 
 
 // Used in throw statement translation.
-void __cfaabi_ehm__throw_terminate(exception_t * except) __attribute__((noreturn));
-void __cfaabi_ehm__rethrow_terminate() __attribute__((noreturn));
-void __cfaabi_ehm__throw_resume(exception_t * except);
+void __cfaehm_throw_terminate(exception_t * except) __attribute__((noreturn));
+void __cfaehm_rethrow_terminate() __attribute__((noreturn));
+void __cfaehm_throw_resume(exception_t * except);
 
 // Function catches termination exceptions.
-void __cfaabi_ehm__try_terminate(
+void __cfaehm_try_terminate(
     void (*try_block)(),
     void (*catch_block)(int index, exception_t * except),
@@ -50,21 +50,21 @@
 
 // Clean-up the exception in catch blocks.
-void __cfaabi_ehm__cleanup_terminate(void * except);
+void __cfaehm_cleanup_terminate(void * except);
 
 // Data structure creates a list of resume handlers.
-struct __cfaabi_ehm__try_resume_node {
-    struct __cfaabi_ehm__try_resume_node * next;
+struct __cfaehm_try_resume_node {
+    struct __cfaehm_try_resume_node * next;
     _Bool (*handler)(exception_t * except);
 };
 
 // These act as constructor and destructor for the resume node.
-void __cfaabi_ehm__try_resume_setup(
-    struct __cfaabi_ehm__try_resume_node * node,
+void __cfaehm_try_resume_setup(
+    struct __cfaehm_try_resume_node * node,
     _Bool (*handler)(exception_t * except));
-void __cfaabi_ehm__try_resume_cleanup(
-    struct __cfaabi_ehm__try_resume_node * node);
+void __cfaehm_try_resume_cleanup(
+    struct __cfaehm_try_resume_node * node);
 
 // Check for a standard way to call fake deconstructors.
-struct __cfaabi_ehm__cleanup_hook {};
+struct __cfaehm_cleanup_hook {};
 
 #ifdef __cforall