Index: src/SymTab/Mangler.cc
===================================================================
--- src/SymTab/Mangler.cc	(revision 4285544e8700816f503a6ff9c79f94d086721677)
+++ src/SymTab/Mangler.cc	(revision 7804e2aa5f09879353f29c346128bb9898678da5)
@@ -144,5 +144,5 @@
 			void Mangler::postvisit( VoidType * voidType ) {
 				printQualifiers( voidType );
-				mangleName << Encoding::voidType;
+				mangleName << Encoding::void_t;
 			}
 
@@ -195,5 +195,5 @@
 				inFunctionType = true;
 				std::list< Type* > returnTypes = getTypes( functionType->returnVals );
-				if (returnTypes.empty()) mangleName << Encoding::voidType;
+				if (returnTypes.empty()) mangleName << Encoding::void_t;
 				else acceptAll( returnTypes, *visitor );
 				mangleName << "_";
@@ -223,13 +223,13 @@
 
 			void Mangler::postvisit( StructInstType * aggregateUseType ) {
-				mangleRef( aggregateUseType, "s" );
+				mangleRef( aggregateUseType, Encoding::struct_t );
 			}
 
 			void Mangler::postvisit( UnionInstType * aggregateUseType ) {
-				mangleRef( aggregateUseType, "u" );
+				mangleRef( aggregateUseType, Encoding::union_t );
 			}
 
 			void Mangler::postvisit( EnumInstType * aggregateUseType ) {
-				mangleRef( aggregateUseType, "e" );
+				mangleRef( aggregateUseType, Encoding::enum_t );
 			}
 
Index: src/SymTab/Mangler.h
===================================================================
--- src/SymTab/Mangler.h	(revision 4285544e8700816f503a6ff9c79f94d086721677)
+++ src/SymTab/Mangler.h	(revision 7804e2aa5f09879353f29c346128bb9898678da5)
@@ -46,5 +46,5 @@
 			extern const std::map<int, std::string> qualifiers;
 
-			extern const std::string voidType;
+			extern const std::string void_t;
 			extern const std::string zero;
 			extern const std::string one;
@@ -56,4 +56,8 @@
 			extern const std::string qualifiedTypeStart;
 			extern const std::string qualifiedTypeEnd;
+
+			extern const std::string struct_t;
+			extern const std::string union_t;
+			extern const std::string enum_t;
 
 			extern const std::string autogen;
Index: src/SymTab/ManglerCommon.cc
===================================================================
--- src/SymTab/ManglerCommon.cc	(revision 4285544e8700816f503a6ff9c79f94d086721677)
+++ src/SymTab/ManglerCommon.cc	(revision 7804e2aa5f09879353f29c346128bb9898678da5)
@@ -64,12 +64,12 @@
 
 			const std::map<int, std::string> qualifiers = {
-				{ Type::Const, "C" },
+				{ Type::Const, "K" },
 				{ Type::Volatile, "V" },
 				{ Type::Atomic, "A" }, // A = Atomic, A0 = Array and forall parameter...
-				{ Type::Mutex, "M" },
+				{ Type::Mutex, "X" },
 				{ Type::Lvalue, "L" },
 			};
 
-			const std::string voidType = "v";
+			const std::string void_t = "v";
 			const std::string zero = "Z";
 			const std::string one = "O";
@@ -82,4 +82,8 @@
 			const std::string qualifiedTypeEnd = "E";
 
+			const std::string struct_t = "S";
+			const std::string union_t = "U";
+			const std::string enum_t = "M";
+
 			const std::string autogen = "autogen__";
 			const std::string intrinsic = "intrinsic__";