diff --git a/src/main/java/net/openhft/chronicle/map/MapContext.java b/src/main/java/net/openhft/chronicle/map/MapContext.java
index 3dd70430b..1743f990c 100644
--- a/src/main/java/net/openhft/chronicle/map/MapContext.java
+++ b/src/main/java/net/openhft/chronicle/map/MapContext.java
@@ -19,7 +19,7 @@ package net.openhft.chronicle.map;
 import net.openhft.chronicle.bytes.BytesStore;
 import net.openhft.chronicle.hash.ChronicleHash;
 import net.openhft.chronicle.hash.Data;
-import net.openhft.chronicle.hash.HashContext;
+import net.openhft.chronicle.set.SetContext;
 
 /**
  * Context, in which {@link MapEntry MapEntries} are accessed. {@code MapContext} allows to access
@@ -36,7 +36,7 @@ import net.openhft.chronicle.hash.HashContext;
  * @param <R> the return type of {@link MapEntryOperations} specified for the queried map
  */
 public interface MapContext<K, V, R>
-        extends HashContext<K>, MapEntryOperations<K, V, R>, DefaultValueProvider<K, V> {
+        extends SetContext<K, R>, MapEntryOperations<K, V, R>, DefaultValueProvider<K, V> {
     /**
      * Returns the accessed {@code ChronicleMap}. Synonym to {@link #map()}.
      */
diff --git a/src/main/java/net/openhft/chronicle/map/MapEntry.java b/src/main/java/net/openhft/chronicle/map/MapEntry.java
index 908ec34fb..505891569 100644
--- a/src/main/java/net/openhft/chronicle/map/MapEntry.java
+++ b/src/main/java/net/openhft/chronicle/map/MapEntry.java
@@ -17,7 +17,7 @@
 package net.openhft.chronicle.map;
 
 import net.openhft.chronicle.hash.Data;
-import net.openhft.chronicle.hash.HashEntry;
+import net.openhft.chronicle.set.SetEntry;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
  * @see MapEntryOperations
  * @see MapQueryContext#entry()
  */
-public interface MapEntry<K, V> extends HashEntry<K> {
+public interface MapEntry<K, V> extends SetEntry<K> {
     @Override
     @NotNull
     MapContext<K, V, ?> context();