diff --git a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index 43424c0c5..9a3168524 100644
--- a/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -147,7 +147,7 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollect
    *
    * @param tenantId For multi-tenant lazy loading provide the tenantId to use.
    */
-  SpiTransaction createQueryTransaction(Object tenantId);
+  SpiTransaction createReadOnlyTransaction(Object tenantId);
 
   /**
    * An event from another server in the cluster used to notify local
diff --git a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
index a2bf783db..606d51b40 100644
--- a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java
@@ -58,7 +58,7 @@ public abstract class AbstractSqlQueryRequest {
       trans = server.currentServerTransaction();
       if (trans == null || !trans.isActive()) {
         // create a local readOnly transaction
-        trans = server.createQueryTransaction(null);
+        trans = server.createReadOnlyTransaction(null);
         createdTransaction = true;
       }
     }
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
index faef445a6..8100a0d7e 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
@@ -170,7 +170,7 @@ class DefaultBeanLoader {
   private List<?> executeQuery(LoadRequest loadRequest, SpiQuery<?> query) {
     if (onIterateUseExtraTxn && loadRequest.isParentFindIterate()) {
       // MySql - we need a different transaction to execute the secondary query
-      SpiTransaction extraTxn = server.createQueryTransaction(query.getTenantId());
+      SpiTransaction extraTxn = server.createReadOnlyTransaction(query.getTenantId());
       try {
         return server.findList(query, extraTxn);
       } finally {
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 0ee1b76c6..14fa172a0 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -2322,8 +2322,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public SpiTransaction createQueryTransaction(Object tenantId) {
-    return transactionManager.createQueryTransaction(tenantId);
+  public SpiTransaction createReadOnlyTransaction(Object tenantId) {
+    return transactionManager.createReadOnlyTransaction(tenantId);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index b6092bf81..bf299983a 100644
--- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -286,7 +286,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
       } else {
         // create an implicit transaction to execute this query
         // potentially using read-only DataSource with autoCommit
-        transaction = ebeanServer.createQueryTransaction(query.getTenantId());
+        transaction = ebeanServer.createReadOnlyTransaction(query.getTenantId());
       }
       createdTransaction = true;
     }
diff --git a/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java
index a4f8a0eff..364e46841 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/DocStoreTransactionManager.java
@@ -24,7 +24,7 @@ public class DocStoreTransactionManager extends TransactionManager {
   }
 
   @Override
-  public SpiTransaction createQueryTransaction(Object tenantId) {
+  public SpiTransaction createReadOnlyTransaction(Object tenantId) {
     return new DocStoreOnlyTransaction("", false, this);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java
index 3d45ad3eb..9a8684982 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java
@@ -23,7 +23,7 @@ abstract class TransactionFactory {
    *
    * @param tenantId The tenantId for lazy loading queries.
    */
-  abstract SpiTransaction createQueryTransaction(Object tenantId);
+  abstract SpiTransaction createReadOnlyTransaction(Object tenantId);
 
   /**
    * Return a new transaction.
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java
index a175f762a..1fd2f9e69 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java
@@ -21,7 +21,7 @@ class TransactionFactoryBasic extends TransactionFactory {
   }
 
   @Override
-  public SpiTransaction createQueryTransaction(Object tenantId) {
+  public SpiTransaction createReadOnlyTransaction(Object tenantId) {
 
     Connection connection = null;
     try {
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java
index dbab9e870..c942ed31e 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java
@@ -26,7 +26,7 @@ class TransactionFactoryBasicWithRead extends TransactionFactoryBasic {
   }
 
   @Override
-  public SpiTransaction createQueryTransaction(Object tenantId) {
+  public SpiTransaction createReadOnlyTransaction(Object tenantId) {
 
     Connection connection = null;
     try {
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java
index 63515c13f..fd70cd47a 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java
@@ -24,7 +24,7 @@ class TransactionFactoryTenant extends TransactionFactory {
   }
 
   @Override
-  public SpiTransaction createQueryTransaction(Object tenantId) {
+  public SpiTransaction createReadOnlyTransaction(Object tenantId) {
     return create(false, tenantId);
   }
 
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java
index 77bec4413..1aa190770 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java
@@ -23,7 +23,7 @@ class TransactionFactoryTenantWithRead extends TransactionFactoryTenant {
   }
 
   @Override
-  public SpiTransaction createQueryTransaction(Object tenantId) {
+  public SpiTransaction createReadOnlyTransaction(Object tenantId) {
 
     Connection connection = null;
     try {
diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
index 708a8fec9..24b856835 100644
--- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
+++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java
@@ -358,7 +358,7 @@ public class TransactionManager implements SpiTransactionManager {
 
   private SpiTransaction createTransaction(TxScope txScope) {
     if (txScope.isReadonly()) {
-      return createQueryTransaction(null);
+      return createReadOnlyTransaction(null);
     } else {
       return createTransaction(true, txScope.getIsolationLevel());
     }
@@ -374,8 +374,8 @@ public class TransactionManager implements SpiTransactionManager {
   /**
    * Create a new Transaction for query only purposes (can use read only datasource).
    */
-  public SpiTransaction createQueryTransaction(Object tenantId) {
-    return transactionFactory.createQueryTransaction(tenantId);
+  public SpiTransaction createReadOnlyTransaction(Object tenantId) {
+    return transactionFactory.createReadOnlyTransaction(tenantId);
   }
 
   /**
diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index 1ca413acc..3961a3f54 100644
--- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -242,7 +242,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public SpiTransaction createQueryTransaction(Object tenantId) {
+  public SpiTransaction createReadOnlyTransaction(Object tenantId) {
     return null;
   }