Index: src/CodeGen/FixMain.cc
===================================================================
--- src/CodeGen/FixMain.cc	(revision af746ccdf606483f8f89907b52e8b9471c72df7c)
+++ src/CodeGen/FixMain.cc	(revision bab42dedcae60fabba662dd711ba8169f2a37e4e)
@@ -52,5 +52,5 @@
 ast::ObjectDecl * makeIntObj(){
 	return new ast::ObjectDecl( CodeLocation(), "",
-		new ast::BasicType( ast::BasicType::SignedInt ) );
+		new ast::BasicType( ast::BasicKind::SignedInt ) );
 }
 
@@ -59,5 +59,5 @@
 		new ast::PointerType(
 			new ast::PointerType(
-				new ast::BasicType( ast::BasicType::Char ) ) ) );
+				new ast::BasicType( ast::BasicKind::Char ) ) ) );
 }
 
Index: src/CodeGen/GenType.cc
===================================================================
--- src/CodeGen/GenType.cc	(revision af746ccdf606483f8f89907b52e8b9471c72df7c)
+++ src/CodeGen/GenType.cc	(revision bab42dedcae60fabba662dd711ba8169f2a37e4e)
@@ -87,6 +87,6 @@
 
 void GenType::postvisit( ast::BasicType const * type ) {
-	ast::BasicType::Kind kind = type->kind;
-	assert( 0 <= kind && kind < ast::BasicType::NUMBER_OF_BASIC_TYPES );
+	ast::BasicKind kind = type->kind;
+	assert( 0 <= kind && kind < ast::BasicKind::NUMBER_OF_BASIC_TYPES );
 	result = std::string( ast::BasicType::typeNames[kind] ) + " " + result;
 	handleQualifiers( type );