The name of the class containing static methods generated from C++ functions is no longer based on the option OutputNamespace.

src/Generator/Generators/CLI/CLIHeadersTemplate.cs

@@ -219,8 +219,7 @@ namespace CppSharp.Generators.CLI
         {
             PushBlock(CLIBlockKind.FunctionsClass);
 
-            WriteLine("public ref class {0}{1}", Options.OutputNamespace,
+            WriteLine("public ref class {0}", TranslationUnit.FileNameWithoutExtension);
-                TranslationUnit.FileNameWithoutExtension);
             WriteLine("{");
             WriteLine("public:");
             PushIndent();

src/Generator/Generators/CLI/CLISourcesTemplate.cs

@@ -804,8 +804,8 @@ namespace CppSharp.Generators.CLI
 
             GenerateDeclarationCommon(function);
 
-            var classSig = string.Format("{0}{1}{2}", QualifiedIdentifier(@namespace),
+            var classSig = string.Format("{0}::{1}", QualifiedIdentifier(@namespace),
-                Options.OutputNamespace, TranslationUnit.FileNameWithoutExtension);
+                TranslationUnit.FileNameWithoutExtension);
 
             Write("{0} {1}::{2}(", function.ReturnType, classSig,
                 function.Name);