diff --git a/jOOQ/src/main/java/org/jooq/Configuration.java b/jOOQ/src/main/java/org/jooq/Configuration.java
index 95f324392b..19b90b6a0e 100644
--- a/jOOQ/src/main/java/org/jooq/Configuration.java
+++ b/jOOQ/src/main/java/org/jooq/Configuration.java
@@ -214,7 +214,7 @@ public interface Configuration extends Serializable {
      * Create a derived configuration from this one, with a new execute listener
      * providers.
      *
-     * @param newExecuteListenerProvider The new execute listener providers to
+     * @param newExecuteListenerProviders The new execute listener providers to
      *            be contained in the derived configuration.
      * @return The derived configuration.
      */
diff --git a/jOOQ/src/main/java/org/jooq/ExecuteListener.java b/jOOQ/src/main/java/org/jooq/ExecuteListener.java
index 8e2ad13bf3..8552d4ff32 100644
--- a/jOOQ/src/main/java/org/jooq/ExecuteListener.java
+++ b/jOOQ/src/main/java/org/jooq/ExecuteListener.java
@@ -44,8 +44,8 @@ import java.util.EventListener;
 
 import org.jooq.conf.Settings;
 import org.jooq.conf.StatementType;
-import org.jooq.impl.DefaultExecuteListener;
 import org.jooq.impl.DSL;
+import org.jooq.impl.DefaultExecuteListener;
 import org.jooq.tools.LoggerListener;
 import org.jooq.tools.StopWatchListener;
 
@@ -55,7 +55,7 @@ import org.jooq.tools.StopWatchListener;
  * <p>
  * <code>ExecuteListener</code> is a base type for loggers, debuggers,
  * profilers, data collectors that can be hooked into a jOOQ {@link DSLContext}
- * using the {@link Configuration#getExecuteListeners()} property, passing
+ * using the {@link Configuration#executeListenerProviders()} property, passing
  * <code>Settings</code> to
  * {@link DSL#using(java.sql.Connection, SQLDialect, Settings)}. jOOQ
  * will use that configuration at the beginning of a query execution event to
diff --git a/jOOQ/src/main/java/org/jooq/impl/package-info.java b/jOOQ/src/main/java/org/jooq/impl/package-info.java
index f6e963f940..70b6b0dca5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/package-info.java
+++ b/jOOQ/src/main/java/org/jooq/impl/package-info.java
@@ -3,7 +3,7 @@
  * <p>
  * This package provides implementations for the jOOQ API from
  * <code>org.jooq</code>, whose interfaces are constructed mostly through the
- * {@link org.jooq.impl.DSLContext} class, which hides implementation facts from
- * the public API
+ * {@link org.jooq.impl.DSL} and {@link org.jooq.DSLContext} classes, which hide
+ * implementation facts from the public API.
  */
 package org.jooq.impl;
\ No newline at end of file
diff --git a/jOOQ/src/main/java/org/jooq/package-info.java b/jOOQ/src/main/java/org/jooq/package-info.java
index 6af8571854..1929a025b9 100644
--- a/jOOQ/src/main/java/org/jooq/package-info.java
+++ b/jOOQ/src/main/java/org/jooq/package-info.java
@@ -3,7 +3,7 @@
  * <p>
  * This package mostly contains interfaces that are implemented by the
  * <code>org.jooq.impl</code> package. These interfaces are constructed mostly
- * through the {@link org.jooq.impl.DSLContext} class, which hides implementation
- * facts from the public API
+ * through the {@link org.jooq.impl.DSL} and {@link org.jooq.DSLContext}
+ * classes, which hide implementation facts from the public API.
  */
 package org.jooq;
\ No newline at end of file