diff --git a/examples/OpenCV/OpenCV.cs b/examples/OpenCV/OpenCV.cs
index 8a0a24aa..593fb715 100644
--- a/examples/OpenCV/OpenCV.cs
+++ b/examples/OpenCV/OpenCV.cs
@@ -5,8 +5,9 @@ namespace CppSharp
 {
     class OpenCV : ILibrary
     {
-        public void Setup(DriverOptions options)
+        public void Setup(Driver driver)
         {
+            var options = driver.Options;
             options.LibraryName = "OpenCV";
             options.Headers.Add("opencv2/core/core_c.h");
             options.Headers.Add("opencv2/core/types_c.h");
@@ -52,7 +53,7 @@ namespace CppSharp
         {
             public static void Main(string[] args)
             {
-                Driver.Run(new OpenCV());
+                ConsoleDriver.Run(new OpenCV());
             }
         }
     }
diff --git a/src/CppSharp/Program.cs b/src/CppSharp/Program.cs
index fad427eb..733dccf1 100644
--- a/src/CppSharp/Program.cs
+++ b/src/CppSharp/Program.cs
@@ -126,7 +126,7 @@ namespace CppSharp
             if (!ParseLibraryAssembly(options.Assembly, out library))
                 return;
 
-            var driver = new Driver(options, library);
+            var driver = new Driver(options, new TextDiagnosticPrinter(), library);
             driver.Setup();
             driver.ParseCode();
             driver.ProcessCode();
diff --git a/src/Generator.Tests/Passes/TestPasses.cs b/src/Generator.Tests/Passes/TestPasses.cs
index e23e2bb1..b2c61a0c 100644
--- a/src/Generator.Tests/Passes/TestPasses.cs
+++ b/src/Generator.Tests/Passes/TestPasses.cs
@@ -88,7 +88,7 @@ namespace Generator.Tests.Passes
             var @enum = library.Enum("TestEnumItemName");
             Assert.IsNotNull(@enum);
 
-            passBuilder.RemovePrefixEnumItem("TEST_ENUM_ITEM_NAME_");
+            passBuilder.RemovePrefix("TEST_ENUM_ITEM_NAME_", RenameTargets.EnumItem);
             passBuilder.CleanInvalidDeclNames();
             passBuilder.RunPasses();
 
diff --git a/tests/Hello/Hello.cs b/tests/Hello/Hello.cs
index a91838c2..d8e73934 100644
--- a/tests/Hello/Hello.cs
+++ b/tests/Hello/Hello.cs
@@ -20,8 +20,8 @@ namespace CppSharp.Tests
         {
             public static void Main(string[] args)
             {
-                Driver.Run(new Hello(LanguageGeneratorKind.CPlusPlusCLI));
-                Driver.Run(new Hello(LanguageGeneratorKind.CSharp));
+                ConsoleDriver.Run(new Hello(LanguageGeneratorKind.CPlusPlusCLI));
+                ConsoleDriver.Run(new Hello(LanguageGeneratorKind.CSharp));
             }
         }
     }
diff --git a/tests/Hello/Hello.h b/tests/Hello/Hello.h
index ab26316e..b13f7ce5 100644
--- a/tests/Hello/Hello.h
+++ b/tests/Hello/Hello.h
@@ -34,7 +34,7 @@ struct CppSharp_API Bar2 : public Bar
     int C;
 };
 
-enum class Enum
+enum Enum
 {
     A = 0, B = 2, C = 5
 };