diff --git a/src/main/java/io/ebean/ExtendedServer.java b/src/main/java/io/ebean/ExtendedServer.java
index 0fc917bdf..3966535e6 100644
--- a/src/main/java/io/ebean/ExtendedServer.java
+++ b/src/main/java/io/ebean/ExtendedServer.java
@@ -1,8 +1,5 @@
 package io.ebean;
 
-import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.api.SpiTransaction;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.persistence.NonUniqueResultException;
@@ -70,7 +67,7 @@ public interface ExtendedServer {
    *
    * @return True if the query finds a matching row in the database
    */
-  <T> boolean exists(SpiQuery<?> ormQuery, SpiTransaction transaction);
+  <T> boolean exists(Query<?> ormQuery, Transaction transaction);
 
   /**
    * Return the number of 'top level' or 'root' entities this query should return.
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 0df57d6d7..985d7c114 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1340,7 +1340,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public <T> boolean exists(SpiQuery<?> ormQuery, SpiTransaction transaction) {
+  public <T> boolean exists(Query<?> ormQuery, Transaction transaction) {
 
     Query<?> ormQueryCopy = ormQuery.copy();
     ormQueryCopy.setMaxRows(1);
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 3b07c3165..ae87ff71c 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -617,7 +617,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public <T> boolean exists(SpiQuery<?> ormQuery, SpiTransaction transaction) {
+  public <T> boolean exists(Query<?> ormQuery, Transaction transaction) {
     return false;
   }