diff --git a/XmlSchemaClassGenerator.Console/Program.cs b/XmlSchemaClassGenerator.Console/Program.cs
index d098f73..a20584e 100644
--- a/XmlSchemaClassGenerator.Console/Program.cs
+++ b/XmlSchemaClassGenerator.Console/Program.cs
@@ -279,7 +279,7 @@ A file name may be given by appending a pipe sign (|) followed by a file name (l
 
             if (nameSubstituteMap.Any())
             {
-                generator.NamingProvider = new SubstituteNamingProvider(nameSubstituteMap);
+                generator.NamingProvider = new SubstituteNamingProvider(generator.NamingScheme, nameSubstituteMap);
             }
 
             generator.CommentLanguages.UnionWith(commentLanguages);