diff --git a/src/AST/ASTVisitor.cs b/src/AST/ASTVisitor.cs
index 8b4dca5b..0b65474e 100644
--- a/src/AST/ASTVisitor.cs
+++ b/src/AST/ASTVisitor.cs
@@ -45,12 +45,12 @@ namespace CppSharp.AST
     public abstract class AstVisitor : IAstVisitor<bool>, IAstVisited
     {
         public ISet<object> Visited { get; private set; }
-        public AstVisitorOptions Options { get; private set; }
+        public AstVisitorOptions VisitOptions { get; private set; }
 
         protected AstVisitor()
         {
             Visited = new HashSet<object>();
-            Options = new AstVisitorOptions();
+            VisitOptions = new AstVisitorOptions();
         }
 
         public bool AlreadyVisited(Type type)
@@ -98,7 +98,7 @@ namespace CppSharp.AST
             if (function.ReturnType.Type != null)
                 function.ReturnType.Visit(this);
 
-            if (Options.VisitFunctionParameters)
+            if (VisitOptions.VisitFunctionParameters)
                 foreach (var param in function.Parameters)
                     param.Visit(this);
 
@@ -163,7 +163,7 @@ namespace CppSharp.AST
             if (!VisitType(template, quals))
                 return false;
 
-            if (Options.VisitTemplateArguments)
+            if (VisitOptions.VisitTemplateArguments)
             {
                 foreach (var arg in template.Arguments)
                 {
@@ -194,7 +194,7 @@ namespace CppSharp.AST
             if (!VisitType(template, quals))
                 return false;
 
-            if (Options.VisitTemplateArguments)
+            if (VisitOptions.VisitTemplateArguments)
             {
                 foreach (var arg in template.Arguments)
                 {
@@ -293,20 +293,20 @@ namespace CppSharp.AST
             if (!VisitDeclarationContext(@class))
                 return false;
 
-            if (Options.VisitClassBases)
+            if (VisitOptions.VisitClassBases)
                 foreach (var baseClass in @class.Bases)
                     if (baseClass.IsClass)
                         baseClass.Class.Visit(this);
 
-            if (Options.VisitClassFields)
+            if (VisitOptions.VisitClassFields)
                 foreach (var field in @class.Fields)
                     VisitFieldDecl(field);
 
-            if (Options.VisitClassProperties)
+            if (VisitOptions.VisitClassProperties)
                 foreach (var property in @class.Properties)
                     VisitProperty(property);
 
-            if (Options.VisitClassMethods)
+            if (VisitOptions.VisitClassMethods)
             {
                 var methods = @class.Methods.ToArray();
                 foreach (var method in methods)
@@ -329,7 +329,7 @@ namespace CppSharp.AST
             if (!VisitDeclaration(property))
                 return false;
 
-            if (Options.VisitFunctionReturnType)
+            if (VisitOptions.VisitFunctionReturnType)
                 return property.Type.Visit(this);
 
             return true;
@@ -349,10 +349,10 @@ namespace CppSharp.AST
                 return false;
 
             var retType = function.ReturnType;
-            if (Options.VisitFunctionReturnType && retType.Type != null)
+            if (VisitOptions.VisitFunctionReturnType && retType.Type != null)
                 retType.Type.Visit(this, retType.Qualifiers);
 
-            if (Options.VisitFunctionParameters)
+            if (VisitOptions.VisitFunctionParameters)
                 foreach (var param in function.Parameters)
                     param.Visit(this);
 
@@ -513,23 +513,23 @@ namespace CppSharp.AST
             foreach (var decl in context.Functions)
                 decl.Visit(this);
 
-            if (Options.VisitNamespaceEnums)
+            if (VisitOptions.VisitNamespaceEnums)
                 foreach (var decl in context.Enums)
                   decl.Visit(this);
 
-            if (Options.VisitNamespaceTemplates)
+            if (VisitOptions.VisitNamespaceTemplates)
                 foreach (var decl in context.Templates)
                     decl.Visit(this);
 
-            if (Options.VisitNamespaceTypedefs)
+            if (VisitOptions.VisitNamespaceTypedefs)
                 foreach (var decl in context.Typedefs)
                     decl.Visit(this);
 
-            if (Options.VisitNamespaceVariables)
+            if (VisitOptions.VisitNamespaceVariables)
                 foreach (var decl in context.Variables)
                     decl.Visit(this);
 
-            if (Options.VisitNamespaceEvents)
+            if (VisitOptions.VisitNamespaceEvents)
                 foreach (var decl in context.Events)
                     decl.Visit(this);
 
@@ -544,7 +544,7 @@ namespace CppSharp.AST
             if (!VisitDeclaration(@event))
                 return false;
 
-            if (Options.VisitEventParameters)
+            if (VisitOptions.VisitEventParameters)
                 foreach (var param in @event.Parameters)
                     param.Visit(this);
 
diff --git a/src/Generator/Generators/CSharp/CSharpMarshal.cs b/src/Generator/Generators/CSharp/CSharpMarshal.cs
index 37661e93..d61956ed 100644
--- a/src/Generator/Generators/CSharp/CSharpMarshal.cs
+++ b/src/Generator/Generators/CSharp/CSharpMarshal.cs
@@ -40,8 +40,8 @@ namespace CppSharp.Generators.CSharp
         protected CSharpMarshalPrinter(CSharpMarshalContext context)
             : base(context)
         {
-            Options.VisitFunctionParameters = false;
-            Options.VisitTemplateArguments = false;
+            VisitOptions.VisitFunctionParameters = false;
+            VisitOptions.VisitTemplateArguments = false;
         }
 
         public override bool VisitMemberPointerType(MemberPointerType member,
diff --git a/src/Generator/Passes/CheckStaticClass.cs b/src/Generator/Passes/CheckStaticClass.cs
index 860e4673..4e1f966b 100644
--- a/src/Generator/Passes/CheckStaticClass.cs
+++ b/src/Generator/Passes/CheckStaticClass.cs
@@ -11,7 +11,7 @@ namespace CppSharp.Passes
     {
         public CheckStaticClass()
         {
-            Options.VisitClassBases = false;
+            VisitOptions.VisitClassBases = false;
         }
 
         public override bool VisitDeclaration(Declaration decl)
diff --git a/src/Generator/Passes/DelegatesPass.cs b/src/Generator/Passes/DelegatesPass.cs
index 80e16ff1..cb68e5bc 100644
--- a/src/Generator/Passes/DelegatesPass.cs
+++ b/src/Generator/Passes/DelegatesPass.cs
@@ -27,12 +27,12 @@ namespace CppSharp.Passes
 
         public DelegatesPass()
         {
-            Options.VisitClassBases = false;
-            Options.VisitFunctionParameters = false;
-            Options.VisitFunctionReturnType = false;
-            Options.VisitNamespaceEnums = false;
-            Options.VisitNamespaceTemplates = false;
-            Options.VisitTemplateArguments = false;
+            VisitOptions.VisitClassBases = false;
+            VisitOptions.VisitFunctionParameters = false;
+            VisitOptions.VisitFunctionReturnType = false;
+            VisitOptions.VisitNamespaceEnums = false;
+            VisitOptions.VisitNamespaceTemplates = false;
+            VisitOptions.VisitTemplateArguments = false;
         }
 
         public override bool VisitLibrary(ASTContext context)
diff --git a/src/Generator/Passes/FindSymbolsPass.cs b/src/Generator/Passes/FindSymbolsPass.cs
index 2b7f7b3d..c9ebe66d 100644
--- a/src/Generator/Passes/FindSymbolsPass.cs
+++ b/src/Generator/Passes/FindSymbolsPass.cs
@@ -6,14 +6,14 @@ namespace CppSharp.Passes
     {
         public FindSymbolsPass()
         {
-            Options.VisitClassBases = false;
-            Options.VisitFunctionParameters = false;
-            Options.VisitFunctionReturnType = false;
-            Options.VisitNamespaceEnums = false;
-            Options.VisitNamespaceTemplates = false;
-            Options.VisitNamespaceTypedefs = false;
-            Options.VisitTemplateArguments = false;
-            Options.VisitClassFields = false;
+            VisitOptions.VisitClassBases = false;
+            VisitOptions.VisitFunctionParameters = false;
+            VisitOptions.VisitFunctionReturnType = false;
+            VisitOptions.VisitNamespaceEnums = false;
+            VisitOptions.VisitNamespaceTemplates = false;
+            VisitOptions.VisitNamespaceTypedefs = false;
+            VisitOptions.VisitTemplateArguments = false;
+            VisitOptions.VisitClassFields = false;
         }
 
         public override bool VisitDeclaration(Declaration decl)
diff --git a/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs b/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs
index 3c89a3e2..4ff699d6 100644
--- a/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs
+++ b/src/Generator/Passes/GetterSetterToPropertyAdvancedPass.cs
@@ -324,15 +324,15 @@ namespace CppSharp.Passes
 
         public GetterSetterToPropertyAdvancedPass()
         {
-            Options.VisitClassProperties = false;
-            Options.VisitFunctionParameters = false;
+            VisitOptions.VisitClassProperties = false;
+            VisitOptions.VisitFunctionParameters = false;
         }
 
         public override bool VisitClassDecl(Class @class)
         {
             if (VisitDeclarationContext(@class))
             {
-                if (Options.VisitClassBases)
+                if (VisitOptions.VisitClassBases)
                     foreach (var baseClass in @class.Bases)
                         if (baseClass.IsClass)
                             VisitClassDecl(baseClass.Class);
diff --git a/src/Generator/Passes/GetterSetterToPropertyPass.cs b/src/Generator/Passes/GetterSetterToPropertyPass.cs
index 4699a30a..e04e373d 100644
--- a/src/Generator/Passes/GetterSetterToPropertyPass.cs
+++ b/src/Generator/Passes/GetterSetterToPropertyPass.cs
@@ -13,15 +13,15 @@ namespace CppSharp.Passes
     {
         public GetterSetterToPropertyPass()
         {
-            Options.VisitClassFields = false;
-            Options.VisitClassProperties = false;
-            Options.VisitNamespaceEnums = false;
-            Options.VisitNamespaceTemplates = false;
-            Options.VisitNamespaceTypedefs = false;
-            Options.VisitNamespaceEvents = false;
-            Options.VisitNamespaceVariables = false;
-            Options.VisitFunctionParameters = false;
-            Options.VisitTemplateArguments = false;
+            VisitOptions.VisitClassFields = false;
+            VisitOptions.VisitClassProperties = false;
+            VisitOptions.VisitNamespaceEnums = false;
+            VisitOptions.VisitNamespaceTemplates = false;
+            VisitOptions.VisitNamespaceTypedefs = false;
+            VisitOptions.VisitNamespaceEvents = false;
+            VisitOptions.VisitNamespaceVariables = false;
+            VisitOptions.VisitFunctionParameters = false;
+            VisitOptions.VisitTemplateArguments = false;
         }
 
         static bool IsSetter(Function method)
diff --git a/src/Generator/Passes/HandleDefaultParamValuesPass.cs b/src/Generator/Passes/HandleDefaultParamValuesPass.cs
index 3971f6cd..debc1887 100644
--- a/src/Generator/Passes/HandleDefaultParamValuesPass.cs
+++ b/src/Generator/Passes/HandleDefaultParamValuesPass.cs
@@ -21,7 +21,7 @@ namespace CppSharp.Passes
 
         public HandleDefaultParamValuesPass()
         {
-            Options.VisitFunctionParameters = false;
+            VisitOptions.VisitFunctionParameters = false;
         }
 
         public override bool VisitTranslationUnit(TranslationUnit unit)
diff --git a/src/Generator/Passes/IgnoreSystemDeclarationsPass.cs b/src/Generator/Passes/IgnoreSystemDeclarationsPass.cs
index a1fb3e13..97342b02 100644
--- a/src/Generator/Passes/IgnoreSystemDeclarationsPass.cs
+++ b/src/Generator/Passes/IgnoreSystemDeclarationsPass.cs
@@ -8,16 +8,16 @@ namespace CppSharp.Passes
     {
         public IgnoreSystemDeclarationsPass()
         {
-            Options.VisitClassBases = false;
-            Options.VisitClassFields = false;
-            Options.VisitClassMethods = false;
-            Options.VisitClassProperties = false;
-            Options.VisitFunctionParameters = false;
-            Options.VisitFunctionReturnType = false;
-            Options.VisitNamespaceEnums = false;
-            Options.VisitNamespaceEvents = false;
-            Options.VisitNamespaceTemplates = false;
-            Options.VisitTemplateArguments = false;
+            VisitOptions.VisitClassBases = false;
+            VisitOptions.VisitClassFields = false;
+            VisitOptions.VisitClassMethods = false;
+            VisitOptions.VisitClassProperties = false;
+            VisitOptions.VisitFunctionParameters = false;
+            VisitOptions.VisitFunctionReturnType = false;
+            VisitOptions.VisitNamespaceEnums = false;
+            VisitOptions.VisitNamespaceEvents = false;
+            VisitOptions.VisitNamespaceTemplates = false;
+            VisitOptions.VisitTemplateArguments = false;
         }
 
         public override bool VisitTranslationUnit(TranslationUnit unit)
diff --git a/src/Generator/Passes/MultipleInheritancePass.cs b/src/Generator/Passes/MultipleInheritancePass.cs
index 7b60c96e..a781f729 100644
--- a/src/Generator/Passes/MultipleInheritancePass.cs
+++ b/src/Generator/Passes/MultipleInheritancePass.cs
@@ -17,14 +17,14 @@ namespace CppSharp.Passes
 
         public MultipleInheritancePass()
         {
-            Options.VisitClassFields = false;
-            Options.VisitNamespaceEnums = false;
-            Options.VisitNamespaceVariables = false;
-            Options.VisitTemplateArguments = false;
-            Options.VisitClassMethods = false;
-            Options.VisitClassProperties = false;
-            Options.VisitFunctionReturnType = false;
-            Options.VisitFunctionParameters = false;
+            VisitOptions.VisitClassFields = false;
+            VisitOptions.VisitNamespaceEnums = false;
+            VisitOptions.VisitNamespaceVariables = false;
+            VisitOptions.VisitTemplateArguments = false;
+            VisitOptions.VisitClassMethods = false;
+            VisitOptions.VisitClassProperties = false;
+            VisitOptions.VisitFunctionReturnType = false;
+            VisitOptions.VisitFunctionParameters = false;
         }
 
         public override bool VisitTranslationUnit(TranslationUnit unit)
diff --git a/src/Generator/Passes/RenamePass.cs b/src/Generator/Passes/RenamePass.cs
index 8485e278..9ebc9b74 100644
--- a/src/Generator/Passes/RenamePass.cs
+++ b/src/Generator/Passes/RenamePass.cs
@@ -30,9 +30,9 @@ namespace CppSharp.Passes
 
         protected RenamePass()
         {
-            Options.VisitFunctionReturnType = false;
-            Options.VisitFunctionParameters = false;
-            Options.VisitTemplateArguments = false;
+            VisitOptions.VisitFunctionReturnType = false;
+            VisitOptions.VisitFunctionParameters = false;
+            VisitOptions.VisitTemplateArguments = false;
         }
 
         protected RenamePass(RenameTargets targets)
diff --git a/src/Generator/Types/Types.cs b/src/Generator/Types/Types.cs
index ebca0796..f2632c9e 100644
--- a/src/Generator/Types/Types.cs
+++ b/src/Generator/Types/Types.cs
@@ -15,8 +15,8 @@ namespace CppSharp
         public TypeIgnoreChecker(ITypeMapDatabase database)
         {
             TypeMapDatabase = database;
-            Options.VisitClassBases = false;
-            Options.VisitTemplateArguments = false;
+            VisitOptions.VisitClassBases = false;
+            VisitOptions.VisitTemplateArguments = false;
         }
 
         void Ignore()