From 0183ecab99e479b8fde44541ace2be3b20538d07 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Sat, 6 Apr 2013 21:00:50 +0200
Subject: [PATCH] [#2379] Replace 3.0-RC1 Executor type by a contextual DSL
 type constructed from Factory.using() - Step 4 - Renamed ContextDSL to
 DSLContext

---
 .../org/jooq/liquibase/test/AdaptersTest.java |   4 +-
 .../java/org/jooq/util/AbstractDatabase.java  |   8 +-
 .../org/jooq/util/AbstractDefinition.java     |   4 +-
 .../src/main/java/org/jooq/util/Database.java |   4 +-
 .../java/org/jooq/util/ase/ASEDatabase.java   |   4 +-
 .../org/jooq/util/cubrid/CUBRIDDatabase.java  |   4 +-
 .../java/org/jooq/util/db2/DB2Database.java   |   4 +-
 .../org/jooq/util/derby/DerbyDatabase.java    |   4 +-
 .../jooq/util/firebird/FirebirdDatabase.java  |   4 +-
 .../java/org/jooq/util/h2/H2Database.java     |   4 +-
 .../org/jooq/util/hsqldb/HSQLDBDatabase.java  |   4 +-
 .../org/jooq/util/ingres/IngresDatabase.java  |   4 +-
 .../java/org/jooq/util/jdbc/JDBCDatabase.java |   4 +-
 .../org/jooq/util/mysql/MySQLDatabase.java    |   4 +-
 .../org/jooq/util/oracle/OracleDatabase.java  |   4 +-
 .../jooq/util/postgres/PostgresDatabase.java  |   4 +-
 .../org/jooq/util/sqlite/SQLiteDatabase.java  |   4 +-
 .../util/sqlserver/SQLServerDatabase.java     |   4 +-
 .../org/jooq/util/sybase/SybaseDatabase.java  |   4 +-
 .../org/jooq/examples/AdventureWorks.java     |   4 +-
 .../org/jooq/examples/DBMS_XPLAN.java         |   4 +-
 .../examples/org/jooq/examples/Library.java   |   4 +-
 .../examples/org/jooq/examples/Sakila.java    |   4 +-
 jOOQ-test/src/org/jooq/test/ASETest.java      |   4 +-
 jOOQ-test/src/org/jooq/test/BaseTest.java     |   8 +-
 jOOQ-test/src/org/jooq/test/CUBRIDTest.java   |   4 +-
 jOOQ-test/src/org/jooq/test/DB2Test.java      |   4 +-
 jOOQ-test/src/org/jooq/test/DerbyTest.java    |   4 +-
 jOOQ-test/src/org/jooq/test/FirebirdTest.java |   4 +-
 jOOQ-test/src/org/jooq/test/H2Test.java       |   4 +-
 jOOQ-test/src/org/jooq/test/HSQLDBTest.java   |   4 +-
 jOOQ-test/src/org/jooq/test/HSQLDBTest2.java  |   4 +-
 jOOQ-test/src/org/jooq/test/IngresTest.java   |   4 +-
 jOOQ-test/src/org/jooq/test/MySQLTest.java    |   4 +-
 .../org/jooq/test/MySQLTestSchemaMapping.java |   4 +-
 .../org/jooq/test/MySQLTestSchemaRewrite.java |   4 +-
 jOOQ-test/src/org/jooq/test/OracleTest.java   |   6 +-
 .../src/org/jooq/test/OracleTestInline.java   |   4 +-
 jOOQ-test/src/org/jooq/test/PostgresTest.java |   4 +-
 .../src/org/jooq/test/SQLServerTest.java      |   4 +-
 .../org/jooq/test/SQLServerTestInline.java    |   4 +-
 jOOQ-test/src/org/jooq/test/SQLiteTest.java   |   4 +-
 jOOQ-test/src/org/jooq/test/SybaseTest.java   |   4 +-
 .../src/org/jooq/test/_/PrettyPrinter.java    |   6 +-
 .../jooq/test/_/testcases/BenchmarkTests.java |  14 +-
 .../org/jooq/test/_/testcases/CRUDTests.java  |   6 +-
 .../jooq/test/_/testcases/DataTypeTests.java  |   4 +-
 .../_/testcases/ExecuteListenerTests.java     |  14 +-
 .../jooq/test/_/testcases/GeneralTests.java   |   6 +-
 .../jooq/test/_/testcases/PlainSQLTests.java  |   4 +-
 .../test/_/testcases/RenderAndBindTests.java  |  10 +-
 .../_/testcases/SchemaAndMappingTests.java    |   4 +-
 .../jooq/test/_/testcases/SelectTests.java    |   6 +-
 .../jooq/test/_/testcases/StatementTests.java |   4 +-
 jOOQ-test/src/org/jooq/test/h2/F.java         |   8 +-
 .../org/jooq/test/h2/TTriggersTrigger.java    |   4 +-
 .../src/org/jooq/test/jOOQAbstractTest.java   |  10 +-
 .../{ContextDSL.xtend => DSLContext.xtend}    |  32 +--
 jOOQ-tools/src/org/jooq/xtend/Factory.xtend   |   8 +-
 .../src/org/jooq/xtend/GenerateAll.xtend      |   2 +-
 jOOQ-tools/src/org/jooq/xtend/InsertDSL.xtend |   2 +-
 jOOQ-tools/src/org/jooq/xtend/MergeDSL.xtend  |   2 +-
 .../src/main/java/org/jooq/Configuration.java |   4 +-
 .../jooq/{ContextDSL.java => DSLContext.java} | 116 ++++----
 .../main/java/org/jooq/ExecuteListener.java   |   8 +-
 jOOQ/src/main/java/org/jooq/Field.java        | 210 +++++++--------
 .../java/org/jooq/InsertOnDuplicateStep.java  |   2 +-
 .../src/main/java/org/jooq/InsertSetStep.java |   4 +-
 .../main/java/org/jooq/InsertValuesStep1.java |   2 +-
 .../java/org/jooq/InsertValuesStep10.java     |   2 +-
 .../java/org/jooq/InsertValuesStep11.java     |   2 +-
 .../java/org/jooq/InsertValuesStep12.java     |   2 +-
 .../java/org/jooq/InsertValuesStep13.java     |   2 +-
 .../java/org/jooq/InsertValuesStep14.java     |   2 +-
 .../java/org/jooq/InsertValuesStep15.java     |   2 +-
 .../java/org/jooq/InsertValuesStep16.java     |   2 +-
 .../java/org/jooq/InsertValuesStep17.java     |   2 +-
 .../java/org/jooq/InsertValuesStep18.java     |   2 +-
 .../java/org/jooq/InsertValuesStep19.java     |   2 +-
 .../main/java/org/jooq/InsertValuesStep2.java |   2 +-
 .../java/org/jooq/InsertValuesStep20.java     |   2 +-
 .../java/org/jooq/InsertValuesStep21.java     |   2 +-
 .../java/org/jooq/InsertValuesStep22.java     |   2 +-
 .../main/java/org/jooq/InsertValuesStep3.java |   2 +-
 .../main/java/org/jooq/InsertValuesStep4.java |   2 +-
 .../main/java/org/jooq/InsertValuesStep5.java |   2 +-
 .../main/java/org/jooq/InsertValuesStep6.java |   2 +-
 .../main/java/org/jooq/InsertValuesStep7.java |   2 +-
 .../main/java/org/jooq/InsertValuesStep8.java |   2 +-
 .../main/java/org/jooq/InsertValuesStep9.java |   2 +-
 .../main/java/org/jooq/InsertValuesStepN.java |   4 +-
 .../main/java/org/jooq/MergeValuesStep1.java  |   2 +-
 .../main/java/org/jooq/MergeValuesStep10.java |   2 +-
 .../main/java/org/jooq/MergeValuesStep11.java |   2 +-
 .../main/java/org/jooq/MergeValuesStep12.java |   2 +-
 .../main/java/org/jooq/MergeValuesStep13.java |   2 +-
 .../main/java/org/jooq/MergeValuesStep14.java |   2 +-
 .../main/java/org/jooq/MergeValuesStep15.java |   2 +-
 .../main/java/org/jooq/MergeValuesStep16.java |   2 +-
 .../main/java/org/jooq/MergeValuesStep17.java |   2 +-
 .../main/java/org/jooq/MergeValuesStep18.java |   2 +-
 .../main/java/org/jooq/MergeValuesStep19.java |   2 +-
 .../main/java/org/jooq/MergeValuesStep2.java  |   2 +-
 .../main/java/org/jooq/MergeValuesStep20.java |   2 +-
 .../main/java/org/jooq/MergeValuesStep21.java |   2 +-
 .../main/java/org/jooq/MergeValuesStep22.java |   2 +-
 .../main/java/org/jooq/MergeValuesStep3.java  |   2 +-
 .../main/java/org/jooq/MergeValuesStep4.java  |   2 +-
 .../main/java/org/jooq/MergeValuesStep5.java  |   2 +-
 .../main/java/org/jooq/MergeValuesStep6.java  |   2 +-
 .../main/java/org/jooq/MergeValuesStep7.java  |   2 +-
 .../main/java/org/jooq/MergeValuesStep8.java  |   2 +-
 .../main/java/org/jooq/MergeValuesStep9.java  |   2 +-
 .../main/java/org/jooq/MergeValuesStepN.java  |   4 +-
 jOOQ/src/main/java/org/jooq/Meta.java         |   2 +-
 jOOQ/src/main/java/org/jooq/Query.java        |  10 +-
 jOOQ/src/main/java/org/jooq/QueryPart.java    |   2 +-
 jOOQ/src/main/java/org/jooq/Record.java       |   4 +-
 jOOQ/src/main/java/org/jooq/Result.java       |   2 +-
 jOOQ/src/main/java/org/jooq/ResultQuery.java  |   2 +-
 jOOQ/src/main/java/org/jooq/SQLDialect.java   |   2 +-
 .../main/java/org/jooq/UpdatableRecord.java   |   4 +-
 .../org/jooq/exception/MappingException.java  |   4 +-
 .../java/org/jooq/impl/AbstractQueryPart.java |  10 +-
 .../java/org/jooq/impl/AbstractRoutine.java   |   4 +-
 .../java/org/jooq/impl/AbstractStore.java     |   4 +-
 .../org/jooq/impl/AbstractStoreQuery.java     |   4 +-
 .../main/java/org/jooq/impl/BatchCRUD.java    |   4 +-
 .../main/java/org/jooq/impl/BatchSingle.java  |   4 +-
 ...ontextDSLImpl.java => DSLContextImpl.java} |  22 +-
 .../org/jooq/impl/DefaultConfiguration.java   |   4 +-
 .../jooq/impl/DefaultConnectionProvider.java  |   2 +-
 jOOQ/src/main/java/org/jooq/impl/Factory.java | 254 +++++++++---------
 .../main/java/org/jooq/impl/LoaderImpl.java   |   4 +-
 .../src/main/java/org/jooq/impl/MetaImpl.java |   4 +-
 .../java/org/jooq/impl/ReferenceImpl.java     |   4 +-
 .../org/jooq/impl/UpdatableRecordImpl.java    |   4 +-
 jOOQ/src/main/java/org/jooq/impl/Utils.java   |   4 +-
 .../main/java/org/jooq/impl/package-info.java |   2 +-
 jOOQ/src/main/java/org/jooq/package-info.java |   2 +-
 .../org/jooq/tools/jdbc/MockDataProvider.java |   6 +-
 .../jooq/tools/jdbc/MockExecuteContext.java   |   6 +-
 .../org/jooq/tools/jdbc/MockFileDatabase.java |   6 +-
 .../test/java/org/jooq/test/AbstractTest.java |   4 +-
 .../src/test/java/org/jooq/test/MockTest.java |  18 +-
 .../test/java/org/jooq/test/SettingsTest.java |  12 +-
 146 files changed, 594 insertions(+), 594 deletions(-)
 rename jOOQ-tools/src/org/jooq/xtend/{ContextDSL.xtend => DSLContext.xtend} (92%)
 rename jOOQ/src/main/java/org/jooq/{ContextDSL.java => DSLContext.java} (96%)
 rename jOOQ/src/main/java/org/jooq/impl/{ContextDSLImpl.java => DSLContextImpl.java} (98%)

diff --git a/jOOQ-liquibase/src/test/java/org/jooq/liquibase/test/AdaptersTest.java b/jOOQ-liquibase/src/test/java/org/jooq/liquibase/test/AdaptersTest.java
index 55e2743bb1..423728fa08 100644
--- a/jOOQ-liquibase/src/test/java/org/jooq/liquibase/test/AdaptersTest.java
+++ b/jOOQ-liquibase/src/test/java/org/jooq/liquibase/test/AdaptersTest.java
@@ -55,7 +55,7 @@ import liquibase.database.structure.View;
 import liquibase.snapshot.DatabaseSnapshot;
 import liquibase.snapshot.DatabaseSnapshotGeneratorFactory;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Field;
 import org.jooq.SQLDialect;
 import org.jooq.Sequence;
