diff --git a/src/Generator/CodeGenerator.cs b/src/Generator/Driver.cs
similarity index 96%
rename from src/Generator/CodeGenerator.cs
rename to src/Generator/Driver.cs
index c7d7a324..f1e6c219 100644
--- a/src/Generator/CodeGenerator.cs
+++ b/src/Generator/Driver.cs
@@ -47,7 +47,7 @@ namespace Cxxi
                     IncludeDirs = options.IncludeDirs,
                     FileName = file,
                     Defines = options.Defines,
-                    toolSetToUse = options.toolset2use
+                    toolSetToUse = options.ToolsetToUse
                 };
 
             if (!ClangParser.Parse(parserOptions))
@@ -74,6 +74,7 @@ namespace Cxxi
             var passes = new PassBuilder(library);
             passes.ResolveIncompleteDecls(typeDatabase);
             passes.CleanInvalidDeclNames();
+            passes.CheckFlagEnums();
 
             if (transform != null)
                 transform.SetupPasses(passes);
@@ -127,6 +128,6 @@ namespace Cxxi
         public List<string> Headers;
         public string Template;
         public string Assembly;
-        public int toolset2use;
+        public int ToolsetToUse;
     }
 }
\ No newline at end of file
diff --git a/src/Generator/Program.cs b/src/Generator/Program.cs
index b1bfee4a..b5fa1da8 100644
--- a/src/Generator/Program.cs
+++ b/src/Generator/Program.cs
@@ -132,10 +132,10 @@ namespace Cxxi
             if (!ParseLibraryAssembly(options.Assembly, out library))
                 return;
 
-            var codeGenerator = new CodeGenerator(options, library);
-            codeGenerator.ParseCode();
-            codeGenerator.ProcessCode();
-            codeGenerator.GenerateCode();
+            var driver = new Driver(options, library);
+            driver.ParseCode();
+            driver.ProcessCode();
+            driver.GenerateCode();
         }
     }
 }