diff --git a/XmlSchemaClassGenerator.Console/Program.cs b/XmlSchemaClassGenerator.Console/Program.cs
index c98c0d4..b0e60e1 100644
--- a/XmlSchemaClassGenerator.Console/Program.cs
+++ b/XmlSchemaClassGenerator.Console/Program.cs
@@ -235,7 +235,6 @@ A file name may be given by appending a pipe sign (|) followed by a file name (l
                 DateTimeWithTimeZone = dateTimeWithTimeZone,
                 EntityFramework = entityFramework,
                 GenerateInterfaces = interfaces,
-                NamingScheme = namingScheme != null ? namingScheme.Value : (pascal ? NamingScheme.PascalCase : NamingScheme.Direct),
                 AssemblyVisible = assembly,
                 CollectionType = collectionType,
                 CollectionImplementationType = collectionImplementationType,
@@ -266,6 +265,15 @@ A file name may be given by appending a pipe sign (|) followed by a file name (l
                 AllowDtdParse = allowDtdParse,
             };
 
+            if (namingScheme != null)
+            {
+                generator.NamingScheme = namingScheme.Value;
+            }
+            else
+            {
+                generator.NamingScheme = pascal ? NamingScheme.PascalCase : NamingScheme.Direct;
+            }
+
             if (nameSubstituteMap.Any())
             {
                 generator.NamingProvider = new SubstituteNamingProvider(nameSubstituteMap);