diff --git a/src/main/java/io/ebean/DB.java b/src/main/java/io/ebean/DB.java
index 0c73686ee..495018a08 100644
--- a/src/main/java/io/ebean/DB.java
+++ b/src/main/java/io/ebean/DB.java
@@ -736,8 +736,11 @@ public class DB {
   }
 
   /**
+   * Deprecated - migrate to sqlQuery().
+   * <p>
    * This is an alias for {@link #sqlQuery(String)}.
    */
+  @Deprecated
   public static SqlQuery createSqlQuery(String sql) {
     return sqlQuery(sql);
   }
diff --git a/src/main/java/io/ebean/Database.java b/src/main/java/io/ebean/Database.java
index b6acd2eec..8617b60be 100644
--- a/src/main/java/io/ebean/Database.java
+++ b/src/main/java/io/ebean/Database.java
@@ -464,8 +464,11 @@ public interface Database {
   SqlQuery sqlQuery(String sql);
 
   /**
+   * Deprecated - migrate to sqlQuery().
+   * <p>
    * This is an alias for {@link #sqlQuery(String)}.
    */
+  @Deprecated
   SqlQuery createSqlQuery(String sql);
 
   /**
diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index 75f502796..15a6515c9 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -865,6 +865,8 @@ public final class Ebean {
   }
 
   /**
+   * Deprecated - migrate to DB.sqlQuery().
+   * <p>
    * Create a SqlQuery for executing native sql
    * query statements.
    * <p>
@@ -872,8 +874,9 @@ public final class Ebean {
    * annotation for examples.
    * </p>
    */
+  @Deprecated
   public static SqlQuery createSqlQuery(String sql) {
-    return serverMgr.getDefaultServer().createSqlQuery(sql);
+    return serverMgr.getDefaultServer().sqlQuery(sql);
   }
 
   /**
diff --git a/src/test/java/io/ebean/SqlRowBooleanTest.java b/src/test/java/io/ebean/SqlRowBooleanTest.java
index 172b24787..1da2189eb 100644
--- a/src/test/java/io/ebean/SqlRowBooleanTest.java
+++ b/src/test/java/io/ebean/SqlRowBooleanTest.java
@@ -11,15 +11,15 @@ public class SqlRowBooleanTest extends BaseTestCase {
 
     SqlQuery sqlQuery;
     if (isSqlServer()) {
-      sqlQuery = Ebean.createSqlQuery("SELECT 1 AS ISNT_NULL");
+      sqlQuery = DB.sqlQuery("SELECT 1 AS ISNT_NULL");
     } else if (isOracle() || isNuoDb()) {
-      sqlQuery = Ebean.createSqlQuery("SELECT 1 AS ISNT_NULL from dual");
+      sqlQuery = DB.sqlQuery("SELECT 1 AS ISNT_NULL from dual");
     } else if (isDb2()) {
-      sqlQuery = Ebean.createSqlQuery("SELECT 1 AS ISNT_NULL from SYSIBM.SYSDUMMY1");
+      sqlQuery = DB.sqlQuery("SELECT 1 AS ISNT_NULL from SYSIBM.SYSDUMMY1");
     } else if (isHana()) {
-      sqlQuery = Ebean.createSqlQuery("SELECT 1 AS ISNT_NULL from sys.dummy");
+      sqlQuery = DB.sqlQuery("SELECT 1 AS ISNT_NULL from sys.dummy");
     } else {
-      sqlQuery = Ebean.createSqlQuery("SELECT 1 IS NOT NULL AS ISNT_NULL");
+      sqlQuery = DB.sqlQuery("SELECT 1 IS NOT NULL AS ISNT_NULL");
     }
     SqlRow row = sqlQuery.findOne();
     Boolean value = row.getBoolean("ISNT_NULL");
diff --git a/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java b/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java
index 0f0d2416b..69dc36751 100644
--- a/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java
+++ b/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java
@@ -38,7 +38,7 @@ public class TestBinaryUUID extends BaseTestCase {
     assertEquals(one1.getName(), fetch1.getName());
 
     String sql = "select id, name from uuone";
-    List<SqlRow> list = DB.createSqlQuery(sql).findList();
+    List<SqlRow> list = DB.sqlQuery(sql).findList();
     for (SqlRow sqlRow : list) {
       Object sqlId = sqlRow.get("id");
       assertNotNull(sqlId);
diff --git a/src/test/java/org/tests/basic/MainDbBoolean.java b/src/test/java/org/tests/basic/MainDbBoolean.java
index 14c900d4e..9db84d2c1 100644
--- a/src/test/java/org/tests/basic/MainDbBoolean.java
+++ b/src/test/java/org/tests/basic/MainDbBoolean.java
@@ -130,7 +130,7 @@ public class MainDbBoolean {
     Assert.assertFalse(!list.get(0).isActive());
 
     String sql = "select id, name, active from t_oneb order by id";
-    List<SqlRow> sqlRows = server.createSqlQuery(sql).findList();
+    List<SqlRow> sqlRows = server.sqlQuery(sql).findList();
     Assert.assertTrue(sqlRows.size() == 2);
     Object active0 = sqlRows.get(0).get("active");
     Object active1 = sqlRows.get(1).get("active");
diff --git a/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
index 2a64c1288..ee14fb0fd 100644
--- a/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
+++ b/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
@@ -68,7 +68,7 @@ public class TestEncrypt extends BaseTestCase {
 
     DB.save(e);
 
-    SqlRow row = DB.createSqlQuery("select * from e_basicenc where id = :id")
+    SqlRow row = DB.sqlQuery("select * from e_basicenc where id = :id")
       .setParameter("id", e.getId())
       .findOne();
 
diff --git a/src/test/java/org/tests/basic/type/TestSqlRowUUID.java b/src/test/java/org/tests/basic/type/TestSqlRowUUID.java
index e6b833002..f2e60c16b 100644
--- a/src/test/java/org/tests/basic/type/TestSqlRowUUID.java
+++ b/src/test/java/org/tests/basic/type/TestSqlRowUUID.java
@@ -1,7 +1,7 @@
 package org.tests.basic.type;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
 import org.junit.Test;
@@ -23,9 +23,9 @@ public class TestSqlRowUUID extends BaseTestCase {
     TUuidEntity e = new TUuidEntity();
     e.setName("blah");
 
-    Ebean.save(e);
+    DB.save(e);
 
-    SqlQuery q = Ebean.createSqlQuery("select * from tuuid_entity where id = :id");
+    SqlQuery q = DB.sqlQuery("select * from tuuid_entity where id = :id");
     q.setParameter("id", e.getId());
     SqlRow sqlRow = q.findOne();
 
@@ -37,7 +37,7 @@ public class TestSqlRowUUID extends BaseTestCase {
     assertFalse(b);
 
 
-    SqlQuery q2 = Ebean.createSqlQuery("select id from tuuid_entity where id = :id");
+    SqlQuery q2 = DB.sqlQuery("select id from tuuid_entity where id = :id");
     q2.setParameter("id", e.getId());
     UUID value = q2.findSingleAttribute(UUID.class);
 
@@ -52,13 +52,13 @@ public class TestSqlRowUUID extends BaseTestCase {
 
     List<UUID> ids = Arrays.asList(e.getId(), UUID.randomUUID());
 
-    List<SqlRow> result = Ebean.createSqlQuery("select id from tuuid_entity where id = any(?::uuid[])")
+    List<SqlRow> result = DB.sqlQuery("select id from tuuid_entity where id = any(?::uuid[])")
       .setParameter(1, ids)
       .findList();
 
     assertThat(result).hasSize(1);
 
-    List<TUuidEntity> list = Ebean.find(TUuidEntity.class)
+    List<TUuidEntity> list = DB.find(TUuidEntity.class)
       .where().rawOrEmpty("id = any(?::uuid[])", ids)
       .findList();
 
diff --git a/src/test/java/org/tests/history/TestHistoryInsert.java b/src/test/java/org/tests/history/TestHistoryInsert.java
index 40f95ce69..3e01c34a7 100644
--- a/src/test/java/org/tests/history/TestHistoryInsert.java
+++ b/src/test/java/org/tests/history/TestHistoryInsert.java
@@ -1,7 +1,7 @@
 package org.tests.history;
 
 import io.ebean.BaseTestCase;
-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.SqlQuery;
 import io.ebean.SqlRow;
 import io.ebean.Transaction;
@@ -32,7 +32,7 @@ public class TestHistoryInsert extends BaseTestCase {
     user.setEmail("one@email.com");
     user.setPasswordHash("someHash");
 
-    Ebean.save(user);
+    DB.save(user);
     logger.info("-- initial save");
 
     Thread.sleep(DB_CLOCK_DELTA); // wait, so that our system clock can catch up
@@ -41,20 +41,20 @@ public class TestHistoryInsert extends BaseTestCase {
     List<SqlRow> history = fetchHistory(user);
     assertThat(history).isEmpty();
 
-    List<Version<User>> versions = Ebean.find(User.class).setId(user.getId()).findVersions();
+    List<Version<User>> versions = DB.find(User.class).setId(user.getId()).findVersions();
     assertThat(versions).hasSize(1);
 
     user.setName("Jim v2");
     user.setPasswordHash("anotherHash");
     Thread.sleep(50); // wait, to ensure that whenModified differs
     logger.info("-- update v2");
-    Ebean.save(user);
+    DB.save(user);
 
     history = fetchHistory(user);
     assertThat(history).hasSize(1);
     assertThat(history.get(0).getString("name")).isEqualTo("Jim");
 
-    versions = Ebean.find(User.class).setId(user.getId()).findVersions();
+    versions = DB.find(User.class).setId(user.getId()).findVersions();
     assertThat(versions).hasSize(2);
     assertThat(versions.get(0).getDiff()).containsKeys("name", "version", "whenModified");
 
@@ -63,25 +63,25 @@ public class TestHistoryInsert extends BaseTestCase {
     Thread.sleep(50); // otherwise the timestamp of "whenModified" may not change
 
     logger.info("-- update v3");
-    Ebean.save(user);
+    DB.save(user);
 
     history = fetchHistory(user);
     assertThat(history).hasSize(2);
     assertThat(history.get(1).getString("name")).isEqualTo("Jim v2");
     assertThat(history.get(1).getString("email")).isEqualTo("one@email.com");
 
-    versions = Ebean.find(User.class).setId(user.getId()).findVersions();
+    versions = DB.find(User.class).setId(user.getId()).findVersions();
     assertThat(versions).hasSize(3);
     assertThat(versions.get(0).getDiff()).containsKeys("name", "email", "version", "whenModified");
 
     logger.info("-- delete");
-    Ebean.delete(user);
+    DB.delete(user);
 
-    User earlyVersion = Ebean.find(User.class).setId(user.getId()).asOf(afterInsert).findOne();
+    User earlyVersion = DB.find(User.class).setId(user.getId()).asOf(afterInsert).findOne();
     assertThat(earlyVersion.getName()).isEqualTo("Jim");
     assertThat(earlyVersion.getEmail()).isEqualTo("one@email.com");
 
-    Ebean.find(User.class).setId(user.getId()).asOf(afterInsert).findOne();
+    DB.find(User.class).setId(user.getId()).asOf(afterInsert).findOne();
 
     logger.info("-- last fetchHistory");
 
@@ -90,7 +90,7 @@ public class TestHistoryInsert extends BaseTestCase {
     assertThat(history.get(2).getString("name")).isEqualTo("Jim v3");
     assertThat(history.get(2).getString("email")).isEqualTo("three@email.com");
 
-    versions = Ebean.find(User.class).setId(user.getId()).findVersions();
+    versions = DB.find(User.class).setId(user.getId()).findVersions();
     assertThat(versions).hasSize(3);
   }
 
@@ -103,28 +103,28 @@ public class TestHistoryInsert extends BaseTestCase {
     user.setEmail("first@email.com");
     user.setPasswordHash("someHash");
 
-    try (Transaction transaction = Ebean.beginTransaction()) {
+    try (Transaction transaction = DB.beginTransaction()) {
       // insert and many updates inside transaction
-      Ebean.save(user);
+      DB.save(user);
       user.setEmail("first2@email.com");
-      Ebean.save(user);
+      DB.save(user);
       user.setEmail("first3@email.com");
-      Ebean.save(user);
+      DB.save(user);
       user.setEmail("first4@email.com");
-      Ebean.save(user);
+      DB.save(user);
 
       transaction.commit();
     }
 
     // a couple more updates outside of the first transaction
     user.setEmail("first5@email.com");
-    Ebean.save(user);
+    DB.save(user);
 
     user.setEmail("first6@email.com");
-    Ebean.save(user);
+    DB.save(user);
 
     List<SqlRow> sqlRows =
-      Ebean.createSqlQuery("select lower(sys_period) lowerBound, upper(sys_period) upperBound from c_user_history where id = :id order by when_modified")
+      DB.sqlQuery("select lower(sys_period) lowerBound, upper(sys_period) upperBound from c_user_history where id = :id order by when_modified")
         .setParameter("id", user.getId())
         .findList();
 
@@ -144,7 +144,7 @@ public class TestHistoryInsert extends BaseTestCase {
    * Use SqlQuery to query the history table directly.
    */
   private List<SqlRow> fetchHistory(User user) {
-    SqlQuery sqlQuery = Ebean.createSqlQuery("select * from c_user_history where id = :id order by when_modified");
+    SqlQuery sqlQuery = DB.sqlQuery("select * from c_user_history where id = :id order by when_modified");
     sqlQuery.setParameter("id", user.getId());
     return sqlQuery.findList();
   }
diff --git a/src/test/java/org/tests/model/array/TestDbArray_basic.java b/src/test/java/org/tests/model/array/TestDbArray_basic.java
index e92527c80..e8da4a84e 100644
--- a/src/test/java/org/tests/model/array/TestDbArray_basic.java
+++ b/src/test/java/org/tests/model/array/TestDbArray_basic.java
@@ -1,6 +1,7 @@
 package org.tests.model.array;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.SqlRow;
@@ -107,7 +108,7 @@ public class TestDbArray_basic extends BaseTestCase {
       query.findList();
 
 
-      final SqlRow row = Ebean.createSqlQuery("select * from earray_bean").findOne();
+      final SqlRow row = DB.sqlQuery("select * from earray_bean").findOne();
 
       final String[] vcs = (String[]) ((java.sql.Array) row.get("vc_enums")).getArray();
       assertThat(vcs).containsExactly("xXxONE", "xXxTWO");
diff --git a/src/test/java/org/tests/model/nofk/TestNoFk.java b/src/test/java/org/tests/model/nofk/TestNoFk.java
index 87110ce14..a2315eb05 100644
--- a/src/test/java/org/tests/model/nofk/TestNoFk.java
+++ b/src/test/java/org/tests/model/nofk/TestNoFk.java
@@ -1,6 +1,7 @@
 package org.tests.model.nofk;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.SqlRow;
 import io.ebean.bean.EntityBean;
@@ -92,7 +93,7 @@ public class TestNoFk extends BaseTestCase {
     assertThat(Ebean.find(EUserNoFk.class).findCount()).isEqualTo(2);
     assertThat(Ebean.find(EUserNoFkSoftDel.class).findCount()).isEqualTo(2);
 
-    SqlRow row = Ebean.createSqlQuery("select count(*) as cnt from efile_no_fk_euser_no_fk").findOne();
+    SqlRow row = DB.sqlQuery("select count(*) as cnt from efile_no_fk_euser_no_fk").findOne();
     assertThat(row.getInteger("cnt")).isEqualTo(3);
     // We should have this data in the database:
     //
@@ -120,7 +121,7 @@ public class TestNoFk extends BaseTestCase {
     assertThat(file2.getFileName()).isEqualTo("java");
 
     // File1 is owned by "root"
-    EntityBeanIntercept ownerEbi = ((EntityBean)file1.getOwner())._ebean_getIntercept();
+    EntityBeanIntercept ownerEbi = ((EntityBean) file1.getOwner())._ebean_getIntercept();
     assertThat(file1.getOwner().getUserId()).isEqualTo(1);
     assertTrue(ownerEbi.isReference());
     assertTrue(ownerEbi.isPartial());
@@ -130,12 +131,11 @@ public class TestNoFk extends BaseTestCase {
     assertFalse(ownerEbi.isPartial());  // and expect, that bean is fully loaded
 
 
-
     // File2 is owned by user #500, but user account does not exist
-    ownerEbi = ((EntityBean)file2.getOwner())._ebean_getIntercept();
+    ownerEbi = ((EntityBean) file2.getOwner())._ebean_getIntercept();
 
     assertThat(file2.getOwner().getUserId()).isEqualTo(500);
-    assertThatThrownBy(()->file2.getOwner().getUserName())
+    assertThatThrownBy(() -> file2.getOwner().getUserName())
       .isInstanceOf(EntityNotFoundException.class)
       .hasMessageContaining("id:500 - Bean has been deleted");
 
@@ -157,7 +157,7 @@ public class TestNoFk extends BaseTestCase {
     assertThat(file2.getFileName()).isEqualTo("java");
 
     // File1 is owned by "root"
-    EntityBeanIntercept ownerEbi = ((EntityBean)file1.getOwner())._ebean_getIntercept();
+    EntityBeanIntercept ownerEbi = ((EntityBean) file1.getOwner())._ebean_getIntercept();
     assertFalse(ownerEbi.isReference());
     assertFalse(ownerEbi.isPartial());
 
@@ -165,10 +165,10 @@ public class TestNoFk extends BaseTestCase {
     assertThat(file1.getOwner().getUserName()).isEqualTo("root");
 
     // File2 is owned by user #500, but user account does not exist
-    ownerEbi = ((EntityBean)file2.getOwner())._ebean_getIntercept();
+    ownerEbi = ((EntityBean) file2.getOwner())._ebean_getIntercept();
 
     assertThat(file2.getOwner().getUserId()).isEqualTo(500);
-    assertThatThrownBy(()->file2.getOwner().getUserName())
+    assertThatThrownBy(() -> file2.getOwner().getUserName())
       .isInstanceOf(EntityNotFoundException.class)
       .hasMessageContaining("id:500 - Bean has been deleted");
 
@@ -201,8 +201,8 @@ public class TestNoFk extends BaseTestCase {
   @Test
   public void testEagerLoadOwner() {
     List<EUserNoFk> owners = Ebean.find(EUserNoFk.class)
-        .fetch("files")
-        .findList();
+      .fetch("files")
+      .findList();
     assertThat(owners).hasSize(2);
 
     EUserNoFk owner1 = owners.get(0);
@@ -232,7 +232,7 @@ public class TestNoFk extends BaseTestCase {
     assertThat(file2.getFileName()).isEqualTo("java");
 
     // File1 is owned by "root"
-    EntityBeanIntercept ownerEbi = ((EntityBean)file1.getOwnerSoftDel())._ebean_getIntercept();
+    EntityBeanIntercept ownerEbi = ((EntityBean) file1.getOwnerSoftDel())._ebean_getIntercept();
     assertThat(file1.getOwnerSoftDel().getUserId()).isEqualTo(1);
     assertTrue(ownerEbi.isReference());
     assertTrue(ownerEbi.isPartial());
@@ -246,7 +246,7 @@ public class TestNoFk extends BaseTestCase {
 
 
     // File2 is owned by user #500, but user account does not exist
-    ownerEbi = ((EntityBean)file2.getOwnerSoftDel())._ebean_getIntercept();
+    ownerEbi = ((EntityBean) file2.getOwnerSoftDel())._ebean_getIntercept();
 
     assertThat(file2.getOwnerSoftDel().getUserId()).isEqualTo(500);
     assertThat(file2.getOwnerSoftDel().isDeleted()).isEqualTo(true);
@@ -269,7 +269,7 @@ public class TestNoFk extends BaseTestCase {
     assertThat(file2.getFileName()).isEqualTo("java");
 
     // File1 is owned by "root"
-    EntityBeanIntercept ownerEbi = ((EntityBean)file1.getOwnerSoftDel())._ebean_getIntercept();
+    EntityBeanIntercept ownerEbi = ((EntityBean) file1.getOwnerSoftDel())._ebean_getIntercept();
     assertFalse(ownerEbi.isReference());
     assertFalse(ownerEbi.isPartial());
 
@@ -278,7 +278,7 @@ public class TestNoFk extends BaseTestCase {
     assertThat(file1.getOwnerSoftDel().getUserName()).isEqualTo("root");
 
     // File2 is owned by user #500, but user account does not exist
-    ownerEbi = ((EntityBean)file2.getOwnerSoftDel())._ebean_getIntercept();
+    ownerEbi = ((EntityBean) file2.getOwnerSoftDel())._ebean_getIntercept();
 //    assertFalse(ownerEbi.isReference());
 //    assertFalse(ownerEbi.isPartial());
 
@@ -312,8 +312,8 @@ public class TestNoFk extends BaseTestCase {
   @Test
   public void testEagerLoadOwnerSoftDel() {
     List<EUserNoFkSoftDel> owners = Ebean.find(EUserNoFkSoftDel.class)
-        .fetch("files")
-        .findList();
+      .fetch("files")
+      .findList();
     assertThat(owners).hasSize(2);
 
     EUserNoFkSoftDel owner1 = owners.get(0);
@@ -386,7 +386,7 @@ public class TestNoFk extends BaseTestCase {
 
 
     assertThat(file2.getEditors().get(2).getUserId()).isEqualTo(501);
-    assertThatThrownBy(()->file2.getEditors().get(2).getUserName())
+    assertThatThrownBy(() -> file2.getEditors().get(2).getUserName())
       .isInstanceOf(EntityNotFoundException.class)
       .hasMessageContaining("id:501 - Bean has been deleted");
 
diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java
index 3df05d0e8..610a63665 100644
--- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java
+++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java
@@ -1,6 +1,7 @@
 package org.tests.o2m.jointable;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
@@ -47,7 +48,7 @@ public class TestOneToManyJoinTableNoTableName extends BaseTestCase {
       assertThat(sql.get(1)).contains("insert into mkeygroup_monkey (mkeygroup_pid, monkey_mid) values (?, ?)");
     }
 
-    int intersectionRows = Ebean.createSqlQuery("select count(*) as total from mkeygroup_monkey where mkeygroup_pid = ?")
+    int intersectionRows = DB.sqlQuery("select count(*) as total from mkeygroup_monkey where mkeygroup_pid = ?")
       .setParameter(1, troop.getPid())
       .findOne()
       .getInteger("total");
diff --git a/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
index 305cf5a33..285ea5485 100644
--- a/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
+++ b/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java
@@ -1,6 +1,7 @@
 package org.tests.query.sqlquery;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.RowMapper;
 import io.ebean.SqlQuery;
@@ -31,7 +32,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     String sql = "select (unit_price * order_qty) from o_order_detail where unit_price > ? order by (unit_price * order_qty) desc";
 
-    List<BigDecimal> lineAmounts = Ebean.createSqlQuery(sql)
+    List<BigDecimal> lineAmounts = DB.sqlQuery(sql)
       .setParameter(1, 3)
       .findSingleAttributeList(BigDecimal.class);
 
@@ -45,7 +46,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     String sql = "select max(unit_price) from o_order_detail where order_qty > ?";
 
-    BigDecimal maxPrice = Ebean.createSqlQuery(sql)
+    BigDecimal maxPrice = DB.sqlQuery(sql)
       .setParameter(1, 2)
       .findSingleDecimal();
 
@@ -59,7 +60,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     String sql = "select max(unit_price) from o_order_detail where order_qty > ?";
 
-    BigDecimal maxPrice = Ebean.createSqlQuery(sql)
+    BigDecimal maxPrice = DB.sqlQuery(sql)
       .setParameter(1, 2)
       .findSingleAttribute(BigDecimal.class);
 
@@ -73,7 +74,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     String sql = "select count(order_qty) from o_order_detail where unit_price > ?";
 
-    long count = Ebean.createSqlQuery(sql)
+    long count = DB.sqlQuery(sql)
       .setParameter(1, 2)
       .findSingleLong();
 
@@ -88,7 +89,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     String sql = "select count(order_qty) from o_order_detail where unit_price > ?";
 
-    long count = Ebean.createSqlQuery(sql)
+    long count = DB.sqlQuery(sql)
       .setParameter(1, 2)
       .findSingleAttribute(Long.class);
 
@@ -102,7 +103,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     String sql = "select min(updtime) from o_order_detail where unit_price > ? and updtime is not null";
 
-    OffsetDateTime minCreated = Ebean.createSqlQuery(sql)
+    OffsetDateTime minCreated = DB.sqlQuery(sql)
       .setParameter(1, 2)
       .findSingleAttribute(OffsetDateTime.class);
 
@@ -144,7 +145,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     String sql = "select id, name, status from o_customer where name = ?";
 
-    CustDto rob = Ebean.createSqlQuery(sql)
+    CustDto rob = DB.sqlQuery(sql)
       .setParameter(1, "Rob")
       .findOne(CUST_MAPPER);
 
@@ -158,7 +159,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     String sql = "select id, name, status from o_customer order by name desc";
 
-    List<CustDto> dtos = Ebean.createSqlQuery(sql)
+    List<CustDto> dtos = DB.sqlQuery(sql)
       .findList(CUST_MAPPER);
 
     assertThat(dtos).isNotEmpty();
@@ -173,7 +174,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     AtomicLong count = new AtomicLong();
 
-    Ebean.createSqlQuery(sql)
+    DB.sqlQuery(sql)
       .findEachRow((resultSet, rowNum) -> {
         count.incrementAndGet();
 
@@ -193,7 +194,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     String sql = "select max(id) from o_customer where name != ?";
 
-    long maxId = Ebean.createSqlQuery(sql)
+    long maxId = DB.sqlQuery(sql)
       .setParameter(1, "Rob")
       .findOne((resultSet, rowNum) -> resultSet.getLong(1));
 
@@ -206,7 +207,7 @@ public class SqlQueryTests extends BaseTestCase {
     ResetBasicData.reset();
 
     String sql = "select * -- \n from o_customer";
-    SqlQuery sqlQuery = Ebean.createSqlQuery(sql);
+    SqlQuery sqlQuery = DB.sqlQuery(sql);
 
     List<SqlRow> list = sqlQuery.findList();
     assertThat(list).isNotEmpty();
@@ -218,7 +219,7 @@ public class SqlQueryTests extends BaseTestCase {
     ResetBasicData.reset();
 
     String sql = "select 'hello\nthere' as hello from o_customer";
-    SqlQuery sqlQuery = Ebean.createSqlQuery(sql);
+    SqlQuery sqlQuery = DB.sqlQuery(sql);
 
     List<SqlRow> list = sqlQuery.findList();
     assertThat(list).isNotEmpty();
@@ -231,7 +232,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    SqlQuery sqlQuery = Ebean.createSqlQuery("Select * from o_order");
+    SqlQuery sqlQuery = DB.sqlQuery("Select * from o_order");
     sqlQuery.setFirstRow(3);
     sqlQuery.setMaxRows(10);
 
@@ -260,7 +261,7 @@ public class SqlQueryTests extends BaseTestCase {
 
       ResetBasicData.reset();
 
-      SqlQuery sqlQuery = Ebean.createSqlQuery("Select * from o_order order by id");
+      SqlQuery sqlQuery = DB.sqlQuery("Select * from o_order order by id");
       sqlQuery.setFirstRow(3);
 
       LoggedSqlCollector.start();
@@ -276,7 +277,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    SqlQuery sqlQuery = Ebean.createSqlQuery("Select * from o_order order by id");
+    SqlQuery sqlQuery = DB.sqlQuery("Select * from o_order order by id");
     sqlQuery.setMaxRows(10);
 
     LoggedSqlCollector.start();
@@ -299,7 +300,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     resetAllMetrics();
 
-    SqlQuery sqlQuery = Ebean.createSqlQuery("select * from o_order where o_order.id > :id order by id")
+    SqlQuery sqlQuery = DB.sqlQuery("select * from o_order where o_order.id > :id order by id")
       .setParameter("id", 3)
       .setMaxRows(10)
       .setLabel("findList-3-10");
@@ -327,7 +328,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     resetAllMetrics();
 
-    SqlQuery sqlQuery = Ebean.createSqlQuery("Select * from o_order")
+    SqlQuery sqlQuery = DB.sqlQuery("Select * from o_order")
       .setMaxRows(10)
       .setLabel("findEach-Max10Rows");
 
@@ -357,7 +358,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     final AtomicInteger count = new AtomicInteger();
 
-    SqlQuery sqlQuery = Ebean.createSqlQuery("select * from o_order");
+    SqlQuery sqlQuery = DB.sqlQuery("select * from o_order");
     sqlQuery.findEach(bean -> count.incrementAndGet());
 
     assertEquals(expectedRows, count.get());
@@ -370,7 +371,7 @@ public class SqlQueryTests extends BaseTestCase {
 
     final AtomicInteger count = new AtomicInteger();
 
-    SqlQuery sqlQuery = Ebean.createSqlQuery("select * from o_order order by id");
+    SqlQuery sqlQuery = DB.sqlQuery("select * from o_order order by id");
     sqlQuery.findEachWhile(bean -> {
       count.incrementAndGet();
       Integer id = bean.getInteger("id");
diff --git a/src/test/java/org/tests/refresh/TestRefreshWithMany.java b/src/test/java/org/tests/refresh/TestRefreshWithMany.java
index 91093663a..65ca483f8 100644
--- a/src/test/java/org/tests/refresh/TestRefreshWithMany.java
+++ b/src/test/java/org/tests/refresh/TestRefreshWithMany.java
@@ -1,5 +1,6 @@
 package org.tests.refresh;
 
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.SqlRow;
 import io.ebean.TransactionalTestCase;
@@ -61,7 +62,7 @@ public class TestRefreshWithMany extends TransactionalTestCase {
       .setParameter("first", "-alt")
       .execute();
 
-    List<SqlRow> sqlRows = Ebean.createSqlQuery("select id, first_name, last_name from contact").findList();
+    List<SqlRow> sqlRows = DB.sqlQuery("select id, first_name, last_name from contact").findList();
     for (SqlRow sqlRow : sqlRows) {
       sqlRow.get("id");
       sqlRow.get("first_name");
diff --git a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
index e9557baeb..7208b3805 100644
--- a/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
+++ b/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java
@@ -1,6 +1,7 @@
 package org.tests.softdelete;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.Ebean;
 import io.ebean.Query;
 import io.ebean.SqlQuery;
@@ -92,7 +93,7 @@ public class TestSoftDeleteBasic extends BaseTestCase {
 
     Ebean.delete(bean);
 
-    SqlQuery sqlQuery = Ebean.createSqlQuery("select * from ebasic_soft_delete where id=?");
+    SqlQuery sqlQuery = DB.sqlQuery("select * from ebasic_soft_delete where id=?");
     sqlQuery.setParameter(1, bean.getId());
     SqlRow sqlRow = sqlQuery.findOne();
     assertThat(sqlRow).isNotNull();
diff --git a/src/test/java/org/tests/update/TestSqlUpdateExceptions.java b/src/test/java/org/tests/update/TestSqlUpdateExceptions.java
index 466b1154a..d0f9ecff2 100644
--- a/src/test/java/org/tests/update/TestSqlUpdateExceptions.java
+++ b/src/test/java/org/tests/update/TestSqlUpdateExceptions.java
@@ -1,6 +1,7 @@
 package org.tests.update;
 
 import io.ebean.BaseTestCase;
+import io.ebean.DB;
 import io.ebean.DuplicateKeyException;
 import io.ebean.Ebean;
 import io.ebean.SqlUpdate;
@@ -24,7 +25,7 @@ public class TestSqlUpdateExceptions extends BaseTestCase {
       .setParams(id, "hi", 1)
       .executeNow();
 
-    UUID foundId = Ebean.createSqlQuery("select id from uuone where id = ?")
+    UUID foundId = DB.sqlQuery("select id from uuone where id = ?")
       .setParams(id)
       .findSingleAttribute(UUID.class);