Renamed class names to match file renames.

src/Generator/Generators/CLI/CLIGenerator.cs

@@ -20,10 +20,10 @@ namespace CppSharp.Generators.CLI
         {
             var outputs = new List<Template>();
 
-            var header = new CLIHeadersTemplate(Driver, units);
+            var header = new CLIHeaders(Driver, units);
             outputs.Add(header);
 
-            var source = new CLISourcesTemplate(Driver, units);
+            var source = new CLISources(Driver, units);
             outputs.Add(source);
 
             return outputs;

src/Generator/Generators/CLI/CLIHeaders.cs

@@ -11,11 +11,11 @@ namespace CppSharp.Generators.CLI
     /// <summary>
     /// Generates C++/CLI header files.
     /// </summary>
-    public class CLIHeadersTemplate : CLITextTemplate
+    public class CLIHeaders : CLITextTemplate
     {
         public override string FileExtension { get { return "h"; } }
 
-        public CLIHeadersTemplate(Driver driver, IEnumerable<TranslationUnit> units)
+        public CLIHeaders(Driver driver, IEnumerable<TranslationUnit> units)
             : base(driver, units)
         {
         }

src/Generator/Generators/CLI/CLISources.cs

@@ -14,9 +14,9 @@ namespace CppSharp.Generators.CLI
     /// <summary>
     /// Generates C++/CLI source files.
     /// </summary>
-    public class CLISourcesTemplate : CLITextTemplate
+    public class CLISources : CLITextTemplate
     {
-        public CLISourcesTemplate(Driver driver, IEnumerable<TranslationUnit> units)
+        public CLISources(Driver driver, IEnumerable<TranslationUnit> units)
             : base(driver, units)
         {
             

src/Generator/Generators/CSharp/CSharpGenerator.cs

@@ -19,7 +19,7 @@ namespace CppSharp.Generators.CSharp
         {
             var outputs = new List<Template>();
 
-            var template = new CSharpTextTemplate(Driver, units, typePrinter, expressionPrinter);
+            var template = new CSharpSources(Driver, units, typePrinter, expressionPrinter);
             outputs.Add(template);
 
             return outputs;

src/Generator/Generators/CSharp/CSharpSources.cs

@@ -156,7 +156,7 @@ namespace CppSharp.Generators.CSharp
         public const int Finalizer = FIRST + 19;
     }
 
-    public class CSharpTextTemplate : Template
+    public class CSharpSources : Template
     {
         public CSharpTypePrinter TypePrinter { get; private set; }
         public CSharpExpressionPrinter ExpressionPrinter { get; private set; }
@@ -166,7 +166,7 @@ namespace CppSharp.Generators.CSharp
             get { return "cs"; }
         }
 
-        public CSharpTextTemplate(Driver driver, IEnumerable<TranslationUnit> units,
+        public CSharpSources(Driver driver, IEnumerable<TranslationUnit> units,
             CSharpTypePrinter typePrinter, CSharpExpressionPrinter expressionPrinter)
             : base(driver, units)
         {

src/Generator/Passes/ObjectOverridesPass.cs

@@ -28,7 +28,7 @@ namespace CppSharp
                 }
                 if (needsStreamInclude)
                 {
-                    var sourcesTemplate = template as CLISourcesTemplate;
+                    var sourcesTemplate = template as CLISources;
                     if (sourcesTemplate != null)
                     {
                         foreach (var block in sourcesTemplate.FindBlocks(CLIBlockKind.Includes))