diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/LabelsAcceptanceTest.java b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/LabelsAcceptanceTest.java
index 6440d7b85802..15490c1807ac 100644
--- a/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/LabelsAcceptanceTest.java
+++ b/community/community-it/kernel-it/src/test/java/org/neo4j/graphdb/LabelsAcceptanceTest.java
@@ -750,7 +750,7 @@ protected void create(
                                     GraphDatabaseFacadeFactory.Dependencies dependencies )
                             {
                                 Function<PlatformModule,EditionModule> factory =
-                                        platformModule -> new CommunityEditionModuleWithCustomIdModule( platformModule, idFactory );
+                                        platformModule -> new CommunityEditionModuleWithCustomIdContextFactory( platformModule, idFactory );
                                 new GraphDatabaseFacadeFactory( DatabaseInfo.COMMUNITY, factory )
                                 {
 
@@ -780,9 +780,9 @@ private Node createNode( GraphDatabaseService db, Label... labels )
         }
     }
 
-    private static class CommunityEditionModuleWithCustomIdModule extends CommunityEditionModule
+    private static class CommunityEditionModuleWithCustomIdContextFactory extends CommunityEditionModule
     {
-        CommunityEditionModuleWithCustomIdModule( PlatformModule platformModule, EphemeralIdGenerator.Factory idFactory )
+        CommunityEditionModuleWithCustomIdContextFactory( PlatformModule platformModule, EphemeralIdGenerator.Factory idFactory )
         {
             super( platformModule );
             idContextFactory = IdContextFactoryBuilder.of( platformModule.fileSystem, platformModule.jobScheduler )
diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/CommunityEditionModule.java b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/CommunityEditionModule.java
index 40f166a6c602..dcdbf753c6aa 100644
--- a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/CommunityEditionModule.java
+++ b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/CommunityEditionModule.java
@@ -101,7 +101,7 @@ public CommunityEditionModule( PlatformModule platformModule )
         threadToTransactionBridge = dependencies.satisfyDependency(
                 new ThreadToStatementContextBridge( getGlobalAvailabilityGuard( platformModule.clock, logging, platformModule.config ) ) );
 
-        idContextFactory = createIdModule( platformModule, fileSystem );
+        idContextFactory = createIdContextFactory( platformModule, fileSystem );
 
         tokenHoldersSupplier = () -> new TokenHolders(
                 new DelegatingTokenHolder( createPropertyKeyCreator( config, dataSourceManager ), TokenHolder.TYPE_PROPERTY_KEY ),
@@ -128,7 +128,7 @@ public CommunityEditionModule( PlatformModule platformModule )
         publishEditionInfo( dependencies.resolveDependency( UsageData.class ), platformModule.databaseInfo, config );
     }
 
-    protected IdContextFactory createIdModule( PlatformModule platformModule, FileSystemAbstraction fileSystem )
+    protected IdContextFactory createIdContextFactory( PlatformModule platformModule, FileSystemAbstraction fileSystem )
     {
         return IdContextFactoryBuilder.of( fileSystem, platformModule.jobScheduler ).build();
     }
diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/id/IdContextFactoryBuilder.java b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/id/IdContextFactoryBuilder.java
index d1632dca5568..147d1bed33f9 100644
--- a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/id/IdContextFactoryBuilder.java
+++ b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/id/IdContextFactoryBuilder.java
@@ -41,6 +41,10 @@ public class IdContextFactoryBuilder
     private IdTypeConfigurationProvider idTypeConfigurationProvider;
     private Function<IdGeneratorFactory,IdGeneratorFactory> factoryWrapper;
 
+    private IdContextFactoryBuilder()
+    {
+    }
+
     public static IdContextFactoryBuilder of( IdTypeConfigurationProvider configurationProvider, JobScheduler jobScheduler )
     {
         IdContextFactoryBuilder builder = new IdContextFactoryBuilder();
diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java
index a1217dce5293..043f5564db68 100644
--- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java
+++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java
@@ -305,7 +305,7 @@ public EnterpriseCoreEditionModule( final PlatformModule platformModule,
                 consensusModule.raftMachine(), dependencies, localDatabase );
 
         idContextFactory = IdContextFactoryBuilder.of( coreStateMachinesModule.idTypeConfigurationProvider, platformModule.jobScheduler )
-                .withIdGenerationFactoryProvider( databaseName -> coreStateMachinesModule.idGeneratorFactory )
+                .withIdGenerationFactoryProvider( ignored -> coreStateMachinesModule.idGeneratorFactory )
                 .withFactoryWrapper( generator -> new FreeIdFilteredIdGeneratorFactory( generator, coreStateMachinesModule.freeIdCondition ) ).build();
 
         // TODO: this is broken, coreStateMachinesModule.tokenHolders should be supplier, somehow...
diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java
index 759e84734db3..fbdc501e7a26 100644
--- a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java
+++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java
@@ -74,7 +74,7 @@ public EnterpriseEditionModule( PlatformModule platformModule )
     }
 
     @Override
-    protected IdContextFactory createIdModule( PlatformModule platformModule, FileSystemAbstraction fileSystem )
+    protected IdContextFactory createIdContextFactory( PlatformModule platformModule, FileSystemAbstraction fileSystem )
     {
         return IdContextFactoryBuilder.of( new EnterpriseIdTypeConfigurationProvider( platformModule.config ), platformModule.jobScheduler )
                 .withFileSystem( fileSystem )
diff --git a/integrationtests/src/test/java/org/neo4j/TransactionGuardIT.java b/integrationtests/src/test/java/org/neo4j/TransactionGuardIT.java
index 035162557dd8..449e07d685b4 100644
--- a/integrationtests/src/test/java/org/neo4j/TransactionGuardIT.java
+++ b/integrationtests/src/test/java/org/neo4j/TransactionGuardIT.java
@@ -724,7 +724,7 @@ private class TransactionGuardTerminationEditionModule extends EnterpriseEdition
         }
 
         @Override
-        protected IdContextFactory createIdModule( PlatformModule platformModule, FileSystemAbstraction fileSystem )
+        protected IdContextFactory createIdContextFactory( PlatformModule platformModule, FileSystemAbstraction fileSystem )
         {
             return IdContextFactoryBuilder.of( new EnterpriseIdTypeConfigurationProvider( platformModule.config ),
                     platformModule.jobScheduler )