diff --git a/src/Generator/Passes/RenamePass.cs b/src/Generator/Passes/RenamePass.cs
index f9d36231..3d29e80a 100644
--- a/src/Generator/Passes/RenamePass.cs
+++ b/src/Generator/Passes/RenamePass.cs
@@ -218,7 +218,8 @@ namespace CppSharp.Passes
 
         public override bool VisitClassDecl(Class @class)
         {
-            base.VisitClassDecl(@class);
+            if (!base.VisitClassDecl(@class))
+                return false;
 
             foreach (var property in @class.Properties.OrderByDescending(p => p.Access))
                 VisitProperty(property);
@@ -232,9 +233,14 @@ namespace CppSharp.Passes
             return true;
         }
 
+        public override bool VisitFieldDecl(Field field)
+        {
+            return VisitDeclaration(field);
+        }
+
         public override bool VisitParameterDecl(Parameter parameter)
         {
-            return base.VisitDeclaration(parameter);
+            return VisitDeclaration(parameter);
         }
     }