diff --git a/jOOQ/src/main/java/org/jooq/Case.java b/jOOQ/src/main/java/org/jooq/Case.java
index 2463181749..ce0d7d105f 100644
--- a/jOOQ/src/main/java/org/jooq/Case.java
+++ b/jOOQ/src/main/java/org/jooq/Case.java
@@ -35,7 +35,7 @@
  */
 package org.jooq;
 
-import org.jooq.impl.Executor;
+import org.jooq.impl.Factory;
 
 
 /**
@@ -52,7 +52,7 @@ import org.jooq.impl.Executor;
  *      ELSE            'three'
  * END
  * </pre></code> Instances of Case are created through the
- * {@link Executor#decode()} method
+ * {@link Factory#decode()} method
  *
  * @author Lukas Eder
  */
diff --git a/jOOQ/src/main/java/org/jooq/Condition.java b/jOOQ/src/main/java/org/jooq/Condition.java
index c98c103c3f..e772519546 100644
--- a/jOOQ/src/main/java/org/jooq/Condition.java
+++ b/jOOQ/src/main/java/org/jooq/Condition.java
@@ -36,7 +36,8 @@
 
 package org.jooq;
 
-import org.jooq.impl.Executor;
+import org.jooq.impl.Factory;
+
 
 /**
  * A condition to be used in a query's where part
@@ -66,7 +67,7 @@ public interface Condition extends QueryPart {
      *
      * @param sql The other condition
      * @return The combined condition
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     @Support
     Condition and(String sql);
@@ -83,7 +84,7 @@ public interface Condition extends QueryPart {
      * @param sql The other condition
      * @param bindings The bindings
      * @return The combined condition
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     @Support
     Condition and(String sql, Object... bindings);
@@ -102,7 +103,7 @@ public interface Condition extends QueryPart {
      * @param parts The {@link QueryPart} objects that are rendered at the
      *            {numbered placeholder} locations
      * @return The combined condition
-     * @see Executor#condition(String, QueryPart...)
+     * @see Factory#condition(String, QueryPart...)
      */
     @Support
     Condition and(String sql, QueryPart... parts);
