diff --git a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
index 2bd8506b5..265c9a2e3 100644
--- a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
+++ b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
@@ -106,7 +106,7 @@ public class NodeDiscovery {
     }
 
 
-    public synchronized FindFindByName mapByName() throws
+    public synchronized ReplicationHubFindByName mapByName() throws
             IOException, InterruptedException {
 
         final AtomicInteger ourProposedIdentifier = new AtomicInteger();
@@ -255,7 +255,7 @@ public class NodeDiscovery {
                 .tcpTransportAndNetwork(tcpConfig)
                 .createWithId(identifier);
 
-        return new FindFindByName(replicationHub);
+        return new ReplicationHubFindByName(replicationHub);
 
     }
 
diff --git a/src/main/java/net/openhft/chronicle/map/FindFindByName.java b/src/main/java/net/openhft/chronicle/map/ReplicationHubFindByName.java
similarity index 95%
rename from src/main/java/net/openhft/chronicle/map/FindFindByName.java
rename to src/main/java/net/openhft/chronicle/map/ReplicationHubFindByName.java
index a4bc865fc..b7829ba0d 100644
--- a/src/main/java/net/openhft/chronicle/map/FindFindByName.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicationHubFindByName.java
@@ -31,7 +31,7 @@ import static net.openhft.chronicle.map.ChronicleMapBuilder.of;
 /**
  * @author Rob Austin.
  */
-class FindFindByName implements FindByName {
+class ReplicationHubFindByName implements FindByName {
 
     public static final int MAP_BY_NAME_CHANNEL = 1;
     private final ReplicationHub replicationHub;
@@ -43,10 +43,11 @@ class FindFindByName implements FindByName {
     /**
      * @throws IOException
      */
-    public FindFindByName(ReplicationHub replicationHub) throws IOException {
+    public ReplicationHubFindByName(ReplicationHub replicationHub) throws IOException {
         this.replicationHub = replicationHub;
         this.map = (Map) of(CharSequence.class, ChronicleMapBuilder.class)
                 .entrySize(300)
+                .entries(128)
                 .instance()
                 .replicatedViaChannel(replicationHub.createChannel((short) MAP_BY_NAME_CHANNEL)).create();
     }
diff --git a/src/test/java/net/openhft/chronicle/map/MapByNameTest.java b/src/test/java/net/openhft/chronicle/map/MapByNameTest.java
index a054ab91e..a4dc9dff1 100644
--- a/src/test/java/net/openhft/chronicle/map/MapByNameTest.java
+++ b/src/test/java/net/openhft/chronicle/map/MapByNameTest.java
@@ -31,7 +31,7 @@ import java.io.IOException;
 public class MapByNameTest {
 
 
-    private FindFindByName findMapByName;
+    private ReplicationHubFindByName findMapByName;
 
     @Before
     public void setUp() throws IOException {
@@ -40,7 +40,7 @@ public class MapByNameTest {
                 .tcpTransportAndNetwork(TcpTransportAndNetworkConfig.of(8243))
                 .createWithId((byte) 1);
 
-        findMapByName = new FindFindByName(replicationHub);
+        findMapByName = new ReplicationHubFindByName(replicationHub);
     }
 
     @Test
@@ -80,7 +80,7 @@ public class MapByNameTest {
                 .name("myMap")
                 .removeReturnsNull(true);
 
-        FindFindByName mapByName = nodeDiscovery.mapByName();
+        ReplicationHubFindByName mapByName = nodeDiscovery.mapByName();
         mapByName.add(builder);
 
         ChronicleMap<Object, Object> myMap2 = mapByName.create("myMap");
@@ -97,7 +97,7 @@ public class MapByNameTest {
                 .removeReturnsNull(true);
 
 
-        FindFindByName mapByName = nodeDiscovery.mapByName();
+        ReplicationHubFindByName mapByName = nodeDiscovery.mapByName();
         mapByName.add(builder);