diff --git a/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java b/community/bolt/src/main/java/org/neo4j/bolt/BoltServer.java
similarity index 97%
rename from community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java
rename to community/bolt/src/main/java/org/neo4j/bolt/BoltServer.java
index 9ee6c9ca52a45..023efc8d268a0 100644
--- a/community/bolt/src/main/java/org/neo4j/bolt/BoltKernelExtension.java
+++ b/community/bolt/src/main/java/org/neo4j/bolt/BoltServer.java
@@ -74,7 +74,7 @@
 import static org.neo4j.kernel.configuration.ssl.LegacySslPolicyConfig.LEGACY_POLICY_NAME;
 import static org.neo4j.scheduler.JobScheduler.Groups.boltNetworkIO;
 
-public class BoltKernelExtension extends LifecycleAdapter
+public class BoltServer extends LifecycleAdapter
 {
     // platform dependencies
     private final GraphDatabaseAPI db;
@@ -99,7 +99,7 @@ public static class Settings implements LoadableConfig
         public static final Setting<String> ssl_policy = setting( "bolt.ssl_policy", STRING, LEGACY_POLICY_NAME );
     }
 
-    public BoltKernelExtension( GraphDatabaseAPI db, FileSystemAbstraction fs, JobScheduler jobScheduler, AvailabilityGuard availabilityGuard,
+    public BoltServer( GraphDatabaseAPI db, FileSystemAbstraction fs, JobScheduler jobScheduler, AvailabilityGuard availabilityGuard,
             ConnectorPortRegister connectorPortRegister, UsageData usageData, Config config, Clock clock, Monitors monitors,
             LogService logService, DependencyResolver dependencyResolver )
     {
@@ -119,8 +119,8 @@ public BoltKernelExtension( GraphDatabaseAPI db, FileSystemAbstraction fs, JobSc
     @Override
     public void start() throws Throwable
     {
-        Log log = logService.getInternalLog( BoltKernelExtension.class );
-        Log userLog = logService.getUserLog( BoltKernelExtension.class );
+        Log log = logService.getInternalLog( BoltServer.class );
+        Log userLog = logService.getUserLog( BoltServer.class );
 
         InternalLoggerFactory.setDefaultFactory( new Netty4LoggerFactory( logService.getInternalLogProvider() ) );
         BoltMessageLogging boltLogging = BoltMessageLogging.create( fs, jobScheduler, config, log );
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/runtime/DefaultBoltConnection.java b/community/bolt/src/main/java/org/neo4j/bolt/runtime/DefaultBoltConnection.java
index caf52415159fa..edb90265a241d 100644
--- a/community/bolt/src/main/java/org/neo4j/bolt/runtime/DefaultBoltConnection.java
+++ b/community/bolt/src/main/java/org/neo4j/bolt/runtime/DefaultBoltConnection.java
@@ -30,7 +30,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.neo4j.bolt.BoltChannel;
-import org.neo4j.bolt.BoltKernelExtension;
+import org.neo4j.bolt.BoltServer;
 import org.neo4j.bolt.v1.packstream.PackOutput;
 import org.neo4j.bolt.v1.runtime.BoltConnectionAuthFatality;
 import org.neo4j.bolt.v1.runtime.BoltProtocolBreachFatality;
@@ -46,7 +46,7 @@
 
 public class DefaultBoltConnection implements BoltConnection
 {
-    protected static final int DEFAULT_MAX_BATCH_SIZE = FeatureToggles.getInteger( BoltKernelExtension.class, "max_batch_size", 100 );
+    protected static final int DEFAULT_MAX_BATCH_SIZE = FeatureToggles.getInteger( BoltServer.class, "max_batch_size", 100 );
 
     private final String id;
 
diff --git a/community/bolt/src/main/resources/META-INF/services/org.neo4j.configuration.LoadableConfig b/community/bolt/src/main/resources/META-INF/services/org.neo4j.configuration.LoadableConfig
index 14f251ff06f2b..d90af6c18f3f5 100644
--- a/community/bolt/src/main/resources/META-INF/services/org.neo4j.configuration.LoadableConfig
+++ b/community/bolt/src/main/resources/META-INF/services/org.neo4j.configuration.LoadableConfig
@@ -1 +1 @@
-org.neo4j.bolt.BoltKernelExtension$Settings
+org.neo4j.bolt.BoltServer$Settings
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/runtime/DefaultBoltConnectionTest.java b/community/bolt/src/test/java/org/neo4j/bolt/runtime/DefaultBoltConnectionTest.java
index e8f84aae2f662..fa74e17f2c941 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/runtime/DefaultBoltConnectionTest.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/runtime/DefaultBoltConnectionTest.java
@@ -30,7 +30,7 @@
 import java.util.concurrent.Future;
 
 import org.neo4j.bolt.BoltChannel;
-import org.neo4j.bolt.BoltKernelExtension;
+import org.neo4j.bolt.BoltServer;
 import org.neo4j.bolt.logging.BoltMessageLogger;
 import org.neo4j.bolt.logging.NullBoltMessageLogger;
 import org.neo4j.bolt.testing.Jobs;
@@ -278,7 +278,7 @@ public void processNextBatchShouldCloseConnectionOnFatalAuthenticationError()
         connection.processNextBatch();
 
         verify( stateMachine ).close();
-        logProvider.assertNone( AssertableLogProvider.inLog( containsString( BoltKernelExtension.class.getPackage().getName() ) ).error( any( String.class ),
+        logProvider.assertNone( AssertableLogProvider.inLog( containsString( BoltServer.class.getPackage().getName() ) ).error( any( String.class ),
                 any( Throwable.class ) ) );
     }
 
@@ -296,7 +296,7 @@ public void processNextBatchShouldCloseConnectionAndLogOnFatalBoltError()
         connection.processNextBatch();
 
         verify( stateMachine ).close();
-        logProvider.assertExactly( AssertableLogProvider.inLog( containsString( BoltKernelExtension.class.getPackage().getName() ) ).error(
+        logProvider.assertExactly( AssertableLogProvider.inLog( containsString( BoltServer.class.getPackage().getName() ) ).error(
                 containsString( "Protocol breach detected in bolt session" ), is( exception ) ) );
     }
 
@@ -314,7 +314,7 @@ public void processNextBatchShouldCloseConnectionAndLogOnUnexpectedException()
         connection.processNextBatch();
 
         verify( stateMachine ).close();
-        logProvider.assertExactly( AssertableLogProvider.inLog( containsString( BoltKernelExtension.class.getPackage().getName() ) ).error(
+        logProvider.assertExactly( AssertableLogProvider.inLog( containsString( BoltServer.class.getPackage().getName() ) ).error(
                 containsString( "Unexpected error detected in bolt session" ), is( exception ) ) );
     }
 
diff --git a/community/bolt/src/test/java/org/neo4j/bolt/runtime/ExecutorBoltSchedulerTest.java b/community/bolt/src/test/java/org/neo4j/bolt/runtime/ExecutorBoltSchedulerTest.java
index 0579bb2c35a6e..e6866dcdbebf2 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/runtime/ExecutorBoltSchedulerTest.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/runtime/ExecutorBoltSchedulerTest.java
@@ -34,7 +34,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.neo4j.bolt.BoltKernelExtension;
+import org.neo4j.bolt.BoltServer;
 import org.neo4j.bolt.testing.Jobs;
 import org.neo4j.function.Predicates;
 import org.neo4j.kernel.configuration.Config;
@@ -203,7 +203,7 @@ public void failingJobShouldLogAndStopConnection() throws Throwable
         verify( connection ).processNextBatch();
         verify( connection ).stop();
 
-        logProvider.assertExactly( AssertableLogProvider.inLog( containsString( BoltKernelExtension.class.getPackage().getName() ) ).error(
+        logProvider.assertExactly( AssertableLogProvider.inLog( containsString( BoltServer.class.getPackage().getName() ) ).error(
                 containsString( "Unexpected error during job scheduling for session" ),
                 matchesExceptionMessage( containsString( "some unexpected error" ) ) ) );
     }
diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/facade/GraphDatabaseFacadeFactory.java b/community/neo4j/src/main/java/org/neo4j/graphdb/facade/GraphDatabaseFacadeFactory.java
index 59613fc889e0f..e8cebeb42ef5b 100644
--- a/community/neo4j/src/main/java/org/neo4j/graphdb/facade/GraphDatabaseFacadeFactory.java
+++ b/community/neo4j/src/main/java/org/neo4j/graphdb/facade/GraphDatabaseFacadeFactory.java
@@ -25,7 +25,7 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import org.neo4j.bolt.BoltKernelExtension;
+import org.neo4j.bolt.BoltServer;
 import org.neo4j.graphdb.DependencyResolver;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Path;
@@ -349,9 +349,9 @@ private static Procedures setupProcedures( PlatformModule platform, EditionModul
         return procedures;
     }
 
-    private static BoltKernelExtension createBoltServer( PlatformModule platform )
+    private static BoltServer createBoltServer( PlatformModule platform )
     {
-        return new BoltKernelExtension( platform.graphDatabaseFacade, platform.fileSystem, platform.jobScheduler, platform.availabilityGuard,
+        return new BoltServer( platform.graphDatabaseFacade, platform.fileSystem, platform.jobScheduler, platform.availabilityGuard,
                 platform.connectorPortRegister, platform.usageData, platform.config, platform.clock, platform.monitors, platform.logging,
                 platform.dependencies );
     }
diff --git a/community/shell/src/test/java/org/neo4j/shell/StartClientIT.java b/community/shell/src/test/java/org/neo4j/shell/StartClientIT.java
index 6e5ceb0340cf8..a8481c3af5a41 100644
--- a/community/shell/src/test/java/org/neo4j/shell/StartClientIT.java
+++ b/community/shell/src/test/java/org/neo4j/shell/StartClientIT.java
@@ -33,7 +33,7 @@
 import java.io.Serializable;
 import java.rmi.RemoteException;
 
-import org.neo4j.bolt.BoltKernelExtension;
+import org.neo4j.bolt.BoltServer;
 import org.neo4j.graphdb.Result;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.logging.AssertableLogProvider;
@@ -216,7 +216,7 @@ protected GraphDatabaseShellServer getGraphDatabaseShellServer( File path, boole
                 getClass().getResource( "/config-with-bolt-connector.conf" ).getFile()}, mock( CtrlCHandler.class ) );
         try
         {
-            log.assertNone( inLog( startsWith( BoltKernelExtension.class.getPackage().getName() ) ).any() );
+            log.assertNone( inLog( startsWith( BoltServer.class.getPackage().getName() ) ).any() );
         }
         finally
         {
diff --git a/integrationtests/src/test/java/org/neo4j/bolt/BoltTlsIT.java b/integrationtests/src/test/java/org/neo4j/bolt/BoltTlsIT.java
index fb811da9cbf6b..f5bc042dcb6af 100644
--- a/integrationtests/src/test/java/org/neo4j/bolt/BoltTlsIT.java
+++ b/integrationtests/src/test/java/org/neo4j/bolt/BoltTlsIT.java
@@ -125,7 +125,7 @@ private void createAndStartDb()
                 .newImpermanentDatabaseBuilder( testDirectory.graphDbDir() )
                 .setConfig( bolt.enabled, "true" )
                 .setConfig( bolt.listen_address, ":" + PortAuthority.allocatePort() )
-                .setConfig( BoltKernelExtension.Settings.ssl_policy, "bolt" )
+                .setConfig( BoltServer.Settings.ssl_policy, "bolt" )
                 .setConfig( sslPolicy.allow_key_generation, "true" )
                 .setConfig( sslPolicy.base_directory, "certificates" )
                 .setConfig( sslPolicy.tls_versions, setup.boltTlsVersions )