@@ -72,7 +72,7 @@ public class AdaptersTest {
     private static Connection       connection;
     private static H2Database       database;
     private static DatabaseSnapshot snapshot;
-    private static ContextDSL       create;
+    private static DSLContext       create;
 
     @BeforeClass
     public static void before() throws Exception {
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
index 4ad519f486..a4a1bf5115 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
@@ -47,7 +47,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
 import org.jooq.impl.SQLDataType;
 import org.jooq.tools.JooqLogger;
@@ -74,7 +74,7 @@ public abstract class AbstractDatabase implements Database {
 
     private SQLDialect                                                  dialect;
     private Connection                                                  connection;
-    private ContextDSL                                                    create;
+    private DSLContext                                                    create;
     private String[]                                                    excludes;
     private String[]                                                    includes;
     private String[]                                                    recordVersionFields;
@@ -135,7 +135,7 @@ public abstract class AbstractDatabase implements Database {
     }
 
     @Override
-    public final ContextDSL create() {
+    public final DSLContext create() {
         if (create == null) {
             create = create0();
         }
@@ -740,7 +740,7 @@ public abstract class AbstractDatabase implements Database {
     /**
      * Create a new Factory
      */
-    protected abstract ContextDSL create0();
+    protected abstract DSLContext create0();
 
     /**
      * Retrieve primary keys and store them to relations
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDefinition.java
index 574a6fd993..f0f51061c4 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDefinition.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDefinition.java
@@ -38,7 +38,7 @@ package org.jooq.util;
 
 import java.sql.Connection;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
 
 /**
@@ -211,7 +211,7 @@ public abstract class AbstractDefinition implements Definition {
         return hashCode;
     }
 
-    protected final ContextDSL create() {
+    protected final DSLContext create() {
         return database.create();
     }
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/Database.java b/jOOQ-meta/src/main/java/org/jooq/util/Database.java
index 50fcd14828..af3c6951b7 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/Database.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/Database.java
@@ -39,7 +39,7 @@ package org.jooq.util;
 import java.sql.Connection;
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
 import org.jooq.util.jaxb.CustomType;
 import org.jooq.util.jaxb.EnumType;
@@ -289,7 +289,7 @@ public interface Database {
     /**
      * Create the factory for this database
      */
-    ContextDSL create();
+    DSLContext create();
 
     /**
      * Check whether a type is an array type
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java
index e5c1d5e84f..bfe9911af7 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java
@@ -46,7 +46,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record10;
@@ -79,7 +79,7 @@ public class ASEDatabase extends AbstractDatabase {
     private static final JooqLogger log = JooqLogger.getLogger(ASEDatabase.class);
 
     @Override
-    protected ContextDSL create0() {
+    protected DSLContext create0() {
         return Factory.using(getConnection(), SQLDialect.ASE);
     }
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java
index 0b03be3865..7382ea429d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java
@@ -53,7 +53,7 @@ import java.util.List;
 
 import org.jooq.Condition;
 import org.jooq.ConnectionProvider;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.Record3;
 import org.jooq.Result;
@@ -269,7 +269,7 @@ public class CUBRIDDatabase extends AbstractDatabase {
     }
 
     @Override
-    protected ContextDSL create0() {
+    protected DSLContext create0() {
         return Factory.using(getConnection(), SQLDialect.CUBRID);
     }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/DB2Database.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/DB2Database.java
index 58de418cd0..ce9fe029aa 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/db2/DB2Database.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/DB2Database.java
@@ -56,7 +56,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.Record4;
 import org.jooq.Result;
@@ -93,7 +93,7 @@ import org.jooq.util.db2.syscat.tables.Tables;
 public class DB2Database extends AbstractDatabase {
 
     @Override
-    protected ContextDSL create0() {
+    protected DSLContext create0() {
         return Factory.using(getConnection(), SQLDialect.DB2);
     }
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyDatabase.java
index 614e6728ad..149d2cb9bd 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyDatabase.java
@@ -50,7 +50,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record5;
@@ -322,7 +322,7 @@ public class DerbyDatabase extends AbstractDatabase {
     }
 
     @Override
-    protected ContextDSL create0() {
+    protected DSLContext create0() {
         return Factory.using(getConnection(), SQLDialect.DERBY);
     }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdDatabase.java
index 1b5c81fdc8..566b963665 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdDatabase.java
@@ -45,7 +45,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.Record3;
 import org.jooq.Result;
@@ -252,7 +252,7 @@ public class FirebirdDatabase extends AbstractDatabase {
     }
 
     @Override
-    protected ContextDSL create0() {
+    protected DSLContext create0() {
         return Factory.using(getConnection(), SQLDialect.FIREBIRD);
     }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/H2Database.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/H2Database.java
index 2faf4f29d4..25dc847d84 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/h2/H2Database.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/H2Database.java
@@ -47,7 +47,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.Record4;
 import org.jooq.Result;
@@ -82,7 +82,7 @@ import org.jooq.util.h2.information_schema.tables.TypeInfo;
 public class H2Database extends AbstractDatabase {
 
     @Override
-    protected ContextDSL create0() {
+    protected DSLContext create0() {
         return Factory.using(getConnection(), SQLDialect.H2);
     }
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBDatabase.java
index 8448413a90..0a94c25a3b 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBDatabase.java
@@ -50,7 +50,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.Record4;
 import org.jooq.Result;
@@ -79,7 +79,7 @@ import org.jooq.util.UDTDefinition;
 public class HSQLDBDatabase extends AbstractDatabase {
 
     @Override
-    protected ContextDSL create0() {
+    protected DSLContext create0() {
         return Factory.using(getConnection(), SQLDialect.HSQLDB);
     }
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java
index 3d3a58d6f4..520b84204d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java
@@ -50,7 +50,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.Record4;
 import org.jooq.Result;
@@ -86,7 +86,7 @@ import org.jooq.util.ingres.ingres.tables.Iitables;
 public class IngresDatabase extends AbstractDatabase {
 
     @Override
-    protected ContextDSL create0() {
+    protected DSLContext create0() {
         return Factory.using(getConnection(), SQLDialect.INGRES);
     }
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jdbc/JDBCDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/jdbc/JDBCDatabase.java
index 0e028fc7cc..264920387a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/jdbc/JDBCDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/jdbc/JDBCDatabase.java
@@ -40,7 +40,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
 import org.jooq.Schema;
 import org.jooq.Sequence;
@@ -71,7 +71,7 @@ public class JDBCDatabase extends AbstractDatabase {
 
     @SuppressWarnings("deprecation")
     @Override
-    protected ContextDSL create0() {
+    protected DSLContext create0() {
         return Factory.using(getConnection(), SQLDialect.SQL99);
     }
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java
index 1c2ed48dc0..9d8932b964 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java
@@ -49,7 +49,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.Record4;
 import org.jooq.Record5;
@@ -330,7 +330,7 @@ public class MySQLDatabase extends AbstractDatabase {
     }
 
     @Override
-    protected ContextDSL create0() {
+    protected DSLContext create0() {
         return Factory.using(getConnection(), SQLDialect.MYSQL);
     }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleDatabase.java
index 494bc4baba..127fc08547 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleDatabase.java
@@ -53,7 +53,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.Record4;
 import org.jooq.Result;
@@ -406,7 +406,7 @@ public class OracleDatabase extends AbstractDatabase {
      * {@inheritDoc}
      */
     @Override
-    protected ContextDSL create0() {
+    protected DSLContext create0() {
         return Factory.using(getConnection(), SQLDialect.ORACLE);
     }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java
index dcc25c804d..2894f22aa3 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java
@@ -59,7 +59,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.Record3;
 import org.jooq.Record4;
@@ -390,7 +390,7 @@ public class PostgresDatabase extends AbstractDatabase {
     }
 
     @Override
-    protected ContextDSL create0() {
+    protected DSLContext create0() {
         return Factory.using(getConnection(), SQLDialect.POSTGRES);
     }
 }
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlite/SQLiteDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlite/SQLiteDatabase.java
index a7cc2859eb..5bfae99882 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlite/SQLiteDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlite/SQLiteDatabase.java
@@ -43,7 +43,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.SQLDialect;
 import org.jooq.impl.Factory;
@@ -82,7 +82,7 @@ public class SQLiteDatabase extends AbstractDatabase {
     }
 
     @Override
-    protected ContextDSL create0() {
+    protected DSLContext create0() {
         return Factory.using(getConnection(), SQLDialect.SQLITE);
     }
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerDatabase.java
index ca04f39e70..d6cc60081f 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerDatabase.java
@@ -48,7 +48,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.Record4;
 import org.jooq.Result;
@@ -77,7 +77,7 @@ import org.jooq.util.UDTDefinition;
 public class SQLServerDatabase extends AbstractDatabase {
 
     @Override
-    protected ContextDSL create0() {
+    protected DSLContext create0() {
         return Factory.using(getConnection(), SQLDialect.SQLSERVER);
     }
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/SybaseDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/SybaseDatabase.java
index 45352d460a..3ec7bc261e 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/SybaseDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/SybaseDatabase.java
@@ -45,7 +45,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.SQLDialect;
 import org.jooq.impl.Factory;
@@ -81,7 +81,7 @@ public class SybaseDatabase extends AbstractDatabase {
     private static final JooqLogger log = JooqLogger.getLogger(SybaseDatabase.class);
 
     @Override
-    protected ContextDSL create0() {
+    protected DSLContext create0() {
         return Factory.using(getConnection(), SQLDialect.SYBASE);
     }
 
diff --git a/jOOQ-test/examples/org/jooq/examples/AdventureWorks.java b/jOOQ-test/examples/org/jooq/examples/AdventureWorks.java
index 77fe6f9db9..2cb0bc09e9 100644
--- a/jOOQ-test/examples/org/jooq/examples/AdventureWorks.java
+++ b/jOOQ-test/examples/org/jooq/examples/AdventureWorks.java
@@ -46,7 +46,7 @@ import static org.jooq.impl.Factory.val;
 import java.sql.Connection;
 import java.sql.DriverManager;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
 import org.jooq.impl.Factory;
 
@@ -56,7 +56,7 @@ public class AdventureWorks {
         Class.forName("com.microsoft.sqlserver.jdbc.SQLServerDriver");
         Connection connection = DriverManager.getConnection("jdbc:sqlserver://localhost:1433;databaseName=AdventureWorks;integratedSecurity=true");
 
-        ContextDSL create = Factory.using(connection, SQLDialect.SQLSERVER);
+        DSLContext create = Factory.using(connection, SQLDialect.SQLSERVER);
 
         System.out.println(create
               .select(Employee.fields())
diff --git a/jOOQ-test/examples/org/jooq/examples/DBMS_XPLAN.java b/jOOQ-test/examples/org/jooq/examples/DBMS_XPLAN.java
index cec5107d8e..7255ad3ca0 100644
--- a/jOOQ-test/examples/org/jooq/examples/DBMS_XPLAN.java
+++ b/jOOQ-test/examples/org/jooq/examples/DBMS_XPLAN.java
@@ -40,7 +40,7 @@ import static org.jooq.impl.Factory.table;
 import java.sql.Connection;
 import java.sql.DriverManager;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
 import org.jooq.examples.oracle.sys.packages.DbmsXplan;
 import org.jooq.impl.Factory;
@@ -51,7 +51,7 @@ public class DBMS_XPLAN {
         Class.forName("oracle.jdbc.OracleDriver");
         Connection connection = DriverManager.getConnection("jdbc:oracle:thin:@localhost:1521:xe", "TEST", "TEST");
 
-        ContextDSL ora = Factory.using(connection, SQLDialect.ORACLE);
+        DSLContext ora = Factory.using(connection, SQLDialect.ORACLE);
         ora.fetch("select * from t_book b join t_author a on b.author_id = a.id");
 
         // TODO [#1113] This doesn't work yet
diff --git a/jOOQ-test/examples/org/jooq/examples/Library.java b/jOOQ-test/examples/org/jooq/examples/Library.java
index 44340f93da..9c56b972fa 100644
--- a/jOOQ-test/examples/org/jooq/examples/Library.java
+++ b/jOOQ-test/examples/org/jooq/examples/Library.java
@@ -45,7 +45,7 @@ import static org.jooq.test.mysql.generatedclasses.tables.TBook.T_BOOK;
 import java.sql.Connection;
 import java.sql.DriverManager;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.SQLDialect;
@@ -61,7 +61,7 @@ import org.jooq.test.mysql.generatedclasses.tables.records.TBookRecord;
 
 public class Library {
 
-    private static ContextDSL create() throws Exception {
+    private static DSLContext create() throws Exception {
         return Factory.using(getConnection(), SQLDialect.MYSQL);
     }
 
diff --git a/jOOQ-test/examples/org/jooq/examples/Sakila.java b/jOOQ-test/examples/org/jooq/examples/Sakila.java
index b4b2b4445e..109f335a8e 100644
--- a/jOOQ-test/examples/org/jooq/examples/Sakila.java
+++ b/jOOQ-test/examples/org/jooq/examples/Sakila.java
@@ -43,7 +43,7 @@ import static org.jooq.examples.mysql.sakila.Tables.CUSTOMER;
 import java.sql.Connection;
 import java.sql.DriverManager;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
 import org.jooq.impl.Factory;
 
@@ -53,7 +53,7 @@ public class Sakila {
         Class.forName("com.mysql.jdbc.Driver");
         Connection connection = DriverManager.getConnection("jdbc:mysql://localhost/sakila", "root", "");
 
-        ContextDSL create = Factory.using(connection, SQLDialect.MYSQL);
+        DSLContext create = Factory.using(connection, SQLDialect.MYSQL);
 
         System.out.println(create
               .select()
diff --git a/jOOQ-test/src/org/jooq/test/ASETest.java b/jOOQ-test/src/org/jooq/test/ASETest.java
index 1d8c954fdd..b36eef2b92 100644
--- a/jOOQ-test/src/org/jooq/test/ASETest.java
+++ b/jOOQ-test/src/org/jooq/test/ASETest.java
@@ -45,7 +45,7 @@ import java.sql.Date;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
@@ -125,7 +125,7 @@ public class ASETest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         return Factory.using(getConnection(), SQLDialect.ASE, settings);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/BaseTest.java b/jOOQ-test/src/org/jooq/test/BaseTest.java
index 27d45917bc..23e0270428 100644
--- a/jOOQ-test/src/org/jooq/test/BaseTest.java
+++ b/jOOQ-test/src/org/jooq/test/BaseTest.java
@@ -55,7 +55,7 @@ import java.util.UUID;
 import junit.framework.Assert;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DAO;
 import org.jooq.DataType;
 import org.jooq.Field;
@@ -705,8 +705,8 @@ public abstract class BaseTest<
         return delegate.getCastableDataTypes();
     }
 
-    protected ContextDSL create(Settings settings) {
-        ContextDSL create = delegate.create(settings);
+    protected DSLContext create(Settings settings) {
+        DSLContext create = delegate.create(settings);
         create.configuration().getExecuteListeners().add(new TestStatisticsListener());
         return create;
     }
@@ -723,7 +723,7 @@ public abstract class BaseTest<
         return delegate.getConnection0(null, null);
     }
 
-    protected final ContextDSL create() {
+    protected final DSLContext create() {
         return delegate.create();
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/CUBRIDTest.java b/jOOQ-test/src/org/jooq/test/CUBRIDTest.java
index 1c80dd6bdf..5a231bfd2b 100644
--- a/jOOQ-test/src/org/jooq/test/CUBRIDTest.java
+++ b/jOOQ-test/src/org/jooq/test/CUBRIDTest.java
@@ -47,7 +47,7 @@ import java.sql.Date;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
@@ -132,7 +132,7 @@ public class CUBRIDTest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         return Factory.using(getConnection(), SQLDialect.CUBRID, settings);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/DB2Test.java b/jOOQ-test/src/org/jooq/test/DB2Test.java
index 5bd43883d8..9590b7da4e 100644
--- a/jOOQ-test/src/org/jooq/test/DB2Test.java
+++ b/jOOQ-test/src/org/jooq/test/DB2Test.java
@@ -50,7 +50,7 @@ import java.sql.Date;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
@@ -132,7 +132,7 @@ public class DB2Test extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         return Factory.using(getConnection(), SQLDialect.DB2, settings);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/DerbyTest.java b/jOOQ-test/src/org/jooq/test/DerbyTest.java
index 3598e1a4d3..1077813723 100644
--- a/jOOQ-test/src/org/jooq/test/DerbyTest.java
+++ b/jOOQ-test/src/org/jooq/test/DerbyTest.java
@@ -52,7 +52,7 @@ import java.sql.Timestamp;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
@@ -132,7 +132,7 @@ public class DerbyTest extends jOOQAbstractTest<
         T_785Record> {
 
 	@Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         return Factory.using(getConnection(), SQLDialect.DERBY, settings);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/FirebirdTest.java b/jOOQ-test/src/org/jooq/test/FirebirdTest.java
index eafba6898c..21ebb173a5 100644
--- a/jOOQ-test/src/org/jooq/test/FirebirdTest.java
+++ b/jOOQ-test/src/org/jooq/test/FirebirdTest.java
@@ -57,7 +57,7 @@ import java.sql.Date;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
@@ -124,7 +124,7 @@ public class FirebirdTest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         return Factory.using(getConnection(), SQLDialect.FIREBIRD, settings);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/H2Test.java b/jOOQ-test/src/org/jooq/test/H2Test.java
index 5c6f1dc323..052e9bf786 100644
--- a/jOOQ-test/src/org/jooq/test/H2Test.java
+++ b/jOOQ-test/src/org/jooq/test/H2Test.java
@@ -52,7 +52,7 @@ import java.sql.Timestamp;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DAO;
 import org.jooq.DataType;
 import org.jooq.Field;
@@ -140,7 +140,7 @@ public class H2Test extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         return Factory.using(getConnection(), SQLDialect.H2, settings);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/HSQLDBTest.java b/jOOQ-test/src/org/jooq/test/HSQLDBTest.java
index 305a7aaeef..35ac1801b7 100644
--- a/jOOQ-test/src/org/jooq/test/HSQLDBTest.java
+++ b/jOOQ-test/src/org/jooq/test/HSQLDBTest.java
@@ -61,7 +61,7 @@ import java.sql.Timestamp;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
@@ -130,7 +130,7 @@ public class HSQLDBTest extends jOOQAbstractTest<
         T_785Record> {
 
 	@Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         return Factory.using(getConnection(), SQLDialect.HSQLDB, settings);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/HSQLDBTest2.java b/jOOQ-test/src/org/jooq/test/HSQLDBTest2.java
index 465a22a13a..2f7a00b6eb 100644
--- a/jOOQ-test/src/org/jooq/test/HSQLDBTest2.java
+++ b/jOOQ-test/src/org/jooq/test/HSQLDBTest2.java
@@ -58,7 +58,7 @@ import java.util.List;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
@@ -129,7 +129,7 @@ public class HSQLDBTest2 extends jOOQAbstractTest<
         T_785Record> {
 
 	@Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
 	    settings = (settings != null) ? settings : new Settings();
         RenderMapping mapping = SettingsTools.getRenderMapping(settings);
         List<MappedSchema> schemata = mapping.getSchemata();
diff --git a/jOOQ-test/src/org/jooq/test/IngresTest.java b/jOOQ-test/src/org/jooq/test/IngresTest.java
index 32e9c018c7..d0baefd5a5 100644
--- a/jOOQ-test/src/org/jooq/test/IngresTest.java
+++ b/jOOQ-test/src/org/jooq/test/IngresTest.java
@@ -50,7 +50,7 @@ import java.sql.Date;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
@@ -129,7 +129,7 @@ public class IngresTest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         return Factory.using(getConnection(), SQLDialect.INGRES, settings);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/MySQLTest.java b/jOOQ-test/src/org/jooq/test/MySQLTest.java
index 18390ac0b1..f2484a754b 100644
--- a/jOOQ-test/src/org/jooq/test/MySQLTest.java
+++ b/jOOQ-test/src/org/jooq/test/MySQLTest.java
@@ -69,7 +69,7 @@ import java.util.List;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DAO;
 import org.jooq.DataType;
 import org.jooq.Field;
@@ -158,7 +158,7 @@ public class MySQLTest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         return Factory.using(getConnection(), SQLDialect.MYSQL, settings);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/MySQLTestSchemaMapping.java b/jOOQ-test/src/org/jooq/test/MySQLTestSchemaMapping.java
index 769b80bd22..c189f3112b 100644
--- a/jOOQ-test/src/org/jooq/test/MySQLTestSchemaMapping.java
+++ b/jOOQ-test/src/org/jooq/test/MySQLTestSchemaMapping.java
@@ -38,7 +38,7 @@ package org.jooq.test;
 
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
 import org.jooq.conf.MappedSchema;
 import org.jooq.conf.RenderMapping;
@@ -65,7 +65,7 @@ public class MySQLTestSchemaMapping extends MySQLTest {
     }
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         settings = (settings != null) ? settings : new Settings();
         RenderMapping mapping = SettingsTools.getRenderMapping(settings);
         List<MappedSchema> schemata = mapping.getSchemata();
diff --git a/jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java b/jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java
index 82713a903d..18ca0f7898 100644
--- a/jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java
+++ b/jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java
@@ -59,7 +59,7 @@ import java.sql.Date;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
@@ -132,7 +132,7 @@ public class MySQLTestSchemaRewrite extends jOOQAbstractTest<
     }
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         return Factory.using(getConnection(), SQLDialect.MYSQL, settings);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/OracleTest.java b/jOOQ-test/src/org/jooq/test/OracleTest.java
index 933906cc20..5a410fedb4 100644
--- a/jOOQ-test/src/org/jooq/test/OracleTest.java
+++ b/jOOQ-test/src/org/jooq/test/OracleTest.java
@@ -92,7 +92,7 @@ import java.util.List;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DAO;
 import org.jooq.DataType;
 import org.jooq.Field;
@@ -214,7 +214,7 @@ public class OracleTest extends jOOQAbstractTest<
     }
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         return Factory.using(getConnection(), SQLDialect.ORACLE, settings);
     }
 
@@ -1333,7 +1333,7 @@ public class OracleTest extends jOOQAbstractTest<
 
     @Test
     public void testOracleMultiSchemaFactories() throws Exception {
-        ContextDSL create = Factory.using(getConnectionMultiSchema(), SQLDialect.ORACLE);
+        DSLContext create = Factory.using(getConnectionMultiSchema(), SQLDialect.ORACLE);
 
         UAddressTypeRecord address = new UAddressTypeRecord();
         address.setStreet(new UStreetTypeRecord());
diff --git a/jOOQ-test/src/org/jooq/test/OracleTestInline.java b/jOOQ-test/src/org/jooq/test/OracleTestInline.java
index eae3fcc84f..2e1a141734 100644
--- a/jOOQ-test/src/org/jooq/test/OracleTestInline.java
+++ b/jOOQ-test/src/org/jooq/test/OracleTestInline.java
@@ -36,7 +36,7 @@
 
 package org.jooq.test;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
 import org.jooq.conf.Settings;
 import org.jooq.conf.StatementType;
@@ -49,7 +49,7 @@ import org.jooq.impl.Factory;
 public class OracleTestInline extends OracleTest {
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         settings = (settings != null) ? settings : new Settings();
         settings.withStatementType(StatementType.STATIC_STATEMENT);
         settings.withRenderFormatted(true);
diff --git a/jOOQ-test/src/org/jooq/test/PostgresTest.java b/jOOQ-test/src/org/jooq/test/PostgresTest.java
index 98a399caaa..22b5bc4afd 100644
--- a/jOOQ-test/src/org/jooq/test/PostgresTest.java
+++ b/jOOQ-test/src/org/jooq/test/PostgresTest.java
@@ -66,7 +66,7 @@ import java.util.List;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
@@ -148,7 +148,7 @@ public class PostgresTest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         return Factory.using(getConnection(), SQLDialect.POSTGRES, settings);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/SQLServerTest.java b/jOOQ-test/src/org/jooq/test/SQLServerTest.java
index bfa298c406..b6dcf6f28c 100644
--- a/jOOQ-test/src/org/jooq/test/SQLServerTest.java
+++ b/jOOQ-test/src/org/jooq/test/SQLServerTest.java
@@ -59,7 +59,7 @@ import java.sql.Date;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
@@ -126,7 +126,7 @@ public class SQLServerTest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         return Factory.using(getConnection(), SQLDialect.SQLSERVER, settings);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/SQLServerTestInline.java b/jOOQ-test/src/org/jooq/test/SQLServerTestInline.java
index dc53b1e697..ab4d46f15c 100644
--- a/jOOQ-test/src/org/jooq/test/SQLServerTestInline.java
+++ b/jOOQ-test/src/org/jooq/test/SQLServerTestInline.java
@@ -36,7 +36,7 @@
 
 package org.jooq.test;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
 import org.jooq.conf.Settings;
 import org.jooq.conf.StatementType;
@@ -49,7 +49,7 @@ import org.jooq.impl.Factory;
 public class SQLServerTestInline extends SQLServerTest {
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         settings = (settings != null) ? settings : new Settings();
         settings.withStatementType(StatementType.STATIC_STATEMENT);
         return Factory.using(getConnection(), SQLDialect.SQLSERVER, settings);
diff --git a/jOOQ-test/src/org/jooq/test/SQLiteTest.java b/jOOQ-test/src/org/jooq/test/SQLiteTest.java
index f2b928fc4f..9d504a8864 100644
--- a/jOOQ-test/src/org/jooq/test/SQLiteTest.java
+++ b/jOOQ-test/src/org/jooq/test/SQLiteTest.java
@@ -49,7 +49,7 @@ import java.sql.Date;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
@@ -126,7 +126,7 @@ public class SQLiteTest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         return Factory.using(getConnection(), SQLDialect.SQLITE, settings);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/SybaseTest.java b/jOOQ-test/src/org/jooq/test/SybaseTest.java
index 88e91c73b2..77e76a09a3 100644
--- a/jOOQ-test/src/org/jooq/test/SybaseTest.java
+++ b/jOOQ-test/src/org/jooq/test/SybaseTest.java
@@ -54,7 +54,7 @@ import java.sql.Date;
 import java.util.UUID;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
@@ -126,7 +126,7 @@ public class SybaseTest extends jOOQAbstractTest<
         T_785Record> {
 
     @Override
-    protected ContextDSL create(Settings settings) {
+    protected DSLContext create(Settings settings) {
         return Factory.using(getConnection(), SQLDialect.SYBASE, settings);
     }
 
diff --git a/jOOQ-test/src/org/jooq/test/_/PrettyPrinter.java b/jOOQ-test/src/org/jooq/test/_/PrettyPrinter.java
index 4e2c26ac85..db21489429 100644
--- a/jOOQ-test/src/org/jooq/test/_/PrettyPrinter.java
+++ b/jOOQ-test/src/org/jooq/test/_/PrettyPrinter.java
@@ -37,7 +37,7 @@ package org.jooq.test._;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.ExecuteContext;
 import org.jooq.conf.SettingsTools;
 import org.jooq.impl.DefaultExecuteListener;
@@ -66,12 +66,12 @@ public class PrettyPrinter extends DefaultExecuteListener {
 
         // Create a new factory for logging rendering purposes
         // This factory doesn't need a connection, only the SQLDialect...
-        ContextDSL pretty = Factory.using(ctx.configuration().getDialect(),
+        DSLContext pretty = Factory.using(ctx.configuration().getDialect(),
 
         // ... and the flag for pretty-printing
             SettingsTools.clone(ctx.configuration().getSettings()).withRenderFormatted(true));
 
-        ContextDSL normal = Factory.using(ctx.configuration().getDialect());
+        DSLContext normal = Factory.using(ctx.configuration().getDialect());
 
         String n = "" + count.incrementAndGet();
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/BenchmarkTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/BenchmarkTests.java
index 54fdd53603..b222f395f2 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/BenchmarkTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/BenchmarkTests.java
@@ -41,7 +41,7 @@ import java.sql.ResultSet;
 import java.util.Collections;
 import java.util.Random;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.ExecuteListener;
 import org.jooq.Record1;
 import org.jooq.Record2;
@@ -91,7 +91,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
     @Test
     public void testBenchmarkNewRecord() throws Exception {
-        ContextDSL create = create();
+        DSLContext create = create();
 
         for (int i = 0; i < REPETITIONS_NEW_RECORD; i++) {
             create.newRecord(TBook());
@@ -128,7 +128,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         // https://github.com/jOOQ/jOOQ/issues/1625
 
 
-        ContextDSL create = create();
+        DSLContext create = create();
         create.configuration().getSettings().setExecuteLogging(false);
         create.configuration().setExecuteListeners(Collections.<ExecuteListener>emptyList());
 
@@ -151,7 +151,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         watch.splitInfo("Reuse SQL String");
     }
 
-    private void testBenchmarkReuseSQLString(ContextDSL create, int repetitions) throws Exception {
+    private void testBenchmarkReuseSQLString(DSLContext create, int repetitions) throws Exception {
         String sql = createSelect(create).getSQL(false);
         PreparedStatement pst = getConnection().prepareStatement(sql);
         pst.setLong(1, 1);
@@ -166,7 +166,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         pst.close();
     }
 
-    private void testBenchmarkReuseSelect(ContextDSL create, int repetitions) {
+    private void testBenchmarkReuseSelect(DSLContext create, int repetitions) {
         Select<?> scs = createSelect(create);
 
         for (int i = 0; i < repetitions; i++) {
@@ -174,13 +174,13 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         }
     }
 
-    private void testBenchmarkFullExecution(ContextDSL create, int repetitions) {
+    private void testBenchmarkFullExecution(DSLContext create, int repetitions) {
         for (int i = 0; i < repetitions; i++) {
             createSelect(create).execute();
         }
     }
 
-    private Select<?> createSelect(ContextDSL create) {
+    private Select<?> createSelect(DSLContext create) {
         return create.select()
                      .from(TBook())
                      .where(TBook_ID().equal(1))
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java
index 8740850264..300d1e2387 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java
@@ -51,7 +51,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Field;
 import org.jooq.InsertQuery;
 import org.jooq.Record1;
@@ -592,7 +592,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         jOOQAbstractTest.reset = false;
 
-        ContextDSL create = create(new Settings().withExecuteWithOptimisticLocking(true));
+        DSLContext create = create(new Settings().withExecuteWithOptimisticLocking(true));
         boolean t = TBook_REC_TIMESTAMP() != null;
         boolean v = TBook_REC_VERSION() != null;
 
@@ -694,7 +694,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
     private <R extends UpdatableRecord<R>> void testStoreWithOptimisticLock0(
         Table<R> table, TableField<R, Integer> id, TableField<R, String> string) throws Exception {
 
-        ContextDSL create = create(new Settings().withExecuteWithOptimisticLocking(true));
+        DSLContext create = create(new Settings().withExecuteWithOptimisticLocking(true));
 
         // Storing without changing shouldn't execute any queries
         R record1 = create.fetchOne(table, id.equal(1));
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
index 04a0bf71d0..eeb835b41a 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java
@@ -77,7 +77,7 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.UUID;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Converter;
 import org.jooq.DataType;
 import org.jooq.Field;
@@ -1594,7 +1594,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         // [#2278] Run the subsequent test twice, once with bind values and once
         // with inlined bind values
-        for (ContextDSL create : asList(
+        for (DSLContext create : asList(
             create(),
             create(new Settings().withStatementType(STATIC_STATEMENT)))) {
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java
index e7e6dffef2..468c9ccc7b 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java
@@ -53,7 +53,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Cursor;
 import org.jooq.ExecuteContext;
 import org.jooq.ExecuteListener;
@@ -100,7 +100,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
     @Test
     public void testExecuteListenerWithData() throws Exception {
-        ContextDSL create = create();
+        DSLContext create = create();
         create.configuration().getExecuteListeners().add(new DataListener());
 
         create.selectOne().fetch();
@@ -210,7 +210,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
     @Test
     public void testExecuteListenerCustomException() throws Exception {
-        ContextDSL create = create();
+        DSLContext create = create();
         create.configuration().getExecuteListeners().add(new CustomExceptionListener());
 
         try {
@@ -236,7 +236,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
     @Test
     public void testExecuteListenerOnResultQuery() throws Exception {
-        ContextDSL create = create();
+        DSLContext create = create();
         create.configuration().getExecuteListeners().add(new ResultQueryListener());
 
         create.configuration().setData("Foo", "Bar");
@@ -580,7 +580,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         jOOQAbstractTest.reset = false;
 
-        ContextDSL create = create();
+        DSLContext create = create();
         create.configuration().getExecuteListeners().add(new BatchSingleListener());
 
         create.configuration().setData("Foo", "Bar");
@@ -794,7 +794,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
     public void testExecuteListenerOnBatchMultiple() {
         jOOQAbstractTest.reset = false;
 
-        ContextDSL create = create();
+        DSLContext create = create();
         create.configuration().getExecuteListeners().add(new BatchMultipleListener());
 
         create.configuration().setData("Foo", "Bar");
@@ -1020,7 +1020,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
     @Test
     public void testExecuteListenerFetchLazyTest() throws Exception {
-        ContextDSL create = create();
+        DSLContext create = create();
         create.configuration().getExecuteListeners().add(new FetchLazyListener());
         FetchLazyListener.reset();
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
index b073d9f33a..83f163e7a9 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java
@@ -61,7 +61,7 @@ import java.sql.Connection;
 import java.sql.Date;
 import java.util.Arrays;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.ExecuteContext;
 import org.jooq.Field;
 import org.jooq.Record;
@@ -232,7 +232,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         // [#1191] Check execution capabilities with new features in ExecuteListener
         ConnectionProviderListener.c = create().configuration().getConnectionProvider().acquire();
         try {
-            ContextDSL create = create();
+            DSLContext create = create();
             create.configuration().getExecuteListeners().add(new ConnectionProviderListener());
             q = create
                     .selectFrom(TAuthor())
@@ -295,7 +295,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
     @Test
     public void testAttachable() throws Exception {
         jOOQAbstractTest.reset = false;
-        ContextDSL create = create();
+        DSLContext create = create();
 
         S store1 = create.newRecord(TBookStore());
         assertNotNull(store1);
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
index dde85788c7..1739d37024 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
@@ -60,7 +60,7 @@ import java.util.List;
 
 import org.jooq.BindContext;
 import org.jooq.Condition;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Cursor;
 import org.jooq.Field;
 import org.jooq.FutureResult;
@@ -575,7 +575,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         // [#1169] Some additional checks to see if custom data is correctly
         // passed on to custom QueryParts
-        ContextDSL create = create();
+        DSLContext create = create();
         create.configuration().setData("Foo-Field", "Bar");
         create.configuration().setData("Foo-Condition", "Bar");
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java
index 11ab4d1225..1f3382a52e 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java
@@ -57,7 +57,7 @@ import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Collections;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Field;
 import org.jooq.Insert;
 import org.jooq.Record;
@@ -354,7 +354,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         // Inlining bind values globally, through the factory settings
         // -----------------------------------------------------------
         {
-            ContextDSL create = create(new Settings()
+            DSLContext create = create(new Settings()
                 .withStatementType(StatementType.STATIC_STATEMENT));
 
             Object[] array1 = create.select(
@@ -395,7 +395,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         // Inlining bind values locally, through bind value parameters
         // -----------------------------------------------------------
         {
-            ContextDSL create = create();
+            DSLContext create = create();
 
             Object[] array1 = create.select(inline(s1), inline(s2), inline(s3), inline(s4)).fetchOneArray();
             Object[] array2 = create.select(inline(b1), inline(b2), inline(sh1), inline(sh2), inline(i1), inline(i2), inline(l1), inline(l2), inline(bi1), inline(bi2), inline(bd1), inline(bd2), inline(db1), inline(db2), inline(f1), inline(f2)).fetchOneArray();
@@ -429,7 +429,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         // Inlining bind values globally, through the factory settings
         // -----------------------------------------------------------
         {
-            ContextDSL create = create(new Settings()
+            DSLContext create = create(new Settings()
                 .withStatementType(StatementType.STATIC_STATEMENT));
 
             // [#1557] Check correct inlining of floating point values with
@@ -456,7 +456,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         Time t1 = Time.valueOf("12:01:15");
         Timestamp ts1 = Timestamp.valueOf("1981-07-10 12:01:15");
 
-        ContextDSL create = create(new Settings()
+        DSLContext create = create(new Settings()
             .withStatementType(StatementType.STATIC_STATEMENT));
 
         DATE date = create.newRecord(TDates());
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
index 87758000a3..d12055515a 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java
@@ -47,7 +47,7 @@ import java.math.BigDecimal;
 import java.sql.Date;
 import java.util.Arrays;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record1;
@@ -106,7 +106,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
                 return;
         }
 
-        ContextDSL factory = create();
+        DSLContext factory = create();
         factory.use(schema().getName());
 
         Result<?> result =
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java
index bd62ce23ca..f220a79f8d 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java
@@ -50,7 +50,7 @@ import static org.jooq.impl.Factory.val;
 import java.sql.Date;
 import java.util.Vector;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record1;
@@ -371,8 +371,8 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         // Checking for syntax correctness and locking behaviour
         // -----------------------------------------------------
-        final ContextDSL create1 = create();
-        final ContextDSL create2 = create();
+        final DSLContext create1 = create();
+        final DSLContext create2 = create();
 
         ((DefaultConnectionProvider) create2.configuration().getConnectionProvider()).setConnection(getNewConnection());
         create2.configuration().getConnectionProvider().acquire().setAutoCommit(false);
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java
index 01933b5260..c1462d81d0 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java
@@ -51,7 +51,7 @@ import java.sql.PreparedStatement;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Cursor;
 import org.jooq.ExecuteContext;
 import org.jooq.Record1;
@@ -99,7 +99,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
     @Test
     public void testKeepStatement() throws Exception {
-        ContextDSL create = create();
+        DSLContext create = create();
         create.configuration().getExecuteListeners().add(new KeepStatementListener());
 
         // [#385] By default, new statements are created for every execution
diff --git a/jOOQ-test/src/org/jooq/test/h2/F.java b/jOOQ-test/src/org/jooq/test/h2/F.java
index 1b4ac79678..4175ffd44f 100644
--- a/jOOQ-test/src/org/jooq/test/h2/F.java
+++ b/jOOQ-test/src/org/jooq/test/h2/F.java
@@ -47,7 +47,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
 import org.jooq.impl.Factory;
 import org.jooq.test.h2.generatedclasses.Routines;
@@ -66,7 +66,7 @@ public class F {
     }
 
     public static void pCreateAuthorByName(Connection connection, String firstName, String lastName) {
-        ContextDSL create = create(connection);
+        DSLContext create = create(connection);
 
         create.insertInto(T_AUTHOR)
               .set(TAuthor.ID, create.select(max(TAuthor.ID).add(1)).from(T_AUTHOR).<Integer>asField())
@@ -97,7 +97,7 @@ public class F {
     }
 
     public static Integer fAuthorExists(Connection connection, String authorName) {
-        ContextDSL create = create(connection);
+        DSLContext create = create(connection);
 
         Integer result =
         create.select(sign(count()))
@@ -138,7 +138,7 @@ public class F {
         return 1;
     }
 
-    private static ContextDSL create(Connection connection) {
+    private static DSLContext create(Connection connection) {
         return Factory.using(connection, SQLDialect.H2);
     }
 }
diff --git a/jOOQ-test/src/org/jooq/test/h2/TTriggersTrigger.java b/jOOQ-test/src/org/jooq/test/h2/TTriggersTrigger.java
index f9f11204e5..204a68e563 100644
--- a/jOOQ-test/src/org/jooq/test/h2/TTriggersTrigger.java
+++ b/jOOQ-test/src/org/jooq/test/h2/TTriggersTrigger.java
@@ -38,7 +38,7 @@ package org.jooq.test.h2;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
 import org.jooq.impl.Factory;
 import org.jooq.test.h2.generatedclasses.Sequences;
@@ -58,7 +58,7 @@ public class TTriggersTrigger implements Trigger {
 
     @Override
     public void fire(Connection conn, Object[] oldRow, Object[] newRow) throws SQLException {
-        ContextDSL create = Factory.using(conn, SQLDialect.H2);
+        DSLContext create = Factory.using(conn, SQLDialect.H2);
         int maxID = create.nextval(Sequences.S_TRIGGERS_SEQUENCE).intValue();
         newRow[0] = maxID;
         newRow[1] = maxID;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index 12bfcc22ee..e7823b9a58 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -63,7 +63,7 @@ import java.util.UUID;
 import javax.swing.UIManager;
 
 import org.jooq.ArrayRecord;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DAO;
 import org.jooq.DataType;
 import org.jooq.ExecuteType;
@@ -492,7 +492,7 @@ public abstract class jOOQAbstractTest<
 
                 @Override
                 public MockResult[] execute(MockExecuteContext context) throws SQLException {
-                    ContextDSL executor = Factory.using(c, getDialect());
+                    DSLContext executor = Factory.using(c, getDialect());
 
                     if (context.batchSingle()) {
                         Query query = executor.query(context.sql(), new Object[context.batchBindings()[0].length]);
@@ -858,13 +858,13 @@ public abstract class jOOQAbstractTest<
     protected abstract Class<?> cLibrary();
     protected abstract Class<?> cSequences();
     protected abstract DataType<?>[] getCastableDataTypes();
-    protected abstract ContextDSL create(Settings settings);
+    protected abstract DSLContext create(Settings settings);
 
     protected final Schema schema() {
         return create().map(TAuthor().getSchema());
     }
 
-    protected final ContextDSL create() {
+    protected final DSLContext create() {
         String defaultSchema = System.getProperty("org.jooq.settings.defaultSchema", "");
         Boolean renderSchema = Boolean.valueOf(System.getProperty("org.jooq.settings.renderSchema", "true"));
 
@@ -873,7 +873,7 @@ public abstract class jOOQAbstractTest<
             .withRenderMapping(new RenderMapping()
                 .withDefaultSchema(defaultSchema));
 
-        ContextDSL create = create(settings);
+        DSLContext create = create(settings);
         create.configuration().getExecuteListeners().add(new TestStatisticsListener());
         create.configuration().getExecuteListeners().add(new PrettyPrinter());
         create.configuration().getExecuteListeners().add(new LifecycleWatcherListener());
diff --git a/jOOQ-tools/src/org/jooq/xtend/ContextDSL.xtend b/jOOQ-tools/src/org/jooq/xtend/DSLContext.xtend
similarity index 92%
rename from jOOQ-tools/src/org/jooq/xtend/ContextDSL.xtend
rename to jOOQ-tools/src/org/jooq/xtend/DSLContext.xtend
index 15a011ada3..93b0982c14 100644
--- a/jOOQ-tools/src/org/jooq/xtend/ContextDSL.xtend
+++ b/jOOQ-tools/src/org/jooq/xtend/DSLContext.xtend
@@ -41,14 +41,14 @@ package org.jooq.xtend
  */
 import org.jooq.Constants
 
-class ContextDSL extends Generators {
+class DSLContext extends Generators {
     
     def static void main(String[] args) {
-        val contextDSL = new ContextDSL();
-        contextDSL.generateSelect();
-        contextDSL.generateSelectDistinct();
-        contextDSL.generateInsert();
-        contextDSL.generateMerge();
+        val ctx = new DSLContext();
+        ctx.generateSelect();
+        ctx.generateSelectDistinct();
+        ctx.generateInsert();
+        ctx.generateMerge();
     }
     
     def generateSelect() {
@@ -73,7 +73,7 @@ class ContextDSL extends Generators {
                  * building methods taking subselect arguments.
                  * <p>
                  * This creates an attached, renderable and executable <code>SELECT</code>
-                 * statement from this {@link ContextDSL}. If you don't need to render or
+                 * statement from this {@link DSLContext}. If you don't need to render or
                  * execute this <code>SELECT</code> statement (e.g. because you want to
                  * create a subselect), consider using the static
                  * {@link Factory#select(«FOR d : (1..degree) SEPARATOR ', '»Field«ENDFOR»)} instead.
@@ -105,8 +105,8 @@ class ContextDSL extends Generators {
             ''');
         }
 
-        insert("org.jooq.ContextDSL", outAPI, "select");
-        insert("org.jooq.impl.ContextDSLImpl", outImpl, "select");
+        insert("org.jooq.DSLContext", outAPI, "select");
+        insert("org.jooq.impl.DSLContextImpl", outImpl, "select");
     }
     
     def generateSelectDistinct() {
@@ -131,7 +131,7 @@ class ContextDSL extends Generators {
                  * building methods taking subselect arguments.
                  * <p>
                  * This creates an attached, renderable and executable <code>SELECT</code>
-                 * statement from this {@link ContextDSL}. If you don't need to render or
+                 * statement from this {@link DSLContext}. If you don't need to render or
                  * execute this <code>SELECT</code> statement (e.g. because you want to
                  * create a subselect), consider using the static
                  * {@link Factory#selectDistinct(«FOR d : (1..degree) SEPARATOR ', '»Field«ENDFOR»)} instead.
@@ -163,8 +163,8 @@ class ContextDSL extends Generators {
             ''');
         }
 
-        insert("org.jooq.ContextDSL", outAPI, "selectDistinct");
-        insert("org.jooq.impl.ContextDSLImpl", outImpl, "selectDistinct");
+        insert("org.jooq.DSLContext", outAPI, "selectDistinct");
+        insert("org.jooq.impl.DSLContextImpl", outImpl, "selectDistinct");
     }
 
     def generateInsert() {
@@ -203,8 +203,8 @@ class ContextDSL extends Generators {
             ''');
         }
 
-        insert("org.jooq.ContextDSL", outAPI, "insert");
-        insert("org.jooq.impl.ContextDSLImpl", outImpl, "insert");
+        insert("org.jooq.DSLContext", outAPI, "insert");
+        insert("org.jooq.impl.DSLContextImpl", outImpl, "insert");
     }
 
     def generateMerge() {
@@ -249,7 +249,7 @@ class ContextDSL extends Generators {
             ''');
         }
 
-        insert("org.jooq.ContextDSL", outAPI, "merge");
-        insert("org.jooq.impl.ContextDSLImpl", outImpl, "merge");
+        insert("org.jooq.DSLContext", outAPI, "merge");
+        insert("org.jooq.impl.DSLContextImpl", outImpl, "merge");
     }
 }
\ No newline at end of file
diff --git a/jOOQ-tools/src/org/jooq/xtend/Factory.xtend b/jOOQ-tools/src/org/jooq/xtend/Factory.xtend
index 9fa7dc2a74..516052ce0c 100644
--- a/jOOQ-tools/src/org/jooq/xtend/Factory.xtend
+++ b/jOOQ-tools/src/org/jooq/xtend/Factory.xtend
@@ -68,7 +68,7 @@ class Factory extends Generators {
                  * {@link «fieldOrRow»#in(Select)}, {@link «fieldOrRow»#equal(Select)} and other predicate
                  * building methods taking subselect arguments.
                  * <p>
-                 * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+                 * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
                  * creates an unattached, and thus not directly renderable or executable
                  * <code>SELECT</code> statement. You can use this statement in two ways:
                  * <ul>
@@ -89,7 +89,7 @@ class Factory extends Generators {
                  *  .orderBy(field2);
                  * </pre></code>
                  *
-                 * @see ContextDSL#select(Field...)
+                 * @see DSLContext#select(Field...)
                  * @see #select(Field...)
                  */
                 «generatedMethod»
@@ -123,7 +123,7 @@ class Factory extends Generators {
                  * {@link «fieldOrRow»#in(Select)}, {@link «fieldOrRow»#equal(Select)} and other predicate
                  * building methods taking subselect arguments.
                  * <p>
-                 * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+                 * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
                  * creates an unattached, and thus not directly renderable or executable
                  * <code>SELECT</code> statement. You can use this statement in two ways:
                  * <ul>
@@ -144,7 +144,7 @@ class Factory extends Generators {
                  *  .orderBy(field2);
                  * </pre></code>
                  *
-                 * @see ContextDSL#selectDistinct(Field...)
+                 * @see DSLContext#selectDistinct(Field...)
                  * @see #selectDistinct(Field...)
                  */
                 «generatedMethod»
diff --git a/jOOQ-tools/src/org/jooq/xtend/GenerateAll.xtend b/jOOQ-tools/src/org/jooq/xtend/GenerateAll.xtend
index c603063907..d7df1869bc 100644
--- a/jOOQ-tools/src/org/jooq/xtend/GenerateAll.xtend
+++ b/jOOQ-tools/src/org/jooq/xtend/GenerateAll.xtend
@@ -4,7 +4,7 @@ class GenerateAll {
     def static void main(String[] args) {
     	BetweenAndSteps::main(args);
     	Conversions::main(args);
-    	ContextDSL::main(args);
+    	DSLContext::main(args);
     	Factory::main(args);
     	InsertDSL::main(args);
     	MergeDSL::main(args);
diff --git a/jOOQ-tools/src/org/jooq/xtend/InsertDSL.xtend b/jOOQ-tools/src/org/jooq/xtend/InsertDSL.xtend
index 07ee5af59b..e11d354209 100644
--- a/jOOQ-tools/src/org/jooq/xtend/InsertDSL.xtend
+++ b/jOOQ-tools/src/org/jooq/xtend/InsertDSL.xtend
@@ -105,7 +105,7 @@ class InsertDSL extends Generators {
                  * This variant of the <code>INSERT .. SELECT</code> statement expects a
                  * select returning exactly as many fields as specified previously in the
                  * <code>INTO</code> clause:
-                 * {@link ContextDSL#insertInto(Table, «(1..degree).join(", ", [e | 'Field'])»)}
+                 * {@link DSLContext#insertInto(Table, «(1..degree).join(", ", [e | 'Field'])»)}
                  */
                 @Support
                 Insert<R> select(Select<? extends Record«degree»<«TN(degree)»>> select);
diff --git a/jOOQ-tools/src/org/jooq/xtend/MergeDSL.xtend b/jOOQ-tools/src/org/jooq/xtend/MergeDSL.xtend
index 5e86f2fa90..0a60d57f29 100644
--- a/jOOQ-tools/src/org/jooq/xtend/MergeDSL.xtend
+++ b/jOOQ-tools/src/org/jooq/xtend/MergeDSL.xtend
@@ -320,7 +320,7 @@ class MergeDSL extends Generators {
                  * This variant of the <code>MERGE .. SELECT</code> statement expects a
                  * select returning exactly as many fields as specified previously in the
                  * <code>INTO</code> clause:
-                 * {@link ContextDSL#mergeInto(Table, «(1..degree).join(', ', [e | 'Field'])»)}
+                 * {@link DSLContext#mergeInto(Table, «(1..degree).join(', ', [e | 'Field'])»)}
                  */
                 @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
                 Merge<R> select(Select<? extends Record«degree»<«TN(degree)»>> select);
diff --git a/jOOQ/src/main/java/org/jooq/Configuration.java b/jOOQ/src/main/java/org/jooq/Configuration.java
index 64539fd1ad..52d73fd86f 100644
--- a/jOOQ/src/main/java/org/jooq/Configuration.java
+++ b/jOOQ/src/main/java/org/jooq/Configuration.java
@@ -42,13 +42,13 @@ import java.util.Map;
 import org.jooq.conf.Settings;
 
 /**
- * A <code>Configuration</code> configures an {@link ContextDSL}, providing it
+ * A <code>Configuration</code> configures an {@link DSLContext}, providing it
  * with information for query construction, rendering and execution.
  * <p>
  * A <code>Configuration</code> wraps all information elements that are
  * needed...
  * <ul>
- * <li>by an {@link ContextDSL} to construct {@link Query} objects</li>
+ * <li>by an {@link DSLContext} to construct {@link Query} objects</li>
  * <li>by a {@link RenderContext} to render {@link Query} objects and
  * {@link QueryPart}s</li>
  * <li>by a {@link BindContext} to bind values to {@link Query} objects and
diff --git a/jOOQ/src/main/java/org/jooq/ContextDSL.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
similarity index 96%
rename from jOOQ/src/main/java/org/jooq/ContextDSL.java
rename to jOOQ/src/main/java/org/jooq/DSLContext.java
index 619f995258..8074d7f5af 100644
--- a/jOOQ/src/main/java/org/jooq/ContextDSL.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -75,13 +75,13 @@ import org.jooq.impl.Factory;
  * Apart from the {@link Factory}, this contextual DSL is the main entry point
  * for client code, to access jOOQ classes and functionality that are related to
  * {@link Query} execution. Unlike objects created through the
- * <code>Factory</code>, objects created from a <code>ContextDSL</code> will be
- * "attached" to the <code>ContextDSL</code>'s {@link #configuration()}, such
+ * <code>Factory</code>, objects created from a <code>DSLContext</code> will be
+ * "attached" to the <code>DSLContext</code>'s {@link #configuration()}, such
  * that they can be executed immediately in a fluent style. An example is given
  * here:
  * <p>
  * <code><pre>
- * ContextDSL create = Factory.using(connection, dialect);
+ * DSLContext create = Factory.using(connection, dialect);
  *
  * // Immediately fetch results after constructing a query
  * create.selectFrom(MY_TABLE).where(MY_TABLE.ID.eq(1)).fetch();
@@ -102,7 +102,7 @@ import org.jooq.impl.Factory;
  * @see Configuration
  * @author Lukas Eder
  */
-public interface ContextDSL {
+public interface DSLContext {
 
     // -------------------------------------------------------------------------
     // XXX Configuration API
@@ -110,7 +110,7 @@ public interface ContextDSL {
 
     /**
      * The <code>Configuration</code> referenced from this
-     * <code>ContextDSL</code>.
+     * <code>DSLContext</code>.
      */
     Configuration configuration();
 
@@ -1323,7 +1323,7 @@ public interface ContextDSL {
      * Create a new DSL select statement.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Collection)} instead.
@@ -1347,7 +1347,7 @@ public interface ContextDSL {
      * Create a new DSL select statement.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field...)} instead.
@@ -1378,7 +1378,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field)} instead.
@@ -1408,7 +1408,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field)} instead.
@@ -1438,7 +1438,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field)} instead.
@@ -1468,7 +1468,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field)} instead.
@@ -1498,7 +1498,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field)} instead.
@@ -1528,7 +1528,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field)} instead.
@@ -1558,7 +1558,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -1588,7 +1588,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -1618,7 +1618,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -1648,7 +1648,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -1678,7 +1678,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -1708,7 +1708,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -1738,7 +1738,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -1768,7 +1768,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -1798,7 +1798,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -1828,7 +1828,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -1858,7 +1858,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -1888,7 +1888,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -1918,7 +1918,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -1948,7 +1948,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -1978,7 +1978,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2008,7 +2008,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2035,7 +2035,7 @@ public interface ContextDSL {
      * Create a new DSL select statement.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Collection)} instead.
@@ -2059,7 +2059,7 @@ public interface ContextDSL {
      * Create a new DSL select statement.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field...)} instead.
@@ -2089,7 +2089,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field)} instead.
@@ -2119,7 +2119,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field)} instead.
@@ -2149,7 +2149,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field)} instead.
@@ -2179,7 +2179,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field)} instead.
@@ -2209,7 +2209,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field)} instead.
@@ -2239,7 +2239,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field)} instead.
@@ -2269,7 +2269,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2299,7 +2299,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2329,7 +2329,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2359,7 +2359,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2389,7 +2389,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2419,7 +2419,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2449,7 +2449,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2479,7 +2479,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2509,7 +2509,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2539,7 +2539,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2569,7 +2569,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2599,7 +2599,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2629,7 +2629,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2659,7 +2659,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2689,7 +2689,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2719,7 +2719,7 @@ public interface ContextDSL {
      * building methods taking subselect arguments.
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
@@ -2746,7 +2746,7 @@ public interface ContextDSL {
      * Create a new DSL select statement for constant <code>0</code> literal
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectZero()} instead.
@@ -2771,7 +2771,7 @@ public interface ContextDSL {
      * Create a new DSL select statement for constant <code>1</code> literal
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectOne()} instead.
@@ -2796,7 +2796,7 @@ public interface ContextDSL {
      * Create a new DSL select statement for <code>COUNT(*)</code>
      * <p>
      * This creates an attached, renderable and executable <code>SELECT</code>
-     * statement from this {@link ContextDSL}. If you don't need to render or
+     * statement from this {@link DSLContext}. If you don't need to render or
      * execute this <code>SELECT</code> statement (e.g. because you want to
      * create a subselect), consider using the static
      * {@link Factory#selectCount()} instead.
@@ -4269,7 +4269,7 @@ public interface ContextDSL {
 
     /**
      * Convenience method to fetch the NEXTVAL for a sequence directly from this
-     * {@link ContextDSL}'s underlying JDBC {@link Connection}
+     * {@link DSLContext}'s underlying JDBC {@link Connection}
      *
      * @throws DataAccessException if something went wrong executing the query
      */
@@ -4278,7 +4278,7 @@ public interface ContextDSL {
 
     /**
      * Convenience method to fetch the CURRVAL for a sequence directly from this
-     * {@link ContextDSL}'s underlying JDBC {@link Connection}
+     * {@link DSLContext}'s underlying JDBC {@link Connection}
      *
      * @throws DataAccessException if something went wrong executing the query
      */
diff --git a/jOOQ/src/main/java/org/jooq/ExecuteListener.java b/jOOQ/src/main/java/org/jooq/ExecuteListener.java
index 8ce09933fe..e4da2ab31e 100644
--- a/jOOQ/src/main/java/org/jooq/ExecuteListener.java
+++ b/jOOQ/src/main/java/org/jooq/ExecuteListener.java
@@ -54,7 +54,7 @@ import org.jooq.tools.StopWatchListener;
  * render, prepare, bind, execute, fetch steps.
  * <p>
  * <code>ExecuteListener</code> is a base type for loggers, debuggers,
- * profilers, data collectors that can be hooked into a jOOQ {@link ContextDSL}
+ * profilers, data collectors that can be hooked into a jOOQ {@link DSLContext}
  * using the {@link Configuration#getExecuteListeners()} property, passing
  * <code>Settings</code> to
  * {@link Factory#using(java.sql.Connection, SQLDialect, Settings)}. jOOQ
@@ -248,10 +248,10 @@ import org.jooq.tools.StopWatchListener;
  * {@link StatementType#PREPARED_STATEMENT}</li>
  * <li>Used with {@link ResultQuery} of statement type
  * {@link StatementType#STATIC_STATEMENT}</li>
- * <li>Used with {@link ContextDSL#fetch(ResultSet)} or with
+ * <li>Used with {@link DSLContext#fetch(ResultSet)} or with
  * {@link InsertResultStep#fetch()}</li>
- * <li>Used with {@link ContextDSL#batch(Query)}</li>
- * <li>Used with {@link ContextDSL#batch(Query[])}</li>
+ * <li>Used with {@link DSLContext#batch(Query)}</li>
+ * <li>Used with {@link DSLContext#batch(Query[])}</li>
  * <li>Used with a {@link Routine} standalone call</li>
  * </ol>
  * <p>
diff --git a/jOOQ/src/main/java/org/jooq/Field.java b/jOOQ/src/main/java/org/jooq/Field.java
index acb50efc6c..edf05e390a 100644
--- a/jOOQ/src/main/java/org/jooq/Field.java
+++ b/jOOQ/src/main/java/org/jooq/Field.java
@@ -1830,7 +1830,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#sign(Field)
      */
@@ -1840,7 +1840,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#abs(Field)
      */
@@ -1850,7 +1850,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#round(Field)
      */
@@ -1860,7 +1860,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#round(Field, int)
      */
@@ -1870,7 +1870,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#floor(Field)
      */
@@ -1880,7 +1880,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#ceil(Field)
      */
@@ -1890,7 +1890,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#sqrt(Field)
      */
@@ -1900,7 +1900,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#exp(Field)
      */
@@ -1910,7 +1910,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#ln(Field)
      */
@@ -1920,7 +1920,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#log(Field, int)
      */
@@ -1930,7 +1930,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#power(Field, Number)
      */
@@ -1948,7 +1948,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#acos(Field)
      */
@@ -1958,7 +1958,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#asin(Field)
      */
@@ -1968,7 +1968,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#atan(Field)
      */
@@ -1978,7 +1978,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#atan2(Field, Number)
      */
@@ -1988,7 +1988,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#atan2(Field, Field)
      */
@@ -1998,7 +1998,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#cos(Field)
      */
@@ -2008,7 +2008,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#sin(Field)
      */
@@ -2018,7 +2018,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#tan(Field)
      */
@@ -2028,7 +2028,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#cot(Field)
      */
@@ -2038,7 +2038,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#sinh(Field)
      */
@@ -2048,7 +2048,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#cosh(Field)
      */
@@ -2058,7 +2058,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#tanh(Field)
      */
@@ -2068,7 +2068,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#coth(Field)
      */
@@ -2078,7 +2078,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#deg(Field)
      */
@@ -2088,7 +2088,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#rad(Field)
      */
@@ -2098,7 +2098,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#count(Field)
      */
@@ -2108,7 +2108,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#countDistinct(Field)
      */
@@ -2118,7 +2118,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#max(Field)
      */
@@ -2128,7 +2128,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#min(Field)
      */
@@ -2138,7 +2138,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#sum(Field)
      */
@@ -2148,7 +2148,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#avg(Field)
      */
@@ -2158,7 +2158,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#median(Field)
      */
@@ -2168,7 +2168,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#stddevPop(Field)
      */
@@ -2178,7 +2178,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#stddevSamp(Field)
      */
@@ -2188,7 +2188,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#varPop(Field)
      */
@@ -2198,7 +2198,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#varSamp(Field)
      */
@@ -2208,7 +2208,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#count(Field)
      * @see AggregateFunction#over()
@@ -2219,7 +2219,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#max(Field)
      * @see AggregateFunction#over()
@@ -2230,7 +2230,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#min(Field)
      * @see AggregateFunction#over()
@@ -2241,7 +2241,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#sum(Field)
      * @see AggregateFunction#over()
@@ -2252,7 +2252,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#avg(Field)
      * @see AggregateFunction#over()
@@ -2263,7 +2263,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#firstValue(Field)
      * @see AggregateFunction#over()
@@ -2274,7 +2274,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#lastValue(Field)
      * @see AggregateFunction#over()
@@ -2285,7 +2285,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#lead(Field)
      * @see AggregateFunction#over()
@@ -2296,7 +2296,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#lead(Field, int)
      * @see AggregateFunction#over()
@@ -2307,7 +2307,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#lead(Field, int, Object)
      * @see AggregateFunction#over()
@@ -2318,7 +2318,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#lead(Field, int, Field)
      * @see AggregateFunction#over()
@@ -2329,7 +2329,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#lag(Field)
      * @see AggregateFunction#over()
@@ -2340,7 +2340,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#lag(Field, int)
      * @see AggregateFunction#over()
@@ -2351,7 +2351,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#lag(Field, int, Object)
      * @see AggregateFunction#over()
@@ -2362,7 +2362,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#lag(Field, int, Field)
      * @see AggregateFunction#over()
@@ -2373,7 +2373,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#stddevPop(Field)
      * @see AggregateFunction#over()
@@ -2384,7 +2384,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#stddevSamp(Field)
      * @see AggregateFunction#over()
@@ -2395,7 +2395,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#varPop(Field)
      * @see AggregateFunction#over()
@@ -2406,7 +2406,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#varSamp(Field)
      * @see AggregateFunction#over()
@@ -2417,7 +2417,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#upper(Field)
      */
@@ -2427,7 +2427,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#lower(Field)
      */
@@ -2437,7 +2437,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#trim(Field)
      */
@@ -2447,7 +2447,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#rtrim(Field)
      */
@@ -2457,7 +2457,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#ltrim(Field)
      */
@@ -2467,7 +2467,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#rpad(Field, Field)
      */
@@ -2477,7 +2477,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#rpad(Field, int)
      */
@@ -2487,7 +2487,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#rpad(Field, Field, Field)
      */
@@ -2497,7 +2497,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#rpad(Field, int, char)
      */
@@ -2507,7 +2507,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#lpad(Field, Field)
      */
@@ -2517,7 +2517,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#lpad(Field, int)
      */
@@ -2527,7 +2527,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#lpad(Field, Field, Field)
      */
@@ -2537,7 +2537,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#lpad(Field, int, char)
      */
@@ -2547,7 +2547,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#repeat(Field, int)
      */
@@ -2557,7 +2557,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#repeat(Field, Field)
      */
@@ -2567,7 +2567,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#replace(Field, Field)
      */
@@ -2577,7 +2577,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#replace(Field, String)
      */
@@ -2587,7 +2587,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#replace(Field, Field, Field)
      */
@@ -2597,7 +2597,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#replace(Field, String, String)
      */
@@ -2607,7 +2607,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#position(Field, String)
      */
@@ -2617,7 +2617,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#position(Field, Field)
      */
@@ -2627,7 +2627,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#ascii(Field)
      */
@@ -2637,7 +2637,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#concat(Field...)
      */
@@ -2647,7 +2647,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#concat(String...)
      */
@@ -2657,7 +2657,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#substring(Field, int)
      */
@@ -2667,7 +2667,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#substring(Field, Field)
      */
@@ -2677,7 +2677,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#substring(Field, int, int)
      */
@@ -2687,7 +2687,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#substring(Field, Field, Field)
      */
@@ -2697,7 +2697,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#length(Field)
      */
@@ -2707,7 +2707,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#charLength(Field)
      */
@@ -2717,7 +2717,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#bitLength(Field)
      */
@@ -2727,7 +2727,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#octetLength(Field)
      */
@@ -2737,7 +2737,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#extract(Field, DatePart)
      */
@@ -2747,7 +2747,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#greatest(Field, Field...)
      */
@@ -2757,7 +2757,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#greatest(Field, Field...)
      */
@@ -2767,7 +2767,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#least(Field, Field...)
      */
@@ -2777,7 +2777,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#least(Field, Field...)
      */
@@ -2787,7 +2787,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#nvl(Field, Object)
      */
@@ -2797,7 +2797,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#nvl(Field, Field)
      */
@@ -2807,7 +2807,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#nvl2(Field, Object, Object)
      */
@@ -2817,7 +2817,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#nvl2(Field, Field, Field)
      */
@@ -2827,7 +2827,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#nullif(Field, Object)
      */
@@ -2837,7 +2837,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#nullif(Field, Field)
      */
@@ -2847,7 +2847,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#decode(Object, Object, Object)
      */
@@ -2857,7 +2857,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#decode(Object, Object, Object, Object...)
      */
@@ -2867,7 +2867,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#decode(Field, Field, Field)
      */
@@ -2877,7 +2877,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#decode(Field, Field, Field, Field...)
      */
@@ -2887,7 +2887,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#coalesce(Object, Object...)
      */
@@ -2897,7 +2897,7 @@ public interface Field<T> extends GroupField {
     /**
      * This method is part of the pre-2.0 API. This API is maintained for
      * backwards-compatibility. It may be removed in the future. Consider using
-     * equivalent methods from {@link ContextDSL}
+     * equivalent methods from {@link DSLContext}
      *
      * @see Factory#coalesce(Field, Field...)
      */
diff --git a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java
index e3aaebc995..5f29e9dd4f 100644
--- a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateStep.java
@@ -77,7 +77,7 @@ public interface InsertOnDuplicateStep<R extends Record> extends InsertFinalStep
      * <li>The <code>INSERT</code> statement's table is a
      * {@link Table} with a {@link Table#getPrimaryKey()}</li>
      * <li>The RDBMS supports the <code>MERGE</code> clause (see
-     * {@link ContextDSL#mergeInto(Table)}).</li>
+     * {@link DSLContext#mergeInto(Table)}).</li>
      * </ul>
      * <p>
      * These are the dialects that fulfill the above requirements:
diff --git a/jOOQ/src/main/java/org/jooq/InsertSetStep.java b/jOOQ/src/main/java/org/jooq/InsertSetStep.java
index 4add563ea6..ba9197798f 100644
--- a/jOOQ/src/main/java/org/jooq/InsertSetStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertSetStep.java
@@ -124,8 +124,8 @@ public interface InsertSetStep<R extends Record> {
      * This variant of the <code>INSERT .. SELECT</code> statement does not
      * allow for specifying a subset of the fields inserted into. It will insert
      * into all fields of the table specified in the <code>INTO</code> clause.
-     * Use {@link ContextDSL#insertInto(Table, Field...)} or
-     * {@link ContextDSL#insertInto(Table, Collection)} instead, to
+     * Use {@link DSLContext#insertInto(Table, Field...)} or
+     * {@link DSLContext#insertInto(Table, Collection)} instead, to
      * define a field set for insertion.
      */
     @Support
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep1.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep1.java
index 1a2068e3f1..5064b570b2 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep1.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep1.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep1<R extends Record, T1> extends InsertOnDuplica
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field)}
+     * {@link DSLContext#insertInto(Table, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record1<T1>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep10.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep10.java
index f47c033b9d..016b975921 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep10.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep10.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep10<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep11.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep11.java
index ac498dd007..9544653258 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep11.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep11.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep11<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep12.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep12.java
index f1eb44314e..db79f6e9a9 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep12.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep12.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep12<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep13.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep13.java
index 3372221816..3bb698607c 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep13.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep13.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep13<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep14.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep14.java
index 87bd1e043b..93b2e63e3b 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep14.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep14.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep14<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep15.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep15.java
index 9d3c1e97e0..719cd1df1b 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep15.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep15.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep15<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep16.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep16.java
index 7949a1d306..d645d1535f 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep16.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep16.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep16<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep17.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep17.java
index 9f0044c094..0bb5d7cfe4 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep17.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep17.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep17<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep18.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep18.java
index ba65e1ab0f..1fd1279fff 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep18.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep18.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep18<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep19.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep19.java
index d19c37e27a..9df4b6ec1d 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep19.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep19.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep19<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep2.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep2.java
index 0dfbba2684..6f6df6d5e7 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep2.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep2.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep2<R extends Record, T1, T2> extends InsertOnDup
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record2<T1, T2>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep20.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep20.java
index 53e75b7f90..4c39972088 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep20.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep20.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep20<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep21.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep21.java
index d71fe6fa69..ce90df473d 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep21.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep21.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep21<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep22.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep22.java
index 070940c9cd..007ded2c8e 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep22.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep22.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep22<R extends Record, T1, T2, T3, T4, T5, T6, T7
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep3.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep3.java
index 86536f3d54..3ba7b63374 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep3.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep3.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep3<R extends Record, T1, T2, T3> extends InsertO
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record3<T1, T2, T3>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep4.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep4.java
index 406f8df73c..1ccc5ce3a8 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep4.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep4.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep4<R extends Record, T1, T2, T3, T4> extends Ins
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record4<T1, T2, T3, T4>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep5.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep5.java
index e1ec482e6d..c39603c94e 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep5.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep5.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep5<R extends Record, T1, T2, T3, T4, T5> extends
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record5<T1, T2, T3, T4, T5>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep6.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep6.java
index 05cdf7f1db..c6b30cfd0e 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep6.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep6.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep6<R extends Record, T1, T2, T3, T4, T5, T6> ext
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record6<T1, T2, T3, T4, T5, T6>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep7.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep7.java
index fe6cebc296..10ad4c3751 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep7.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep7.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep7<R extends Record, T1, T2, T3, T4, T5, T6, T7>
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record7<T1, T2, T3, T4, T5, T6, T7>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep8.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep8.java
index a53759f38a..316a7b6c1e 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep8.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep8.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep8<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record8<T1, T2, T3, T4, T5, T6, T7, T8>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStep9.java b/jOOQ/src/main/java/org/jooq/InsertValuesStep9.java
index 6e37847b8a..a3c4d1df83 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStep9.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStep9.java
@@ -83,7 +83,7 @@ public interface InsertValuesStep9<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#insertInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support
     Insert<R> select(Select<? extends Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9>> select);
diff --git a/jOOQ/src/main/java/org/jooq/InsertValuesStepN.java b/jOOQ/src/main/java/org/jooq/InsertValuesStepN.java
index 5a209d524e..8d6318f0c7 100644
--- a/jOOQ/src/main/java/org/jooq/InsertValuesStepN.java
+++ b/jOOQ/src/main/java/org/jooq/InsertValuesStepN.java
@@ -82,8 +82,8 @@ public interface InsertValuesStepN<R extends Record> extends InsertOnDuplicateSt
      * This variant of the <code>INSERT .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#insertInto(Table, Field...)} or
-     * {@link ContextDSL#insertInto(Table, Collection)}
+     * {@link DSLContext#insertInto(Table, Field...)} or
+     * {@link DSLContext#insertInto(Table, Collection)}
      */
     @Support
     Insert<R> select(Select<?> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java
index b134f7e888..a790c18799 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep1.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep1<R extends Record, T1> {
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field)}
+     * {@link DSLContext#mergeInto(Table, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record1<T1>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java
index bf126eea8c..776d4ee397 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep10.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep10<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java
index 7f363182ec..cbec988d39 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep11.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep11<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java
index 739508c5f4..5bab40f7c2 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep12.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep12<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java
index b42814f899..fd2b0e749a 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep13.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep13<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java
index 6b19c21df2..540fb1e310 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep14.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep14<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java
index 3ca1952ec2..4c29660f72 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep15.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep15<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java
index d7fa76be0b..b2682023d0 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep16.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep16<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java
index 042b60c066..8d04d2c2e8 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep17.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep17<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java
index 2f51f184fc..979f346158 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep18.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep18<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java
index 3098790c5a..0a33fbc032 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep19.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep19<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java
index 88ae57593f..95ef666e0e 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep2.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep2<R extends Record, T1, T2> {
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record2<T1, T2>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java
index e784b69a57..6cbc94102b 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep20.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep20<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java
index 631643ae2b..e2b8f91135 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep21.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep21<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java
index 0a94195bd4..f358a7b01b 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep22.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep22<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java
index 0a1bf7d18a..c8882773a1 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep3.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep3<R extends Record, T1, T2, T3> {
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record3<T1, T2, T3>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java
index de0287d366..bf78338d9b 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep4.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep4<R extends Record, T1, T2, T3, T4> {
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record4<T1, T2, T3, T4>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java
index d6e86ea28b..8335c6d6bc 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep5.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep5<R extends Record, T1, T2, T3, T4, T5> {
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record5<T1, T2, T3, T4, T5>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java
index b67eec3c3a..65279356ae 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep6.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep6<R extends Record, T1, T2, T3, T4, T5, T6> {
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record6<T1, T2, T3, T4, T5, T6>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java
index 39ec20669d..7bcfad908c 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep7.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep7<R extends Record, T1, T2, T3, T4, T5, T6, T7>
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record7<T1, T2, T3, T4, T5, T6, T7>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java
index b37d941cbc..68a6a061b7 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep8.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep8<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record8<T1, T2, T3, T4, T5, T6, T7, T8>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java b/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java
index ad8d5be083..14f4661bf0 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStep9.java
@@ -88,7 +88,7 @@ public interface MergeValuesStep9<R extends Record, T1, T2, T3, T4, T5, T6, T7,
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
+     * {@link DSLContext#mergeInto(Table, Field, Field, Field, Field, Field, Field, Field, Field, Field)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<? extends Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9>> select);
diff --git a/jOOQ/src/main/java/org/jooq/MergeValuesStepN.java b/jOOQ/src/main/java/org/jooq/MergeValuesStepN.java
index 54c7137f3b..6516a47553 100644
--- a/jOOQ/src/main/java/org/jooq/MergeValuesStepN.java
+++ b/jOOQ/src/main/java/org/jooq/MergeValuesStepN.java
@@ -86,8 +86,8 @@ public interface MergeValuesStepN<R extends Record> {
      * This variant of the <code>MERGE .. SELECT</code> statement expects a
      * select returning exactly as many fields as specified previously in the
      * <code>INTO</code> clause:
-     * {@link ContextDSL#mergeInto(Table, Field...)} or
-     * {@link ContextDSL#mergeInto(Table, Collection)}
+     * {@link DSLContext#mergeInto(Table, Field...)} or
+     * {@link DSLContext#mergeInto(Table, Collection)}
      */
     @Support({ CUBRID, DB2, H2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     Merge<R> select(Select<?> select);
diff --git a/jOOQ/src/main/java/org/jooq/Meta.java b/jOOQ/src/main/java/org/jooq/Meta.java
index ca8b21c177..2920b18a15 100644
--- a/jOOQ/src/main/java/org/jooq/Meta.java
+++ b/jOOQ/src/main/java/org/jooq/Meta.java
@@ -45,7 +45,7 @@ import org.jooq.exception.DataAccessException;
 /**
  * A wrapping object for {@link DatabaseMetaData}
  * <p>
- * This object can be obtained through {@link ContextDSL#meta()} in order to
+ * This object can be obtained through {@link DSLContext#meta()} in order to
  * provide convenient access to your database meta data. This abstraction has
  * two purposes:
  * <p>
diff --git a/jOOQ/src/main/java/org/jooq/Query.java b/jOOQ/src/main/java/org/jooq/Query.java
index c0943fe4a2..be9d01a83b 100644
--- a/jOOQ/src/main/java/org/jooq/Query.java
+++ b/jOOQ/src/main/java/org/jooq/Query.java
@@ -85,7 +85,7 @@ public interface Query extends QueryPart, Attachable {
      * Retrieve the SQL code rendered by this Query
      * <p>
      * This method can be expected to work correctly for any SQL dialect, as a
-     * query is usually "attached" when created from a {@link ContextDSL}.
+     * query is usually "attached" when created from a {@link DSLContext}.
      * <p>
      * Use this method, when you want to use jOOQ for object oriented query
      * creation, but execute the query with some other technology, such as
@@ -97,7 +97,7 @@ public interface Query extends QueryPart, Attachable {
      * </ul>
      * <p>
      * Note, this is the same as calling {@link #getSQL(boolean)}. The boolean
-     * parameter will depend on your {@link ContextDSL}'s {@link Settings}:
+     * parameter will depend on your {@link DSLContext}'s {@link Settings}:
      * <table border="1">
      * <tr>
      * <th><code>StatementType</code></th>
@@ -139,7 +139,7 @@ public interface Query extends QueryPart, Attachable {
      * <code>List</code> cannot be modified. To modify bind values, use
      * {@link #getParams()} instead.
      *
-     * @see ContextDSL#extractBindValues(QueryPart)
+     * @see DSLContext#extractBindValues(QueryPart)
      */
     List<Object> getBindValues();
 
@@ -153,7 +153,7 @@ public interface Query extends QueryPart, Attachable {
      *
      * @see Param
      * @see Factory#param(String, Object)
-     * @see ContextDSL#extractParams(QueryPart)
+     * @see DSLContext#extractParams(QueryPart)
      */
     Map<String, Param<?>> getParams();
 
@@ -165,7 +165,7 @@ public interface Query extends QueryPart, Attachable {
      *
      * @see Param
      * @see Factory#param(String, Object)
-     * @see ContextDSL#extractParam(QueryPart, String)
+     * @see DSLContext#extractParam(QueryPart, String)
      */
     Param<?> getParam(String name);
 
diff --git a/jOOQ/src/main/java/org/jooq/QueryPart.java b/jOOQ/src/main/java/org/jooq/QueryPart.java
index c743bf96c6..32cd7325d0 100644
--- a/jOOQ/src/main/java/org/jooq/QueryPart.java
+++ b/jOOQ/src/main/java/org/jooq/QueryPart.java
@@ -53,7 +53,7 @@ public interface QueryPart extends Serializable {
      * For improved debugging, this renders a SQL string of this
      * <code>QueryPart</code> with inlined bind variables. If you wish to gain
      * more control over the concrete SQL rendering of this
-     * <code>QueryPart</code>, use {@link ContextDSL#renderContext()} to obtain a
+     * <code>QueryPart</code>, use {@link DSLContext#renderContext()} to obtain a
      * configurable render context for SQL rendering.
      *
      * @return A SQL string representation of this <code>QueryPart</code>
diff --git a/jOOQ/src/main/java/org/jooq/Record.java b/jOOQ/src/main/java/org/jooq/Record.java
index 986c54fe6e..07fcf54d11 100644
--- a/jOOQ/src/main/java/org/jooq/Record.java
+++ b/jOOQ/src/main/java/org/jooq/Record.java
@@ -803,7 +803,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * or {@link ResultSet#previous()}, etc.</li>
      * </ul>
      * <p>
-     * You may use {@link ContextDSL#fetch(ResultSet)} to unwind this wrapper
+     * You may use {@link DSLContext#fetch(ResultSet)} to unwind this wrapper
      * again.
      * <p>
      * This is the same as creating a new {@link Result} with this
@@ -873,7 +873,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * "changed" flags set to true for all values. This means that
      * {@link UpdatableRecord#store()} will perform an <code>INSERT</code>
      * statement. If you wish to store the record using an <code>UPDATE</code>
-     * statement, use {@link ContextDSL#executeUpdate(UpdatableRecord)} instead.
+     * statement, use {@link DSLContext#executeUpdate(UpdatableRecord)} instead.
      *
      * @param source The source object to copy data from
      * @throws MappingException wrapping any reflection exception that might
diff --git a/jOOQ/src/main/java/org/jooq/Result.java b/jOOQ/src/main/java/org/jooq/Result.java
index 3086a54792..7dbca0ecd3 100644
--- a/jOOQ/src/main/java/org/jooq/Result.java
+++ b/jOOQ/src/main/java/org/jooq/Result.java
@@ -832,7 +832,7 @@ public interface Result<R extends Record> extends List<R>, Attachable {
      * or {@link ResultSet#previous()}, etc.</li>
      * </ul>
      * <p>
-     * You may use {@link ContextDSL#fetch(ResultSet)} to unwind this wrapper
+     * You may use {@link DSLContext#fetch(ResultSet)} to unwind this wrapper
      * again.
      *
      * @return A wrapper JDBC <code>ResultSet</code>
diff --git a/jOOQ/src/main/java/org/jooq/ResultQuery.java b/jOOQ/src/main/java/org/jooq/ResultQuery.java
index 97c342ed23..2021182253 100644
--- a/jOOQ/src/main/java/org/jooq/ResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/ResultQuery.java
@@ -98,7 +98,7 @@ public interface ResultQuery<R extends Record> extends Query {
      * execution, but not for result fetching.
      * <p>
      * The returned <code>ResultSet</code> can be used with
-     * {@link ContextDSL#fetch(ResultSet)}
+     * {@link DSLContext#fetch(ResultSet)}
      *
      * @return The result.
      * @throws DataAccessException if something went wrong executing the query
diff --git a/jOOQ/src/main/java/org/jooq/SQLDialect.java b/jOOQ/src/main/java/org/jooq/SQLDialect.java
index b8c9f954fe..2d51620b63 100644
--- a/jOOQ/src/main/java/org/jooq/SQLDialect.java
+++ b/jOOQ/src/main/java/org/jooq/SQLDialect.java
@@ -168,7 +168,7 @@ public enum SQLDialect {
     }
 
     /**
-     * A {@link ContextDSL} class whose instances are pre-configured with this
+     * A {@link DSLContext} class whose instances are pre-configured with this
      * dialect.
      */
     public final Class<? extends Factory> getFactory() {
diff --git a/jOOQ/src/main/java/org/jooq/UpdatableRecord.java b/jOOQ/src/main/java/org/jooq/UpdatableRecord.java
index d3879acc47..0b9209937f 100644
--- a/jOOQ/src/main/java/org/jooq/UpdatableRecord.java
+++ b/jOOQ/src/main/java/org/jooq/UpdatableRecord.java
@@ -147,8 +147,8 @@ public interface UpdatableRecord<R extends UpdatableRecord<R>> extends TableReco
      * <p>
      * Should you want to circumvent jOOQ-generated updates to these columns,
      * you can render an <code>INSERT</code> or <code>UPDATE</code> statement
-     * manually using the various {@link ContextDSL#insertInto(Table)},
-     * {@link ContextDSL#update(Table)} methods.</li>
+     * manually using the various {@link DSLContext#insertInto(Table)},
+     * {@link DSLContext#update(Table)} methods.</li>
      * </ul>
      * <p>
      * <h5>Optimistic locking</h5>
diff --git a/jOOQ/src/main/java/org/jooq/exception/MappingException.java b/jOOQ/src/main/java/org/jooq/exception/MappingException.java
index 9785280c9e..51a61f70df 100644
--- a/jOOQ/src/main/java/org/jooq/exception/MappingException.java
+++ b/jOOQ/src/main/java/org/jooq/exception/MappingException.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.exception;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Cursor;
 import org.jooq.Record;
 import org.jooq.Result;
@@ -52,7 +52,7 @@ import org.jooq.ResultQuery;
  * </ul>
  * ... or when copying data into a {@link Record} with any of these methods
  * <ul>
- * <li> {@link ContextDSL#newRecord(org.jooq.Table, Object)}</li>
+ * <li> {@link DSLContext#newRecord(org.jooq.Table, Object)}</li>
  * <li> {@link Record#from(Object)}</li>
  * </ul>
  *
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java b/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java
index c530f3fcea..973c6c2eb0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java
@@ -40,7 +40,7 @@ import java.sql.SQLException;
 
 import org.jooq.BindContext;
 import org.jooq.Configuration;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.QueryPart;
 import org.jooq.QueryPartInternal;
 import org.jooq.RenderContext;
@@ -129,28 +129,28 @@ abstract class AbstractQueryPart implements QueryPartInternal {
     /**
      * Internal convenience method
      */
-    protected final ContextDSL create() {
+    protected final DSLContext create() {
         return create(getConfiguration());
     }
 
     /**
      * Internal convenience method
      */
-    protected final ContextDSL create(Configuration configuration) {
+    protected final DSLContext create(Configuration configuration) {
         return Factory.using(configuration);
     }
 
     /**
      * Internal convenience method
      */
-    protected final ContextDSL create(RenderContext ctx) {
+    protected final DSLContext create(RenderContext ctx) {
         return Factory.using(ctx.configuration());
     }
 
     /**
      * Internal convenience method
      */
-    protected final ContextDSL create(BindContext ctx) {
+    protected final DSLContext create(BindContext ctx) {
         return Factory.using(ctx.configuration());
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
index 5622d36bc7..036d1a84db 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
@@ -56,7 +56,7 @@ import org.jooq.ArrayRecord;
 import org.jooq.AttachableInternal;
 import org.jooq.BindContext;
 import org.jooq.Configuration;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.ExecuteContext;
 import org.jooq.ExecuteListener;
@@ -237,7 +237,7 @@ public abstract class AbstractRoutine<T> extends AbstractQueryPart implements Ro
     }
 
     private final int executeSelectFrom() {
-        ContextDSL create = create(configuration);
+        DSLContext create = create(configuration);
         Result<?> result = create.selectFrom(table(asField())).fetch();
         results.put(returnParameter, result);
         return 0;
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractStore.java b/jOOQ/src/main/java/org/jooq/impl/AbstractStore.java
index 5385298bc9..71e4e7dd22 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractStore.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractStore.java
@@ -42,7 +42,7 @@ import org.jooq.ArrayRecord;
 import org.jooq.Attachable;
 import org.jooq.AttachableInternal;
 import org.jooq.Configuration;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 
 /**
@@ -93,7 +93,7 @@ abstract class AbstractStore implements AttachableInternal {
     /**
      * This method is used in generated code!
      */
-    protected final ContextDSL create() {
+    protected final DSLContext create() {
         return Factory.using(getConfiguration());
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
index bcf97ffeb9..c857b6e0c1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
@@ -50,7 +50,7 @@ import java.util.Map;
 
 import org.jooq.BindContext;
 import org.jooq.Configuration;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.ExecuteContext;
 import org.jooq.ExecuteListener;
 import org.jooq.Field;
@@ -256,7 +256,7 @@ abstract class AbstractStoreQuery<R extends Record> extends AbstractQuery implem
                     result = ctx.statement().executeUpdate();
                     listener.executeEnd(ctx);
 
-                    ContextDSL create = Factory.using(ctx.connection(), SQLDialect.SQLITE, ctx.configuration().getSettings());
+                    DSLContext create = Factory.using(ctx.connection(), SQLDialect.SQLITE, ctx.configuration().getSettings());
                     returned =
                     create.select(returning)
                           .from(getInto())
diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java b/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java
index b8ae15963e..30729c5f1d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java
@@ -47,7 +47,7 @@ import org.jooq.AttachableInternal;
 import org.jooq.Batch;
 import org.jooq.BatchBindStep;
 import org.jooq.Configuration;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.ExecuteContext;
 import org.jooq.Query;
 import org.jooq.UpdatableRecord;
@@ -63,7 +63,7 @@ class BatchCRUD implements Batch {
      */
     private static final long          serialVersionUID = -2935544935267715011L;
 
-    private final ContextDSL             create;
+    private final DSLContext             create;
     private final Configuration        configuration;
     private final UpdatableRecord<?>[] records;
     private final Action               action;
diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java
index 8dcd3fe0df..e04995ac30 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java
@@ -44,7 +44,7 @@ import java.util.List;
 
 import org.jooq.BatchBindStep;
 import org.jooq.Configuration;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.ExecuteContext;
 import org.jooq.ExecuteListener;
 import org.jooq.Param;
@@ -60,7 +60,7 @@ class BatchSingle implements BatchBindStep {
      */
     private static final long    serialVersionUID = 3793967258181493207L;
 
-    private final ContextDSL       create;
+    private final DSLContext       create;
     private final Configuration  configuration;
     private final Query          query;
     private final List<Object[]> allBindValues;
diff --git a/jOOQ/src/main/java/org/jooq/impl/ContextDSLImpl.java b/jOOQ/src/main/java/org/jooq/impl/DSLContextImpl.java
similarity index 98%
rename from jOOQ/src/main/java/org/jooq/impl/ContextDSLImpl.java
rename to jOOQ/src/main/java/org/jooq/impl/DSLContextImpl.java
index 49263f6abd..bb2ab50966 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ContextDSLImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSLContextImpl.java
@@ -82,7 +82,7 @@ import org.jooq.BindContext;
 import org.jooq.Condition;
 import org.jooq.Configuration;
 import org.jooq.ConnectionProvider;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Cursor;
 import org.jooq.DataType;
 import org.jooq.DeleteQuery;
@@ -198,7 +198,7 @@ import org.jooq.tools.csv.CSVReader;
  * @author Lukas Eder
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
-class ContextDSLImpl implements ContextDSL, Serializable {
+class DSLContextImpl implements DSLContext, Serializable {
 
     /**
      * Generated UID
@@ -210,39 +210,39 @@ class ContextDSLImpl implements ContextDSL, Serializable {
     // XXX Constructors
     // -------------------------------------------------------------------------
 
-    ContextDSLImpl(SQLDialect dialect) {
+    DSLContextImpl(SQLDialect dialect) {
         this(dialect, null);
     }
 
-    ContextDSLImpl(SQLDialect dialect, Settings settings) {
+    DSLContextImpl(SQLDialect dialect, Settings settings) {
         this(new DefaultConfiguration(new NoConnectionProvider(), dialect, settings, null));
     }
 
-    ContextDSLImpl(Connection connection, SQLDialect dialect) {
+    DSLContextImpl(Connection connection, SQLDialect dialect) {
         this(connection, dialect, null);
     }
 
-    ContextDSLImpl(Connection connection, SQLDialect dialect, Settings settings) {
+    DSLContextImpl(Connection connection, SQLDialect dialect, Settings settings) {
         this(new DefaultConfiguration(new DefaultConnectionProvider(connection), dialect, settings, null));
     }
 
-    ContextDSLImpl(DataSource datasource, SQLDialect dialect) {
+    DSLContextImpl(DataSource datasource, SQLDialect dialect) {
         this(datasource, dialect, null);
     }
 
-    ContextDSLImpl(DataSource datasource, SQLDialect dialect, Settings settings) {
+    DSLContextImpl(DataSource datasource, SQLDialect dialect, Settings settings) {
         this(new DefaultConfiguration(new DataSourceConnectionProvider(datasource), dialect, settings, null));
     }
 
-    ContextDSLImpl(ConnectionProvider connectionProvider, SQLDialect dialect) {
+    DSLContextImpl(ConnectionProvider connectionProvider, SQLDialect dialect) {
         this(connectionProvider, dialect, null);
     }
 
-    ContextDSLImpl(ConnectionProvider connectionProvider, SQLDialect dialect, Settings settings) {
+    DSLContextImpl(ConnectionProvider connectionProvider, SQLDialect dialect, Settings settings) {
         this(new DefaultConfiguration(connectionProvider, dialect, settings, null));
     }
 
-    ContextDSLImpl(Configuration configuration) {
+    DSLContextImpl(Configuration configuration) {
 
         // The Configuration can be null when unattached Query objects are
         // executed or when unattached Records are stored...
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java b/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
index f15b76b05f..016f8c7409 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
@@ -47,14 +47,14 @@ import javax.xml.bind.JAXB;
 
 import org.jooq.Configuration;
 import org.jooq.ConnectionProvider;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.ExecuteListener;
 import org.jooq.SQLDialect;
 import org.jooq.conf.Settings;
 import org.jooq.conf.SettingsTools;
 
 /**
- * A default implementation for configurations within a {@link ContextDSL}, if no
+ * A default implementation for configurations within a {@link DSLContext}, if no
  * custom configuration was supplied to {@link Factory#using(Configuration)}
  */
 class DefaultConfiguration implements Configuration {
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultConnectionProvider.java b/jOOQ/src/main/java/org/jooq/impl/DefaultConnectionProvider.java
index ce9af6b182..ba8b5a01c7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultConnectionProvider.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultConnectionProvider.java
@@ -77,7 +77,7 @@ public class DefaultConnectionProvider implements ConnectionProvider {
     public final void release(Connection released) {}
 
     // -------------------------------------------------------------------------
-    // XXX: Original ContextDSL/Factory API (JDBC utility methods)
+    // XXX: Original DSLContext/Factory API (JDBC utility methods)
     // -------------------------------------------------------------------------
 
     public final void setConnection(Connection connection) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/Factory.java b/jOOQ/src/main/java/org/jooq/impl/Factory.java
index f4b20d08af..a9a4bedfeb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Factory.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Factory.java
@@ -71,7 +71,7 @@ import org.jooq.Case;
 import org.jooq.Condition;
 import org.jooq.Configuration;
 import org.jooq.ConnectionProvider;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.DatePart;
 import org.jooq.Field;
@@ -148,7 +148,7 @@ import org.jooq.types.DayToSecond;
 /**
  * A factory providing implementations to the <code>org.jooq</code> interfaces.
  * <p>
- * Apart from the {@link ContextDSL}, this factory is the main entry point for
+ * Apart from the {@link DSLContext}, this factory is the main entry point for
  * client code, to access jOOQ classes and functionality. Here, you can
  * instanciate all of those objects that cannot be accessed through other
  * objects. For example, to create a {@link Field} representing a constant
@@ -181,7 +181,7 @@ import org.jooq.types.DayToSecond;
  * }
  * </pre></code>
  *
- * @see ContextDSL
+ * @see DSLContext
  * @author Lukas Eder
  */
 @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -199,8 +199,8 @@ public class Factory {
      *
      * @param dialect The dialect to use with objects created from this executor
      */
-    public static ContextDSL using(SQLDialect dialect) {
-        return new ContextDSLImpl(dialect, null);
+    public static DSLContext using(SQLDialect dialect) {
+        return new DSLContextImpl(dialect, null);
     }
 
     /**
@@ -213,8 +213,8 @@ public class Factory {
      * @param settings The runtime settings to apply to objects created from
      *            this executor
      */
-    public static ContextDSL using(SQLDialect dialect, Settings settings) {
-        return new ContextDSLImpl(dialect, settings);
+    public static DSLContext using(SQLDialect dialect, Settings settings) {
+        return new DSLContextImpl(dialect, settings);
     }
 
     /**
@@ -232,8 +232,8 @@ public class Factory {
      * @param dialect The dialect to use with objects created from this executor
      * @see DefaultConnectionProvider
      */
-    public static ContextDSL using(Connection connection, SQLDialect dialect) {
-        return new ContextDSLImpl(connection, dialect, null);
+    public static DSLContext using(Connection connection, SQLDialect dialect) {
+        return new DSLContextImpl(connection, dialect, null);
     }
 
     /**
@@ -253,8 +253,8 @@ public class Factory {
      *            this executor
      * @see DefaultConnectionProvider
      */
-    public static ContextDSL using(Connection connection, SQLDialect dialect, Settings settings) {
-        return new ContextDSLImpl(connection, dialect, settings);
+    public static DSLContext using(Connection connection, SQLDialect dialect, Settings settings) {
+        return new DSLContextImpl(connection, dialect, settings);
     }
 
     /**
@@ -272,8 +272,8 @@ public class Factory {
      * @param dialect The dialect to use with objects created from this executor
      * @see DataSourceConnectionProvider
      */
-    public static ContextDSL using(DataSource datasource, SQLDialect dialect) {
-        return new ContextDSLImpl(datasource, dialect);
+    public static DSLContext using(DataSource datasource, SQLDialect dialect) {
+        return new DSLContextImpl(datasource, dialect);
     }
 
     /**
@@ -293,8 +293,8 @@ public class Factory {
      *            this executor
      * @see DataSourceConnectionProvider
      */
-    public static ContextDSL using(DataSource datasource, SQLDialect dialect, Settings settings) {
-        return new ContextDSLImpl(datasource, dialect, settings);
+    public static DSLContext using(DataSource datasource, SQLDialect dialect, Settings settings) {
+        return new DSLContextImpl(datasource, dialect, settings);
     }
 
     /**
@@ -305,8 +305,8 @@ public class Factory {
      *            JDBC connections
      * @param dialect The dialect to use with objects created from this executor
      */
-    public static ContextDSL using(ConnectionProvider connectionProvider, SQLDialect dialect) {
-        return new ContextDSLImpl(connectionProvider, dialect);
+    public static DSLContext using(ConnectionProvider connectionProvider, SQLDialect dialect) {
+        return new DSLContextImpl(connectionProvider, dialect);
     }
 
     /**
@@ -319,8 +319,8 @@ public class Factory {
      * @param settings The runtime settings to apply to objects created from
      *            this executor
      */
-    public static ContextDSL using(ConnectionProvider connectionProvider, SQLDialect dialect, Settings settings) {
-        return new ContextDSLImpl(connectionProvider, dialect, settings);
+    public static DSLContext using(ConnectionProvider connectionProvider, SQLDialect dialect, Settings settings) {
+        return new DSLContextImpl(connectionProvider, dialect, settings);
     }
 
     /**
@@ -328,8 +328,8 @@ public class Factory {
      *
      * @param configuration The configuration
      */
-    public static ContextDSL using(Configuration configuration) {
-        return new ContextDSLImpl(configuration);
+    public static DSLContext using(Configuration configuration) {
+        return new DSLContextImpl(configuration);
     }
 
     // -------------------------------------------------------------------------
@@ -339,7 +339,7 @@ public class Factory {
     /**
      * Create a new DSL subselect statement.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -360,7 +360,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Collection)
+     * @see DSLContext#select(Collection)
      */
     @Support
     public static SelectSelectStep<Record> select(Collection<? extends Field<?>> fields) {
@@ -370,7 +370,7 @@ public class Factory {
     /**
      * Create a new DSL subselect statement.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -391,7 +391,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      */
     @Support
     public static SelectSelectStep<Record> select(Field<?>... fields) {
@@ -401,7 +401,7 @@ public class Factory {
     /**
      * Create a new DSL select statement.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -428,7 +428,7 @@ public class Factory {
      * {@link Field#in(Select)}, {@link Field#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -449,7 +449,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -466,7 +466,7 @@ public class Factory {
      * {@link Row2#in(Select)}, {@link Row2#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -487,7 +487,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -504,7 +504,7 @@ public class Factory {
      * {@link Row3#in(Select)}, {@link Row3#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -525,7 +525,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -542,7 +542,7 @@ public class Factory {
      * {@link Row4#in(Select)}, {@link Row4#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -563,7 +563,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -580,7 +580,7 @@ public class Factory {
      * {@link Row5#in(Select)}, {@link Row5#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -601,7 +601,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -618,7 +618,7 @@ public class Factory {
      * {@link Row6#in(Select)}, {@link Row6#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -639,7 +639,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -656,7 +656,7 @@ public class Factory {
      * {@link Row7#in(Select)}, {@link Row7#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -677,7 +677,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -694,7 +694,7 @@ public class Factory {
      * {@link Row8#in(Select)}, {@link Row8#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -715,7 +715,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -732,7 +732,7 @@ public class Factory {
      * {@link Row9#in(Select)}, {@link Row9#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -753,7 +753,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -770,7 +770,7 @@ public class Factory {
      * {@link Row10#in(Select)}, {@link Row10#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -791,7 +791,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -808,7 +808,7 @@ public class Factory {
      * {@link Row11#in(Select)}, {@link Row11#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -829,7 +829,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -846,7 +846,7 @@ public class Factory {
      * {@link Row12#in(Select)}, {@link Row12#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -867,7 +867,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -884,7 +884,7 @@ public class Factory {
      * {@link Row13#in(Select)}, {@link Row13#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -905,7 +905,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -922,7 +922,7 @@ public class Factory {
      * {@link Row14#in(Select)}, {@link Row14#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -943,7 +943,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -960,7 +960,7 @@ public class Factory {
      * {@link Row15#in(Select)}, {@link Row15#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -981,7 +981,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -998,7 +998,7 @@ public class Factory {
      * {@link Row16#in(Select)}, {@link Row16#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1019,7 +1019,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1036,7 +1036,7 @@ public class Factory {
      * {@link Row17#in(Select)}, {@link Row17#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1057,7 +1057,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1074,7 +1074,7 @@ public class Factory {
      * {@link Row18#in(Select)}, {@link Row18#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1095,7 +1095,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1112,7 +1112,7 @@ public class Factory {
      * {@link Row19#in(Select)}, {@link Row19#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1133,7 +1133,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1150,7 +1150,7 @@ public class Factory {
      * {@link Row20#in(Select)}, {@link Row20#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1171,7 +1171,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1188,7 +1188,7 @@ public class Factory {
      * {@link Row21#in(Select)}, {@link Row21#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1209,7 +1209,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1226,7 +1226,7 @@ public class Factory {
      * {@link Row22#in(Select)}, {@link Row22#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1247,7 +1247,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#select(Field...)
+     * @see DSLContext#select(Field...)
      * @see #select(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1261,7 +1261,7 @@ public class Factory {
     /**
      * Create a new DSL subselect statement.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1282,7 +1282,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Collection)
+     * @see DSLContext#selectDistinct(Collection)
      */
     @Support
     public static SelectSelectStep<Record> selectDistinct(Collection<? extends Field<?>> fields) {
@@ -1292,7 +1292,7 @@ public class Factory {
     /**
      * Create a new DSL subselect statement.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1313,7 +1313,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      */
     @Support
     public static SelectSelectStep<Record> selectDistinct(Field<?>... fields) {
@@ -1329,7 +1329,7 @@ public class Factory {
      * {@link Field#in(Select)}, {@link Field#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1350,7 +1350,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1367,7 +1367,7 @@ public class Factory {
      * {@link Row2#in(Select)}, {@link Row2#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1388,7 +1388,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1405,7 +1405,7 @@ public class Factory {
      * {@link Row3#in(Select)}, {@link Row3#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1426,7 +1426,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1443,7 +1443,7 @@ public class Factory {
      * {@link Row4#in(Select)}, {@link Row4#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1464,7 +1464,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1481,7 +1481,7 @@ public class Factory {
      * {@link Row5#in(Select)}, {@link Row5#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1502,7 +1502,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1519,7 +1519,7 @@ public class Factory {
      * {@link Row6#in(Select)}, {@link Row6#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1540,7 +1540,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1557,7 +1557,7 @@ public class Factory {
      * {@link Row7#in(Select)}, {@link Row7#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1578,7 +1578,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1595,7 +1595,7 @@ public class Factory {
      * {@link Row8#in(Select)}, {@link Row8#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1616,7 +1616,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1633,7 +1633,7 @@ public class Factory {
      * {@link Row9#in(Select)}, {@link Row9#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1654,7 +1654,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1671,7 +1671,7 @@ public class Factory {
      * {@link Row10#in(Select)}, {@link Row10#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1692,7 +1692,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1709,7 +1709,7 @@ public class Factory {
      * {@link Row11#in(Select)}, {@link Row11#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1730,7 +1730,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1747,7 +1747,7 @@ public class Factory {
      * {@link Row12#in(Select)}, {@link Row12#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1768,7 +1768,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1785,7 +1785,7 @@ public class Factory {
      * {@link Row13#in(Select)}, {@link Row13#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1806,7 +1806,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1823,7 +1823,7 @@ public class Factory {
      * {@link Row14#in(Select)}, {@link Row14#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1844,7 +1844,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1861,7 +1861,7 @@ public class Factory {
      * {@link Row15#in(Select)}, {@link Row15#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1882,7 +1882,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1899,7 +1899,7 @@ public class Factory {
      * {@link Row16#in(Select)}, {@link Row16#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1920,7 +1920,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1937,7 +1937,7 @@ public class Factory {
      * {@link Row17#in(Select)}, {@link Row17#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1958,7 +1958,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1975,7 +1975,7 @@ public class Factory {
      * {@link Row18#in(Select)}, {@link Row18#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -1996,7 +1996,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2013,7 +2013,7 @@ public class Factory {
      * {@link Row19#in(Select)}, {@link Row19#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -2034,7 +2034,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2051,7 +2051,7 @@ public class Factory {
      * {@link Row20#in(Select)}, {@link Row20#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -2072,7 +2072,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2089,7 +2089,7 @@ public class Factory {
      * {@link Row21#in(Select)}, {@link Row21#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -2110,7 +2110,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2127,7 +2127,7 @@ public class Factory {
      * {@link Row22#in(Select)}, {@link Row22#equal(Select)} and other predicate
      * building methods taking subselect arguments.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -2148,7 +2148,7 @@ public class Factory {
      *  .orderBy(field2);
      * </pre></code>
      *
-     * @see ContextDSL#selectDistinct(Field...)
+     * @see DSLContext#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2162,7 +2162,7 @@ public class Factory {
     /**
      * Create a new DSL subselect statement.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -2184,7 +2184,7 @@ public class Factory {
      * </pre></code>
      *
      * @see Factory#zero()
-     * @see ContextDSL#selectZero()
+     * @see DSLContext#selectZero()
      */
     @Support
     public static SelectSelectStep<Record1<Integer>> selectZero() {
@@ -2194,7 +2194,7 @@ public class Factory {
     /**
      * Create a new DSL subselect statement.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -2216,7 +2216,7 @@ public class Factory {
      * </pre></code>
      *
      * @see Factory#one()
-     * @see ContextDSL#selectOne()
+     * @see DSLContext#selectOne()
      */
     @Support
     public static SelectSelectStep<Record1<Integer>> selectOne() {
@@ -2226,7 +2226,7 @@ public class Factory {
     /**
      * Create a new DSL subselect statement.
      * <p>
-     * Unlike {@link Select} factory methods in the {@link ContextDSL} API, this
+     * Unlike {@link Select} factory methods in the {@link DSLContext} API, this
      * creates an unattached, and thus not directly renderable or executable
      * <code>SELECT</code> statement. You can use this statement in two ways:
      * <ul>
@@ -2248,7 +2248,7 @@ public class Factory {
      * </pre></code>
      *
      * @see Factory#count()
-     * @see ContextDSL#selectCount()
+     * @see DSLContext#selectCount()
      */
     @Support
     public static SelectSelectStep<Record1<Integer>> selectCount() {
@@ -6704,7 +6704,7 @@ public class Factory {
      * <ul>
      * <li>They can be used with Spring's <code>JdbcTemplate</code>, which
      * supports named parameters. Use
-     * {@link ContextDSL#renderNamedParams(QueryPart)} to render
+     * {@link DSLContext#renderNamedParams(QueryPart)} to render
      * parameter names in SQL</li>
      * <li>Named parameters can be retrieved using a well-known name from
      * {@link Query#getParam(String)} and {@link Query#getParams()}.</li>
@@ -6712,7 +6712,7 @@ public class Factory {
      *
      * @see Query#getParam(String)
      * @see Query#getParams()
-     * @see ContextDSL#renderNamedParams(QueryPart)
+     * @see DSLContext#renderNamedParams(QueryPart)
      */
     @Support
     public static <T> Param<T> param(String name, T value) {
@@ -8448,7 +8448,7 @@ public class Factory {
     }
 
     /**
-     * Get the default data type for the {@link ContextDSL}'s underlying
+     * Get the default data type for the {@link DSLContext}'s underlying
      * {@link SQLDialect} and a given Java type.
      *
      * @param <T> The generic type
diff --git a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
index 02fcd963f6..216319391e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
@@ -51,7 +51,7 @@ import java.util.List;
 
 import org.jooq.Condition;
 import org.jooq.Configuration;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Field;
 import org.jooq.InsertQuery;
 import org.jooq.Loader;
@@ -100,7 +100,7 @@ class LoaderImpl<R extends TableRecord<R>> implements
 
     // Configuration data
     // ------------------
-    private final ContextDSL          create;
+    private final DSLContext          create;
     private final Configuration     configuration;
     private final Table<R>          table;
     private int                     onDuplicate             = ON_DUPLICATE_KEY_ERROR;
diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
index 6c096576e3..05e23bd318 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
@@ -49,7 +49,7 @@ import java.util.Map;
 import org.jooq.Catalog;
 import org.jooq.Configuration;
 import org.jooq.ConnectionProvider;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DataType;
 import org.jooq.Meta;
 import org.jooq.Record;
@@ -74,7 +74,7 @@ class MetaImpl implements Meta, Serializable {
      */
     private static final long                   serialVersionUID = 3582980783173033809L;
 
-    private final ContextDSL                      create;
+    private final DSLContext                      create;
     private final Configuration                 configuration;
     private transient volatile DatabaseMetaData meta;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java
index f43ed735aa..c04e12e27a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java
@@ -45,7 +45,7 @@ import java.util.Collection;
 import java.util.List;
 
 import org.jooq.AttachableInternal;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
 import org.jooq.Record;
@@ -184,7 +184,7 @@ class ReferenceImpl<R extends Record, O extends Record> extends AbstractKey<R> i
     /**
      * Extract a configuration from the first record of a collection of records
      */
-    private static <R extends Record> ContextDSL extractExecutor(Collection<? extends R> records)
+    private static <R extends Record> DSLContext extractExecutor(Collection<? extends R> records)
         throws DetachedException {
         R first = first(records);
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java
index f8f0f2ec62..25aa79045c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UpdatableRecordImpl.java
@@ -44,7 +44,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 
 import org.jooq.Configuration;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.DeleteQuery;
 import org.jooq.Field;
 import org.jooq.ForeignKey;
@@ -153,7 +153,7 @@ public class UpdatableRecordImpl<R extends UpdatableRecord<R>> extends TableReco
     }
 
     private final int storeInsert() {
-        ContextDSL create = create();
+        DSLContext create = create();
         InsertQuery<R> insert = create.insertQuery(getTable());
         addChangedValues(insert);
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Utils.java b/jOOQ/src/main/java/org/jooq/impl/Utils.java
index a84aee87b6..aa090dd823 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Utils.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Utils.java
@@ -86,7 +86,7 @@ import org.jooq.Attachable;
 import org.jooq.AttachableInternal;
 import org.jooq.BindContext;
 import org.jooq.Configuration;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Converter;
 import org.jooq.Cursor;
 import org.jooq.DataType;
@@ -140,7 +140,7 @@ final class Utils {
 
     /**
      * [#1537] This constant is used internally by jOOQ to omit the RETURNING
-     * clause in {@link ContextDSL#batchStore(UpdatableRecord...)} calls for
+     * clause in {@link DSLContext#batchStore(UpdatableRecord...)} calls for
      * {@link SQLDialect#POSTGRES}
      */
     static final String          DATA_OMIT_RETURNING_CLAUSE                   = "org.jooq.configuration.omit-returning-clause";
diff --git a/jOOQ/src/main/java/org/jooq/impl/package-info.java b/jOOQ/src/main/java/org/jooq/impl/package-info.java
index b4559ae670..f6e963f940 100644
--- a/jOOQ/src/main/java/org/jooq/impl/package-info.java
+++ b/jOOQ/src/main/java/org/jooq/impl/package-info.java
@@ -3,7 +3,7 @@
  * <p>
  * This package provides implementations for the jOOQ API from
  * <code>org.jooq</code>, whose interfaces are constructed mostly through the
- * {@link org.jooq.impl.ContextDSL} class, which hides implementation facts from
+ * {@link org.jooq.impl.DSLContext} class, which hides implementation facts from
  * the public API
  */
 package org.jooq.impl;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/package-info.java b/jOOQ/src/main/java/org/jooq/package-info.java
index 0265595ebf..6af8571854 100644
--- a/jOOQ/src/main/java/org/jooq/package-info.java
+++ b/jOOQ/src/main/java/org/jooq/package-info.java
@@ -3,7 +3,7 @@
  * <p>
  * This package mostly contains interfaces that are implemented by the
  * <code>org.jooq.impl</code> package. These interfaces are constructed mostly
- * through the {@link org.jooq.impl.ContextDSL} class, which hides implementation
+ * through the {@link org.jooq.impl.DSLContext} class, which hides implementation
  * facts from the public API
  */
 package org.jooq;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockDataProvider.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockDataProvider.java
index d0f9b67a7a..8f35e92bd0 100644
--- a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockDataProvider.java
+++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockDataProvider.java
@@ -39,7 +39,7 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Query;
 import org.jooq.ResultQuery;
 
@@ -91,10 +91,10 @@ public interface MockDataProvider {
      * <ul>
      * <li>A {@link MockExecuteContext#batchSQL()} with more than one SQL
      * string is a strong indicator for a "multi-batch statement", as understood
-     * by jOOQ's {@link ContextDSL#batch(Query...)}.</li>
+     * by jOOQ's {@link DSLContext#batch(Query...)}.</li>
      * <li>A {@link MockExecuteContext#batchBindings()} with more than one
      * bind variable array is a strong indicator for a "single-batch statement",
-     * as understood by jOOQ's {@link ContextDSL#batch(Query)}.</li>
+     * as understood by jOOQ's {@link DSLContext#batch(Query)}.</li>
      * </ul>
      * </li>
      * <li>It is recommended to return as many <code>MockResult</code> objects
diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockExecuteContext.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockExecuteContext.java
index eb62af39dd..628d942560 100644
--- a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockExecuteContext.java
+++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockExecuteContext.java
@@ -37,7 +37,7 @@ package org.jooq.tools.jdbc;
 
 import java.sql.Statement;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Query;
 
 /**
@@ -130,7 +130,7 @@ public class MockExecuteContext {
      *
      * @return Whether this execution context is from a "single batch"
      *         statement.
-     * @see ContextDSL#batch(Query)
+     * @see DSLContext#batch(Query)
      */
     public boolean batchSingle() {
         return bindings.length > 1;
@@ -140,7 +140,7 @@ public class MockExecuteContext {
      * Whether this execution context is from a "multi batch" statement.
      *
      * @return Whether this execution context is from a "multi batch" statement.
-     * @see ContextDSL#batch(Query...)
+     * @see DSLContext#batch(Query...)
      */
     public boolean batchMultiple() {
         return sql.length > 1;
diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockFileDatabase.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockFileDatabase.java
index a62d910cef..c26660df23 100644
--- a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockFileDatabase.java
+++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockFileDatabase.java
@@ -51,7 +51,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
 import org.jooq.impl.Factory;
 import org.jooq.tools.JooqLogger;
@@ -103,7 +103,7 @@ import org.jooq.tools.JooqLogger;
  * Results can be loaded using several techniques:
  * <ul>
  * <li>When results are prefixed with <code>></code>, then
- * {@link ContextDSL#fetchFromTXT(String)} is used</li>
+ * {@link DSLContext#fetchFromTXT(String)} is used</li>
  * <li>In the future, other types of result sources will be supported, such as
  * CSV, XML, JSON</li>
  * </ul>
@@ -120,7 +120,7 @@ public class MockFileDatabase implements MockDataProvider {
     private final String                         encoding;
     private final Map<String, List<MockResult>>  matchExactly;
     private final Map<Pattern, List<MockResult>> matchPattern;
-    private final ContextDSL                       create;
+    private final DSLContext                       create;
 
     public MockFileDatabase(File file) throws IOException {
         this(file, "UTF-8");
diff --git a/jOOQ/src/test/java/org/jooq/test/AbstractTest.java b/jOOQ/src/test/java/org/jooq/test/AbstractTest.java
index 290fcd21fc..68ddd7086b 100644
--- a/jOOQ/src/test/java/org/jooq/test/AbstractTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/AbstractTest.java
@@ -45,7 +45,7 @@ import java.sql.Time;
 import java.sql.Timestamp;
 
 import org.jooq.BindContext;
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.RenderContext;
 import org.jooq.Result;
 import org.jooq.SQLDialect;
@@ -67,7 +67,7 @@ public abstract class AbstractTest {
 
     protected Mockery              context;
     protected PreparedStatement    statement;
-    protected ContextDSL             create;
+    protected DSLContext             create;
     protected Result<Table1Record> resultEmpty;
     protected Result<Table1Record> resultOne;
     protected Result<Table1Record> resultTwo;
diff --git a/jOOQ/src/test/java/org/jooq/test/MockTest.java b/jOOQ/src/test/java/org/jooq/test/MockTest.java
index a535ec3db1..b66b172645 100644
--- a/jOOQ/src/test/java/org/jooq/test/MockTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/MockTest.java
@@ -48,7 +48,7 @@ import java.io.File;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.InsertResultStep;
 import org.jooq.Query;
 import org.jooq.Record;
@@ -76,7 +76,7 @@ import org.junit.Test;
  */
 public class MockTest extends AbstractTest {
 
-    private static ContextDSL MOCK;
+    private static DSLContext MOCK;
 
     @BeforeClass
     public static void before() throws Exception {
@@ -86,7 +86,7 @@ public class MockTest extends AbstractTest {
 
     @Test
     public void testEmptyResult() {
-        ContextDSL e = Factory.using(new MockConnection(new EmptyResult()), SQLDialect.H2);
+        DSLContext e = Factory.using(new MockConnection(new EmptyResult()), SQLDialect.H2);
         Result<Record> result = e.fetch("select ?, ? from dual", 1, 2);
 
         assertEquals(0, result.size());
@@ -110,7 +110,7 @@ public class MockTest extends AbstractTest {
 
     @Test
     public void testSingleResult() {
-        ContextDSL e = Factory.using(new MockConnection(new SingleResult()), SQLDialect.H2);
+        DSLContext e = Factory.using(new MockConnection(new SingleResult()), SQLDialect.H2);
         Result<Record> result = e.fetch("select ?, ? from dual", 1, 2);
 
         assertEquals(1, result.size());
@@ -139,7 +139,7 @@ public class MockTest extends AbstractTest {
 
     @Test
     public void testDoubleResult() {
-        ContextDSL e = Factory.using(new MockConnection(new DoubleResult()), SQLDialect.H2);
+        DSLContext e = Factory.using(new MockConnection(new DoubleResult()), SQLDialect.H2);
         List<Result<Record>> result = e.fetchMany("select ?, ? from dual", 1, 2);
 
         assertEquals(2, result.size());
@@ -192,7 +192,7 @@ public class MockTest extends AbstractTest {
 
     @Test
     public void testBatchSingle() {
-        ContextDSL e = Factory.using(new MockConnection(new BatchSingle()), SQLDialect.H2);
+        DSLContext e = Factory.using(new MockConnection(new BatchSingle()), SQLDialect.H2);
 
         int[] result =
         e.batch(
@@ -226,7 +226,7 @@ public class MockTest extends AbstractTest {
 
     @Test
     public void testBatchMultiple() {
-        ContextDSL e = Factory.using(new MockConnection(new BatchMultiple()), SQLDialect.H2);
+        DSLContext e = Factory.using(new MockConnection(new BatchMultiple()), SQLDialect.H2);
 
         Query query = e.query("insert into x values(?, ?)", null, null);
 
@@ -263,7 +263,7 @@ public class MockTest extends AbstractTest {
 
     @Test
     public void testException() {
-        ContextDSL e = Factory.using(new MockConnection(new Exceptional()), SQLDialect.H2);
+        DSLContext e = Factory.using(new MockConnection(new Exceptional()), SQLDialect.H2);
 
         Query query = e.query("insert into x values(1)");
 
@@ -288,7 +288,7 @@ public class MockTest extends AbstractTest {
     public void testInsertReturning() {
 
         // Note: INSERT .. RETURNING is hard to mock for all dialects...
-        ContextDSL e = Factory.using(new MockConnection(new InsertReturning()), SQLDialect.ORACLE);
+        DSLContext e = Factory.using(new MockConnection(new InsertReturning()), SQLDialect.ORACLE);
 
         InsertResultStep<Table1Record> query = e
             .insertInto(TABLE1, FIELD_ID1)
diff --git a/jOOQ/src/test/java/org/jooq/test/SettingsTest.java b/jOOQ/src/test/java/org/jooq/test/SettingsTest.java
index afab1b8e91..54bed4e0dd 100644
--- a/jOOQ/src/test/java/org/jooq/test/SettingsTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/SettingsTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import org.jooq.ContextDSL;
+import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.SQLDialect;
 import org.jooq.Schema;
@@ -88,23 +88,23 @@ public class SettingsTest {
         Schema schema = new SchemaImpl("S");
         Table<?> table = new TableImpl<Record>("T", schema);
 
-        ContextDSL create0 = Factory.using(SQLDialect.ORACLE);
+        DSLContext create0 = Factory.using(SQLDialect.ORACLE);
         assertEquals("\"S\".\"T\"", create0.render(table));
 
-        ContextDSL create1 = Factory.using(SQLDialect.ORACLE, new Settings().withRenderSchema(false));
+        DSLContext create1 = Factory.using(SQLDialect.ORACLE, new Settings().withRenderSchema(false));
         assertEquals("\"T\"", create1.render(table));
 
-        ContextDSL create2 = Factory.using(SQLDialect.ORACLE);
+        DSLContext create2 = Factory.using(SQLDialect.ORACLE);
         create2.configuration().getSettings().setRenderSchema(false);
         assertEquals("\"T\"", create2.render(table));
     }
 
     @Test
     public void testRenderMapping() {
-        ContextDSL create1 = Factory.using(SQLDialect.ORACLE, new Settings().withRenderMapping(mapping()));
+        DSLContext create1 = Factory.using(SQLDialect.ORACLE, new Settings().withRenderMapping(mapping()));
         assertEquals("\"TABLEX\"", create1.render(TABLE1));
 
-        ContextDSL create2 = Factory.using(SQLDialect.ORACLE);
+        DSLContext create2 = Factory.using(SQLDialect.ORACLE);
         create2.configuration().getSettings().setRenderMapping(mapping());
         assertEquals("\"TABLEX\"", create2.render(TABLE1));
     }