diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
index d47b5fbbf..8dc39b17f 100644
--- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
+++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java
@@ -115,9 +115,9 @@ public class DatabaseConfig {
   private TenantCatalogProvider tenantCatalogProvider;
 
   /**
-   * When true will load entity classes via ModuleInfoLoader.
+   * When true will load entity classes via EntityClassRegister.
    * <p>
-   * NB: ModuleInfoLoader implementations are generated by querybean generator.
+   * NB: EntityClassRegister implementations are generated by querybean generator.
    * Having this on and registering entity classes means we don't need to manually
    * write that code or use classpath scanning to find entity classes.
    */
@@ -3376,7 +3376,7 @@ public class DatabaseConfig {
   }
 
   /**
-   * Return true if entity classes should be loaded and registered via ModuleInfoLoader.
+   * Return true if entity classes should be loaded and registered via EntityClassRegister.
    * <p>
    * When false we either register entity classes via application code or use classpath
    * scanning to find and register entity classes.
diff --git a/ebean-api/src/main/java/io/ebean/config/ModuleInfoLoader.java b/ebean-api/src/main/java/io/ebean/config/EntityClassRegister.java
similarity index 87%
rename from ebean-api/src/main/java/io/ebean/config/ModuleInfoLoader.java
rename to ebean-api/src/main/java/io/ebean/config/EntityClassRegister.java
index 94d35ab2c..8bf2418a6 100644
--- a/ebean-api/src/main/java/io/ebean/config/ModuleInfoLoader.java
+++ b/ebean-api/src/main/java/io/ebean/config/EntityClassRegister.java
@@ -5,7 +5,7 @@ import java.util.List;
 /**
  * Loads and returns entity classes to register with Ebean databases.
  */
-public interface ModuleInfoLoader {
+public interface EntityClassRegister {
 
   /**
    * Return entity classes to register for a named DB (not default DB).
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 70c0e0cf7..5b8499661 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -1,12 +1,7 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.config.BackgroundExecutorWrapper;
-import io.ebean.config.ContainerConfig;
-import io.ebean.config.DatabaseConfig;
-import io.ebean.config.DatabaseConfigProvider;
-import io.ebean.config.ModuleInfoLoader;
-import io.ebean.config.TenantMode;
-import io.ebean.config.UnderscoreNamingConvention;
+import io.ebean.config.*;
+import io.ebean.config.EntityClassRegister;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.event.ShutdownManager;
 import io.ebean.service.SpiContainer;
@@ -129,7 +124,7 @@ public final class DefaultContainer implements SpiContainer {
     if (config.isAutoLoadModuleInfo()) {
       // auto register entity classes
       boolean found = false;
-      for (ModuleInfoLoader loader : ServiceLoader.load(ModuleInfoLoader.class)) {
+      for (EntityClassRegister loader : ServiceLoader.load(EntityClassRegister.class)) {
         config.addAll(loader.classesFor(config.getName(), config.isDefaultServer()));
         found = true;
       }
@@ -140,9 +135,9 @@ public final class DefaultContainer implements SpiContainer {
   }
 
   private void checkMissingModulePathProvides() {
-    URL servicesFile = ClassLoader.getSystemResource("META-INF/services/io.ebean.config.ModuleInfoLoader");
+    URL servicesFile = ClassLoader.getSystemResource("META-INF/services/io.ebean.config.EntityClassRegister");
     if (servicesFile != null) {
-      log.error("module-info.java is probably missing 'provides io.ebean.config.ModuleInfoLoader with _Ebean$ModuleInfo' clause. ModuleInfoLoader exists but was not service loaded.");
+      log.error("module-info.java is probably missing 'provides io.ebean.config.EntityClassRegister with EbeanEntityRegister' clause. EntityClassRegister exists but was not service loaded.");
     }
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
index af0edfef1..82f29361c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -578,8 +578,8 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   }
 
   private <T> String errNothingRegistered() {
-    return "There are no registered entities. If using query beans, that generates _Ebean$ModuleInfo.java into " +
-      "generated sources and is service loaded. If using module-info.java, then probably missing 'provides io.ebean.config.ModuleInfoLoader with _Ebean$ModuleInfo' clause.";
+    return "There are no registered entities. If using query beans, that generates EbeanEntityRegister.java into " +
+      "generated sources and is service loaded. If using module-info.java, then probably missing 'provides io.ebean.config.EntityClassRegister with EbeanEntityRegister' clause.";
   }
 
   private String errNotRegistered(Class<?> beanClass) {
diff --git a/ebean-core/src/main/java/module-info.java b/ebean-core/src/main/java/module-info.java
index 3f9b23b05..a0462e27b 100644
--- a/ebean-core/src/main/java/module-info.java
+++ b/ebean-core/src/main/java/module-info.java
@@ -4,7 +4,7 @@ module io.ebean.core {
   uses io.ebean.cache.ServerCachePlugin;
   uses io.ebean.cache.ServerCacheNotifyPlugin;
   uses io.ebean.config.DatabaseConfigProvider;
-  uses io.ebean.config.ModuleInfoLoader;
+  uses io.ebean.config.EntityClassRegister;
   uses io.ebean.config.dbplatform.DatabasePlatformProvider;
   uses io.ebean.datasource.DataSourceAlertFactory;
   uses io.ebean.core.type.ExtraTypeFactory;
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index 68283606f..a8eac4946 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -113,7 +113,7 @@
                 <annotationProcessorPath>
                   <groupId>io.ebean</groupId>
                   <artifactId>kotlin-querybean-generator</artifactId>
-                  <version>13.6.2</version>
+                  <version>13.6.6-SNAPSHOT</version>
                 </annotationProcessorPath>
               </annotationProcessorPaths>
             </configuration>
diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java
index e0431f9b0..784e2bdb7 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java
@@ -30,5 +30,5 @@ interface Constants {
 
   String MODULEINFO = "io.ebean.config.ModuleInfo";
   String METAINF_MANIFEST = "META-INF/ebean-generated-info.mf";
-  String METAINF_SERVICES_MODULELOADER = "META-INF/services/io.ebean.config.ModuleInfoLoader";
+  String METAINF_SERVICES_MODULELOADER = "META-INF/services/io.ebean.config.EntityClassRegister";
 }
diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
index d08242ef4..6ef2960ba 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
@@ -88,7 +88,7 @@ class ProcessingContext implements Constants {
   private List<String> loadedPrefixEntities = new ArrayList<>(); ;
 
   /**
-   * The package for the generated ModuleInfoLoader.
+   * The package for the generated EntityClassRegister.
    */
   private String factoryPackage;
 
@@ -537,7 +537,7 @@ class ProcessingContext implements Constants {
   }
 
   /**
-   * Return the class name of the generated ModuleInfoLoader
+   * Return the class name of the generated EntityClassRegister
    * (such that we can read the current meta data for partial compile).
    */
   String loadMetaInfServices() {
diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java
index 1fa190687..44215410c 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java
@@ -105,20 +105,20 @@ public class Processor extends AbstractProcessor implements Constants {
       }
     } catch (Throwable e) {
       e.printStackTrace();
-      processingContext.logError(null, "Failed to initialise ModuleInfoLoader error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
+      processingContext.logError(null, "Failed to initialise EntityClassRegister error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
     }
   }
 
   private void writeModuleInfoBean() {
     try {
       if (moduleWriter == null) {
-        processingContext.logError(null, "ModuleInfoLoader was not initialised and not written");
+        processingContext.logError(null, "EntityClassRegister was not initialised and not written");
       } else {
         moduleWriter.write();
       }
     } catch (Throwable e) {
       e.printStackTrace();
-      processingContext.logError(null, "Failed to write ModuleInfoLoader error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
+      processingContext.logError(null, "Failed to write EntityClassRegister error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
     }
   }
 
diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
index b604d3c9d..a3a68f74a 100644
--- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
+++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
@@ -25,7 +25,7 @@ class SimpleModuleInfoWriter {
   SimpleModuleInfoWriter(ProcessingContext processingContext) throws IOException {
     this.processingContext = processingContext;
     this.factoryPackage = processingContext.getFactoryPackage();
-    this.factoryShortName = "_Ebean$ModuleInfo";
+    this.factoryShortName = "EbeanEntityRegister";
     this.factoryFullName = factoryPackage + "." + factoryShortName;
     this.javaFileObject = processingContext.createWriter(factoryFullName);
   }
@@ -94,7 +94,7 @@ class SimpleModuleInfoWriter {
     writer.append("import %s;", Constants.GENERATED).eol();
     writer.eol();
     writer.append("import io.ebean.config.ModuleInfo;").eol();
-    writer.append("import io.ebean.config.ModuleInfoLoader;").eol();
+    writer.append("import io.ebean.config.EntityClassRegister;").eol();
     writer.eol();
   }
 
@@ -128,7 +128,7 @@ class SimpleModuleInfoWriter {
 
     buildAtContextModule(writer);
 
-    writer.append("public class %s implements ModuleInfoLoader {", factoryShortName).eol().eol();
+    writer.append("public class %s implements EntityClassRegister {", factoryShortName).eol().eol();
     writeMethodOtherClasses();
     writeMethodEntityClasses(processingContext.getDbEntities(), null);
 
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java
index 2b27a034c..187d7ca02 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java
@@ -31,6 +31,6 @@ interface Constants {
 
   String MODULEINFO = "io.ebean.config.ModuleInfo";
   String METAINF_MANIFEST = "META-INF/ebean-generated-info.mf";
-  String METAINF_SERVICES_MODULELOADER = "META-INF/services/io.ebean.config.ModuleInfoLoader";
+  String METAINF_SERVICES_MODULELOADER = "META-INF/services/io.ebean.config.EntityClassRegister";
 
 }
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
index fe73814e2..099bc0eab 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java
@@ -84,7 +84,7 @@ class ProcessingContext implements Constants {
   private List<String> loadedPrefixEntities = new ArrayList<>();
 
   /**
-   * The package for the generated ModuleInfoLoader.
+   * The package for the generated EntityClassRegister.
    */
   private String factoryPackage;
 
@@ -516,8 +516,8 @@ class ProcessingContext implements Constants {
   }
 
   /**
-   * Return the class name of the generated ModuleInfoLoader
-   * (such that we can read the current meta data for partial compile).
+   * Return the class name of the generated EntityClassRegister
+   * (such that we can read the current metadata for partial compile).
    */
   String loadMetaInfServices() {
     try {
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java
index e7457cd82..e52f5a3e3 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/Processor.java
@@ -93,20 +93,20 @@ public class Processor extends AbstractProcessor implements Constants {
       }
     } catch (Throwable e) {
       e.printStackTrace();
-      processingContext.logError(null, "Failed to initialise ModuleInfoLoader error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
+      processingContext.logError(null, "Failed to initialise EntityClassRegister error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
     }
   }
 
   private void writeModuleInfoBean() {
     try {
       if (moduleWriter == null) {
-        processingContext.logError(null, "ModuleInfoLoader was not initialised and not written");
+        processingContext.logError(null, "EntityClassRegister was not initialised and not written");
       } else {
         moduleWriter.write();
       }
     } catch (Throwable e) {
       e.printStackTrace();
-      processingContext.logError(null, "Failed to write ModuleInfoLoader error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
+      processingContext.logError(null, "Failed to write EntityClassRegister error:" + e + " stack:" + Arrays.toString(e.getStackTrace()));
     }
   }
 
diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
index c06e615dc..51833ab9e 100644
--- a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
+++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleModuleInfoWriter.java
@@ -25,7 +25,7 @@ class SimpleModuleInfoWriter {
   SimpleModuleInfoWriter(ProcessingContext processingContext) throws IOException {
     this.processingContext = processingContext;
     this.factoryPackage = processingContext.getFactoryPackage();
-    this.factoryShortName = "_Ebean$ModuleInfo";
+    this.factoryShortName = "EbeanEntityRegister";
     this.factoryFullName = factoryPackage + "." + factoryShortName;
     this.javaFileObject = processingContext.createWriter(factoryFullName);
   }
@@ -94,7 +94,7 @@ class SimpleModuleInfoWriter {
     writer.append("import %s;", Constants.GENERATED).eol();
     writer.eol();
     writer.append("import io.ebean.config.ModuleInfo;").eol();
-    writer.append("import io.ebean.config.ModuleInfoLoader;").eol();
+    writer.append("import io.ebean.config.EntityClassRegister;").eol();
     writer.eol();
   }
 
@@ -128,7 +128,7 @@ class SimpleModuleInfoWriter {
 
     buildAtContextModule(writer);
 
-    writer.append("public class %s implements ModuleInfoLoader {", factoryShortName).eol().eol();
+    writer.append("public class %s implements EntityClassRegister {", factoryShortName).eol().eol();
     writeMethodOtherClasses();
     writeMethodEntityClasses(processingContext.getDbEntities(), null);