diff --git a/src/main/java/net/openhft/chronicle/map/NodeDiscoveryHostPortBroadcaster.java b/src/main/java/net/openhft/chronicle/map/NodeDiscoveryBroadcaster.java
similarity index 97%
rename from src/main/java/net/openhft/chronicle/map/NodeDiscoveryHostPortBroadcaster.java
rename to src/main/java/net/openhft/chronicle/map/NodeDiscoveryBroadcaster.java
index 2cdfcf79d..4f31215b3 100644
--- a/src/main/java/net/openhft/chronicle/map/NodeDiscoveryHostPortBroadcaster.java
+++ b/src/main/java/net/openhft/chronicle/map/NodeDiscoveryBroadcaster.java
@@ -16,8 +16,8 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static net.openhft.chronicle.map.NodeDiscoveryHostPortBroadcaster.BOOTSTRAP_BYTES;
-import static net.openhft.chronicle.map.NodeDiscoveryHostPortBroadcaster.LOG;
+import static net.openhft.chronicle.map.NodeDiscoveryBroadcaster.BOOTSTRAP_BYTES;
+import static net.openhft.chronicle.map.NodeDiscoveryBroadcaster.LOG;
 
 /**
  * Broad cast the nodes host ports and identifiers over UDP, to make it easy to join a grid of remote nodes
@@ -25,8 +25,8 @@ import static net.openhft.chronicle.map.NodeDiscoveryHostPortBroadcaster.LOG;
  *
  * @author Rob Austin.
  */
-public class NodeDiscoveryHostPortBroadcaster extends UdpChannelReplicator {
-    public static final Logger LOG = LoggerFactory.getLogger(NodeDiscoveryHostPortBroadcaster.class.getName
+public class NodeDiscoveryBroadcaster extends UdpChannelReplicator {
+    public static final Logger LOG = LoggerFactory.getLogger(NodeDiscoveryBroadcaster.class.getName
             ());
     private static final byte UNUSED = (byte) -1;
 
@@ -46,7 +46,7 @@ public class NodeDiscoveryHostPortBroadcaster extends UdpChannelReplicator {
      * @param externalizable
      * @throws java.io.IOException
      */
-    NodeDiscoveryHostPortBroadcaster(
+    NodeDiscoveryBroadcaster(
             @NotNull final UdpReplicationConfig replicationConfig,
             final int serializedEntrySize,
             final BytesExternalizable externalizable)
diff --git a/src/test/java/net/openhft/chronicle/map/NodeDiscoveryHostPortBroadcasterTest.java b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryHostPortBroadcasterTest.java
index 847b9d6e3..4b02baf3a 100644
--- a/src/test/java/net/openhft/chronicle/map/NodeDiscoveryHostPortBroadcasterTest.java
+++ b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryHostPortBroadcasterTest.java
@@ -25,10 +25,10 @@ public class NodeDiscoveryHostPortBroadcasterTest extends TestCase {
         BytesExternalizableImpl externalizable = new BytesExternalizableImpl(remoteNodes);
 
 
-        final NodeDiscoveryHostPortBroadcaster nodeDiscoveryHostPortBroadcaster
-                = new NodeDiscoveryHostPortBroadcaster(udpConfig, 1024, externalizable);
+        final NodeDiscoveryBroadcaster nodeDiscoveryBroadcaster
+                = new NodeDiscoveryBroadcaster(udpConfig, 1024, externalizable);
 
-        externalizable.setModificationNotifier(nodeDiscoveryHostPortBroadcaster);
+        externalizable.setModificationNotifier(nodeDiscoveryBroadcaster);
 
 
         Thread.sleep(1000);
@@ -71,10 +71,10 @@ public class NodeDiscoveryHostPortBroadcasterTest extends TestCase {
         BytesExternalizableImpl externalizable = new BytesExternalizableImpl(remoteNodes);
 
 
-        final NodeDiscoveryHostPortBroadcaster nodeDiscoveryHostPortBroadcaster
-                = new NodeDiscoveryHostPortBroadcaster(udpConfig, 1024, externalizable);
+        final NodeDiscoveryBroadcaster nodeDiscoveryBroadcaster
+                = new NodeDiscoveryBroadcaster(udpConfig, 1024, externalizable);
 
-        externalizable.setModificationNotifier(nodeDiscoveryHostPortBroadcaster);
+        externalizable.setModificationNotifier(nodeDiscoveryBroadcaster);
 
 
         Thread.sleep(10000000);