diff --git a/src/main/java/net/openhft/chronicle/hash/HashEntry.java b/src/main/java/net/openhft/chronicle/hash/HashEntry.java
index 1ac48bc47..6c6aa6225 100644
--- a/src/main/java/net/openhft/chronicle/hash/HashEntry.java
+++ b/src/main/java/net/openhft/chronicle/hash/HashEntry.java
@@ -21,7 +21,7 @@ import net.openhft.chronicle.set.SetEntry;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * The <i>present</i> {@code ChronicleHash} entry context.
+ * A context of a <i>present</i> entry in the {@code ChronicleHash}.
  *
  * <p>This interface is not usable by itself; it merely defines the common base for {@link MapEntry}
  * and {@link SetEntry}.
diff --git a/src/main/java/net/openhft/chronicle/hash/replication/HashRemoteQueryContext.java b/src/main/java/net/openhft/chronicle/hash/replication/HashRemoteQueryContext.java
deleted file mode 100644
index 4b1501615..000000000
--- a/src/main/java/net/openhft/chronicle/hash/replication/HashRemoteQueryContext.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *      Copyright (C) 2015  higherfrequencytrading.com
- *
- *      This program is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU Lesser General Public License as published by
- *      the Free Software Foundation, either version 3 of the License.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU Lesser General Public License for more details.
- *
- *      You should have received a copy of the GNU Lesser General Public License
- *      along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.openhft.chronicle.hash.replication;
-
-import net.openhft.chronicle.hash.HashQueryContext;
-
-public interface HashRemoteQueryContext<K> extends HashQueryContext<K>, RemoteOperationContext<K> {
-    @Override
-    HashReplicableEntry<K> entry();
-}
diff --git a/src/main/java/net/openhft/chronicle/hash/replication/HashReplicableEntry.java b/src/main/java/net/openhft/chronicle/hash/replication/HashReplicableEntry.java
deleted file mode 100644
index aa6b0a565..000000000
--- a/src/main/java/net/openhft/chronicle/hash/replication/HashReplicableEntry.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *      Copyright (C) 2015  higherfrequencytrading.com
- *
- *      This program is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU Lesser General Public License as published by
- *      the Free Software Foundation, either version 3 of the License.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU Lesser General Public License for more details.
- *
- *      You should have received a copy of the GNU Lesser General Public License
- *      along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.openhft.chronicle.hash.replication;
-
-import net.openhft.chronicle.hash.HashEntry;
-
-public interface HashReplicableEntry<K> extends HashEntry<K>, ReplicableEntry {
-
-}
diff --git a/src/main/java/net/openhft/chronicle/hash/replication/ReplicableEntry.java b/src/main/java/net/openhft/chronicle/hash/replication/ReplicableEntry.java
index 2dfa2d9f9..8bf62ff38 100644
--- a/src/main/java/net/openhft/chronicle/hash/replication/ReplicableEntry.java
+++ b/src/main/java/net/openhft/chronicle/hash/replication/ReplicableEntry.java
@@ -21,13 +21,14 @@ import net.openhft.chronicle.hash.ChronicleHashBuilder;
 import net.openhft.chronicle.hash.HashAbsentEntry;
 import net.openhft.chronicle.hash.HashEntry;
 import net.openhft.chronicle.map.ChronicleMap;
