diff --git a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
index 5d4dcd96..4d21dac1 100644
--- a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
+++ b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
@@ -281,19 +281,15 @@ namespace CppSharp.Generators.CLI
 
                 var typePrinter = new CLITypePrinter(Driver, typeCtx);
                 var retType = function.ReturnType.Type.Visit(typePrinter,
-                    function.ReturnType.Qualifiers).Split('<')[0];
+                    function.ReturnType.Qualifiers);
 
                 var typeNamesStr = "";
-                var paramNamesStr = "";
                 var paramNames = template.Parameters.Select(param => param.Name).ToList();
                 if (paramNames.Any())
-                {
                     typeNamesStr = "typename " + string.Join(", typename ", paramNames);
-                    paramNamesStr = string.Join(", ", paramNames);
-                }
 
                 WriteLine("generic<{0}>", typeNamesStr);
-                WriteLine("{0}<{1}> {2}({3});", retType, paramNamesStr, SafeIdentifier(function.Name),
+                WriteLine("{0} {1}({2});", retType, SafeIdentifier(function.Name),
                     GenerateParametersList(function.Parameters));
             }
             PopIndent();
diff --git a/src/Generator/Generators/CLI/CLISourcesTemplate.cs b/src/Generator/Generators/CLI/CLISourcesTemplate.cs
index 83343ab8..c8fa8214 100644
--- a/src/Generator/Generators/CLI/CLISourcesTemplate.cs
+++ b/src/Generator/Generators/CLI/CLISourcesTemplate.cs
@@ -215,19 +215,15 @@ namespace CppSharp.Generators.CLI
 
             var typePrinter = new CLITypePrinter(Driver, typeCtx);
             var retType = function.ReturnType.Type.Visit(typePrinter,
-                function.ReturnType.Qualifiers).Split('<')[0];
+                function.ReturnType.Qualifiers);
 
             var typeNamesStr = "";
-            var paramNamesStr = "";
             var paramNames = template.Parameters.Select(param => param.Name).ToList();
             if (paramNames.Any())
-            {
                 typeNamesStr = "typename " + string.Join(", typename ", paramNames);
-                paramNamesStr = string.Join(", ", paramNames);
-            }
 
             WriteLine("generic<{0}>", typeNamesStr);
-            WriteLine("{0}<{1}> {2}::{3}({4});", retType, paramNamesStr, 
+            WriteLine("{0} {1}::{2}({3})", retType, 
                 QualifiedIdentifier(@class), SafeIdentifier(function.Name),
                 GenerateParametersList(function.Parameters));