diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/CausalClusteringSettings.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/CausalClusteringSettings.java
index 3643fe5f4eb9..d307d9c5d345 100644
--- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/CausalClusteringSettings.java
+++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/CausalClusteringSettings.java
@@ -240,8 +240,8 @@ public HostnameResolver getHostnameResolver( LogProvider logProvider, LogProvide
             setting( "causal_clustering.discovery_type", options( DiscoveryType.class ), DiscoveryType.LIST.name() );
 
     @Description( "Select the middleware used for cluster topology discovery" )
-    public static final Setting<DiscoveryServiceFactorySelector.DiscoveryMiddleware> middleware_type =
-            setting( "causal_clustering.middleware_type", options( DiscoveryServiceFactorySelector.DiscoveryMiddleware.class ),
+    public static final Setting<DiscoveryServiceFactorySelector.DiscoveryImplementation> discovery_implementation =
+            setting( "causal_clustering.discovery_implementation", options( DiscoveryServiceFactorySelector.DiscoveryImplementation.class ),
                     DiscoveryServiceFactorySelector.DEFAULT.name() );
 
     @Description( "Prevents the network middleware from dumping its own logs. Defaults to true." )
diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/DiscoveryServiceFactorySelector.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/DiscoveryServiceFactorySelector.java
index 35bafe3c1560..b1f3dca7c9e2 100644
--- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/DiscoveryServiceFactorySelector.java
+++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/DiscoveryServiceFactorySelector.java
@@ -27,17 +27,17 @@
 
 public abstract class DiscoveryServiceFactorySelector<T extends DiscoveryServiceFactory>
 {
-    public static DiscoveryMiddleware DEFAULT = DiscoveryMiddleware.hazelcast;
+    public static DiscoveryImplementation DEFAULT = DiscoveryImplementation.hazelcast;
 
     public T select( Config config )
     {
-        DiscoveryMiddleware middleware = config.get( CausalClusteringSettings.middleware_type );
+        DiscoveryImplementation middleware = config.get( CausalClusteringSettings.discovery_implementation );
         return select( middleware );
     }
 
-    protected abstract T select( DiscoveryMiddleware middleware );
+    protected abstract T select( DiscoveryImplementation middleware );
 
-    public enum DiscoveryMiddleware
+    public enum DiscoveryImplementation
     {
         hazelcast, akka
     }
diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/EnterpriseDiscoveryServiceFactorySelector.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/EnterpriseDiscoveryServiceFactorySelector.java
index 910d12c843ec..855494f3b193 100644
--- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/EnterpriseDiscoveryServiceFactorySelector.java
+++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/discovery/EnterpriseDiscoveryServiceFactorySelector.java
@@ -25,7 +25,7 @@
 public class EnterpriseDiscoveryServiceFactorySelector extends DiscoveryServiceFactorySelector<DiscoveryServiceFactory>
 {
     @Override
-    protected DiscoveryServiceFactory select( DiscoveryMiddleware middleware )
+    protected DiscoveryServiceFactory select( DiscoveryImplementation middleware )
     {
         switch ( middleware )
         {
diff --git a/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/CausalClusterInProcessBuilder.java b/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/CausalClusterInProcessBuilder.java
index 2f741c890b85..97b92b5bb3e5 100644
--- a/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/CausalClusterInProcessBuilder.java
+++ b/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/CausalClusterInProcessBuilder.java
@@ -70,7 +70,7 @@ public static class Builder implements WithCores, WithReplicas, WithLogger, With
         private PortPickingFactory portFactory = PortPickingFactory.DEFAULT;
         private final Map<String, String> config = new HashMap<>();
         private List<String> databases = new ArrayList<>( Collections.singletonList( "default" ) );
-        private DiscoveryServiceFactorySelector.DiscoveryMiddleware discoveryServiceFactory = DiscoveryServiceFactorySelector.DEFAULT;
+        private DiscoveryServiceFactorySelector.DiscoveryImplementation discoveryServiceFactory = DiscoveryServiceFactorySelector.DEFAULT;
 
         @Override
         public WithReplicas withCores( int n )
@@ -124,7 +124,7 @@ public Builder withOptionalDatabases( List<String> databaseNames )
         }
 
         @Override
-        public Builder withDiscoveryServiceFactory( DiscoveryServiceFactorySelector.DiscoveryMiddleware discoveryServiceFactory )
+        public Builder withDiscoveryServiceFactory( DiscoveryServiceFactorySelector.DiscoveryImplementation discoveryServiceFactory )
         {
             this.discoveryServiceFactory = discoveryServiceFactory;
             return this;
@@ -172,7 +172,7 @@ interface WithOptionalDatabasesAndPorts
 
         Builder withOptionalDatabases( List<String> databaseNames );
 
-        Builder withDiscoveryServiceFactory( DiscoveryServiceFactorySelector.DiscoveryMiddleware discoveryServiceFactory );
+        Builder withDiscoveryServiceFactory( DiscoveryServiceFactorySelector.DiscoveryImplementation discoveryServiceFactory );
     }
 
     /**
@@ -260,7 +260,7 @@ public static class CausalCluster
         private final Log log;
         private final PortPickingFactory portFactory;
         private final Map<String,String> config;
-        private final DiscoveryServiceFactorySelector.DiscoveryMiddleware discoveryServiceFactory;
+        private final DiscoveryServiceFactorySelector.DiscoveryImplementation discoveryServiceFactory;
 
         private List<ServerControls> coreControls = synchronizedList( new ArrayList<>() );
         private List<ServerControls> replicaControls = synchronizedList( new ArrayList<>() );
diff --git a/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilder.java b/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilder.java
index 6998fb833716..ab7366a952bd 100644
--- a/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilder.java
+++ b/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilder.java
@@ -35,7 +35,7 @@
 
 public class EnterpriseInProcessServerBuilder extends AbstractInProcessServerBuilder
 {
-    private DiscoveryServiceFactorySelector.DiscoveryMiddleware discoveryServiceFactory = DiscoveryServiceFactorySelector.DEFAULT;
+    private DiscoveryServiceFactorySelector.DiscoveryImplementation discoveryServiceFactory = DiscoveryServiceFactorySelector.DEFAULT;
 
     public EnterpriseInProcessServerBuilder()
     {
@@ -57,7 +57,7 @@ protected AbstractNeoServer createNeoServer( Map<String,String> configMap,
             GraphDatabaseFacadeFactory.Dependencies dependencies, FormattedLogProvider userLogProvider )
     {
         Config config = Config.defaults( configMap );
-        config.augment( CausalClusteringSettings.middleware_type, discoveryServiceFactory.name() );
+        config.augment( CausalClusteringSettings.discovery_implementation, discoveryServiceFactory.name() );
         return new OpenEnterpriseNeoServer( config, dependencies, userLogProvider );
     }
 
@@ -69,7 +69,7 @@ protected AbstractNeoServer createNeoServer( Map<String,String> configMap,
      * @param discoveryService
      * @return this builder instance
      */
-    public EnterpriseInProcessServerBuilder withDiscoveryServiceFactory( DiscoveryServiceFactorySelector.DiscoveryMiddleware discoveryService )
+    public EnterpriseInProcessServerBuilder withDiscoveryServiceFactory( DiscoveryServiceFactorySelector.DiscoveryImplementation discoveryService )
     {
         this.discoveryServiceFactory = discoveryService;
         return this;