diff --git a/jOOQ/src/main/java/org/jooq/Configuration.java b/jOOQ/src/main/java/org/jooq/Configuration.java
index 35f45964d6..00544f2509 100644
--- a/jOOQ/src/main/java/org/jooq/Configuration.java
+++ b/jOOQ/src/main/java/org/jooq/Configuration.java
@@ -400,8 +400,8 @@ public interface Configuration extends Serializable {
      * This method is not thread-safe and should not be used in globally
      * available <code>Configuration</code> objects.
      *
-     * @param newExecutorProvider The new executor to be contained in the
-     *            changed configuration.
+     * @param newExecutor The new executor to be contained in the changed
+     *            configuration.
      * @return The changed configuration.
      */
     Configuration set(Executor newExecutor);
@@ -426,7 +426,7 @@ public interface Configuration extends Serializable {
      * This method is not thread-safe and should not be used in globally
      * available <code>Configuration</code> objects.
      *
-     * @param newConnection The new data source to be contained in the changed
+     * @param newDataSource The new data source to be contained in the changed
      *            configuration.
      * @return The changed configuration.
      */
@@ -453,8 +453,8 @@ public interface Configuration extends Serializable {
      * This method is not thread-safe and should not be used in globally
      * available <code>Configuration</code> objects.
      *
-     * @param newRecordMapperProvider The new record mapper to be contained in
-     *            the changed configuration.
+     * @param newRecordMapper The new record mapper to be contained in the
+     *            changed configuration.
      * @return The changed configuration.
      */
     Configuration set(RecordMapper<?, ?> newRecordMapper);
diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index df399e7008..7d4dd81dd2 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -420,7 +420,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * <code>DSLContext</code>'s underlying {@link #configuration()}'s
      * {@link Configuration#connectionProvider()}.
      *
-     * @param runnable The code running statements against the
+     * @param callable The code running statements against the
      *            <code>connection</code>.
      * @return The outcome of the callable
      */
@@ -4463,7 +4463,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * 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 DSL#select(Field...)} instead.
+     * {@link DSL#select(SelectField...)} instead.
      * <p>
      * Example: <code><pre>
      * DSLContext create = DSL.using(configuration);
@@ -4485,7 +4485,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * using plain SQL</li>
      * </ul>
      *
-     * @see DSL#select(Field...)
+     * @see DSL#select(SelectField...)
      */
     @Support
     SelectSelectStep<Record> select(SelectField<?>... fields);
@@ -4495,7 +4495,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Field#in(Select)}, {@link Field#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4525,7 +4525,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row2#in(Select)}, {@link Row2#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4555,7 +4555,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row3#in(Select)}, {@link Row3#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4585,7 +4585,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row4#in(Select)}, {@link Row4#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4615,7 +4615,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row5#in(Select)}, {@link Row5#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4645,7 +4645,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row6#in(Select)}, {@link Row6#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4675,7 +4675,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row7#in(Select)}, {@link Row7#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4705,7 +4705,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row8#in(Select)}, {@link Row8#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4735,7 +4735,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row9#in(Select)}, {@link Row9#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4765,7 +4765,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row10#in(Select)}, {@link Row10#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4795,7 +4795,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row11#in(Select)}, {@link Row11#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4825,7 +4825,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row12#in(Select)}, {@link Row12#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4855,7 +4855,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row13#in(Select)}, {@link Row13#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4885,7 +4885,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row14#in(Select)}, {@link Row14#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4915,7 +4915,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row15#in(Select)}, {@link Row15#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4945,7 +4945,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row16#in(Select)}, {@link Row16#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -4975,7 +4975,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row17#in(Select)}, {@link Row17#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5005,7 +5005,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row18#in(Select)}, {@link Row18#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5035,7 +5035,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row19#in(Select)}, {@link Row19#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5065,7 +5065,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row20#in(Select)}, {@link Row20#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5095,7 +5095,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row21#in(Select)}, {@link Row21#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5125,7 +5125,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row22#in(Select)}, {@link Row22#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5194,7 +5194,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * 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 DSL#selectDistinct(Field...)} instead.
+     * {@link DSL#selectDistinct(SelectField...)} instead.
      * <p>
      * Example: <code><pre>
      * DSLContext create = DSL.using(configuration);
@@ -5215,7 +5215,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
      * using plain SQL</li>
      * </ul>
      *
-     * @see DSL#selectDistinct(Field...)
+     * @see DSL#selectDistinct(SelectField...)
      */
     @Support
     SelectSelectStep<Record> selectDistinct(SelectField<?>... fields);
@@ -5225,7 +5225,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Field#in(Select)}, {@link Field#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5255,7 +5255,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row2#in(Select)}, {@link Row2#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5285,7 +5285,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row3#in(Select)}, {@link Row3#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5315,7 +5315,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row4#in(Select)}, {@link Row4#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5345,7 +5345,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row5#in(Select)}, {@link Row5#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5375,7 +5375,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row6#in(Select)}, {@link Row6#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5405,7 +5405,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row7#in(Select)}, {@link Row7#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5435,7 +5435,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row8#in(Select)}, {@link Row8#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5465,7 +5465,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row9#in(Select)}, {@link Row9#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5495,7 +5495,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row10#in(Select)}, {@link Row10#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5525,7 +5525,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row11#in(Select)}, {@link Row11#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5555,7 +5555,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row12#in(Select)}, {@link Row12#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5585,7 +5585,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row13#in(Select)}, {@link Row13#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5615,7 +5615,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row14#in(Select)}, {@link Row14#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5645,7 +5645,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row15#in(Select)}, {@link Row15#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5675,7 +5675,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row16#in(Select)}, {@link Row16#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5705,7 +5705,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row17#in(Select)}, {@link Row17#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5735,7 +5735,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row18#in(Select)}, {@link Row18#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5765,7 +5765,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row19#in(Select)}, {@link Row19#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5795,7 +5795,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row20#in(Select)}, {@link Row20#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5825,7 +5825,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row21#in(Select)}, {@link Row21#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -5855,7 +5855,7 @@ public interface DSLContext extends Scope , AutoCloseable  {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row22#in(Select)}, {@link Row22#equal(Select)} and other predicate
      * building methods taking subselect arguments.
diff --git a/jOOQ/src/main/java/org/jooq/Record.java b/jOOQ/src/main/java/org/jooq/Record.java
index b731297c68..d75ed64888 100644
--- a/jOOQ/src/main/java/org/jooq/Record.java
+++ b/jOOQ/src/main/java/org/jooq/Record.java
@@ -692,7 +692,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1> Record1<T1> into(Field<T1> field1);
@@ -702,7 +702,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2> Record2<T1, T2> into(Field<T1> field1, Field<T2> field2);
@@ -712,7 +712,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3> Record3<T1, T2, T3> into(Field<T1> field1, Field<T2> field2, Field<T3> field3);
@@ -722,7 +722,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4> Record4<T1, T2, T3, T4> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4);
@@ -732,7 +732,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5> Record5<T1, T2, T3, T4, T5> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5);
@@ -742,7 +742,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6> Record6<T1, T2, T3, T4, T5, T6> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6);
@@ -752,7 +752,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7> Record7<T1, T2, T3, T4, T5, T6, T7> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7);
@@ -762,7 +762,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7, T8> Record8<T1, T2, T3, T4, T5, T6, T7, T8> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8);
@@ -772,7 +772,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7, T8, T9> Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9);
@@ -782,7 +782,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10);
@@ -792,7 +792,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11);
@@ -802,7 +802,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12);
@@ -812,7 +812,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13);
@@ -822,7 +822,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14);
@@ -832,7 +832,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15);
@@ -842,7 +842,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16);
@@ -852,7 +852,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17);
@@ -862,7 +862,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18);
@@ -872,7 +872,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19);
@@ -882,7 +882,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20);
@@ -892,7 +892,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21);
@@ -902,7 +902,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * fields.
      *
      * @return The new record
