diff --git a/src/main/java/com/uid2/operator/service/IUIDOperatorService.java b/src/main/java/com/uid2/operator/service/IUIDOperatorService.java
index dc6671cef..5aef54f7a 100644
--- a/src/main/java/com/uid2/operator/service/IUIDOperatorService.java
+++ b/src/main/java/com/uid2/operator/service/IUIDOperatorService.java
@@ -16,7 +16,7 @@ public interface IUIDOperatorService {
 
     RefreshResponse refreshIdentity(RefreshTokenInput input);
 
-    RawUidResponse mapIdentity(MapRequest request);
+    RawUidResponse mapHashedDiiIdentity(MapRequest request);
 
     @Deprecated
     RawUidResponse map(HashedDiiIdentity hashedDiiIdentity, Instant asOf);
diff --git a/src/main/java/com/uid2/operator/service/UIDOperatorService.java b/src/main/java/com/uid2/operator/service/UIDOperatorService.java
index f5ba469b9..965afdb4b 100644
--- a/src/main/java/com/uid2/operator/service/UIDOperatorService.java
+++ b/src/main/java/com/uid2/operator/service/UIDOperatorService.java
@@ -161,7 +161,7 @@ public RefreshResponse refreshIdentity(RefreshTokenInput input) {
     }
 
     @Override
-    public RawUidResponse mapIdentity(MapRequest request) {
+    public RawUidResponse mapHashedDiiIdentity(MapRequest request) {
         final FirstLevelHashIdentity firstLevelHashIdentity = getFirstLevelHashIdentity(request.hashedDiiIdentity,
                 request.asOf);
         if (request.shouldCheckOptOut() && getGlobalOptOutResult(firstLevelHashIdentity, false).isOptedOut()) {
diff --git a/src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java b/src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java
index 055659924..52a4d7e8d 100644
--- a/src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java
+++ b/src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java
@@ -1450,7 +1450,7 @@ private JsonObject handleIdentityMapCommon(RoutingContext rc, InputUtil.InputVal
         for (int i = 0; i < count; ++i) {
             final InputUtil.InputVal input = inputList[i];
             if (input != null && input.isValid()) {
-                final RawUidResponse rawUidResponse = idService.mapIdentity(
+                final RawUidResponse rawUidResponse = idService.mapHashedDiiIdentity(
                         new MapRequest(
                                 input.toHashedDiiIdentity(this.identityScope),
                                 OptoutCheckPolicy.respectOptOut(),
diff --git a/src/test/java/com/uid2/operator/UIDOperatorServiceTest.java b/src/test/java/com/uid2/operator/UIDOperatorServiceTest.java
index 794228db8..0a4b56299 100644
--- a/src/test/java/com/uid2/operator/UIDOperatorServiceTest.java
+++ b/src/test/java/com/uid2/operator/UIDOperatorServiceTest.java
@@ -367,15 +367,15 @@ public void testIdentityMapForOptOutUser(IdentityType type, String identity, Ide
         if (scope == IdentityScope.UID2) {
             verify(shutdownHandler, atLeastOnce()).handleSaltRetrievalResponse(false);
             verify(shutdownHandler, never()).handleSaltRetrievalResponse(true);
-            rawUidResponse = uid2Service.mapIdentity(mapRequestForceMap);
+            rawUidResponse = uid2Service.mapHashedDiiIdentity(mapRequestForceMap);
             reset(shutdownHandler);
-            rawUidResponseShouldBeOptOut = uid2Service.mapIdentity(mapRequestRespectOptOut);
+            rawUidResponseShouldBeOptOut = uid2Service.mapHashedDiiIdentity(mapRequestRespectOptOut);
         } else {
             verify(shutdownHandler, atLeastOnce()).handleSaltRetrievalResponse(false);
             verify(shutdownHandler, never()).handleSaltRetrievalResponse(true);
-            rawUidResponse = euidService.mapIdentity(mapRequestForceMap);
+            rawUidResponse = euidService.mapHashedDiiIdentity(mapRequestForceMap);
             reset(shutdownHandler);
-            rawUidResponseShouldBeOptOut = euidService.mapIdentity(mapRequestRespectOptOut);
+            rawUidResponseShouldBeOptOut = euidService.mapHashedDiiIdentity(mapRequestRespectOptOut);
         }
         verify(shutdownHandler, atLeastOnce()).handleSaltRetrievalResponse(false);
         verify(shutdownHandler, never()).handleSaltRetrievalResponse(true);
@@ -471,10 +471,10 @@ void testSpecialIdentityOptOutIdentityMap(TestIdentityInputType type, String id,
 
         final RawUidResponse rawUidResponse;
         if(scope == IdentityScope.EUID) {
-            rawUidResponse = euidService.mapIdentity(mapRequestRespectOptOut);
+            rawUidResponse = euidService.mapHashedDiiIdentity(mapRequestRespectOptOut);
         }
         else {
-            rawUidResponse = uid2Service.mapIdentity(mapRequestRespectOptOut);
+            rawUidResponse = uid2Service.mapHashedDiiIdentity(mapRequestRespectOptOut);
         }
         verify(shutdownHandler, atLeastOnce()).handleSaltRetrievalResponse(false);
         verify(shutdownHandler, never()).handleSaltRetrievalResponse(true);
@@ -585,10 +585,10 @@ void testSpecialIdentityRefreshOptOutIdentityMap(TestIdentityInputType type, Str
 
         final RawUidResponse rawUidResponse;
         if(scope == IdentityScope.EUID) {
-            rawUidResponse = euidService.mapIdentity(mapRequestRespectOptOut);
+            rawUidResponse = euidService.mapHashedDiiIdentity(mapRequestRespectOptOut);
         }
         else {
-            rawUidResponse = uid2Service.mapIdentity(mapRequestRespectOptOut);
+            rawUidResponse = uid2Service.mapHashedDiiIdentity(mapRequestRespectOptOut);
         }
         verify(shutdownHandler, atLeastOnce()).handleSaltRetrievalResponse(false);
         verify(shutdownHandler, never()).handleSaltRetrievalResponse(true);
@@ -656,10 +656,10 @@ void testSpecialIdentityValidateIdentityMap(TestIdentityInputType type, String i
 
         final RawUidResponse rawUidResponse;
         if(scope == IdentityScope.EUID) {
-            rawUidResponse = euidService.mapIdentity(mapRequestRespectOptOut);
+            rawUidResponse = euidService.mapHashedDiiIdentity(mapRequestRespectOptOut);
         }
         else {
-            rawUidResponse = uid2Service.mapIdentity(mapRequestRespectOptOut);
+            rawUidResponse = uid2Service.mapHashedDiiIdentity(mapRequestRespectOptOut);
         }
         verify(shutdownHandler, atLeastOnce()).handleSaltRetrievalResponse(false);
         verify(shutdownHandler, never()).handleSaltRetrievalResponse(true);
@@ -775,10 +775,10 @@ void testExpiredSaltsNotifiesShutdownHandler(TestIdentityInputType type, String
         final RawUidResponse rawUidResponse;
         reset(shutdownHandler);
         if(scope == IdentityScope.EUID) {
-            rawUidResponse = euidService.mapIdentity(mapRequest);
+            rawUidResponse = euidService.mapHashedDiiIdentity(mapRequest);
         }
         else {
-            rawUidResponse = uid2Service.mapIdentity(mapRequest);
+            rawUidResponse = uid2Service.mapHashedDiiIdentity(mapRequest);
         }
         verify(shutdownHandler, atLeastOnce()).handleSaltRetrievalResponse(true);
         verify(shutdownHandler, never()).handleSaltRetrievalResponse(false);
diff --git a/src/test/java/com/uid2/operator/benchmark/IdentityMapBenchmark.java b/src/test/java/com/uid2/operator/benchmark/IdentityMapBenchmark.java
index 880875fc0..59b033542 100644
--- a/src/test/java/com/uid2/operator/benchmark/IdentityMapBenchmark.java
+++ b/src/test/java/com/uid2/operator/benchmark/IdentityMapBenchmark.java
@@ -32,6 +32,6 @@ public RawUidResponse IdentityMapRawThroughput() {
     @Benchmark
     @BenchmarkMode(Mode.Throughput)
     public RawUidResponse IdentityMapWithOptOutThroughput() {
-        return uidService.mapIdentity(new MapRequest(hashedDiiIdentities[(idx++) & 65535], OptoutCheckPolicy.RespectOptOut, Instant.now()));
+        return uidService.mapHashedDiiIdentity(new MapRequest(hashedDiiIdentities[(idx++) & 65535], OptoutCheckPolicy.RespectOptOut, Instant.now()));
     }
 }