Index: src/ResolvExpr/CommonType.cc
===================================================================
--- src/ResolvExpr/CommonType.cc	(revision 7d55e4dc38c32ca94ef018a3351482d390520db1)
+++ src/ResolvExpr/CommonType.cc	(revision 4ac402ddad18fa0baca5b47593a1b262b3702fa0)
@@ -485,5 +485,5 @@
 	// GENERATED END
 	static_assert(
-		sizeof(commonTypes)/sizeof(commonTypes[0][0]) == BasicType::NUMBER_OF_BASIC_TYPES * BasicType::NUMBER_OF_BASIC_TYPES,
+		sizeof(commonTypes)/sizeof(commonTypes[0][0]) == ast::BasicType::NUMBER_OF_BASIC_TYPES * ast::BasicType::NUMBER_OF_BASIC_TYPES,
 		"Each basic type kind should have a corresponding row in the combined type matrix"
 	);
Index: src/ResolvExpr/ConversionCost.cc
===================================================================
--- src/ResolvExpr/ConversionCost.cc	(revision 7d55e4dc38c32ca94ef018a3351482d390520db1)
+++ src/ResolvExpr/ConversionCost.cc	(revision 4ac402ddad18fa0baca5b47593a1b262b3702fa0)
@@ -268,5 +268,5 @@
 	// GENERATED END
 	static_assert(
-		sizeof(costMatrix)/sizeof(costMatrix[0][0]) == BasicType::NUMBER_OF_BASIC_TYPES * BasicType::NUMBER_OF_BASIC_TYPES,
+		sizeof(costMatrix)/sizeof(costMatrix[0][0]) == ast::BasicType::NUMBER_OF_BASIC_TYPES * ast::BasicType::NUMBER_OF_BASIC_TYPES,
 		"Missing row in the cost matrix"
 	);
@@ -315,5 +315,5 @@
 	// GENERATED END
 	static_assert(
-		sizeof(signMatrix)/sizeof(signMatrix[0][0]) == BasicType::NUMBER_OF_BASIC_TYPES * BasicType::NUMBER_OF_BASIC_TYPES,
+		sizeof(signMatrix)/sizeof(signMatrix[0][0]) == ast::BasicType::NUMBER_OF_BASIC_TYPES * ast::BasicType::NUMBER_OF_BASIC_TYPES,
 		"Missing row in the sign matrix"
 	);
Index: src/SymTab/ManglerCommon.cc
===================================================================
--- src/SymTab/ManglerCommon.cc	(revision 7d55e4dc38c32ca94ef018a3351482d390520db1)
+++ src/SymTab/ManglerCommon.cc	(revision 4ac402ddad18fa0baca5b47593a1b262b3702fa0)
@@ -15,6 +15,7 @@
 
 #include "Mangler.h"
-#include "SynTree/Type.h"
-#include "SynTree/Declaration.h"
+
+#include "AST/Decl.hpp"
+#include "AST/Type.hpp"
 
 namespace SymTab {
@@ -79,13 +80,13 @@
 			// GENERATED END
 			static_assert(
-				sizeof(basicTypes)/sizeof(basicTypes[0]) == BasicType::NUMBER_OF_BASIC_TYPES,
+				sizeof(basicTypes)/sizeof(basicTypes[0]) == ast::BasicType::NUMBER_OF_BASIC_TYPES,
 				"Each basic type kind should have a corresponding mangler letter"
 			);
 
 			const std::map<int, std::string> qualifiers = {
-				{ Type::Const, "K" },
-				{ Type::Volatile, "V" },
-				{ Type::Atomic, "DA" }, // A is array, so need something unique for atmoic. For now, go with multiletter DA
-				{ Type::Mutex, "X" },
+				{ ast::CV::Const, "K" },
+				{ ast::CV::Volatile, "V" },
+				{ ast::CV::Atomic, "DA" }, // A is array, so need something unique for atmoic. For now, go with multiletter DA
+				{ ast::CV::Mutex, "X" },
 			};
 
@@ -111,5 +112,5 @@
 			};
 			static_assert(
-				sizeof(typeVariables) / sizeof(typeVariables[0]) == TypeDecl::NUMBER_OF_KINDS,
+				sizeof(typeVariables) / sizeof(typeVariables[0]) == ast::TypeDecl::NUMBER_OF_KINDS,
 				"Each type variable kind should have a corresponding mangler prefix"
 			);