diff --git a/src/AST/FunctionExtensions.cs b/src/AST/FunctionExtensions.cs
index dafa66a1..17a1c9ae 100644
--- a/src/AST/FunctionExtensions.cs
+++ b/src/AST/FunctionExtensions.cs
@@ -21,7 +21,8 @@ namespace CppSharp.AST
                 @params.Add(new Parameter
                     {
                         QualifiedType = pointer,
-                        Name = "instance"
+                        Name = "instance",
+                        Namespace = function
                     });
             }
 
@@ -31,7 +32,8 @@ namespace CppSharp.AST
                 @params.Add(new Parameter
                     {
                         QualifiedType = pointer,
-                        Name = "instance"
+                        Name = "instance",
+                        Namespace = function
                     });
             }
 
@@ -45,7 +47,8 @@ namespace CppSharp.AST
                             pointer : param.QualifiedType,
                         Kind = param.Kind,
                         Usage = param.Usage,
-                        Name = universalDelegate ? "arg" + ++i : param.Name
+                        Name = universalDelegate ? $"arg{++i}": param.Name,
+                        Namespace = param.Namespace
                     });
 
                 if (param.Kind == ParameterKind.IndirectReturnType &&
@@ -54,7 +57,8 @@ namespace CppSharp.AST
                     @params.Add(new Parameter
                         {
                             QualifiedType = pointer,
-                            Name = "instance"
+                            Name = "instance",
+                            Namespace = function
                         });
                 }
             }
@@ -67,7 +71,8 @@ namespace CppSharp.AST
                     @params.Add(new Parameter
                         {
                             QualifiedType = new QualifiedType(new BuiltinType(PrimitiveType.Int)),
-                            Name = "__forBases"
+                            Name = "__forBases",
+                            Namespace = function
                         });
                 }
             }
diff --git a/src/Generator/Generators/CLI/CLISources.cs b/src/Generator/Generators/CLI/CLISources.cs
index 1281bc83..2b0a667b 100644
--- a/src/Generator/Generators/CLI/CLISources.cs
+++ b/src/Generator/Generators/CLI/CLISources.cs
@@ -946,7 +946,7 @@ namespace CppSharp.Generators.CLI
             {
                 WriteLine("auto {0} = ::{1}();", valueMarshalName, @class.QualifiedOriginalName);
 
-                var param = new Parameter { Name = "(*this)" };
+                var param = new Parameter { Name = "(*this)" , Namespace = function.Namespace };
                 var ctx = new MarshalContext(Context)
                     {
                         MarshalVarPrefix = valueMarshalName,
diff --git a/src/Generator/Generators/CSharp/CSharpSources.cs b/src/Generator/Generators/CSharp/CSharpSources.cs
index 066cb50a..f4535da5 100644
--- a/src/Generator/Generators/CSharp/CSharpSources.cs
+++ b/src/Generator/Generators/CSharp/CSharpSources.cs
@@ -1608,7 +1608,8 @@ namespace CppSharp.Generators.CSharp
                 var param = new Parameter
                 {
                     Name = Helpers.ReturnIdentifier,
-                    QualifiedType = method.OriginalReturnType
+                    QualifiedType = method.OriginalReturnType,
+                    Namespace = method
                 };
 
                 // Marshal the managed result to native
diff --git a/src/Generator/Passes/CheckAbiParameters.cs b/src/Generator/Passes/CheckAbiParameters.cs
index 54a3f866..2dcb5911 100644
--- a/src/Generator/Passes/CheckAbiParameters.cs
+++ b/src/Generator/Passes/CheckAbiParameters.cs
@@ -48,6 +48,7 @@ namespace CppSharp.Passes
                         Kind = ParameterKind.IndirectReturnType,
                         QualifiedType = function.ReturnType,
                         Name = "return",
+                        Namespace = function
                     };
 
                 function.Parameters.Insert(0, indirectParam);
@@ -73,7 +74,8 @@ namespace CppSharp.Passes
                 {
                     Kind = ParameterKind.ImplicitDestructorParameter,
                     QualifiedType = new QualifiedType(new BuiltinType(PrimitiveType.Int)),
-                    Name = "delete"
+                    Name = "delete",
+                    Namespace = method
                 });
             }
 
diff --git a/src/Generator/Passes/CheckOperatorsOverloads.cs b/src/Generator/Passes/CheckOperatorsOverloads.cs
index 42149d86..6a088c58 100644
--- a/src/Generator/Passes/CheckOperatorsOverloads.cs
+++ b/src/Generator/Passes/CheckOperatorsOverloads.cs
@@ -84,7 +84,8 @@ namespace CppSharp.Passes
                 {
                     Name = Generator.GeneratedIdentifier("op"),
                     QualifiedType = new QualifiedType(type),
-                    Kind = ParameterKind.OperatorParameter
+                    Kind = ParameterKind.OperatorParameter,
+                    Namespace = @operator
                 });
             }
         }
diff --git a/src/Generator/Passes/ObjectOverridesPass.cs b/src/Generator/Passes/ObjectOverridesPass.cs
index 6cad17da..666cc0c3 100644
--- a/src/Generator/Passes/ObjectOverridesPass.cs
+++ b/src/Generator/Passes/ObjectOverridesPass.cs
@@ -141,7 +141,7 @@ namespace CppSharp
             var methodEqualsParam = new Parameter
             {
                 Name = "object",
-                QualifiedType = new QualifiedType(new CILType(typeof(Object))),
+                QualifiedType = new QualifiedType(new CILType(typeof(Object)))
             };
 
             var methodEquals = new Method
diff --git a/src/Generator/Passes/SpecializationMethodsWithDependentPointersPass.cs b/src/Generator/Passes/SpecializationMethodsWithDependentPointersPass.cs
index 4357e573..b43e7c5f 100644
--- a/src/Generator/Passes/SpecializationMethodsWithDependentPointersPass.cs
+++ b/src/Generator/Passes/SpecializationMethodsWithDependentPointersPass.cs
@@ -120,6 +120,7 @@ namespace CppSharp.Passes
                         new QualifiedType(new TagType(specializedMethod.Namespace))));
                     thisParameter.Name = "@this";
                     thisParameter.Kind = ParameterKind.Extension;
+                    thisParameter.Namespace = extensionMethod;
                     extensionMethod.Parameters.Insert(0, thisParameter);
                 }
             }