diff --git a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java
index 170a3a406..019955114 100644
--- a/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java
+++ b/ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java
@@ -111,7 +111,7 @@ public class ProfileManager implements ProfilingListener {
   public AutoTuneCollection profilingCollection(boolean reset) {
     AutoTuneCollection req = new AutoTuneCollection();
     for (ProfileOrigin origin : profileMap.values()) {
-      BeanDescriptor<?> desc = server.getBeanDescriptorById(origin.getOrigin().getBeanType());
+      BeanDescriptor<?> desc = server.descriptorById(origin.getOrigin().getBeanType());
       if (desc != null) {
         origin.profilingCollection(desc, req, reset);
       }
diff --git a/ebean-autotune/src/test/java/org/tests/autofetch/BaseTestCase.java b/ebean-autotune/src/test/java/org/tests/autofetch/BaseTestCase.java
index e59dbbb4b..102affc90 100644
--- a/ebean-autotune/src/test/java/org/tests/autofetch/BaseTestCase.java
+++ b/ebean-autotune/src/test/java/org/tests/autofetch/BaseTestCase.java
@@ -11,6 +11,6 @@ public class BaseTestCase {
   }
 
   protected <T> BeanDescriptor<T> getBeanDescriptor(Class<T> cls) {
-    return spiEbeanServer().getBeanDescriptor(cls);
+    return spiEbeanServer().descriptor(cls);
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
index b964d2296..449a528f4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java
@@ -63,7 +63,7 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer,
   /**
    * Return the PersistenceContextScope to use defined at query or server level.
    */
-  PersistenceContextScope getPersistenceContextScope(SpiQuery<?> query);
+  PersistenceContextScope persistenceContextScope(SpiQuery<?> query);
 
   /**
    * Clear the query execution statistics.
@@ -73,32 +73,32 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer,
   /**
    * Return the transaction manager.
    */
-  SpiTransactionManager getTransactionManager();
+  SpiTransactionManager transactionManager();
 
   /**
    * Return all the descriptors.
    */
-  List<BeanDescriptor<?>> getBeanDescriptors();
+  List<BeanDescriptor<?>> descriptors();
 
   /**
    * Return the BeanDescriptor for a given type of bean.
    */
-  <T> BeanDescriptor<T> getBeanDescriptor(Class<T> type);
+  <T> BeanDescriptor<T> descriptor(Class<T> type);
 
   /**
    * Return BeanDescriptor using it's unique id.
    */
-  BeanDescriptor<?> getBeanDescriptorById(String className);
+  BeanDescriptor<?> descriptorById(String className);
 
   /**
    * Return BeanDescriptor using it's unique doc store queueId.
    */
-  BeanDescriptor<?> getBeanDescriptorByQueueId(String queueId);
+  BeanDescriptor<?> descriptorByQueueId(String queueId);
 
   /**
    * Return BeanDescriptors mapped to this table.
    */
-  List<BeanDescriptor<?>> getBeanDescriptors(String tableName);
+  List<BeanDescriptor<?>> descriptors(String tableName);
 
   /**
    * Process committed changes from another framework.
@@ -170,7 +170,7 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer,
   /**
    * Return the default batch size for lazy loading.
    */
-  int getLazyLoadBatchSize();
+  int lazyLoadBatchSize();
 
   /**
    * Return true if the type is known as an Entity or Xml type or a List Set or
@@ -181,18 +181,18 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer,
   /**
    * Return the ReadAuditLogger to use for logging all read audit events.
    */
-  ReadAuditLogger getReadAuditLogger();
+  ReadAuditLogger readAuditLogger();
 
   /**
    * Return the ReadAuditPrepare used to populate the read audit events with
    * user context information (user id, user ip address etc).
    */
-  ReadAuditPrepare getReadAuditPrepare();
+  ReadAuditPrepare readAuditPrepare();
 
   /**
    * Return the DataTimeZone to use when reading/writing timestamps via JDBC.
    */
-  DataTimeZone getDataTimeZone();
+  DataTimeZone dataTimeZone();
 
   /**
    * Check for slow query event.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java
index bce3efb0c..0bec5a5a5 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/BeanRequest.java
@@ -122,6 +122,6 @@ public abstract class BeanRequest {
    * Return the DataTimeZone to use.
    */
   public DataTimeZone dataTimeZone() {
-    return server.getDataTimeZone();
+    return server.dataTimeZone();
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
index 834b6ed7c..826f3a15f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
@@ -54,7 +54,7 @@ final class DefaultBeanLoader {
   private void loadManyInternal(EntityBean parentBean, String propertyName, Transaction t, boolean refresh, boolean onlyIds) {
     EntityBeanIntercept ebi = parentBean._ebean_getIntercept();
     PersistenceContext pc = ebi.getPersistenceContext();
-    BeanDescriptor<?> parentDesc = server.getBeanDescriptor(parentBean.getClass());
+    BeanDescriptor<?> parentDesc = server.descriptor(parentBean.getClass());
     BeanPropertyAssocMany<?> many = (BeanPropertyAssocMany<?>) parentDesc.beanProperty(propertyName);
     BeanCollection<?> beanCollection = null;
     ExpressionList<?> filterMany = null;
@@ -176,7 +176,7 @@ final class DefaultBeanLoader {
       pc = null;
     }
 
-    BeanDescriptor<?> desc = server.getBeanDescriptor(bean.getClass());
+    BeanDescriptor<?> desc = server.descriptor(bean.getClass());
     if (EntityType.EMBEDDED == desc.entityType()) {
       // lazy loading on an embedded bean property
       EntityBean embeddedOwner = (EntityBean) ebi.getEmbeddedOwner();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 44d5b5814..b5ae8d560 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -295,7 +295,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public int getLazyLoadBatchSize() {
+  public int lazyLoadBatchSize() {
     return lazyLoadBatchSize;
   }
 
@@ -320,7 +320,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public DataTimeZone getDataTimeZone() {
+  public DataTimeZone dataTimeZone() {
     return dataTimeZone;
   }
 
@@ -365,12 +365,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   }
 
   @Override
-  public ReadAuditPrepare getReadAuditPrepare() {
+  public ReadAuditPrepare readAuditPrepare() {
     return readAuditPrepare;
   }
 
   @Override
-  public ReadAuditLogger getReadAuditLogger() {
+  public ReadAuditLogger readAuditLogger() {
     return readAuditLogger;
   }
 
@@ -595,7 +595,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     if (a == null) {
       return null;
     }
-    BeanDescriptor<?> desc = getBeanDescriptor(a.getClass());
+    BeanDescriptor<?> desc = descriptor(a.getClass());
     return DiffHelp.diff(a, b, desc);
   }
 
@@ -628,7 +628,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   public void truncate(Class<?>... types) {
     List<String> tableNames = new ArrayList<>();
     for (Class<?> type : types) {
-      tableNames.add(getBeanDescriptor(type).baseTable());
+      tableNames.add(descriptor(type).baseTable());
     }
     truncate(tableNames.toArray(new String[0]));
   }
@@ -659,7 +659,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   @Override
   public void clearQueryStatistics() {
-    for (BeanDescriptor<?> desc : getBeanDescriptors()) {
+    for (BeanDescriptor<?> desc : descriptors()) {
       desc.clearQueryStatistics();
     }
   }
@@ -674,7 +674,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   @Override
   public <T> T createEntityBean(Class<T> type) {
-    return getBeanDescriptor(type).createBean();
+    return descriptor(type).createBean();
   }
 
   /**
@@ -691,7 +691,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     if (id == null) {
       throw new NullPointerException("The id is null");
     }
-    BeanDescriptor desc = getBeanDescriptor(type);
+    BeanDescriptor desc = descriptor(type);
     id = desc.convertId(id);
     PersistenceContext pc = null;
     SpiTransaction t = transactionManager.getActive();
@@ -852,7 +852,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public Object nextId(Class<?> beanType) {
-    BeanDescriptor<?> desc = getBeanDescriptor(beanType);
+    BeanDescriptor<?> desc = descriptor(beanType);
     return desc.nextId(null);
   }
 
@@ -871,7 +871,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
     // use first bean in the list as the correct type
     Class<T> beanType = (Class<T>) list.get(0).getClass();
-    BeanDescriptor<T> beanDescriptor = getBeanDescriptor(beanType);
+    BeanDescriptor<T> beanDescriptor = descriptor(beanType);
     if (beanDescriptor == null) {
       throw new PersistenceException("BeanDescriptor not found, is [" + beanType + "] an entity bean?");
     }
@@ -880,7 +880,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public <T> Set<String> validateQuery(Query<T> query) {
-    BeanDescriptor<T> beanDescriptor = getBeanDescriptor(query.getBeanType());
+    BeanDescriptor<T> beanDescriptor = descriptor(query.getBeanType());
     if (beanDescriptor == null) {
       throw new PersistenceException("BeanDescriptor not found, is [" + query.getBeanType() + "] an entity bean?");
     }
@@ -889,7 +889,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public <T> Filter<T> filter(Class<T> beanType) {
-    BeanDescriptor<T> desc = getBeanDescriptor(beanType);
+    BeanDescriptor<T> desc = descriptor(beanType);
     if (desc == null) {
       String m = beanType.getName() + " is NOT an Entity Bean registered with this server?";
       throw new PersistenceException(m);
@@ -899,7 +899,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public <T> CsvReader<T> createCsvReader(Class<T> beanType) {
-    BeanDescriptor<T> descriptor = getBeanDescriptor(beanType);
+    BeanDescriptor<T> descriptor = descriptor(beanType);
     if (descriptor == null) {
       throw new NullPointerException("BeanDescriptor for " + beanType.getName() + " not found");
     }
@@ -923,7 +923,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public void merge(Object bean, MergeOptions options, Transaction transaction) {
-    BeanDescriptor<?> desc = getBeanDescriptor(bean.getClass());
+    BeanDescriptor<?> desc = descriptor(bean.getClass());
     if (desc == null) {
       throw new PersistenceException(bean.getClass().getName() + " is NOT an Entity Bean registered with this server?");
     }
@@ -937,7 +937,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public <T> Query<T> findNative(Class<T> beanType, String nativeSql) {
-    BeanDescriptor<T> desc = getBeanDescriptor(beanType);
+    BeanDescriptor<T> desc = descriptor(beanType);
     if (desc == null) {
       throw new PersistenceException(beanType.getName() + " is NOT an Entity Bean registered with this server?");
     }
@@ -948,7 +948,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public <T> Query<T> createNamedQuery(Class<T> beanType, String namedQuery) {
-    BeanDescriptor<T> desc = getBeanDescriptor(beanType);
+    BeanDescriptor<T> desc = descriptor(beanType);
     if (desc == null) {
       throw new PersistenceException(beanType.getName() + " is NOT an Entity Bean registered with this server?");
     }
@@ -974,7 +974,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public <T> DefaultOrmQuery<T> createQuery(Class<T> beanType) {
-    BeanDescriptor<T> desc = getBeanDescriptor(beanType);
+    BeanDescriptor<T> desc = descriptor(beanType);
     if (desc == null) {
       throw new PersistenceException(beanType.getName() + " is NOT an Entity Bean registered with this server?");
     }
@@ -983,7 +983,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public <T> Update<T> createUpdate(Class<T> beanType, String ormUpdate) {
-    BeanDescriptor<?> desc = getBeanDescriptor(beanType);
+    BeanDescriptor<?> desc = descriptor(beanType);
     if (desc == null) {
       String m = beanType.getName() + " is NOT an Entity Bean registered with this server?";
       throw new PersistenceException(m);
@@ -1134,14 +1134,14 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Return true if transactions PersistenceContext should be used.
    */
   private <T> boolean useTransactionPersistenceContext(SpiQuery<T> query) {
-    return PersistenceContextScope.TRANSACTION == getPersistenceContextScope(query);
+    return PersistenceContextScope.TRANSACTION == persistenceContextScope(query);
   }
 
   /**
    * Return the PersistenceContextScope to use defined at query or server level.
    */
   @Override
-  public PersistenceContextScope getPersistenceContextScope(SpiQuery<?> query) {
+  public PersistenceContextScope persistenceContextScope(SpiQuery<?> query) {
     PersistenceContextScope scope = query.getPersistenceContextScope();
     return (scope != null) ? scope : defaultPersistenceContextScope;
   }
@@ -2048,7 +2048,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Return all the BeanDescriptors.
    */
   @Override
-  public List<BeanDescriptor<?>> getBeanDescriptors() {
+  public List<BeanDescriptor<?>> descriptors() {
     return beanDescriptorManager.getBeanDescriptorList();
   }
 
@@ -2056,7 +2056,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Return the transaction manager.
    */
   @Override
-  public SpiTransactionManager getTransactionManager() {
+  public SpiTransactionManager transactionManager() {
     return transactionManager;
   }
 
@@ -2075,13 +2075,13 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public boolean isSupportedType(java.lang.reflect.Type genericType) {
     TypeInfo typeInfo = ParamTypeHelper.getTypeInfo(genericType);
-    return typeInfo != null && getBeanDescriptor(typeInfo.getBeanType()) != null;
+    return typeInfo != null && descriptor(typeInfo.getBeanType()) != null;
   }
 
   @Override
   public Object beanId(Object bean, Object id) {
     EntityBean eb = checkEntityBean(bean);
-    BeanDescriptor<?> desc = getBeanDescriptor(bean.getClass());
+    BeanDescriptor<?> desc = descriptor(bean.getClass());
     if (desc == null) {
       throw new PersistenceException(bean.getClass().getName() + " is NOT an Entity Bean registered with this server?");
     }
@@ -2091,7 +2091,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public Object beanId(Object bean) {
     EntityBean eb = checkEntityBean(bean);
-    BeanDescriptor<?> desc = getBeanDescriptor(bean.getClass());
+    BeanDescriptor<?> desc = descriptor(bean.getClass());
     if (desc == null) {
       throw new PersistenceException(bean.getClass().getName() + " is NOT an Entity Bean registered with this server?");
     }
@@ -2102,7 +2102,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Return the BeanDescriptor for a given type of bean.
    */
   @Override
-  public <T> BeanDescriptor<T> getBeanDescriptor(Class<T> beanClass) {
+  public <T> BeanDescriptor<T> descriptor(Class<T> beanClass) {
     return beanDescriptorManager.getBeanDescriptor(beanClass);
   }
 
@@ -2110,7 +2110,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Return the BeanDescriptor's for a given table name.
    */
   @Override
-  public List<BeanDescriptor<?>> getBeanDescriptors(String tableName) {
+  public List<BeanDescriptor<?>> descriptors(String tableName) {
     return beanDescriptorManager.getBeanDescriptors(tableName);
   }
 
@@ -2119,7 +2119,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   @Override
   public List<? extends BeanType<?>> beanTypes() {
-    return getBeanDescriptors();
+    return descriptors();
   }
 
   /**
@@ -2132,11 +2132,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
 
   @Override
   public BeanType<?> beanTypeForQueueId(String queueId) {
-    return getBeanDescriptorByQueueId(queueId);
+    return descriptorByQueueId(queueId);
   }
 
   @Override
-  public BeanDescriptor<?> getBeanDescriptorByQueueId(String queueId) {
+  public BeanDescriptor<?> descriptorByQueueId(String queueId) {
     return beanDescriptorManager.getBeanDescriptorByQueueId(queueId);
   }
 
@@ -2145,14 +2145,14 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    */
   @Override
   public <T> BeanType<T> beanType(Class<T> beanType) {
-    return getBeanDescriptor(beanType);
+    return descriptor(beanType);
   }
 
   /**
    * Return the BeanDescriptor using its class name.
    */
   @Override
-  public BeanDescriptor<?> getBeanDescriptorById(String beanClassName) {
+  public BeanDescriptor<?> descriptorById(String beanClassName) {
     return beanDescriptorManager.getBeanDescriptorByClassName(beanClassName);
   }
 
@@ -2278,7 +2278,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   @Override
   public Set<Property> checkUniqueness(Object bean, Transaction transaction) {
     EntityBean entityBean = checkEntityBean(bean);
-    BeanDescriptor<?> beanDesc = getBeanDescriptor(entityBean.getClass());
+    BeanDescriptor<?> beanDesc = descriptor(entityBean.getClass());
     BeanProperty idProperty = beanDesc.idProperty();
     // if the ID of the Property is null we are unable to check uniqueness
     if (idProperty == null) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
index e03ce40ce..58c5dae77 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java
@@ -66,7 +66,7 @@ public final class DtoQueryRequest<T> extends AbstractSqlQueryRequest {
   @Override
   protected void setResultSet(ResultSet resultSet, Object queryPlanKey) throws SQLException {
     this.resultSet = resultSet;
-    this.dataReader = new RsetDataReader(server.getDataTimeZone(), resultSet);
+    this.dataReader = new RsetDataReader(server.dataTimeZone(), resultSet);
     obtainPlan(queryPlanKey);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
index 11bdc6470..64f63a0fc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java
@@ -325,7 +325,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
     if (ctx != null) return ctx;
 
     // determine the scope (from the query and then server)
-    PersistenceContextScope scope = server.getPersistenceContextScope(query);
+    PersistenceContextScope scope = server.persistenceContextScope(query);
     if (scope == PersistenceContextScope.QUERY || t == null) {
       return new DefaultPersistenceContext();
     }
@@ -745,7 +745,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
    */
   public int lazyLoadBatchSize() {
     int batchSize = query.getLazyLoadBatchSize();
-    return (batchSize > 0) ? batchSize : server.getLazyLoadBatchSize();
+    return (batchSize > 0) ? batchSize : server.lazyLoadBatchSize();
   }
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index 5a809be00..0fbf5b800 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -759,14 +759,14 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType, SpiBeanType {
    * Return the ReadAuditLogger for logging read audit events.
    */
   public ReadAuditLogger readAuditLogger() {
-    return ebeanServer.getReadAuditLogger();
+    return ebeanServer.readAuditLogger();
   }
 
   /**
    * Return the ReadAuditPrepare for preparing read audit events prior to logging.
    */
   private ReadAuditPrepare readAuditPrepare() {
-    return ebeanServer.getReadAuditPrepare();
+    return ebeanServer.readAuditPrepare();
   }
 
   public boolean isChangeLog() {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
index f33ebe235..699fbe48f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
@@ -175,7 +175,7 @@ public final class DefaultPersister implements Persister {
   public <T> List<T> draftRestore(Query<T> query, Transaction transaction) {
 
     Class<T> beanType = query.getBeanType();
-    BeanDescriptor<T> desc = server.getBeanDescriptor(beanType);
+    BeanDescriptor<T> desc = server.descriptor(beanType);
 
     DraftHandler<T> draftHandler = new DraftHandler<>(desc, transaction);
 
@@ -220,7 +220,7 @@ public final class DefaultPersister implements Persister {
   public <T> List<T> publish(Query<T> query, Transaction transaction) {
 
     Class<T> beanType = query.getBeanType();
-    BeanDescriptor<T> desc = server.getBeanDescriptor(beanType);
+    BeanDescriptor<T> desc = server.descriptor(beanType);
 
     DraftHandler<T> draftHandler = new DraftHandler<>(desc, transaction);
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
index 10b243f1e..ccaf22f41 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java
@@ -86,7 +86,7 @@ public class CQueryPlan implements SpiQueryPlan {
    */
   CQueryPlan(OrmQueryRequest<?> request, SqlLimitResponse sqlRes, SqlTree sqlTree, boolean rawSql, String logWhereSql) {
     this.server = request.server();
-    this.dataTimeZone = server.getDataTimeZone();
+    this.dataTimeZone = server.dataTimeZone();
     this.beanType = request.descriptor().type();
     this.planKey = request.queryPlanKey();
     SpiQuery<?> query = request.query();
@@ -111,7 +111,7 @@ public class CQueryPlan implements SpiQueryPlan {
    */
   CQueryPlan(OrmQueryRequest<?> request, String sql, SqlTree sqlTree, String logWhereSql) {
     this.server = request.server();
-    this.dataTimeZone = server.getDataTimeZone();
+    this.dataTimeZone = server.dataTimeZone();
     this.beanType = request.descriptor().type();
     SpiQuery<?> query = request.query();
     this.profileLocation = query.getProfileLocation();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java
index 12866b61c..cbfb73559 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java
@@ -425,7 +425,7 @@ public final class DJsonContext implements SpiJsonContext {
    * Return the BeanDescriptor for the given bean type.
    */
   private <T> BeanDescriptor<T> getDescriptor(Class<T> beanType) {
-    BeanDescriptor<T> d = server.getBeanDescriptor(beanType);
+    BeanDescriptor<T> d = server.descriptor(beanType);
     if (d == null) {
       throw new RuntimeException("No BeanDescriptor found for " + beanType);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java
index e458a7ce1..17c9e9372 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java
@@ -600,7 +600,7 @@ public final class WriteJson implements SpiJsonWriter {
   }
 
   private <T> BeanDescriptor<T> getDescriptor(Class<T> cls) {
-    BeanDescriptor<T> d = server.getBeanDescriptor(cls);
+    BeanDescriptor<T> d = server.descriptor(cls);
     if (d == null) {
       throw new RuntimeException("No BeanDescriptor found for " + cls);
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
index 02b66191b..919f0838d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java
@@ -47,7 +47,7 @@ public final class BeanPersistIds implements BinaryWritable {
 
   public static BeanPersistIds readBinaryMessage(SpiEbeanServer server, BinaryReadContext input) throws IOException {
 
-    BeanDescriptor<?> desc = server.getBeanDescriptorById(input.readUTF());
+    BeanDescriptor<?> desc = server.descriptorById(input.readUTF());
     BeanPersistIds bp = new BeanPersistIds(desc);
     bp.read(input);
     return bp;
diff --git a/ebean-core/src/test/java/io/ebean/BaseTestCase.java b/ebean-core/src/test/java/io/ebean/BaseTestCase.java
index 3960bdc42..4f023c12e 100644
--- a/ebean-core/src/test/java/io/ebean/BaseTestCase.java
+++ b/ebean-core/src/test/java/io/ebean/BaseTestCase.java
@@ -38,7 +38,7 @@ public abstract class BaseTestCase {
 
   @AfterEach
   public void checkForLeak(TestInfo testInfo) {
-    TransactionScopeManager scope = spiEbeanServer().getTransactionManager().scope();
+    TransactionScopeManager scope = spiEbeanServer().transactionManager().scope();
     SpiTransaction trans = scope.getInScope();
     if (trans != null) {
       String msg = getClass().getSimpleName() + "." + testInfo.getDisplayName() + " did not clear threadScope:" + trans;
@@ -99,7 +99,7 @@ public abstract class BaseTestCase {
   }
 
   protected SpiTransaction getInScopeTransaction() {
-    return spiEbeanServer().getTransactionManager().scope().getInScope();
+    return spiEbeanServer().transactionManager().scope().getInScope();
   }
 
   /**
@@ -235,7 +235,7 @@ public abstract class BaseTestCase {
   }
 
   protected <T> BeanDescriptor<T> getBeanDescriptor(Class<T> cls) {
-    return spiEbeanServer().getBeanDescriptor(cls);
+    return spiEbeanServer().descriptor(cls);
   }
 
   protected <T> ServerCacheStatistics getBeanCacheStats(Class<T> cls, boolean reset) {
diff --git a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
index ae80084f4..17bd8f19b 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java
@@ -104,7 +104,7 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer {
   }
 
   @Override
-  public DataTimeZone getDataTimeZone() {
+  public DataTimeZone dataTimeZone() {
     return null;
   }
 
@@ -139,7 +139,7 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer {
   }
 
   @Override
-  public PersistenceContextScope getPersistenceContextScope(SpiQuery<?> query) {
+  public PersistenceContextScope persistenceContextScope(SpiQuery<?> query) {
     return null;
   }
 
@@ -149,12 +149,12 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer {
   }
 
   @Override
-  public ReadAuditLogger getReadAuditLogger() {
+  public ReadAuditLogger readAuditLogger() {
     return null;
   }
 
   @Override
-  public ReadAuditPrepare getReadAuditPrepare() {
+  public ReadAuditPrepare readAuditPrepare() {
     return null;
   }
 
@@ -164,32 +164,32 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer {
   }
 
   @Override
-  public BeanDescriptor<?> getBeanDescriptorByQueueId(String queueId) {
+  public BeanDescriptor<?> descriptorByQueueId(String queueId) {
     return null;
   }
 
   @Override
-  public SpiTransactionManager getTransactionManager() {
+  public SpiTransactionManager transactionManager() {
     return null;
   }
 
   @Override
-  public List<BeanDescriptor<?>> getBeanDescriptors() {
+  public List<BeanDescriptor<?>> descriptors() {
     return null;
   }
 
   @Override
-  public <T> BeanDescriptor<T> getBeanDescriptor(Class<T> type) {
+  public <T> BeanDescriptor<T> descriptor(Class<T> type) {
     return null;
   }
 
   @Override
-  public BeanDescriptor<?> getBeanDescriptorById(String descriptorId) {
+  public BeanDescriptor<?> descriptorById(String descriptorId) {
     return null;
   }
 
   @Override
-  public List<BeanDescriptor<?>> getBeanDescriptors(String tableName) {
+  public List<BeanDescriptor<?>> descriptors(String tableName) {
     return null;
   }
 
@@ -277,7 +277,7 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer {
   }
 
   @Override
-  public int getLazyLoadBatchSize() {
+  public int lazyLoadBatchSize() {
     return 0;
   }
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java
index 3f6a1c21e..30a3e5afc 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java
@@ -26,7 +26,7 @@ public class CacheBeanDataTest extends BaseTestCase {
   public void extract_load_on_customer() {
 
     SpiEbeanServer server = spiEbeanServer();
-    BeanDescriptor<Customer> desc = server.getBeanDescriptor(Customer.class);
+    BeanDescriptor<Customer> desc = server.descriptor(Customer.class);
 
     Customer c = new Customer();
     c.setId(98989);
@@ -78,7 +78,7 @@ public class CacheBeanDataTest extends BaseTestCase {
   public void extract_load_withEmbeddedBean() {
 
     SpiEbeanServer server = spiEbeanServer();
-    BeanDescriptor<EPerson> desc = server.getBeanDescriptor(EPerson.class);
+    BeanDescriptor<EPerson> desc = server.descriptor(EPerson.class);
     BeanPropertyAssocOne<?> addressBeanProperty = (BeanPropertyAssocOne<?>) desc.beanProperty("address");
 
     EAddress address = new EAddress();
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java
index 8e59de674..cd6114904 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java
@@ -24,7 +24,7 @@ public class CachedBeanDataFromBeanTest extends BaseTestCase {
   @Test
   public void extract() {
 
-    BeanDescriptor<Customer> desc = server.getBeanDescriptor(Customer.class);
+    BeanDescriptor<Customer> desc = server.descriptor(Customer.class);
 
     Date largeDate = new Date(9223372036825200000L);
 
@@ -56,7 +56,7 @@ public class CachedBeanDataFromBeanTest extends BaseTestCase {
     car.setDriver("Jimmy");
     car.setNotes("some notes");
 
-    BeanDescriptor<Car> carDesc = server.getBeanDescriptor(Car.class);
+    BeanDescriptor<Car> carDesc = server.descriptor(Car.class);
     CachedBeanData cacheData = CachedBeanDataFromBean.extract(carDesc, (EntityBean) car);
 
     Car newCar = new Car();
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java
index 8ca823b84..c77b855e0 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java
@@ -100,7 +100,7 @@ public class BinaryTransactionEventReadWriteTest extends BaseTestCase {
 
   class TDEbeanServer extends TDSpiEbeanServer {
     @Override
-    public BeanDescriptor<?> getBeanDescriptorById(String descriptorId) {
+    public BeanDescriptor<?> descriptorById(String descriptorId) {
       return customerBeanDescriptor;
     }
   }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java
index a380d2bb7..56be7e09c 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java
@@ -29,7 +29,7 @@ public class TestDiffHelpSimple extends BaseTestCase {
   public TestDiffHelpSimple() {
     server = DB.getDefault();
     SpiEbeanServer spiServer = (SpiEbeanServer) server;
-    orderDesc = spiServer.getBeanDescriptor(Order.class);
+    orderDesc = spiServer.descriptor(Order.class);
   }
 
   private Order createBaseOrder(Database server) {
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java
index 308e0239c..6b3371bfb 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java
@@ -23,7 +23,7 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase {
   public TestDiffHelpWithEmbedded() {
     server = DB.getDefault();
     SpiEbeanServer spiServer = (SpiEbeanServer) server;
-    emainDesc = spiServer.getBeanDescriptor(EMain.class);
+    emainDesc = spiServer.descriptor(EMain.class);
   }
 
   @Test
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java
index 025b05c51..382397c9b 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java
@@ -23,7 +23,7 @@ import static org.mockito.Mockito.when;
 
 public class BeanDescriptorTest extends BaseTestCase {
 
-  private BeanDescriptor<Customer> customerDesc = spiEbeanServer().getBeanDescriptor(Customer.class);
+  private BeanDescriptor<Customer> customerDesc = spiEbeanServer().descriptor(Customer.class);
 
   @Test
   public void createReference() {
@@ -74,7 +74,7 @@ public class BeanDescriptorTest extends BaseTestCase {
 
     DB.save(shelter);
 
-    BeanDescriptor<Animal> animalDesc = spiEbeanServer().getBeanDescriptor(Animal.class);
+    BeanDescriptor<Animal> animalDesc = spiEbeanServer().descriptor(Animal.class);
 
     Animal bean = animalDesc.createReference(Boolean.FALSE, false, dog.getId(), null);
     assertThat(bean.getId()).isEqualTo(dog.getId());
@@ -142,7 +142,7 @@ public class BeanDescriptorTest extends BaseTestCase {
   @Test
   public void isIdTypeExternal_when_externalId() {
 
-    BeanDescriptor<Country> countryDesc = spiEbeanServer().getBeanDescriptor(Country.class);
+    BeanDescriptor<Country> countryDesc = spiEbeanServer().descriptor(Country.class);
     assertThat(countryDesc.isIdGeneratedValue()).isFalse();
   }
 
@@ -155,21 +155,21 @@ public class BeanDescriptorTest extends BaseTestCase {
   @Test
   public void isIdTypeExternal_when_explicitGeneratedValue() {
 
-    BeanDescriptor<Contact> desc = spiEbeanServer().getBeanDescriptor(Contact.class);
+    BeanDescriptor<Contact> desc = spiEbeanServer().descriptor(Contact.class);
     assertThat(desc.isIdGeneratedValue()).isTrue();
   }
 
   @Test
   public void isIdTypeExternal_when_uuidGenerator_and_generatedValue() {
 
-    BeanDescriptor<BSite> desc = spiEbeanServer().getBeanDescriptor(BSite.class);
+    BeanDescriptor<BSite> desc = spiEbeanServer().descriptor(BSite.class);
     assertThat(desc.isIdGeneratedValue()).isTrue();
   }
 
   @Test
   public void isIdTypeExternal_when_uuidGenerator_and_noGeneratedValue() {
 
-    BeanDescriptor<BUser> desc = spiEbeanServer().getBeanDescriptor(BUser.class);
+    BeanDescriptor<BUser> desc = spiEbeanServer().descriptor(BUser.class);
     assertThat(desc.isIdGeneratedValue()).isFalse();
   }
 }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java
index 0ee380ee2..b3883db7e 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java
@@ -27,7 +27,7 @@ public class BeanDescriptor_registerTest {
 
     SpiEbeanServer ebeanServer = (SpiEbeanServer)DatabaseFactory.create(config);
     try {
-      BeanDescriptor<EBasic> desc = ebeanServer.getBeanDescriptor(EBasic.class);
+      BeanDescriptor<EBasic> desc = ebeanServer.descriptor(EBasic.class);
       persistListenerRegistrationTests(desc);
       persistControllerRegistrationTests(desc);
     } finally {
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java
index 5a09b7286..4cbffc35c 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java
@@ -19,7 +19,7 @@ public class BeanDescriptor_whenCreatedPropertyTest extends BaseTestCase {
 
     SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
 
-    BeanDescriptor<Customer> desc = server.getBeanDescriptor(Customer.class);
+    BeanDescriptor<Customer> desc = server.descriptor(Customer.class);
 
     BeanProperty whenCreatedProperty = desc.whenCreatedProperty();
     assertEquals("cretime", whenCreatedProperty.dbColumn());
@@ -28,7 +28,7 @@ public class BeanDescriptor_whenCreatedPropertyTest extends BaseTestCase {
     assertEquals("updtime", whenModifiedProperty.dbColumn());
 
 
-    BeanDescriptor<EBasic> eBasicDesc = server.getBeanDescriptor(EBasic.class);
+    BeanDescriptor<EBasic> eBasicDesc = server.descriptor(EBasic.class);
     assertNull(eBasicDesc.whenCreatedProperty());
     assertNull(eBasicDesc.whenModifiedProperty());
   }
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java
index 0a3ab0a0d..048871533 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java
@@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class BeanPropertyAssocManyTest extends BaseTestCase {
 
-  private BeanDescriptor<Customer> customerDesc = spiEbeanServer().getBeanDescriptor(Customer.class);
+  private BeanDescriptor<Customer> customerDesc = spiEbeanServer().descriptor(Customer.class);
 
   @SuppressWarnings("unchecked")
   private BeanPropertyAssocMany<Customer> contacts() {
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java
index 9bb323448..db7c3ea55 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java
@@ -31,7 +31,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase {
   @Test
   public void testHasId() {
 
-    BeanDescriptor<Order> beanDescriptor = spiServer.getBeanDescriptor(Order.class);
+    BeanDescriptor<Order> beanDescriptor = spiServer.descriptor(Order.class);
     assertNotNull(beanDescriptor.idProperty());
     assertEquals("id", beanDescriptor.idProperty().name());
 
@@ -54,7 +54,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase {
   @Test
   public void testIsReference() {
 
-    BeanDescriptor<Customer> beanDescriptor = spiServer.getBeanDescriptor(Customer.class);
+    BeanDescriptor<Customer> beanDescriptor = spiServer.descriptor(Customer.class);
 
     Customer order = new Customer();
     EntityBeanIntercept ebi = getIntercept(order);
@@ -69,7 +69,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase {
 
   @Test
   public void isReference_withGeneratedOnInsertOnlyProperty_expect_false() {
-    BeanDescriptor<UserInterestLive> descriptor = spiServer.getBeanDescriptor(UserInterestLive.class);
+    BeanDescriptor<UserInterestLive> descriptor = spiServer.descriptor(UserInterestLive.class);
     UserInterestLive bean = new UserInterestLive(new UserInterestLiveKey(1L, 2L));
     EntityBeanIntercept ebi = getIntercept(bean);
     assertFalse(descriptor.referenceIdPropertyOnly(ebi));
@@ -78,7 +78,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase {
   @Test
   public void test_getIdForJson() {
 
-    BeanDescriptor<Order> orderDesc = spiServer.getBeanDescriptor(Order.class);
+    BeanDescriptor<Order> orderDesc = spiServer.descriptor(Order.class);
 
     Order order = new Order();
     order.setId(42);
@@ -96,7 +96,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase {
     RCustomer rCustomer = new RCustomer();
     rCustomer.setKey(key);
 
-    BeanDescriptor<RCustomer> rcustDesc = spiServer.getBeanDescriptor(RCustomer.class);
+    BeanDescriptor<RCustomer> rcustDesc = spiServer.descriptor(RCustomer.class);
 
     @SuppressWarnings("unchecked")
     Map<String, Object> idForJson = (Map<String, Object>) rcustDesc.idForJson(rCustomer);
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java
index 2f1cb654a..406dbd2ef 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java
@@ -20,7 +20,7 @@ public class TestCollectionLoadedStatus extends BaseTestCase {
   public void test() {
 
     SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
-    BeanDescriptor<Customer> custDesc = server.getBeanDescriptor(Customer.class);
+    BeanDescriptor<Customer> custDesc = server.descriptor(Customer.class);
 
     Customer customer = new Customer();
     EntityBean eb = (EntityBean) customer;
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java
index e6675b99e..6ad4e5ba0 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java
@@ -30,7 +30,7 @@ public class TestDiffHelpInsertSimple extends BaseTestCase {
   public TestDiffHelpInsertSimple() {
     server = DB.getDefault();
     SpiEbeanServer spiServer = (SpiEbeanServer) server;
-    orderDesc = spiServer.getBeanDescriptor(Order.class);
+    orderDesc = spiServer.descriptor(Order.class);
   }
 
   private Order createBaseOrder(Database server) {
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java
index 30154c184..f835cc427 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java
@@ -22,7 +22,7 @@ public class TestDiffHelpInsertWithEmbedded extends BaseTestCase {
   public TestDiffHelpInsertWithEmbedded() {
     Database server = DB.getDefault();
     SpiEbeanServer spiServer = (SpiEbeanServer) server;
-    emainDesc = spiServer.getBeanDescriptor(EMain.class);
+    emainDesc = spiServer.descriptor(EMain.class);
   }
 
   @Test
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java
index a28ac7ca3..5ebd28abe 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java
@@ -30,7 +30,7 @@ public class WriteJsonDirtyTest {
       .findOne();
 
     SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
-    BeanDescriptor<Customer> descriptor = server.getBeanDescriptor(Customer.class);
+    BeanDescriptor<Customer> descriptor = server.descriptor(Customer.class);
 
     customer.setName("dirtyCustName");
     customer.setAnniversary(new Date(System.currentTimeMillis()));
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java
index 0410b6296..62f89784a 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java
@@ -28,7 +28,7 @@ public class TransactionManagerTest extends BaseTestCase {
 
     SpiEbeanServer server = spiEbeanServer();
 
-    SpiTransactionManager transactionManager = server.getTransactionManager();
+    SpiTransactionManager transactionManager = server.transactionManager();
 
     DataSource dataSource = transactionManager.getDataSource();
     Connection connection = dataSource.getConnection();
diff --git a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java
index e792aa0cc..89a4a5241 100644
--- a/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java
+++ b/ebean-core/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java
@@ -25,7 +25,7 @@ public class DocStoreBeanBaseAdapterTest extends BaseTestCase {
   public void test_basic_construction() throws Exception {
 
     SpiEbeanServer server = spiEbeanServer();
-    BeanDescriptor<Order> orderDesc = server.getBeanDescriptor(Order.class);
+    BeanDescriptor<Order> orderDesc = server.descriptor(Order.class);
 
     DeployBeanDescriptor<Order> deployDesc = (DeployBeanDescriptor<Order>) mock(DeployBeanDescriptor.class);
 
diff --git a/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java b/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java
index a1d2a8c38..23794b476 100644
--- a/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java
+++ b/ebean-core/src/test/java/org/tests/basic/TestAnnotationBase.java
@@ -210,28 +210,28 @@ public class TestAnnotationBase extends BaseTestCase {
 
   @Test
   public void testFindMaxSize() throws SecurityException {
-    BeanDescriptor<TestAnnotationBaseEntity> descriptor = spiEbeanServer().getBeanDescriptor(TestAnnotationBaseEntity.class);
+    BeanDescriptor<TestAnnotationBaseEntity> descriptor = spiEbeanServer().descriptor(TestAnnotationBaseEntity.class);
     BeanProperty bp = descriptor.findProperty("constraintAnnotation");
     assertEquals(40, bp.dbLength());
   }
 
   @Test
   public void testFindJakartaMaxSize() throws SecurityException {
-    BeanDescriptor<TestJakartaAnnotationBaseEntity> descriptor = spiEbeanServer().getBeanDescriptor(TestJakartaAnnotationBaseEntity.class);
+    BeanDescriptor<TestJakartaAnnotationBaseEntity> descriptor = spiEbeanServer().descriptor(TestJakartaAnnotationBaseEntity.class);
     BeanProperty bp = descriptor.findProperty("constraintAnnotation");
     assertEquals(40, bp.dbLength());
   }
 
   @Test
   public void annotationClassIndexes() throws SecurityException {
-    BeanDescriptor<TestAnnotationBaseEntity> descriptor = spiEbeanServer().getBeanDescriptor(TestAnnotationBaseEntity.class);
+    BeanDescriptor<TestAnnotationBaseEntity> descriptor = spiEbeanServer().descriptor(TestAnnotationBaseEntity.class);
     final IndexDefinition[] indexDefinitions = descriptor.indexDefinitions();
     assertEquals(3, indexDefinitions.length);
   }
 
   @Test
   public void testNotNullWithGroup() throws SecurityException {
-    BeanDescriptor<TestAnnotationBaseEntity> descriptor = spiEbeanServer().getBeanDescriptor(TestAnnotationBaseEntity.class);
+    BeanDescriptor<TestAnnotationBaseEntity> descriptor = spiEbeanServer().descriptor(TestAnnotationBaseEntity.class);
 
     BeanProperty bp = descriptor.findProperty("null1");
     assertFalse(bp.isNullable());
@@ -245,7 +245,7 @@ public class TestAnnotationBase extends BaseTestCase {
 
   @Test
   public void testJakartaNotNullWithGroup() throws SecurityException {
-    BeanDescriptor<TestJakartaAnnotationBaseEntity> descriptor = spiEbeanServer().getBeanDescriptor(TestJakartaAnnotationBaseEntity.class);
+    BeanDescriptor<TestJakartaAnnotationBaseEntity> descriptor = spiEbeanServer().descriptor(TestJakartaAnnotationBaseEntity.class);
 
     BeanProperty bp = descriptor.findProperty("null1");
     assertFalse(bp.isNullable());
diff --git a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java
index 9a18772cf..d2bbdd893 100644
--- a/ebean-core/src/test/java/org/tests/basic/TestJodaType.java
+++ b/ebean-core/src/test/java/org/tests/basic/TestJodaType.java
@@ -19,7 +19,7 @@ public class TestJodaType extends BaseTestCase {
   public void test() {
 
     SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
-    BeanDescriptor<TJodaEntity> beanDescriptor = server.getBeanDescriptor(TJodaEntity.class);
+    BeanDescriptor<TJodaEntity> beanDescriptor = server.descriptor(TJodaEntity.class);
     BeanProperty beanProperty = beanDescriptor.beanProperty("localTime");
     ScalarType<?> scalarType = beanProperty.scalarType();
 
diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java
index 204131aa9..08db38a0b 100644
--- a/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java
+++ b/ebean-core/src/test/java/org/tests/basic/TestQueryWithCache.java
@@ -23,7 +23,7 @@ public class TestQueryWithCache extends BaseTestCase {
     ResetBasicData.reset();
 
     SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
-    BeanDescriptor<Country> beanDescriptor = server.getBeanDescriptor(Country.class);
+    BeanDescriptor<Country> beanDescriptor = server.descriptor(Country.class);
     CacheOptions cacheOptions = beanDescriptor.cacheOptions();
 
     assertNotNull(cacheOptions);
diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java
index 095b192de..f2f2679f4 100644
--- a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java
+++ b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java
@@ -23,7 +23,7 @@ public class TestDeleteByIdList extends BaseTestCase {
 
     OrderDetail dummy = DB.reference(OrderDetail.class, 1);
     SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
-    server.getBeanDescriptor(OrderDetail.class).cacheBeanPut(dummy);
+    server.descriptor(OrderDetail.class).cacheBeanPut(dummy);
 
     Customer c0 = ResetBasicData.createCustAndOrder("DelIdList-0");
     assertNotNull(c0);
diff --git a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java
index ead179968..83003b889 100644
--- a/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java
+++ b/ebean-core/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java
@@ -23,7 +23,7 @@ public class TestDeleteCascadeById extends BaseTestCase {
 
     OrderDetail dummy = DB.reference(OrderDetail.class, 1);
     SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
-    server.getBeanDescriptor(OrderDetail.class).cacheBeanPut(dummy);
+    server.descriptor(OrderDetail.class).cacheBeanPut(dummy);
 
     Customer cust = ResetBasicData.createCustAndOrder("DelCas");
     assertNotNull(cust);
diff --git a/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java
index 390189e0a..c3472f57c 100644
--- a/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java
+++ b/ebean-core/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java
@@ -79,7 +79,7 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase {
     SpiEbeanServer spiServer = (SpiEbeanServer) DB.getDefault();
 
     BeanDescriptor<TestOnCascadeDeleteChildrenWithCompositeKeys.User> beanDescriptor =
-      spiServer.getBeanDescriptor(TestOnCascadeDeleteChildrenWithCompositeKeys.User.class);
+      spiServer.descriptor(TestOnCascadeDeleteChildrenWithCompositeKeys.User.class);
 
     BeanPropertyAssocMany<?> beanProperty = (BeanPropertyAssocMany<?>) beanDescriptor.beanProperty("userRoles");
 
diff --git a/ebean-core/src/test/java/org/tests/el/TestELBasic.java b/ebean-core/src/test/java/org/tests/el/TestELBasic.java
index e0b7431cc..c29d8b70b 100644
--- a/ebean-core/src/test/java/org/tests/el/TestELBasic.java
+++ b/ebean-core/src/test/java/org/tests/el/TestELBasic.java
@@ -21,7 +21,7 @@ public class TestELBasic extends BaseTestCase {
   public void testEl() {
 
     SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
-    BeanDescriptor<Customer> descriptor = server.getBeanDescriptor(Customer.class);
+    BeanDescriptor<Customer> descriptor = server.descriptor(Customer.class);
 
     ElPropertyDeploy elId = descriptor.elPropertyDeploy("id");
     assertTrue(elId instanceof BeanProperty);
diff --git a/ebean-core/src/test/java/org/tests/family/TestInheritance.java b/ebean-core/src/test/java/org/tests/family/TestInheritance.java
index 910d4cf72..239e4f77b 100644
--- a/ebean-core/src/test/java/org/tests/family/TestInheritance.java
+++ b/ebean-core/src/test/java/org/tests/family/TestInheritance.java
@@ -24,7 +24,7 @@ public class TestInheritance extends BaseTestCase {
 
   @Test
   public void testDescriptor() {
-    BeanDescriptor<GrandParentPerson> desc = spiEbeanServer().getBeanDescriptor(GrandParentPerson.class);
+    BeanDescriptor<GrandParentPerson> desc = spiEbeanServer().descriptor(GrandParentPerson.class);
     BeanProperty prop1 = desc.beanProperty("someBean");
     BeanProperty prop2 = desc.beanProperty("effectiveBean");
 
diff --git a/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java b/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java
index a46684808..d3ef275fc 100644
--- a/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java
+++ b/ebean-core/src/test/java/org/tests/genkey/TestSeqBatch.java
@@ -16,7 +16,7 @@ public class TestSeqBatch extends BaseTestCase {
       return;
     }
 
-    BeanDescriptor<TOne> d = spiEbeanServer().getBeanDescriptor(TOne.class);
+    BeanDescriptor<TOne> d = spiEbeanServer().descriptor(TOne.class);
     Object id = d.nextId(null);
     assertNotNull(id);
     for (int i = 0; i < 16; i++) {
diff --git a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java
index efc21e866..452998032 100644
--- a/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java
+++ b/ebean-core/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java
@@ -2,7 +2,6 @@ package org.tests.lifecycle;
 
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
-import io.ebean.DB;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import org.tests.model.basic.EBasicWithLifecycle;
@@ -167,7 +166,7 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase {
 
     DB.save(bean);
 
-    BeanDescriptor<EBasicWithLifecycle> desc = ((SpiEbeanServer) server()).getBeanDescriptor(EBasicWithLifecycle.class);
+    BeanDescriptor<EBasicWithLifecycle> desc = ((SpiEbeanServer) server()).descriptor(EBasicWithLifecycle.class);
     EBasicWithLifecycle loaded = desc.createReference(false, false, bean.getId(), null);
 
     // Here you see the big difference.
diff --git a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java
index f17a8ffa7..62faa4694 100644
--- a/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java
+++ b/ebean-core/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java
@@ -23,7 +23,7 @@ public class TestPersistenceContextServerConfig extends BaseTestCase {
     SpiEbeanServer ebeanServer = (SpiEbeanServer) create();
     try {
       Query<EBasicVer> query = ebeanServer.find(EBasicVer.class);
-      PersistenceContextScope scope = ebeanServer.getPersistenceContextScope((SpiQuery<?>) query);
+      PersistenceContextScope scope = ebeanServer.persistenceContextScope((SpiQuery<?>) query);
 
       assertEquals(PersistenceContextScope.QUERY, scope);
     } finally {
diff --git a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java
index cb3e22a07..2dab70e77 100644
--- a/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java
+++ b/ebean-core/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java
@@ -21,7 +21,7 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase {
   public void test() {
 
     SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
-    BeanDescriptor<Order> d = server.getBeanDescriptor(Order.class);
+    BeanDescriptor<Order> d = server.descriptor(Order.class);
     ElPropertyValue elGetValue = d.elGetValue("customer.contacts");
 
     assertTrue(elGetValue.containsMany());
diff --git a/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java b/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java
index be7c97be1..50b101ce0 100644
--- a/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java
+++ b/ebean-core/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java
@@ -25,7 +25,7 @@ public class TestManyLazyLoadingQuery extends BaseTestCase {
 
     SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
 
-    BeanDescriptor<Order> descOrder = server.getBeanDescriptor(Order.class);
+    BeanDescriptor<Order> descOrder = server.descriptor(Order.class);
     BeanPropertyAssocMany<?> beanProperty = (BeanPropertyAssocMany<?>) descOrder.beanProperty("details");
 
     List<Object> parentIds = new ArrayList<>();
diff --git a/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java b/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java
index e14ac0f18..7b510e858 100644
--- a/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java
+++ b/ebean-core/src/test/java/org/tests/test/TestInheritWithMany.java
@@ -27,7 +27,7 @@ public class TestInheritWithMany extends BaseTestCase {
     assertNotNull(server);
 
     SpiEbeanServer spiServer = (SpiEbeanServer) server;
-    BeanDescriptor<IMRoot> beanDescriptor = spiServer.getBeanDescriptor(IMRoot.class);
+    BeanDescriptor<IMRoot> beanDescriptor = spiServer.descriptor(IMRoot.class);
     InheritInfo inheritInfo = beanDescriptor.inheritInfo();
     assertNotNull(inheritInfo);
 
diff --git a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java
index e96af4aec..ddd05f05c 100644
--- a/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java
+++ b/ebean-core/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java
@@ -24,7 +24,7 @@ public class TestJsonBeanDescriptorParse extends BaseTestCase {
   public void test() throws IOException {
     SpiEbeanServer server = (SpiEbeanServer) DB.getDefault();
 
-    BeanDescriptor<Customer> descriptor = server.getBeanDescriptor(Customer.class);
+    BeanDescriptor<Customer> descriptor = server.descriptor(Customer.class);
 
     StringReader reader = new StringReader("{\"id\":123,\"name\":\"Hello rob\"}");
     JsonParser parser = server.json().createParser(reader);
diff --git a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java
index 610a2c424..0f0f66f02 100644
--- a/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java
+++ b/ebean-core/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java
@@ -42,7 +42,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase {
 
       Product refProd = jsonContext.toBean(Product.class, jsonString);
 
-      BeanDescriptor<Product> prodDesc = server.getBeanDescriptor(Product.class);
+      BeanDescriptor<Product> prodDesc = server.descriptor(Product.class);
       EntityBean eb = (EntityBean) refProd;
       prodDesc.isReference(eb._ebean_getIntercept());
 
@@ -73,7 +73,7 @@ public class TestTextJsonReferenceBean extends BaseTestCase {
     Order o2 = jsonContext.toBean(Order.class, jsonOrder);
     Customer customer = o2.getCustomer();
 
-    BeanDescriptor<Customer> custDesc = server.getBeanDescriptor(Customer.class);
+    BeanDescriptor<Customer> custDesc = server.descriptor(Customer.class);
 
     assertTrue(custDesc.isReference(((EntityBean) customer)._ebean_getIntercept()));
   }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
index 0cb6db92d..bfaed1ffe 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/visitor/VisitAllUsing.java
@@ -21,7 +21,7 @@ public final class VisitAllUsing extends VisitProperties {
    * Visit all the descriptors for a given server.
    */
   public VisitAllUsing(BeanVisitor visitor, SpiEbeanServer server) {
-    this(visitor, server.getBeanDescriptors());
+    this(visitor, server.descriptors());
   }
 
   /**
diff --git a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java
index 29a0bb78f..66189f3c0 100644
--- a/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java
+++ b/ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java
@@ -93,7 +93,7 @@ public abstract class BaseTestCase {
   }
 
   protected SpiTransaction getInScopeTransaction() {
-    return spiEbeanServer().getTransactionManager().scope().getInScope();
+    return spiEbeanServer().transactionManager().scope().getInScope();
   }
 
   /**
@@ -229,7 +229,7 @@ public abstract class BaseTestCase {
   }
 
   protected <T> BeanDescriptor<T> getBeanDescriptor(Class<T> cls) {
-    return spiEbeanServer().getBeanDescriptor(cls);
+    return spiEbeanServer().descriptor(cls);
   }
 
   protected <T> ServerCacheStatistics getBeanCacheStats(Class<T> cls, boolean reset) {