-     * @see #into(Record)
+     * @see #into(Table)
      */
     @Generated("This class was generated using jOOQ-tools")
     <T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> into(Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21, Field<T22> field22);
@@ -1591,7 +1591,7 @@ public interface Record extends Attachable, Comparable<Record> {
      * {@link #getValue(String, Converter)} method. It is recommended to use
      * {@link #get(String, Converter)} instead.
      *
-     * @see {@link #get(String, Converter)}
+     * @see #get(String, Converter)
      */
     <U> U getValue(String fieldName, Converter<?, ? extends U> converter) throws IllegalArgumentException, DataTypeException;
 
diff --git a/jOOQ/src/main/java/org/jooq/RecordContext.java b/jOOQ/src/main/java/org/jooq/RecordContext.java
index 824f81e032..86ba08ba75 100644
--- a/jOOQ/src/main/java/org/jooq/RecordContext.java
+++ b/jOOQ/src/main/java/org/jooq/RecordContext.java
@@ -51,7 +51,7 @@ public interface RecordContext extends Scope {
      * <ul>
      * <li>{@link ExecuteType#BATCH} when calling
      * {@link DSLContext#batchStore(UpdatableRecord...) batchStore()},
-     * {@link DSLContext#batchInsert(UpdatableRecord...) batchInsert()},
+     * {@link DSLContext#batchInsert(TableRecord...) batchInsert()},
      * {@link DSLContext#batchUpdate(UpdatableRecord...) batchUpdate()},
      * {@link DSLContext#batchDelete(UpdatableRecord...) batchDelete()}.</li>
      * <li>{@link ExecuteType#READ} when calling
diff --git a/jOOQ/src/main/java/org/jooq/Result.java b/jOOQ/src/main/java/org/jooq/Result.java
index 94d0fc5555..57fc2857f6 100644
--- a/jOOQ/src/main/java/org/jooq/Result.java
+++ b/jOOQ/src/main/java/org/jooq/Result.java
@@ -997,9 +997,9 @@ public interface Result<R extends Record> extends List<R>, Attachable {
      * non-unique in the result set. Use {@link #intoGroups(String, String)}
      * instead, if your keys are non-unique
      *
-     * @param key The key field name. Client code must assure that this field is
-     *            unique in the result set.
-     * @param value The value field name
+     * @param keyFieldName The key field name. Client code must assure that this
+     *            field is unique in the result set.
+     * @param valueFieldName The value field name
      * @return A Map containing the results
      * @throws IllegalArgumentException If any of the argument field names is
      *             not contained in {@link #fieldsRow()}
@@ -1017,9 +1017,9 @@ public interface Result<R extends Record> extends List<R>, Attachable {
      * non-unique in the result set. Use {@link #intoGroups(Name, Name)}
      * instead, if your keys are non-unique
      *
-     * @param key The key field name. Client code must assure that this field is
-     *            unique in the result set.
-     * @param value The value field name
+     * @param keyFieldName The key field name. Client code must assure that this
+     *            field is unique in the result set.
+     * @param valueFieldName The value field name
      * @return A Map containing the results
      * @throws IllegalArgumentException If any of the argument field names is
      *             not contained in {@link #fieldsRow()}
diff --git a/jOOQ/src/main/java/org/jooq/Table.java b/jOOQ/src/main/java/org/jooq/Table.java
index a996fba9a5..b63a25c7c8 100644
--- a/jOOQ/src/main/java/org/jooq/Table.java
+++ b/jOOQ/src/main/java/org/jooq/Table.java
@@ -419,7 +419,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * MY_TABLE.as(MY_OTHER_TABLE, f -> MY_OTHER_TABLE.field(f));
      * </pre></code>
      *
-     * @param alias The alias name
+     * @param otherTable The other table whose name is used as alias name
      * @param aliasFunction The function providing field aliases.
      * @return The table alias
      */
@@ -437,7 +437,7 @@ public interface Table<R extends Record> extends TableLike<R> {
      * MY_TABLE.as("t1", (f, i) -> "column" + i);
      * </pre></code>
      *
-     * @param alias The alias name
+     * @param otherTable The other table whose name is used as alias name
      * @param aliasFunction The function providing field aliases.
      * @return The table alias
      */
diff --git a/jOOQ/src/main/java/org/jooq/TransactionProvider.java b/jOOQ/src/main/java/org/jooq/TransactionProvider.java
index b54f69efdf..dea2c400fe 100644
--- a/jOOQ/src/main/java/org/jooq/TransactionProvider.java
+++ b/jOOQ/src/main/java/org/jooq/TransactionProvider.java
@@ -70,7 +70,7 @@ public interface TransactionProvider {
      * {@link #commit(TransactionContext)} or
      * {@link #rollback(TransactionContext)} is called.
      *
-     * @param Configuration the configuration scoped to this transaction and its
+     * @param ctx the configuration scoped to this transaction and its
      *            nested transactions.
      * @throws DataAccessException Any exception issued by the underlying
      *             database.
@@ -78,21 +78,20 @@ public interface TransactionProvider {
     void begin(TransactionContext ctx) throws DataAccessException;
 
     /**
-     * @param Configuration the configuration scoped to this transaction and its
-     *            nested transactions.
-     * @param transaction The user-defined transaction object returned from
-     *            {@link #begin(TransactionContext)}. May be <code>null</code>.
+     * Commit a transaction.
+     *
+     * @param ctx the configuration scoped to this transaction and its nested
+     *            transactions.
      * @throws DataAccessException Any exception issued by the underlying
      *             database.
      */
     void commit(TransactionContext ctx) throws DataAccessException;
 
     /**
-     * @param Configuration the configuration scoped to this transaction and its
-     *            nested transactions.
-     * @param transaction The user-defined transaction object returned from
-     *            {@link #begin(TransactionContext)}. May be <code>null</code>.
-     * @param cause The exception that has caused the rollback.
+     * Rollback a transaction.
+     *
+     * @param ctx the configuration scoped to this transaction and its nested
+     *            transactions.
      * @throws DataAccessException Any exception issued by the underlying
      *             database.
      */
diff --git a/jOOQ/src/main/java/org/jooq/WithStep.java b/jOOQ/src/main/java/org/jooq/WithStep.java
index 0f3a4abcca..9bfc6afd9e 100644
--- a/jOOQ/src/main/java/org/jooq/WithStep.java
+++ b/jOOQ/src/main/java/org/jooq/WithStep.java
@@ -327,7 +327,7 @@ public interface WithStep extends QueryPart {
      * 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 DSL#select(Field...)} instead.
+     * {@link DSL#select(SelectField...)} instead.
      * <p>
      * Example: <code><pre>
      * DSLContext create = DSL.using(configuration);
@@ -340,7 +340,7 @@ public interface WithStep extends QueryPart {
      *       .execute();
      * </pre></code>
      *
-     * @see DSL#select(Field...)
+     * @see DSL#select(SelectField...)
      */
     @Support({ FIREBIRD, HSQLDB, POSTGRES })
     SelectSelectStep<Record> select(SelectField<?>... fields);
@@ -350,7 +350,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Field#in(Select)}, {@link Field#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -381,7 +381,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row2#in(Select)}, {@link Row2#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -412,7 +412,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row3#in(Select)}, {@link Row3#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -443,7 +443,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row4#in(Select)}, {@link Row4#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -474,7 +474,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row5#in(Select)}, {@link Row5#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -505,7 +505,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row6#in(Select)}, {@link Row6#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -536,7 +536,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row7#in(Select)}, {@link Row7#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -567,7 +567,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row8#in(Select)}, {@link Row8#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -598,7 +598,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row9#in(Select)}, {@link Row9#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -629,7 +629,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row10#in(Select)}, {@link Row10#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -660,7 +660,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row11#in(Select)}, {@link Row11#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -691,7 +691,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row12#in(Select)}, {@link Row12#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -722,7 +722,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row13#in(Select)}, {@link Row13#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -753,7 +753,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row14#in(Select)}, {@link Row14#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -784,7 +784,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row15#in(Select)}, {@link Row15#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -815,7 +815,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row16#in(Select)}, {@link Row16#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -846,7 +846,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row17#in(Select)}, {@link Row17#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -877,7 +877,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row18#in(Select)}, {@link Row18#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -908,7 +908,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row19#in(Select)}, {@link Row19#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -939,7 +939,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row20#in(Select)}, {@link Row20#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -970,7 +970,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row21#in(Select)}, {@link Row21#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1001,7 +1001,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #select(Field...)}, except that it
+     * This is the same as {@link #select(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row22#in(Select)}, {@link Row22#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1062,7 +1062,7 @@ public interface WithStep extends QueryPart {
      * 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 DSL#selectDistinct(Field...)} instead.
+     * {@link DSL#selectDistinct(SelectField...)} instead.
      * <p>
      * Example: <code><pre>
      * DSLContext create = DSL.using(configuration);
@@ -1074,7 +1074,7 @@ public interface WithStep extends QueryPart {
      *       .orderBy(field2);
      * </pre></code>
      *
-     * @see DSL#selectDistinct(Field...)
+     * @see DSL#selectDistinct(SelectField...)
      */
     @Support({ FIREBIRD, HSQLDB, POSTGRES })
     SelectSelectStep<Record> selectDistinct(SelectField<?>... fields);
@@ -1084,7 +1084,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Field#in(Select)}, {@link Field#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1115,7 +1115,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row2#in(Select)}, {@link Row2#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1146,7 +1146,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row3#in(Select)}, {@link Row3#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1177,7 +1177,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row4#in(Select)}, {@link Row4#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1208,7 +1208,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row5#in(Select)}, {@link Row5#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1239,7 +1239,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row6#in(Select)}, {@link Row6#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1270,7 +1270,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row7#in(Select)}, {@link Row7#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1301,7 +1301,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row8#in(Select)}, {@link Row8#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1332,7 +1332,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row9#in(Select)}, {@link Row9#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1363,7 +1363,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row10#in(Select)}, {@link Row10#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1394,7 +1394,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row11#in(Select)}, {@link Row11#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1425,7 +1425,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row12#in(Select)}, {@link Row12#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1456,7 +1456,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row13#in(Select)}, {@link Row13#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1487,7 +1487,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row14#in(Select)}, {@link Row14#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1518,7 +1518,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row15#in(Select)}, {@link Row15#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1549,7 +1549,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row16#in(Select)}, {@link Row16#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1580,7 +1580,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row17#in(Select)}, {@link Row17#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1611,7 +1611,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row18#in(Select)}, {@link Row18#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1642,7 +1642,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row19#in(Select)}, {@link Row19#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1673,7 +1673,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row20#in(Select)}, {@link Row20#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1704,7 +1704,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row21#in(Select)}, {@link Row21#equal(Select)} and other predicate
      * building methods taking subselect arguments.
@@ -1735,7 +1735,7 @@ public interface WithStep extends QueryPart {
     /**
      * Create a new DSL select statement.
      * <p>
-     * This is the same as {@link #selectDistinct(Field...)}, except that it
+     * This is the same as {@link #selectDistinct(SelectField...)}, except that it
      * declares additional record-level typesafety, which is needed by
      * {@link Row22#in(Select)}, {@link Row22#equal(Select)} and other predicate
      * building methods taking subselect arguments.
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
index 4f10a27c56..7cf0f8693c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
@@ -3144,6 +3144,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
     }
 
     // [jooq-tools] START [newRecord]
+
     @Generated("This method was generated using jOOQ-tools")
     @Override
     public <T1> Record1<T1> newRecord(Field<T1> field1) {