Index: src/SymTab/GenImplicitCall.cpp
===================================================================
--- src/SymTab/GenImplicitCall.cpp	(revision af746ccdf606483f8f89907b52e8b9471c72df7c)
+++ src/SymTab/GenImplicitCall.cpp	(revision cf191acabcbe38d3f82a9149c4febffefea40a9a)
@@ -133,5 +133,5 @@
 
 	ast::ptr< ast::DeclWithType > index = new ast::ObjectDecl(
-		loc, indexName.newName(), new ast::BasicType( ast::BasicType::SignedInt ),
+		loc, indexName.newName(), new ast::BasicType( ast::BasicKind::SignedInt ),
 		new ast::SingleInit( loc, begin ) );
 	ast::ptr< ast::Expr > indexVar = new ast::VariableExpr( loc, index );
Index: src/SymTab/Mangler.cc
===================================================================
--- src/SymTab/Mangler.cc	(revision af746ccdf606483f8f89907b52e8b9471c72df7c)
+++ src/SymTab/Mangler.cc	(revision cf191acabcbe38d3f82a9149c4febffefea40a9a)
@@ -142,5 +142,5 @@
 void Mangler::postvisit( const ast::BasicType * basicType ) {
 	printQualifiers( basicType );
-	assertf( basicType->kind < ast::BasicType::NUMBER_OF_BASIC_TYPES, "Unhandled basic type: %d", basicType->kind );
+	assertf( basicType->kind < ast::BasicKind::NUMBER_OF_BASIC_TYPES, "Unhandled basic type: %d", basicType->kind );
 	mangleName += Encoding::basicTypes[ basicType->kind ];
 }
Index: src/SymTab/ManglerCommon.cc
===================================================================
--- src/SymTab/ManglerCommon.cc	(revision af746ccdf606483f8f89907b52e8b9471c72df7c)
+++ src/SymTab/ManglerCommon.cc	(revision cf191acabcbe38d3f82a9149c4febffefea40a9a)
@@ -41,5 +41,5 @@
 //   - "Di" char32_t
 //   - "Ds" char16_t
-const std::string basicTypes[ast::BasicType::NUMBER_OF_BASIC_TYPES] = {
+const std::string basicTypes[ast::BasicKind::NUMBER_OF_BASIC_TYPES] = {
 	"b",        // _Bool
 	"c",        // char
@@ -81,5 +81,5 @@
 // GENERATED END
 static_assert(
-	sizeof(basicTypes) / sizeof(basicTypes[0]) == ast::BasicType::NUMBER_OF_BASIC_TYPES,
+	sizeof(basicTypes) / sizeof(basicTypes[0]) == ast::BasicKind::NUMBER_OF_BASIC_TYPES,
 	"Each basic type kind should have a corresponding mangler letter"
 );