diff --git a/src/main/java/io/ebean/DocumentStore.java b/src/main/java/io/ebean/DocumentStore.java
index f9cb809ee..1717bea47 100644
--- a/src/main/java/io/ebean/DocumentStore.java
+++ b/src/main/java/io/ebean/DocumentStore.java
@@ -123,11 +123,8 @@ public interface DocumentStore {
    *  server.find(Order.class)
    *    .setUseDocStore(true)
    *    .where()... // perhaps add predicates
-   *    .findEach(new QueryEachConsumer<Order>() {
-   *      @Override
-   *      public void accept(Order bean) {
-   *        // process the bean
-   *      }
+   *    .findEach((Order order) -> {
+   *      // process the bean ...
    *    });
    *
    * }</pre>
@@ -151,7 +148,7 @@ public interface DocumentStore {
    *  server.find(Order.class)
    *    .setUseDocStore(true)
    *    .where()... // perhaps add predicates
-   *    .findEachWhile(new QueryEachWhileConsumer<Order>() {
+   *    .findEachWhile(new Predicate<Order>() {
    *      @Override
    *      public void accept(Order bean) {
    *        // process the bean
diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java
index de498f133..4ca3e7c6b 100644
--- a/src/main/java/io/ebean/EbeanServer.java
+++ b/src/main/java/io/ebean/EbeanServer.java
@@ -851,7 +851,7 @@ public interface EbeanServer {
    * Execute the query visiting the each bean one at a time.
    * <p>
    * Compared to findEach() this provides the ability to stop processing the query
-   * results early by returning false for the QueryEachWhileConsumer.
+   * results early by returning false for the Predicate.
    * </p>
    * <p>
    * Unlike findList() this is suitable for processing a query that will return
diff --git a/src/main/java/io/ebean/Query.java b/src/main/java/io/ebean/Query.java
index fb71bb927..1dac8b938 100644
--- a/src/main/java/io/ebean/Query.java
+++ b/src/main/java/io/ebean/Query.java
@@ -666,8 +666,7 @@ public interface Query<T> {
    * </p>
    * <p>
    * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the QueryEachConsumer (SAM) interface which is better suited to use
-   * with Java8 closures.
+   * iterator uses the Consumer interface which is better suited to use with Java8 closures.
    * </p>
    * <pre>{@code
    *
@@ -696,8 +695,7 @@ public interface Query<T> {
    * </p>
    * <p>
    * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the QueryEachWhileConsumer (SAM) interface which is better suited to use
-   * with Java8 closures.
+   * iterator uses the Predicate (SAM) interface which is better suited to use with Java8 closures.
    * </p>
    * <pre>{@code
    *