diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreEdgeClusterSettings.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreEdgeClusterSettings.java
index a9f832305f9b6..1909fd2fdaf70 100644
--- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreEdgeClusterSettings.java
+++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreEdgeClusterSettings.java
@@ -138,8 +138,8 @@ public String toString()
             setting( "core_edge.raft_advertised_address", ADVERTISED_SOCKET_ADDRESS, "localhost:7000" );
 
     @Description("Host and port to bind the cluster management communication.")
-    public static final Setting<ListenSocketAddress> hazelcast_listen_address =
-            setting( "core_edge.hazelcast_listen_address", LISTEN_SOCKET_ADDRESS, "0.0.0.0:5000" );
+    public static final Setting<ListenSocketAddress> discovery_listen_address =
+            setting( "core_edge.discovery_listen_address", LISTEN_SOCKET_ADDRESS, "0.0.0.0:5000" );
 
     @Description("A comma-separated list of other members of the cluster to join.")
     public static final Setting<List<AdvertisedSocketAddress>> initial_core_cluster_members =
diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastServerLifecycle.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastServerLifecycle.java
index e1c9769139cea..2b0795f46c697 100644
--- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastServerLifecycle.java
+++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastServerLifecycle.java
@@ -103,7 +103,7 @@ private HazelcastInstance createHazelcastInstance()
         log.info( "Discovering cluster with initial members: " + initialMembers );
 
         NetworkConfig networkConfig = new NetworkConfig();
-        ListenSocketAddress hazelcastAddress = config.get( CoreEdgeClusterSettings.hazelcast_listen_address );
+        ListenSocketAddress hazelcastAddress = config.get( CoreEdgeClusterSettings.discovery_listen_address );
         networkConfig.setPort( hazelcastAddress.socketAddress().getPort() );
         networkConfig.setJoin( joinConfig );
 
diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/CoreClusterMember.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/CoreClusterMember.java
index 7401992933df7..06b7dcaca9282 100644
--- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/CoreClusterMember.java
+++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/CoreClusterMember.java
@@ -77,7 +77,7 @@ public CoreClusterMember( int serverId, int clusterSize,
         params.put( CoreEdgeClusterSettings.cluster_name.name(), CLUSTER_NAME );
         params.put( CoreEdgeClusterSettings.initial_core_cluster_members.name(), initialMembers );
         params.put( GraphDatabaseSettings.record_format.name(), recordFormat );
-        params.put( CoreEdgeClusterSettings.hazelcast_listen_address.name(), "localhost:" + clusterPort );
+        params.put( CoreEdgeClusterSettings.discovery_listen_address.name(), "localhost:" + clusterPort );
         params.put( CoreEdgeClusterSettings.transaction_advertised_address.name(), "localhost:" + txPort );
         params.put( CoreEdgeClusterSettings.transaction_listen_address.name(), "127.0.0.1:" + txPort );
         params.put( CoreEdgeClusterSettings.raft_advertised_address.name(), "localhost:" + raftPort );