diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java b/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
index 8f3b6fb3ba..d9067f3052 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
@@ -62,7 +62,6 @@ import org.jooq.ExecuteListenerProvider;
 import org.jooq.RecordListenerProvider;
 import org.jooq.RecordMapperProvider;
 import org.jooq.SQLDialect;
-import org.jooq.SchemaMapping;
 import org.jooq.TransactionProvider;
 import org.jooq.VisitListenerProvider;
 import org.jooq.conf.Settings;
@@ -503,12 +502,13 @@ public class DefaultConfiguration implements Configuration {
      * {@inheritDoc}
      */
     @Override
+    @SuppressWarnings("deprecation")
     public final Configuration set(Settings newSettings) {
         this.settings = newSettings != null
             ? SettingsTools.clone(newSettings)
             : SettingsTools.defaultSettings();
 
-        this.mapping = new SchemaMapping(this);
+        this.mapping = new org.jooq.SchemaMapping(this);
         return this;
     }
 
diff --git a/jOOQ/src/test/java/org/jooq/test/BindContextTest.java b/jOOQ/src/test/java/org/jooq/test/BindContextTest.java
index df1a08e7b0..48dc494ecc 100644
--- a/jOOQ/src/test/java/org/jooq/test/BindContextTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/BindContextTest.java
@@ -41,6 +41,7 @@
 package org.jooq.test;
 
 import org.jooq.BindContext;
+import org.jooq.Context;
 import org.jooq.RenderContext;
 import org.jooq.exception.DataAccessException;
 import org.jooq.impl.CustomCondition;
@@ -74,11 +75,7 @@ public class BindContextTest extends AbstractTest {
         Object value;
 
         @Override
-        public void toSQL(RenderContext context) {
-        }
-
-        @Override
-        public void bind(BindContext context) throws DataAccessException {
+        public void accept(Context<?> context) throws DataAccessException {
             value = context.data("key");
         }
 
diff --git a/jOOQ/src/test/java/org/jooq/test/CustomQueryPartTest.java b/jOOQ/src/test/java/org/jooq/test/CustomQueryPartTest.java
index 18475cc4ad..2cb1f51d3c 100644
--- a/jOOQ/src/test/java/org/jooq/test/CustomQueryPartTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/CustomQueryPartTest.java
@@ -43,6 +43,7 @@ package org.jooq.test;
 import static org.jooq.impl.DSL.val;
 
 import org.jooq.BindContext;
+import org.jooq.Context;
 import org.jooq.QueryPart;
 import org.jooq.RenderContext;
 import org.jooq.impl.CustomQueryPart;
@@ -64,12 +65,7 @@ public class CustomQueryPartTest extends AbstractTest {
         QueryPart p = new CustomQueryPart() {
 
             @Override
-            public void toSQL(RenderContext ctx) {
-                ctx.visit(val("abc"));
-            }
-
-            @Override
-            public void bind(BindContext ctx) {
+            public void accept(Context<?> ctx) {
                 ctx.visit(val("abc"));
             }
         };
diff --git a/jOOQ/src/test/java/org/jooq/test/RenderContextTest.java b/jOOQ/src/test/java/org/jooq/test/RenderContextTest.java
index a668120299..eb8cb1f11d 100644
--- a/jOOQ/src/test/java/org/jooq/test/RenderContextTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/RenderContextTest.java
@@ -41,6 +41,7 @@
 package org.jooq.test;
 
 import org.jooq.BindContext;
+import org.jooq.Context;
 import org.jooq.RenderContext;
 import org.jooq.exception.DataAccessException;
 import org.jooq.impl.CustomCondition;
@@ -74,12 +75,8 @@ public class RenderContextTest extends AbstractTest {
         Object value;
 
         @Override
-        public void toSQL(RenderContext context) {
+        public void accept(Context<?> context) {
             value = context.data("key");
         }
-
-        @Override
-        public void bind(BindContext context) throws DataAccessException {}
-
     }
 }