diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
index cf5a6ec99..5d0b9a50a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java
@@ -78,7 +78,7 @@ final class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreE
    * Compile/build the sub query.
    */
   protected CQuery<?> compileSubQuery(BeanQueryRequest<?> queryRequest) {
-    SpiEbeanServer ebeanServer = (SpiEbeanServer) queryRequest.getEbeanServer();
+    SpiEbeanServer ebeanServer = (SpiEbeanServer) queryRequest.database();
     return ebeanServer.compileQuery(Type.SQ_EXISTS, subQuery, queryRequest.transaction());
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
index 6e80916a0..cc508f3e5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/InQueryExpression.java
@@ -65,8 +65,7 @@ final class InQueryExpression extends AbstractExpression implements UnsupportedD
    * Compile/build the sub query.
    */
   private CQuery<?> compileSubQuery(BeanQueryRequest<?> queryRequest) {
-
-    SpiEbeanServer ebeanServer = (SpiEbeanServer) queryRequest.getEbeanServer();
+    SpiEbeanServer ebeanServer = (SpiEbeanServer) queryRequest.database();
     return ebeanServer.compileQuery(Type.SQ_IN, subQuery, queryRequest.transaction());
   }
 
diff --git a/ebean-test/src/test/java/org/tests/model/controller/TestBeanFindController.java b/ebean-test/src/test/java/org/tests/model/controller/TestBeanFindController.java
index 27cbae2a2..2e51847eb 100644
--- a/ebean-test/src/test/java/org/tests/model/controller/TestBeanFindController.java
+++ b/ebean-test/src/test/java/org/tests/model/controller/TestBeanFindController.java
@@ -54,7 +54,7 @@ public class TestBeanFindController implements BeanFindController {
 
     elementsMap.forEach((beanType, ids) -> {
       final Map<Integer, FindControllerMain> idLookup = controllerLookup.get(beanType);
-      request.getEbeanServer().find(beanType).where()
+      request.database().find(beanType).where()
         .idIn(ids).setMapKey("id")
         .findMap().forEach((id, bean) -> idLookup.get((Integer) id).setTarget(bean));
     });
@@ -69,18 +69,17 @@ public class TestBeanFindController implements BeanFindController {
     Class<?> beanType = beanTypeFor(findControllerMain.getTargetTableName(), request);
 
     if (beanType != null) {
-      findControllerMain.setTarget(request.getEbeanServer().find(beanType, findControllerMain.getTargetId()));
+      findControllerMain.setTarget(request.database().find(beanType, findControllerMain.getTargetId()));
     }
 
     return result;
   }
 
   private Class<?> beanTypeFor(String tableName, BeanQueryRequest<?> request) {
-    List<? extends BeanType<?>> types = request.getEbeanServer()
-      .getPluginApi().getBeanTypes(tableName);
+    List<? extends BeanType<?>> types = request.database().pluginApi().beanTypes(tableName);
     for (BeanType<?> type : types) {
       if (type.isInheritanceRoot()) {
-        return type.getBeanType();
+        return type.type();
       }
     }
     return null;