diff --git a/src/main/java/net/openhft/chronicle/hash/replication/TcpInetSocketAddress.java b/src/main/java/net/openhft/chronicle/hash/replication/TcpInetSocketAddress.java
index cfd0c7fd5..a128a046d 100644
--- a/src/main/java/net/openhft/chronicle/hash/replication/TcpInetSocketAddress.java
+++ b/src/main/java/net/openhft/chronicle/hash/replication/TcpInetSocketAddress.java
@@ -2,7 +2,7 @@ package net.openhft.chronicle.hash.replication;
 
 import java.net.InetSocketAddress;
 
-public class TcpInetSocketAddress extends InetSocketAddress {
+class TcpInetSocketAddress extends InetSocketAddress {
     private final String toString;
 
     public TcpInetSocketAddress(String hostname, int port) {
diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
index 9c62c7314..9d4bc09fd 100755
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
@@ -102,7 +102,7 @@ public final class ChronicleMapBuilder<K, V> implements Cloneable,
     private static final int MAX_SEGMENTS_TO_CHAISE_COMPACT_MULTI_MAPS = (1 << 20);
     private static final Logger LOG =
             LoggerFactory.getLogger(ChronicleMapBuilder.class.getName());
-    public static final long DEFAULT_STATELESS_CLIENT_TIMEOUT = TimeUnit.SECONDS.toMillis(10);
+    static final long DEFAULT_STATELESS_CLIENT_TIMEOUT = TimeUnit.SECONDS.toMillis(10);
 
     private static final StringBuilder EMTRY_STRING_BUILDER = new StringBuilder();
 
diff --git a/src/main/java/net/openhft/chronicle/hash/FindByName.java b/src/main/java/net/openhft/chronicle/map/FindByName.java
similarity index 86%
rename from src/main/java/net/openhft/chronicle/hash/FindByName.java
rename to src/main/java/net/openhft/chronicle/map/FindByName.java
index 77fd8fcfa..b67da6cf5 100644
--- a/src/main/java/net/openhft/chronicle/hash/FindByName.java
+++ b/src/main/java/net/openhft/chronicle/map/FindByName.java
@@ -1,4 +1,6 @@
-package net.openhft.chronicle.hash;
+package net.openhft.chronicle.map;
+
+import net.openhft.chronicle.hash.ChronicleHash;
 
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
@@ -6,7 +8,7 @@ import java.util.concurrent.TimeoutException;
 /**
  * @author Rob Austin.
  */
-public interface FindByName {
+interface FindByName {
 
     /**
      * @param name the name of the map or set
diff --git a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
index 04331cfb0..c4c14bc24 100644
--- a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
+++ b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
@@ -53,7 +53,7 @@ import static net.openhft.chronicle.map.NodeDiscoveryBroadcaster.LOG;
  *
  *         This code is in alpha, and still has to undergo refactoring
  */
-public class NodeDiscovery {
+class NodeDiscovery {
 
     public static final int DEFAULT_UDP_BROADCAST_PORT = 8129;
     public static final short DEFAULT_TCP_PORT = (short) 8123;
diff --git a/src/main/java/net/openhft/chronicle/map/ReplicationHubFindByName.java b/src/main/java/net/openhft/chronicle/map/ReplicationHubFindByName.java
index 92d5d9d86..071b8f6fd 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicationHubFindByName.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicationHubFindByName.java
@@ -19,7 +19,6 @@ package net.openhft.chronicle.map;
 import net.openhft.chronicle.hash.ChronicleHash;
 import net.openhft.chronicle.hash.ChronicleHashBuilder;
 import net.openhft.chronicle.hash.ChronicleHashInstanceConfig;
-import net.openhft.chronicle.hash.FindByName;
 import net.openhft.chronicle.hash.replication.ReplicationChannel;
 import net.openhft.chronicle.hash.replication.ReplicationHub;
 import org.slf4j.Logger;