diff --git a/README.md b/README.md
index c53dc22f6..c5f86244d 100644
--- a/README.md
+++ b/README.md
@@ -679,7 +679,7 @@ Map map2;
     ChronicleMapBuilder<Integer, CharSequence> map1Builder =
             ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(20000L)
-                    .addReplicator(tcp((byte) 1, tcpConfig));
+                    .addReplicator((byte) 1, tcpConfig);
 
 
     map1 = map1Builder.create();
diff --git a/src/main/java/net/openhft/chronicle/ChronicleHashBuilder.java b/src/main/java/net/openhft/chronicle/ChronicleHashBuilder.java
index a5dd0306f..c37ea2cda 100644
--- a/src/main/java/net/openhft/chronicle/ChronicleHashBuilder.java
+++ b/src/main/java/net/openhft/chronicle/ChronicleHashBuilder.java
@@ -189,7 +189,7 @@ public interface ChronicleHashBuilder<K, C, B extends ChronicleHashBuilder<K, C,
 
     B metaDataBytes(int metaDataBytes);
 
-    B replicators(byte identifier, ReplicatorConfig... replicators);
+    B replicators(byte identifier, ReplicationConfig... replicators);
 
     B timeProvider(TimeProvider timeProvider);
 
diff --git a/src/main/java/net/openhft/chronicle/map/ChannelProviderBuilder.java b/src/main/java/net/openhft/chronicle/map/ChannelProviderBuilder.java
index 00021b4de..0bb05dab4 100644
--- a/src/main/java/net/openhft/chronicle/map/ChannelProviderBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/ChannelProviderBuilder.java
@@ -26,8 +26,8 @@ public final class ChannelProviderBuilder {
     byte identifier;
     int maxEntrySize = 1024;
     int maxNumberOfChronicles = 128;
-    private UdpReplicationReplicatorConfig udpReplicationConfig = null;
-    private TcpReplicationReplicatorConfig tcpReplicationConfig = null;
+    private UdpReplicationConfig udpReplicationConfig = null;
+    private TcpReplicationConfig tcpReplicationConfig = null;
 
 
 
@@ -40,16 +40,16 @@ public final class ChannelProviderBuilder {
         return this;
     }
 
-    public ChannelProviderBuilder replicators(byte identifier, ReplicatorConfig... replicatorConfigs) {
+    public ChannelProviderBuilder replicators(byte identifier, ReplicationConfig... replicationConfigs) {
         this.identifier = identifier;
 
 
-        for (ReplicatorConfig replicatorConfig : replicatorConfigs) {
+        for (ReplicationConfig replicationConfig : replicationConfigs) {
 
-            if (replicatorConfig instanceof TcpReplicationReplicatorConfig) {
-                this.tcpReplicationConfig = (TcpReplicationReplicatorConfig) replicatorConfig;
-            } else if (replicatorConfig instanceof UdpReplicationReplicatorConfig) {
-                this.udpReplicationConfig = (UdpReplicationReplicatorConfig) replicatorConfig;
+            if (replicationConfig instanceof TcpReplicationConfig) {
+                this.tcpReplicationConfig = (TcpReplicationConfig) replicationConfig;
+            } else if (replicationConfig instanceof UdpReplicationConfig) {
+                this.udpReplicationConfig = (UdpReplicationConfig) replicationConfig;
             } else
                 throw new UnsupportedOperationException();
         }
diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
index 2acf42ca4..725815757 100644
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
@@ -551,17 +551,17 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
         return toString().hashCode();
     }
 
-    public ChronicleMapBuilder<K, V> replicators(byte identifier, ReplicatorConfig... replicatorConfigs) {
+    public ChronicleMapBuilder<K, V> replicators(byte identifier, ReplicationConfig... replicationConfigs) {
 
         this.identifier = identifier;
         this.replicators.clear();
-        for (ReplicatorConfig replicatorConfig : replicatorConfigs) {
+        for (ReplicationConfig replicationConfig : replicationConfigs) {
 
             Replicator replicator;
-            if (replicatorConfig instanceof TcpReplicationReplicatorConfig) {
-                replicator = Replicators.tcp((TcpReplicationReplicatorConfig) replicatorConfig);
-            } else if (replicatorConfig instanceof UdpReplicationReplicatorConfig) {
-                replicator = Replicators.udp((UdpReplicationReplicatorConfig) replicatorConfig);
+            if (replicationConfig instanceof TcpReplicationConfig) {
+                replicator = Replicators.tcp((TcpReplicationConfig) replicationConfig);
+            } else if (replicationConfig instanceof UdpReplicationConfig) {
+                replicator = Replicators.udp((UdpReplicationConfig) replicationConfig);
             } else
                 throw new UnsupportedOperationException();
 
diff --git a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
index ba9fa9d60..ad2723a86 100644
--- a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
+++ b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
@@ -25,7 +25,7 @@ import static net.openhft.chronicle.map.ConcurrentExpiryMap.getDefaultAddress;
 import static net.openhft.chronicle.map.DiscoveryNodeBytesMarshallable.ProposedNodes;
 import static net.openhft.chronicle.map.NodeDiscoveryBroadcaster.BOOTSTRAP_BYTES;
 import static net.openhft.chronicle.map.NodeDiscoveryBroadcaster.LOG;
-import static net.openhft.chronicle.map.UdpReplicationReplicatorConfig.simple;
+import static net.openhft.chronicle.map.UdpReplicationConfig.simple;
 
 /**
  * @author Rob Austin.
@@ -35,7 +35,7 @@ import static net.openhft.chronicle.map.UdpReplicationReplicatorConfig.simple;
 public class NodeDiscovery {
 
     private final AddressAndPort ourAddressAndPort;
-    private final UdpReplicationReplicatorConfig udpConfig;
+    private final UdpReplicationConfig udpConfig;
     private final DiscoveryNodeBytesMarshallable discoveryNodeBytesMarshallable;
     private final AtomicReference<NodeDiscoveryEventListener> nodeDiscoveryEventListenerAtomicReference =
             new AtomicReference<NodeDiscoveryEventListener>();
@@ -200,7 +200,7 @@ public class NodeDiscovery {
         // add our identifier and host:port to the list of known identifiers
         knownNodes.add(ourAddressAndPort, identifier);
 
-        final TcpReplicationReplicatorConfig tcpConfig = TcpReplicationReplicatorConfig
+        final TcpReplicationConfig tcpConfig = TcpReplicationConfig
                 .of(ourAddressAndPort.getPort(), toInetSocketArray(knownHostPorts))
                 .heartBeatInterval(1, SECONDS).nonUniqueIdentifierListener(identifierListener);
 
@@ -339,7 +339,7 @@ class NodeDiscoveryBroadcaster extends UdpChannelReplicator {
      * @throws java.io.IOException
      */
     NodeDiscoveryBroadcaster(
-            @NotNull final UdpReplicationReplicatorConfig replicationConfig,
+            @NotNull final UdpReplicationConfig replicationConfig,
             final int serializedEntrySize,
             final BytesMarshallable externalizable)
             throws IOException {
diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatorConfig.java b/src/main/java/net/openhft/chronicle/map/ReplicationConfig.java
similarity index 63%
rename from src/main/java/net/openhft/chronicle/map/ReplicatorConfig.java
rename to src/main/java/net/openhft/chronicle/map/ReplicationConfig.java
index d99514f25..a72abed48 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatorConfig.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicationConfig.java
@@ -3,7 +3,7 @@ package net.openhft.chronicle.map;
 /**
  * @author Rob Austin.
  */
-public interface ReplicatorConfig<B> {
+public interface ReplicationConfig<B> {
 
 
 }
diff --git a/src/main/java/net/openhft/chronicle/map/Replicators.java b/src/main/java/net/openhft/chronicle/map/Replicators.java
index 48df2c12a..023e8a7b2 100644
--- a/src/main/java/net/openhft/chronicle/map/Replicators.java
+++ b/src/main/java/net/openhft/chronicle/map/Replicators.java
@@ -25,7 +25,7 @@ final class Replicators {
     private Replicators() {
     }
 
-    static Replicator tcp(final TcpReplicationReplicatorConfig replicationConfig) {
+    static Replicator tcp(final TcpReplicationConfig replicationConfig) {
         return new Replicator() {
 
             @Override
@@ -39,7 +39,7 @@ final class Replicators {
     }
 
     static Replicator udp(
-            final UdpReplicationReplicatorConfig replicationConfig) {
+            final UdpReplicationConfig replicationConfig) {
         return new Replicator() {
 
             @Override
diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicationReplicatorConfig.java b/src/main/java/net/openhft/chronicle/map/TcpReplicationConfig.java
similarity index 83%
rename from src/main/java/net/openhft/chronicle/map/TcpReplicationReplicatorConfig.java
rename to src/main/java/net/openhft/chronicle/map/TcpReplicationConfig.java
index 53d1a4614..5bce434ab 100644
--- a/src/main/java/net/openhft/chronicle/map/TcpReplicationReplicatorConfig.java
+++ b/src/main/java/net/openhft/chronicle/map/TcpReplicationConfig.java
@@ -29,7 +29,7 @@ import static java.util.Collections.unmodifiableSet;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 
-public class TcpReplicationReplicatorConfig implements ReplicatorConfig {
+public class TcpReplicationConfig implements ReplicationConfig {
 
     private static final int DEFAULT_PACKET_SIZE = 1024 * 8;
     private static final long DEFAULT_HEART_BEAT_INTERVAL = 20;
@@ -45,7 +45,7 @@ public class TcpReplicationReplicatorConfig implements ReplicatorConfig {
     private TimeUnit heartBeatIntervalUnit = DEFAULT_HEART_BEAT_INTERVAL_UNIT;
     public IdentifierListener identifierListener;
 
-    TcpReplicationReplicatorConfig() {
+    TcpReplicationConfig() {
 
     }
 
@@ -53,7 +53,7 @@ public class TcpReplicationReplicatorConfig implements ReplicatorConfig {
         return identifierListener;
     }
 
-    public TcpReplicationReplicatorConfig nonUniqueIdentifierListener(@NotNull final IdentifierListener
+    public TcpReplicationConfig nonUniqueIdentifierListener(@NotNull final IdentifierListener
                                                                     identifierListener) {
         this.identifierListener = identifierListener;
         return this;
@@ -63,7 +63,7 @@ public class TcpReplicationReplicatorConfig implements ReplicatorConfig {
         return autoReconnectedUponDroppedConnection;
     }
 
-    public TcpReplicationReplicatorConfig autoReconnectedUponDroppedConnection(boolean autoReconnectedUponDroppedConnection) {
+    public TcpReplicationConfig autoReconnectedUponDroppedConnection(boolean autoReconnectedUponDroppedConnection) {
         this.autoReconnectedUponDroppedConnection = autoReconnectedUponDroppedConnection;
         return this;
     }
@@ -72,7 +72,7 @@ public class TcpReplicationReplicatorConfig implements ReplicatorConfig {
         return throttlingConfig;
     }
 
-    public TcpReplicationReplicatorConfig throttlingConfig(ThrottlingConfig throttlingConfig) {
+    public TcpReplicationConfig throttlingConfig(ThrottlingConfig throttlingConfig) {
         this.throttlingConfig = throttlingConfig;
         return this;
     }
@@ -90,7 +90,7 @@ public class TcpReplicationReplicatorConfig implements ReplicatorConfig {
         return serverPort;
     }
 
-    public TcpReplicationReplicatorConfig serverPort(int serverPort) {
+    public TcpReplicationConfig serverPort(int serverPort) {
         this.serverPort = serverPort;
         return this;
     }
@@ -99,7 +99,7 @@ public class TcpReplicationReplicatorConfig implements ReplicatorConfig {
         return endpoints;
     }
 
-    public TcpReplicationReplicatorConfig endpoints(Set<InetSocketAddress> endpoints) {
+    public TcpReplicationConfig endpoints(Set<InetSocketAddress> endpoints) {
 
         for (final InetSocketAddress endpoint : endpoints) {
             if (endpoint.getPort() == serverPort && "localhost".equals(endpoint.getHostName()))
@@ -115,11 +115,11 @@ public class TcpReplicationReplicatorConfig implements ReplicatorConfig {
         return packetSize;
     }
 
-    public static TcpReplicationReplicatorConfig of(int serverPort, InetSocketAddress... endpoints) {
+    public static TcpReplicationConfig of(int serverPort, InetSocketAddress... endpoints) {
         return of(serverPort, Arrays.asList(endpoints));
     }
 
-    public static TcpReplicationReplicatorConfig of(int serverPort, Collection<InetSocketAddress> endpoints) {
+    public static TcpReplicationConfig of(int serverPort, Collection<InetSocketAddress> endpoints) {
         // at least in tests, we configure "receive-only" replication without endpoints.
         // TODO decide what to do with this case
 //        if (endpoints.isEmpty())
@@ -130,7 +130,7 @@ public class TcpReplicationReplicatorConfig implements ReplicatorConfig {
                         + " can not point to the same port as the server");
         }
 
-        TcpReplicationReplicatorConfig tcpReplicationConfig = new TcpReplicationReplicatorConfig();
+        TcpReplicationConfig tcpReplicationConfig = new TcpReplicationConfig();
 
         tcpReplicationConfig.serverPort(serverPort);
         tcpReplicationConfig.endpoints = unmodifiableSet(new HashSet<InetSocketAddress>(endpoints));
@@ -141,14 +141,14 @@ public class TcpReplicationReplicatorConfig implements ReplicatorConfig {
     }
 
 
-    public TcpReplicationReplicatorConfig packetSize(int packetSize) {
+    public TcpReplicationConfig packetSize(int packetSize) {
         if (packetSize <= 0)
             throw new IllegalArgumentException();
         this.packetSize = packetSize;
         return this;
     }
 
-    public TcpReplicationReplicatorConfig throttlingConfig(long heartBeatInterval, TimeUnit heartBeatIntervalUnit) {
+    public TcpReplicationConfig throttlingConfig(long heartBeatInterval, TimeUnit heartBeatIntervalUnit) {
         this.heartBeatInterval = heartBeatInterval;
         this.heartBeatIntervalUnit = heartBeatIntervalUnit;
         return this;
@@ -160,7 +160,7 @@ public class TcpReplicationReplicatorConfig implements ReplicatorConfig {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TcpReplicationReplicatorConfig that = (TcpReplicationReplicatorConfig) o;
+        TcpReplicationConfig that = (TcpReplicationConfig) o;
 
         if (autoReconnectedUponDroppedConnection != that.autoReconnectedUponDroppedConnection) return false;
         if (heartBeatInterval != that.heartBeatInterval) return false;
@@ -199,7 +199,7 @@ public class TcpReplicationReplicatorConfig implements ReplicatorConfig {
                 '}';
     }
 
-    public TcpReplicationReplicatorConfig heartBeatInterval(long time, TimeUnit unit) {
+    public TcpReplicationConfig heartBeatInterval(long time, TimeUnit unit) {
         this.heartBeatInterval = time;
         this.heartBeatIntervalUnit = unit;
         return this;
diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
index 3dc3a5732..61a013ce3 100644
--- a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
@@ -55,7 +55,7 @@ class TcpReplicator extends AbstractChannelReplicator implements Closeable {
     private final byte localIdentifier;
     private final int maxEntrySizeBytes;
     private final Replica.EntryExternalizable externalizable;
-    private final TcpReplicationReplicatorConfig replicationConfig;
+    private final TcpReplicationConfig replicationConfig;
 
     private long selectorTimeout;
 
@@ -68,7 +68,7 @@ class TcpReplicator extends AbstractChannelReplicator implements Closeable {
      */
     TcpReplicator(@NotNull final Replica replica,
                   @NotNull final Replica.EntryExternalizable externalizable,
-                  @NotNull final TcpReplicationReplicatorConfig replicationConfig,
+                  @NotNull final TcpReplicationConfig replicationConfig,
                   final int maxEntrySizeBytes) throws IOException {
 
         super("TcpSocketReplicator-" + replica.identifier(), replicationConfig.throttlingConfig(),
diff --git a/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java b/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java
index e253c4d26..26c20d123 100644
--- a/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java
@@ -66,7 +66,7 @@ class UdpChannelReplicator extends AbstractChannelReplicator implements Replica.
      * @param localIdentifier   just used for logging
      * @throws IOException
      */
-    UdpChannelReplicator(@NotNull final UdpReplicationReplicatorConfig replicationConfig,
+    UdpChannelReplicator(@NotNull final UdpReplicationConfig replicationConfig,
                          final int maxPayloadSize, final byte localIdentifier)
             throws IOException {
 
diff --git a/src/main/java/net/openhft/chronicle/map/UdpReplicationReplicatorConfig.java b/src/main/java/net/openhft/chronicle/map/UdpReplicationConfig.java
similarity index 77%
rename from src/main/java/net/openhft/chronicle/map/UdpReplicationReplicatorConfig.java
rename to src/main/java/net/openhft/chronicle/map/UdpReplicationConfig.java
index ad4ebd862..15a3382d7 100644
--- a/src/main/java/net/openhft/chronicle/map/UdpReplicationReplicatorConfig.java
+++ b/src/main/java/net/openhft/chronicle/map/UdpReplicationConfig.java
@@ -23,16 +23,16 @@ import java.net.InetAddress;
 import java.net.NetworkInterface;
 
 
-public abstract class UdpReplicationReplicatorConfig implements ReplicatorConfig {
+public abstract class UdpReplicationConfig implements ReplicationConfig {
 
     /**
      * Package-private constructor forbids subclassing from outside of the package
      */
-    UdpReplicationReplicatorConfig() {
+    UdpReplicationConfig() {
         // nothing to do
     }
 
-    public static UdpReplicationReplicatorConfig simple(@NotNull InetAddress address, int port) {
+    public static UdpReplicationConfig simple(@NotNull InetAddress address, int port) {
         if (address.isMulticastAddress())
             throw new IllegalArgumentException();
 
@@ -40,17 +40,17 @@ public abstract class UdpReplicationReplicatorConfig implements ReplicatorConfig
         return create(address, port, null, ThrottlingConfig.noThrottling());
     }
 
-    public static UdpReplicationReplicatorConfig multiCast(@NotNull InetAddress address, int port,
+    public static UdpReplicationConfig multiCast(@NotNull InetAddress address, int port,
                                                  @NotNull NetworkInterface networkInterface) {
         if (!address.isMulticastAddress() || networkInterface == null)
             throw new IllegalArgumentException();
         return create(address, port, networkInterface, ThrottlingConfig.noThrottling());
     }
 
-    static UdpReplicationReplicatorConfig create(InetAddress address, int port,
+    static UdpReplicationConfig create(InetAddress address, int port,
                                        NetworkInterface networkInterface,
                                        ThrottlingConfig throttlingConfig) {
-        return new UdpReplicationReplicatorConfigBean(address, port, networkInterface,
+        return new UdpReplicationConfigBean(address, port, networkInterface,
                 throttlingConfig);
     }
 
@@ -63,7 +63,7 @@ public abstract class UdpReplicationReplicatorConfig implements ReplicatorConfig
 
     public abstract ThrottlingConfig throttlingConfig();
 
-    public UdpReplicationReplicatorConfig throttlingConfig(ThrottlingConfig throttlingConfig) {
+    public UdpReplicationConfig throttlingConfig(ThrottlingConfig throttlingConfig) {
         ThrottlingConfig.checkMillisecondBucketInterval(throttlingConfig, "UDP");
         return create(address(), port(), networkInterface(), throttlingConfig);
     }
diff --git a/src/main/java/net/openhft/chronicle/map/UdpReplicationReplicatorConfigBean.java b/src/main/java/net/openhft/chronicle/map/UdpReplicationConfigBean.java
similarity index 88%
rename from src/main/java/net/openhft/chronicle/map/UdpReplicationReplicatorConfigBean.java
rename to src/main/java/net/openhft/chronicle/map/UdpReplicationConfigBean.java
index 120c88747..441aa4eac 100644
--- a/src/main/java/net/openhft/chronicle/map/UdpReplicationReplicatorConfigBean.java
+++ b/src/main/java/net/openhft/chronicle/map/UdpReplicationConfigBean.java
@@ -4,13 +4,13 @@ import java.net.InetAddress;
 import java.net.NetworkInterface;
 
 
-final class UdpReplicationReplicatorConfigBean extends UdpReplicationReplicatorConfig {
+final class UdpReplicationConfigBean extends UdpReplicationConfig {
     private final InetAddress address;
     private final int port;
     private final NetworkInterface networkInterface;
     private final ThrottlingConfig throttlingConfig;
 
-    UdpReplicationReplicatorConfigBean(
+    UdpReplicationConfigBean(
             InetAddress address,
             int port,
             NetworkInterface networkInterface,
@@ -63,8 +63,8 @@ final class UdpReplicationReplicatorConfigBean extends UdpReplicationReplicatorC
         if (o == this) {
             return true;
         }
-        if (o instanceof UdpReplicationReplicatorConfig) {
-            UdpReplicationReplicatorConfig that = (UdpReplicationReplicatorConfig) o;
+        if (o instanceof UdpReplicationConfig) {
+            UdpReplicationConfig that = (UdpReplicationConfig) o;
             return (this.address.equals(that.address()))
                     && (this.port == that.port())
                     && (this.networkInterface.equals(that.networkInterface()))
diff --git a/src/main/java/net/openhft/chronicle/map/UdpReplicator.java b/src/main/java/net/openhft/chronicle/map/UdpReplicator.java
index bb80dc6b1..e32fac525 100644
--- a/src/main/java/net/openhft/chronicle/map/UdpReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/UdpReplicator.java
@@ -40,7 +40,7 @@ class UdpReplicator extends UdpChannelReplicator implements Replica.Modification
 
     UdpReplicator(@NotNull final Replica replica,
                   @NotNull final Replica.EntryExternalizable entryExternalizable,
-                  @NotNull final UdpReplicationReplicatorConfig replicationConfig,
+                  @NotNull final UdpReplicationConfig replicationConfig,
                   final int serializedEntrySize)
             throws IOException {
 
diff --git a/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java b/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java
index ede9d2189..1e5eb3310 100644
--- a/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java
+++ b/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java
@@ -164,7 +164,7 @@ public class ChronicleSetBuilder<E>
     }
 
     @Override
-    public ChronicleSetBuilder<E> replicators(byte identifier, ReplicatorConfig... replicators) {
+    public ChronicleSetBuilder<E> replicators(byte identifier, ReplicationConfig... replicators) {
         chronicleMapBuilder.replicators(identifier, replicators);
         return this;
     }
diff --git a/src/test/java/net/openhft/chronicle/map/Builder.java b/src/test/java/net/openhft/chronicle/map/Builder.java
index 64a4fbf86..4c1abddc9 100644
--- a/src/test/java/net/openhft/chronicle/map/Builder.java
+++ b/src/test/java/net/openhft/chronicle/map/Builder.java
@@ -68,7 +68,7 @@ public class Builder {
             final byte identifier,
             final int serverPort,
             final InetSocketAddress... endpoints) throws IOException {
-        TcpReplicationReplicatorConfig tcpConfig = TcpReplicationReplicatorConfig.of(serverPort, endpoints)
+        TcpReplicationConfig tcpConfig = TcpReplicationConfig.of(serverPort, endpoints)
                 .heartBeatInterval(1L, SECONDS);
         return ChronicleMapBuilder.of(kClass, vClass)
                 .entries(20000L)
diff --git a/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java b/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java
index 22e2fdfe6..086dffb86 100644
--- a/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java
+++ b/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java
@@ -51,7 +51,7 @@ public class ChannelReplicationTest {
 
     public void setup() throws IOException {
         {
-            TcpReplicationReplicatorConfig tcpConfig = TcpReplicationReplicatorConfig
+            TcpReplicationConfig tcpConfig = TcpReplicationConfig
                     .of(8086, new InetSocketAddress("localhost", 8087))
                     .heartBeatInterval(1, SECONDS);
 
@@ -66,8 +66,8 @@ public class ChannelReplicationTest {
         }
 
         {
-            TcpReplicationReplicatorConfig tcpConfig =
-                    TcpReplicationReplicatorConfig.of(8087).heartBeatInterval(1, SECONDS);
+            TcpReplicationConfig tcpConfig =
+                    TcpReplicationConfig.of(8087).heartBeatInterval(1, SECONDS);
 
             channelProviderB = new ChannelProviderBuilder().replicators((byte) 2, tcpConfig)
                     .create();
diff --git a/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java b/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java
index e44e674ed..f5292974c 100644
--- a/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java
+++ b/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java
@@ -59,7 +59,7 @@ public class PostChannelCreationTest {
     public void setup() throws IOException {
 
         {
-            final TcpReplicationReplicatorConfig tcpConfig = TcpReplicationReplicatorConfig
+            final TcpReplicationConfig tcpConfig = TcpReplicationConfig
                     .of(8086, new InetSocketAddress("localhost", 8087))
                     .heartBeatInterval(1, SECONDS);
 
@@ -80,7 +80,7 @@ public class PostChannelCreationTest {
 
 
         {
-            final TcpReplicationReplicatorConfig tcpConfig = TcpReplicationReplicatorConfig
+            final TcpReplicationConfig tcpConfig = TcpReplicationConfig
                     .of(8087, new InetSocketAddress("localhost", 8086))
                     .heartBeatInterval(1, SECONDS);
 
diff --git a/src/test/java/net/openhft/chronicle/map/SingleMapClusterTest.java b/src/test/java/net/openhft/chronicle/map/SingleMapClusterTest.java
index 1c75888ec..99c41eefa 100644
--- a/src/test/java/net/openhft/chronicle/map/SingleMapClusterTest.java
+++ b/src/test/java/net/openhft/chronicle/map/SingleMapClusterTest.java
@@ -56,7 +56,7 @@ public class SingleMapClusterTest {
     public void setup() throws IOException {
 
         {
-            final TcpReplicationReplicatorConfig tcpReplicationConfig = TcpReplicationReplicatorConfig
+            final TcpReplicationConfig tcpReplicationConfig = TcpReplicationConfig
                     .of(8086, new InetSocketAddress("localhost", 8087))
                     .heartBeatInterval(1, SECONDS);
             int maxEntrySize = 1024;
@@ -73,7 +73,7 @@ public class SingleMapClusterTest {
 
 
         {
-            final TcpReplicationReplicatorConfig tcpReplicationConfig = TcpReplicationReplicatorConfig
+            final TcpReplicationConfig tcpReplicationConfig = TcpReplicationConfig
                     .of(8087, new InetSocketAddress("localhost", 8086))
                     .heartBeatInterval(1, SECONDS);
 
diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3wayPutReturnsNull.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3wayPutReturnsNull.java
index 681550355..e8925e4fb 100644
--- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3wayPutReturnsNull.java
+++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest3wayPutReturnsNull.java
@@ -44,7 +44,7 @@ public class TCPSocketReplicationTest3wayPutReturnsNull {
             final byte identifier,
             final int serverPort,
             final InetSocketAddress... endpoints) throws IOException {
-        TcpReplicationReplicatorConfig tcpConfig = TcpReplicationReplicatorConfig.of(serverPort, endpoints);
+        TcpReplicationConfig tcpConfig = TcpReplicationConfig.of(serverPort, endpoints);
         return (T) ChronicleMapBuilder.of(Integer.class, CharSequence.class)
 
                 .entries(1000)
diff --git a/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServers.java b/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServers.java
index 4616e26d8..fd418c0c5 100644
--- a/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServers.java
+++ b/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServers.java
@@ -27,7 +27,7 @@ import java.net.InetSocketAddress;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static net.openhft.chronicle.map.Builder.getPersistenceFile;
-import static net.openhft.chronicle.map.TcpReplicationReplicatorConfig.of;
+import static net.openhft.chronicle.map.TcpReplicationConfig.of;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -43,7 +43,7 @@ public class TwoMapOnDifferentServers {
     @Before
     public void setup() throws IOException {
 
-        final TcpReplicationReplicatorConfig tcpConfig =
+        final TcpReplicationConfig tcpConfig =
                 of(8076, new InetSocketAddress("localhost", 8077))
                         .heartBeatInterval(1, SECONDS);
 
diff --git a/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java b/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java
index b47ee20de..8a2550b74 100644
--- a/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java
+++ b/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java
@@ -37,7 +37,7 @@ public class UDPSocketReplicationTest {
             final int identifier,
             final int udpPort) throws IOException {
 
-        UdpReplicationReplicatorConfig udpConfig = UdpReplicationReplicatorConfig
+        UdpReplicationConfig udpConfig = UdpReplicationConfig
                 .simple(Inet4Address.getByName("255.255.255.255"), udpPort);
 
         return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
diff --git a/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java
index 702d68152..57576a192 100644
--- a/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java
+++ b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java
@@ -27,7 +27,7 @@ import java.net.InetSocketAddress;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static net.openhft.chronicle.map.Builder.getPersistenceFile;
-import static net.openhft.chronicle.map.TcpReplicationReplicatorConfig.of;
+import static net.openhft.chronicle.map.TcpReplicationConfig.of;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;