diff --git a/src/Bridge/ASTVisitor.cs b/src/Bridge/ASTVisitor.cs
index 91e261fe..0fcaee29 100644
--- a/src/Bridge/ASTVisitor.cs
+++ b/src/Bridge/ASTVisitor.cs
@@ -57,7 +57,7 @@ namespace Cxxi
             if (function.ReturnType != null)
                 function.ReturnType.Visit(this);
 
-            foreach (var param in function.Arguments)
+            foreach (var param in function.Parameters)
                 param.Visit(this);
 
             return true;
diff --git a/src/Bridge/Type.cs b/src/Bridge/Type.cs
index 6458c8cb..fc4a2e2b 100644
--- a/src/Bridge/Type.cs
+++ b/src/Bridge/Type.cs
@@ -203,11 +203,11 @@ namespace Cxxi
         public Type ReturnType;
 
         // Argument types.
-        public List<Parameter> Arguments;
+        public List<Parameter> Parameters;
 
         public FunctionType()
         {
-            Arguments = new List<Parameter>();
+            Parameters = new List<Parameter>();
         }
 
         public override T Visit<T>(ITypeVisitor<T> visitor, TypeQualifiers quals)
diff --git a/src/Generator/Generators/CLI/CLITypePrinter.cs b/src/Generator/Generators/CLI/CLITypePrinter.cs
index a655b2c5..eb00ec89 100644
--- a/src/Generator/Generators/CLI/CLITypePrinter.cs
+++ b/src/Generator/Generators/CLI/CLITypePrinter.cs
@@ -32,12 +32,12 @@ namespace Cxxi.Generators.CLI
 
         public string VisitFunctionType(FunctionType function, TypeQualifiers quals)
         {
-            var arguments = function.Arguments;
+            var arguments = function.Parameters;
             var returnType = function.ReturnType;
             var args = string.Empty;
 
             if (arguments.Count > 0)
-                args = VisitParameters(function.Arguments, hasNames: false);
+                args = VisitParameters(function.Parameters, hasNames: false);
 
             if (returnType.IsPrimitiveType(PrimitiveType.Void))
             {
@@ -78,7 +78,7 @@ namespace Cxxi.Generators.CLI
         {
             return string.Format("delegate {0} {{0}}({1})",
                 function.ReturnType.Visit(this),
-                VisitParameters(function.Arguments, hasNames: true));
+                VisitParameters(function.Parameters, hasNames: true));
         }
 
         public string VisitPointerType(PointerType pointer, TypeQualifiers quals)
@@ -174,9 +174,10 @@ namespace Cxxi.Generators.CLI
             return decl.Name;
         }
 
-        public string VisitTemplateParameterType(TemplateParameterType param, TypeQualifiers quals)
+        public string VisitTemplateParameterType(TemplateParameterType param,
+            TypeQualifiers quals)
         {
-            throw new NotImplementedException();
+            return param.Parameter.Name;
         }
 
         public string VisitPrimitiveType(PrimitiveType type, TypeQualifiers quals)
diff --git a/src/Generator/Generators/CSharp/CSharpTypePrinter.cs b/src/Generator/Generators/CSharp/CSharpTypePrinter.cs
index 5834da9e..782a3cfd 100644
--- a/src/Generator/Generators/CSharp/CSharpTypePrinter.cs
+++ b/src/Generator/Generators/CSharp/CSharpTypePrinter.cs
@@ -33,12 +33,12 @@ namespace Cxxi.Generators.CSharp
 
         public string VisitFunctionType(FunctionType function, TypeQualifiers quals)
         {
-            var arguments = function.Arguments;
+            var arguments = function.Parameters;
             var returnType = function.ReturnType;
             var args = string.Empty;
 
             if (arguments.Count > 0)
-                args = VisitParameters(function.Arguments, hasNames: false);
+                args = VisitParameters(function.Parameters, hasNames: false);
 
             if (returnType.IsPrimitiveType(PrimitiveType.Void))
             {
@@ -237,7 +237,7 @@ namespace Cxxi.Generators.CSharp
         {
             return string.Format("delegate {0} {{0}}({1})",
                 function.ReturnType.Visit(this),
-                VisitParameters(function.Arguments, hasNames: true));
+                VisitParameters(function.Parameters, hasNames: true));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Generator/Types/CppTypePrinter.cs b/src/Generator/Types/CppTypePrinter.cs
index fe2526ac..b26264fd 100644
--- a/src/Generator/Types/CppTypePrinter.cs
+++ b/src/Generator/Types/CppTypePrinter.cs
@@ -127,12 +127,12 @@ namespace Cxxi.Types
 
         public string VisitFunctionType(FunctionType function, TypeQualifiers quals)
         {
-            var arguments = function.Arguments;
+            var arguments = function.Parameters;
             var returnType = function.ReturnType;
             var args = string.Empty;
 
             if (arguments.Count > 0)
-                args = VisitParameters(function.Arguments, hasNames: false);
+                args = VisitParameters(function.Parameters, hasNames: false);
 
             return string.Format("{0} ({1})", returnType.Visit(this), args);
         }
diff --git a/src/Generator/Types/Types.cs b/src/Generator/Types/Types.cs
index 4b1d5068..962d4d4d 100644
--- a/src/Generator/Types/Types.cs
+++ b/src/Generator/Types/Types.cs
@@ -26,7 +26,7 @@ namespace Cxxi
             if (!function.ReturnType.Visit(this))
                 return false;
 
-            foreach (var arg in function.Arguments)
+            foreach (var arg in function.Parameters)
             {
                 if (!arg.Type.Visit(this))
                     return false;
diff --git a/src/Parser/Parser.cpp b/src/Parser/Parser.cpp
index 062a5b9d..21dfc1cf 100644
--- a/src/Parser/Parser.cpp
+++ b/src/Parser/Parser.cpp
@@ -771,7 +771,7 @@ Cxxi::Type^ Parser::WalkType(clang::QualType QualType, clang::TypeLoc* TL,
             FA->Name = marshalString<E_UTF8>(PVD->getNameAsString());
             FA->QualifiedType = GetQualifiedType(PVD->getType(), WalkType(PVD->getType(), &PTL));
 
-            F->Arguments->Add(FA);
+            F->Parameters->Add(FA);
         }
 
         return F;