@@ -158,7 +159,7 @@ public interface Condition extends QueryPart {
      *
      * @param sql The other condition
      * @return The combined condition
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     @Support
     Condition or(String sql);
@@ -175,7 +176,7 @@ public interface Condition extends QueryPart {
      * @param sql The other condition
      * @param bindings The bindings
      * @return The combined condition
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     @Support
     Condition or(String sql, Object... bindings);
@@ -194,7 +195,7 @@ public interface Condition extends QueryPart {
      * @param parts The {@link QueryPart} objects that are rendered at the
      *            {numbered placeholder} locations
      * @return The combined condition
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     @Support
     Condition or(String sql, QueryPart... parts);
@@ -232,7 +233,7 @@ public interface Condition extends QueryPart {
     /**
      * Invert this condition
      * <p>
-     * This is the same as calling {@link Executor#not(Condition)}
+     * This is the same as calling {@link Factory#not(Condition)}
      *
      * @return This condition, inverted
      */
diff --git a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
index 41cd4589a1..ee5926a22e 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
@@ -35,7 +35,8 @@
  */
 package org.jooq;
 
-import org.jooq.impl.Executor;
+import org.jooq.impl.Factory;
+
 
 /**
  * This type is used for the {@link Delete}'s DSL API.
@@ -68,7 +69,7 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     DeleteConditionStep<R> and(String sql);
 
@@ -81,7 +82,7 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     DeleteConditionStep<R> and(String sql, Object... bindings);
 
@@ -94,7 +95,7 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, QueryPart...)
+     * @see Factory#condition(String, QueryPart...)
      */
     DeleteConditionStep<R> and(String sql, QueryPart... parts);
 
@@ -131,7 +132,7 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     DeleteConditionStep<R> or(String sql);
 
@@ -144,7 +145,7 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     DeleteConditionStep<R> or(String sql, Object... bindings);
 
@@ -157,7 +158,7 @@ public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, QueryPart...)
+     * @see Factory#condition(String, QueryPart...)
      */
     DeleteConditionStep<R> or(String sql, QueryPart... parts);
 
diff --git a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
index 3883652b75..ae32b872b0 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
@@ -37,7 +37,7 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.impl.Executor;
+import org.jooq.impl.Factory;
 
 /**
  * This type is used for the {@link Delete}'s DSL API.
@@ -74,7 +74,7 @@ public interface DeleteWhereStep<R extends Record> extends DeleteFinalStep<R> {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     @Support
     DeleteConditionStep<R> where(String sql);
@@ -87,7 +87,7 @@ public interface DeleteWhereStep<R extends Record> extends DeleteFinalStep<R> {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     @Support
     DeleteConditionStep<R> where(String sql, Object... bindings);
@@ -100,7 +100,7 @@ public interface DeleteWhereStep<R extends Record> extends DeleteFinalStep<R> {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, QueryPart...)
+     * @see Factory#condition(String, QueryPart...)
      */
     @Support
     DeleteConditionStep<R> where(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/DivideByOnStep.java b/jOOQ/src/main/java/org/jooq/DivideByOnStep.java
index e100cf537d..2e553cbd7f 100644
--- a/jOOQ/src/main/java/org/jooq/DivideByOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/DivideByOnStep.java
@@ -35,7 +35,8 @@
  */
 package org.jooq;
 
-import org.jooq.impl.Executor;
+import org.jooq.impl.Factory;
+
 
 /**
  * An intermediate type for the construction of a relational division
@@ -58,7 +59,7 @@ public interface DivideByOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     @Support
     DivideByOnConditionStep on(String sql);
@@ -71,7 +72,7 @@ public interface DivideByOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     @Support
     DivideByOnConditionStep on(String sql, Object... bindings);
@@ -84,7 +85,7 @@ public interface DivideByOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, QueryPart...)
+     * @see Factory#condition(String, QueryPart...)
      */
     @Support
     DivideByOnConditionStep on(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/Query.java b/jOOQ/src/main/java/org/jooq/Query.java
index 4213655d5c..a7852066a8 100644
--- a/jOOQ/src/main/java/org/jooq/Query.java
+++ b/jOOQ/src/main/java/org/jooq/Query.java
@@ -46,6 +46,7 @@ import org.jooq.conf.StatementType;
 import org.jooq.exception.DataAccessException;
 import org.jooq.exception.DataTypeException;
 import org.jooq.impl.Executor;
+import org.jooq.impl.Factory;
 
 /**
  * Any query
@@ -146,22 +147,22 @@ public interface Query extends QueryPart, Attachable {
      * cannot be modified, but the {@link Param} elements allow for modifying
      * bind values on an existing {@link Query}.
      * <p>
-     * Bind values created with {@link Executor#val(Object)} will have their bind
+     * Bind values created with {@link Factory#val(Object)} will have their bind
      * index as name.
      *
      * @see Param
-     * @see Executor#param(String, Object)
+     * @see Factory#param(String, Object)
      */
     Map<String, Param<?>> getParams();
 
     /**
      * Get a named parameter from the {@link Query}, provided its name.
      * <p>
-     * Bind values created with {@link Executor#val(Object)} will have their bind
+     * Bind values created with {@link Factory#val(Object)} will have their bind
      * index as name.
      *
      * @see Param
-     * @see Executor#param(String, Object)
+     * @see Factory#param(String, Object)
      */
     Param<?> getParam(String name);
 
diff --git a/jOOQ/src/main/java/org/jooq/SelectConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectConditionStep.java
index 545db7e112..313e05f8b4 100644
--- a/jOOQ/src/main/java/org/jooq/SelectConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectConditionStep.java
@@ -35,7 +35,8 @@
  */
 package org.jooq;
 
-import org.jooq.impl.Executor;
+import org.jooq.impl.Factory;
+
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -97,7 +98,7 @@ public interface SelectConditionStep extends SelectConnectByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     @Support
     SelectConditionStep and(String sql);
@@ -111,7 +112,7 @@ public interface SelectConditionStep extends SelectConnectByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     @Support
     SelectConditionStep and(String sql, Object... bindings);
@@ -125,7 +126,7 @@ public interface SelectConditionStep extends SelectConnectByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, QueryPart...)
+     * @see Factory#condition(String, QueryPart...)
      */
     @Support
     SelectConditionStep and(String sql, QueryPart... parts);
@@ -167,7 +168,7 @@ public interface SelectConditionStep extends SelectConnectByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     @Support
     SelectConditionStep or(String sql);
@@ -181,7 +182,7 @@ public interface SelectConditionStep extends SelectConnectByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     @Support
     SelectConditionStep or(String sql, Object... bindings);
@@ -195,7 +196,7 @@ public interface SelectConditionStep extends SelectConnectByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, QueryPart...)
+     * @see Factory#condition(String, QueryPart...)
      */
     @Support
     SelectConditionStep or(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
index f92214200d..1376c512d3 100644
--- a/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
@@ -35,7 +35,8 @@
  */
 package org.jooq;
 
-import org.jooq.impl.Executor;
+import org.jooq.impl.Factory;
+
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -97,7 +98,7 @@ public interface SelectHavingConditionStep extends SelectOrderByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     @Support
     SelectHavingConditionStep and(String sql);
@@ -111,7 +112,7 @@ public interface SelectHavingConditionStep extends SelectOrderByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     @Support
     SelectHavingConditionStep and(String sql, Object... bindings);
@@ -125,7 +126,7 @@ public interface SelectHavingConditionStep extends SelectOrderByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, QueryPart...)
+     * @see Factory#condition(String, QueryPart...)
      */
     @Support
     SelectHavingConditionStep and(String sql, QueryPart... parts);
@@ -167,7 +168,7 @@ public interface SelectHavingConditionStep extends SelectOrderByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     @Support
     SelectHavingConditionStep or(String sql);
@@ -181,7 +182,7 @@ public interface SelectHavingConditionStep extends SelectOrderByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     @Support
     SelectHavingConditionStep or(String sql, Object... bindings);
@@ -195,7 +196,7 @@ public interface SelectHavingConditionStep extends SelectOrderByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, QueryPart...)
+     * @see Factory#condition(String, QueryPart...)
      */
     @Support
     SelectHavingConditionStep or(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/SelectHavingStep.java b/jOOQ/src/main/java/org/jooq/SelectHavingStep.java
index c549a14588..cbf281fcd2 100644
--- a/jOOQ/src/main/java/org/jooq/SelectHavingStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectHavingStep.java
@@ -37,7 +37,7 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.impl.Executor;
+import org.jooq.impl.Factory;
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -103,7 +103,7 @@ public interface SelectHavingStep extends SelectOrderByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     @Support
     SelectHavingConditionStep having(String sql);
@@ -116,7 +116,7 @@ public interface SelectHavingStep extends SelectOrderByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     @Support
     SelectHavingConditionStep having(String sql, Object... bindings);
@@ -129,7 +129,7 @@ public interface SelectHavingStep extends SelectOrderByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, QueryPart...)
+     * @see Factory#condition(String, QueryPart...)
      */
     @Support
     SelectHavingConditionStep having(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/SelectWhereStep.java b/jOOQ/src/main/java/org/jooq/SelectWhereStep.java
index 5c29f54f4d..f67185fa2e 100644
--- a/jOOQ/src/main/java/org/jooq/SelectWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectWhereStep.java
@@ -37,7 +37,7 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.impl.Executor;
+import org.jooq.impl.Factory;
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -103,7 +103,7 @@ public interface SelectWhereStep extends SelectConnectByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     @Support
     SelectConditionStep where(String sql);
@@ -116,7 +116,7 @@ public interface SelectWhereStep extends SelectConnectByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     @Support
     SelectConditionStep where(String sql, Object... bindings);
@@ -129,7 +129,7 @@ public interface SelectWhereStep extends SelectConnectByStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, QueryPart...)
+     * @see Factory#condition(String, QueryPart...)
      */
     @Support
     SelectConditionStep where(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java b/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
index a41d9685f6..86a5cce997 100644
--- a/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
@@ -35,7 +35,8 @@
  */
 package org.jooq;
 
-import org.jooq.impl.Executor;
+import org.jooq.impl.Factory;
+
 
 /**
  * An intermediate (optional) type for the construction of a <code>JOIN</code>
@@ -63,7 +64,7 @@ public interface TableOnConditionStep extends Table<Record> {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     @Support
     TableOnConditionStep and(String sql);
@@ -77,7 +78,7 @@ public interface TableOnConditionStep extends Table<Record> {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     @Support
     TableOnConditionStep and(String sql, Object... bindings);
@@ -91,7 +92,7 @@ public interface TableOnConditionStep extends Table<Record> {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, QueryPart...)
+     * @see Factory#condition(String, QueryPart...)
      */
     @Support
     TableOnConditionStep and(String sql, QueryPart... parts);
@@ -133,7 +134,7 @@ public interface TableOnConditionStep extends Table<Record> {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     @Support
     TableOnConditionStep or(String sql);
@@ -147,7 +148,7 @@ public interface TableOnConditionStep extends Table<Record> {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     @Support
     TableOnConditionStep or(String sql, Object... bindings);
@@ -161,7 +162,7 @@ public interface TableOnConditionStep extends Table<Record> {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, QueryPart...)
+     * @see Factory#condition(String, QueryPart...)
      */
     @Support
     TableOnConditionStep or(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/TableOnStep.java b/jOOQ/src/main/java/org/jooq/TableOnStep.java
index 81e1eba16d..72eb3c8bc5 100644
--- a/jOOQ/src/main/java/org/jooq/TableOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/TableOnStep.java
@@ -38,7 +38,7 @@ package org.jooq;
 import java.util.Collection;
 
 import org.jooq.exception.DataAccessException;
-import org.jooq.impl.Executor;
+import org.jooq.impl.Factory;
 
 /**
  * An intermediate type for the construction of a <code>JOIN</code> clause,
@@ -64,7 +64,7 @@ public interface TableOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     @Support
     TableOnConditionStep on(String sql);
@@ -77,7 +77,7 @@ public interface TableOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     @Support
     TableOnConditionStep on(String sql, Object... bindings);
@@ -90,7 +90,7 @@ public interface TableOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, QueryPart...)
+     * @see Factory#condition(String, QueryPart...)
      */
     @Support
     TableOnConditionStep on(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
index e81f5dfbef..03a3268ce5 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
@@ -37,7 +37,7 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.impl.Executor;
+import org.jooq.impl.Factory;
 
 /**
  * This type is used for the {@link Update}'s DSL API.
@@ -76,7 +76,7 @@ public interface UpdateWhereStep<R extends Record> extends UpdateFinalStep<R> {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String)
+     * @see Factory#condition(String)
      */
     @Support
     UpdateConditionStep<R> where(String sql);
@@ -89,7 +89,7 @@ public interface UpdateWhereStep<R extends Record> extends UpdateFinalStep<R> {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, Object...)
+     * @see Factory#condition(String, Object...)
      */
     @Support
     UpdateConditionStep<R> where(String sql, Object... bindings);
@@ -102,7 +102,7 @@ public interface UpdateWhereStep<R extends Record> extends UpdateFinalStep<R> {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Executor#condition(String, QueryPart...)
+     * @see Factory#condition(String, QueryPart...)
      */
     @Support
     UpdateConditionStep<R> where(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java
index c27f6c88ad..055f9c1850 100644
--- a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java
@@ -38,7 +38,6 @@ package org.jooq.util.mysql;
 import org.jooq.EnumType;
 import org.jooq.Field;
 import org.jooq.SQLDialect;
-import org.jooq.impl.Executor;
 import org.jooq.impl.Factory;
 
 /**
@@ -61,7 +60,7 @@ public class MySQLFactory extends Factory {
     /**
      * Get the MySQL-specific <code>DECODE()</code> function
      * <p>
-     * Don't mix this up with the various {@link Executor#decode()} methods!
+     * Don't mix this up with the various {@link Factory#decode()} methods!
      */
     public static Field<String> decode(String cryptString, String keyString) {
         return decode(val(cryptString), val(keyString));
@@ -70,7 +69,7 @@ public class MySQLFactory extends Factory {
     /**
      * Get the MySQL-specific <code>DECODE()</code> function
      * <p>
-     * Don't mix this up with the various {@link Executor#decode()} methods!
+     * Don't mix this up with the various {@link Factory#decode()} methods!
      */
     public static Field<String> decode(Field<String> cryptString, Field<String> keyString) {
         return function("decode", String.class, cryptString, keyString);