diff --git a/src/Generator/Generators/Registrable/Lua/Sol/LuaSolGeneratorOptions.cs b/src/Generator/Generators/Registrable/Lua/Sol/LuaSolGeneratorOptions.cs
index bf5169eb..5eb17f8c 100644
--- a/src/Generator/Generators/Registrable/Lua/Sol/LuaSolGeneratorOptions.cs
+++ b/src/Generator/Generators/Registrable/Lua/Sol/LuaSolGeneratorOptions.cs
@@ -4,7 +4,7 @@
     {
         public LuaSolNamingStrategy NamingStrategy;
 
-        public LuaSolGeneratorOptions(LuaSolGenerator generator) : base()
+        public LuaSolGeneratorOptions(LuaSolGenerator generator) : base(generator)
         {
             NamingStrategy = new LuaSolNamingStrategy(generator);
         }
diff --git a/src/Generator/Generators/Registrable/RegistrableGeneratorOptions.cs b/src/Generator/Generators/Registrable/RegistrableGeneratorOptions.cs
index 83650e65..597b1fa0 100644
--- a/src/Generator/Generators/Registrable/RegistrableGeneratorOptions.cs
+++ b/src/Generator/Generators/Registrable/RegistrableGeneratorOptions.cs
@@ -13,7 +13,8 @@ namespace CppSharp.Generators.Registrable
     {
         public delegate string Delegate(string name);
 
-        protected Generator generator;
+        protected Generator Generator;
+
         public virtual string OutputSubDir { get; }
         public virtual string RootContextType { get; }
         public virtual string RootContextName { get; }
@@ -58,8 +59,9 @@ namespace CppSharp.Generators.Registrable
         public virtual string DefaultStaticCastFunctionTemplateFullyQualifiedName => null;
         public virtual string DefaultDynamicCastFunctionTemplateFullyQualifiedName => null;
 
-        public RegistrableGeneratorOptions()
+        public RegistrableGeneratorOptions(Generator generator)
         {
+            Generator = generator;
             OutputSubDir = DefaultOutputSubdir;
             RootContextType = DefaultRootContextType;
             RootContextName = DefaultRootContextName;
diff --git a/src/Generator/Generators/Registrable/RegistrableNamingStrategy.cs b/src/Generator/Generators/Registrable/RegistrableNamingStrategy.cs
index 3faeca9d..b23e4654 100644
--- a/src/Generator/Generators/Registrable/RegistrableNamingStrategy.cs
+++ b/src/Generator/Generators/Registrable/RegistrableNamingStrategy.cs
@@ -3,7 +3,6 @@ using CppSharp.Generators.C;
 using CppSharp.Generators.Registrable.Lua.Sol;
 using System.Collections.Generic;
 using System.Text;
-using System.Xml.Linq;
 
 namespace CppSharp.Generators.Registrable
 {
@@ -386,7 +385,7 @@ namespace CppSharp.Generators.Registrable
             }
         }
 
-        public string GetCppContext(Declaration entity, RegistrableGeneratorContext context, FQNOption option)
+        public virtual string GetCppContext(Declaration entity, RegistrableGeneratorContext context, FQNOption option)
         {
             if (context != null)
             {