diff --git a/src/Generator/Passes/RenamePass.cs b/src/Generator/Passes/RenamePass.cs
index 9dc5778fb..748b3c727 100644
--- a/src/Generator/Passes/RenamePass.cs
+++ b/src/Generator/Passes/RenamePass.cs
@@ -181,6 +181,8 @@ where typedefDecl.Type.Desugar() is FunctionType
                     declarations.AddRange(@class.TemplateParameters);
             }
 
+            declarations.RemoveAll(d => !d.IsGenerated);
+
             var existing = declarations.Find(d => d != decl && d.Name == newName);
             if (existing != null)
                 return CheckExisting(decl, existing);
diff --git a/tests/dotnet/Common/Common.Tests.cs b/tests/dotnet/Common/Common.Tests.cs
index 81552884a..3ef6c2441 100644
--- a/tests/dotnet/Common/Common.Tests.cs
+++ b/tests/dotnet/Common/Common.Tests.cs
@@ -899,7 +899,7 @@ public void TestNonTrivialDtorInvocation()
         using (var nonTrivialDtor = new NonTrivialDtor())
         {
         }
-        Assert.IsTrue(NonTrivialDtor.dtorCalled);
+        Assert.IsTrue(NonTrivialDtor.DtorCalled);
     }
 
     [Test]