+import net.openhft.chronicle.map.MapEntry;
 import net.openhft.chronicle.map.Replica;
 import net.openhft.chronicle.map.replication.MapRemoteOperations;
 import net.openhft.chronicle.set.replication.SetRemoteOperations;
 
 /**
- * Abstracts an in replicated {@link ChronicleHash}. A {@link HashAbsentEntry} might be a {@code
- * ReplicableEntry} as well as {@link HashEntry}.
+ * Abstracts a replicable entry in the replicated {@link ChronicleHash}. A {@link HashAbsentEntry}
+ * might be a {@code ReplicableEntry} as well as {@link HashEntry}.
  */
 public interface ReplicableEntry {
     /**
@@ -35,7 +36,7 @@ public interface ReplicableEntry {
      * the identifier of the {@code ChronicleHash} node on which this entry was updated last.
      *
      * <p>When the entry is replicated, this identifier comes to remote nodes as {@link
-     * HashRemoteQueryContext#remoteIdentifier()}.
+     * RemoteOperationContext#remoteIdentifier()}.
      *
      * <p>On {@code ChronicleHash} local operations with entries, like {@link ChronicleMap#put(
      * Object, Object)}, this identifier is overwritten to the own {@code ChronicleHash} {@link
@@ -52,7 +53,7 @@ public interface ReplicableEntry {
      * the time of the last.
      *
      * <p>When the entry is replicated, this timestamp comes to remote nodes as {@link
-     * HashRemoteQueryContext#remoteTimestamp()}.
+     * RemoteOperationContext#remoteTimestamp()}.
      *
      * <p>On {@code ChronicleHash} local operations with entries, like {@link ChronicleMap#put(
      * Object, Object)}, this timestamp is overwritten using {@linkplain
diff --git a/src/main/java/net/openhft/chronicle/map/MapEntry.java b/src/main/java/net/openhft/chronicle/map/MapEntry.java
index bdbc773aa..8640aa90d 100644
--- a/src/main/java/net/openhft/chronicle/map/MapEntry.java
+++ b/src/main/java/net/openhft/chronicle/map/MapEntry.java
@@ -21,7 +21,7 @@ import net.openhft.chronicle.hash.HashEntry;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * The <i>present</i> {@code ChronicleHash} entry context.
+ * A context of a <i>present</i> entry in the {@code ChronicleHash}.
  * 
  * @param <K> the map key type
  * @param <V> the map value type
diff --git a/src/main/java/net/openhft/chronicle/map/MapQueryContext.java b/src/main/java/net/openhft/chronicle/map/MapQueryContext.java
index fde6ea97a..9007931f7 100644
--- a/src/main/java/net/openhft/chronicle/map/MapQueryContext.java
+++ b/src/main/java/net/openhft/chronicle/map/MapQueryContext.java
@@ -21,7 +21,7 @@ import net.openhft.chronicle.map.replication.MapRemoteOperations;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * The context of {@link ChronicleMap} operations with <i>individual keys</i>
+ * A context of {@link ChronicleMap} operations with <i>individual keys</i>
  * (like during {@code get()}, {@code put()}, etc., opposed to <i>bulk</i> operations).
  * This is the main context type of {@link MapMethods} and {@link MapRemoteOperations}.
  *
diff --git a/src/main/java/net/openhft/chronicle/map/replication/MapRemoteQueryContext.java b/src/main/java/net/openhft/chronicle/map/replication/MapRemoteQueryContext.java
index 89b60081a..b849d161e 100644
--- a/src/main/java/net/openhft/chronicle/map/replication/MapRemoteQueryContext.java
+++ b/src/main/java/net/openhft/chronicle/map/replication/MapRemoteQueryContext.java
@@ -17,7 +17,7 @@
 package net.openhft.chronicle.map.replication;
 
 import net.openhft.chronicle.hash.Data;
-import net.openhft.chronicle.hash.replication.HashRemoteQueryContext;
+import net.openhft.chronicle.hash.replication.RemoteOperationContext;
 import net.openhft.chronicle.hash.serialization.SizeMarshaller;
 import net.openhft.chronicle.map.ChronicleMap;
 import net.openhft.chronicle.map.ChronicleMapBuilder;
@@ -34,7 +34,7 @@ import org.jetbrains.annotations.Nullable;
  * @see MapRemoteOperations
  */
 public interface MapRemoteQueryContext<K, V, R> extends MapQueryContext<K, V, R>,
-        HashRemoteQueryContext<K> {
+        RemoteOperationContext<K> {
     @Nullable
     @Override
     MapReplicableEntry<K, V> entry();
diff --git a/src/main/java/net/openhft/chronicle/map/replication/MapReplicableEntry.java b/src/main/java/net/openhft/chronicle/map/replication/MapReplicableEntry.java
index 6ff837490..1bf930923 100644
--- a/src/main/java/net/openhft/chronicle/map/replication/MapReplicableEntry.java
+++ b/src/main/java/net/openhft/chronicle/map/replication/MapReplicableEntry.java
@@ -16,8 +16,17 @@
 
 package net.openhft.chronicle.map.replication;
 
-import net.openhft.chronicle.hash.replication.HashReplicableEntry;
+import net.openhft.chronicle.hash.replication.ReplicableEntry;
+import net.openhft.chronicle.map.ChronicleMap;
 import net.openhft.chronicle.map.MapEntry;
 
-public interface MapReplicableEntry<K, V> extends MapEntry<K, V>, HashReplicableEntry<K> {
+/**
+ * A context of a <i>present</i> entry in the replicated {@link ChronicleMap}.
+ *
+ * @param <K> the map key type
+ * @param <V> the map value type
+ * @see MapRemoteOperations
+ * @see MapRemoteQueryContext
+ */
+public interface MapReplicableEntry<K, V> extends MapEntry<K, V>, ReplicableEntry {
 }
diff --git a/src/main/java/net/openhft/chronicle/set/SetEntry.java b/src/main/java/net/openhft/chronicle/set/SetEntry.java
index 064b07ee4..54002cfcd 100644
--- a/src/main/java/net/openhft/chronicle/set/SetEntry.java
+++ b/src/main/java/net/openhft/chronicle/set/SetEntry.java
@@ -19,7 +19,7 @@ package net.openhft.chronicle.set;
 import net.openhft.chronicle.hash.HashEntry;
 
 /**
- * The <i>present</i> {@link ChronicleSet} entry context.
+ * A context of a <i>present</i> entry in the {@link ChronicleSet}.
  *  
  * @param <K> the set key type
  * @see SetEntryOperations
diff --git a/src/main/java/net/openhft/chronicle/set/SetQueryContext.java b/src/main/java/net/openhft/chronicle/set/SetQueryContext.java
index 291392eb7..7bda75c60 100644
--- a/src/main/java/net/openhft/chronicle/set/SetQueryContext.java
+++ b/src/main/java/net/openhft/chronicle/set/SetQueryContext.java
@@ -25,7 +25,7 @@ import net.openhft.chronicle.set.replication.SetRemoteOperations;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * The context of {@link ChronicleSet} operations with <i>individual keys</i>
+ * A context of {@link ChronicleSet} operations with <i>individual keys</i>
  * (most: {@code contains()}, {@code add()}, etc., opposed to <i>bulk</i> operations).
  *
  * @param <K> the set key type
diff --git a/src/main/java/net/openhft/chronicle/set/replication/SetRemoteQueryContext.java b/src/main/java/net/openhft/chronicle/set/replication/SetRemoteQueryContext.java
index 61e3cbd30..3be756685 100644
--- a/src/main/java/net/openhft/chronicle/set/replication/SetRemoteQueryContext.java
+++ b/src/main/java/net/openhft/chronicle/set/replication/SetRemoteQueryContext.java
@@ -16,7 +16,7 @@
 
 package net.openhft.chronicle.set.replication;
 
-import net.openhft.chronicle.hash.replication.HashRemoteQueryContext;
+import net.openhft.chronicle.hash.replication.RemoteOperationContext;
 import net.openhft.chronicle.set.ChronicleSet;
 import net.openhft.chronicle.set.SetEntryOperations;
 import net.openhft.chronicle.set.SetQueryContext;
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable;
  * @see SetRemoteOperations
  */
 public interface SetRemoteQueryContext<K, R>
-        extends SetQueryContext<K, R>, HashRemoteQueryContext<K> {
+        extends SetQueryContext<K, R>, RemoteOperationContext<K> {
     @Override
     @Nullable
     SetReplicableEntry<K> entry();
diff --git a/src/main/java/net/openhft/chronicle/set/replication/SetReplicableEntry.java b/src/main/java/net/openhft/chronicle/set/replication/SetReplicableEntry.java
index 681ba1c50..849b22ae3 100644
--- a/src/main/java/net/openhft/chronicle/set/replication/SetReplicableEntry.java
+++ b/src/main/java/net/openhft/chronicle/set/replication/SetReplicableEntry.java
@@ -16,8 +16,16 @@
 
 package net.openhft.chronicle.set.replication;
 
-import net.openhft.chronicle.hash.replication.HashReplicableEntry;
+import net.openhft.chronicle.hash.replication.ReplicableEntry;
+import net.openhft.chronicle.set.ChronicleSet;
 import net.openhft.chronicle.set.SetEntry;
 
-public interface SetReplicableEntry<K> extends SetEntry<K>, HashReplicableEntry<K> {
+/**
+ * A context of a <i>present</i> entry in the replicated {@link ChronicleSet}.
+ *
+ * @param <K> the set key type
+ * @see SetRemoteOperations
+ * @see SetRemoteQueryContext
+ */
+public interface SetReplicableEntry<K> extends SetEntry<K>, ReplicableEntry {
 }