diff --git a/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java b/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
index 2c6407f..8466b95 100644
--- a/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
+++ b/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
@@ -46,7 +46,7 @@
 import org.onosproject.net.intent.OpticalConnectivityIntent;
 import org.onosproject.net.intent.PointToPointIntent;
 import org.onosproject.net.newresource.ResourceService;
-import org.onosproject.net.resource.device.DeviceResourceStore;
+import org.onosproject.net.resource.device.IntentSetMultimap;
 import org.onosproject.net.resource.link.LinkResourceAllocations;
 import org.onosproject.net.resource.link.LinkResourceService;
 import org.onosproject.net.topology.LinkWeight;
@@ -98,7 +98,7 @@
     protected DeviceService deviceService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DeviceResourceStore deviceResourceStore;
+    protected IntentSetMultimap intentSetMultimap;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected LinkResourceService linkResourceService;
@@ -385,7 +385,7 @@
                 }
             } else if (intent instanceof OpticalCircuitIntent) {
                 resourceService.release(intent.id());
-                deviceResourceStore.releaseMapping(intent.id());
+                intentSetMultimap.releaseMapping(intent.id());
                 if (lra != null) {
                     linkResourceService.releaseResources(lra);
                 }
diff --git a/core/api/src/main/java/org/onosproject/net/resource/device/DeviceResourceStore.java b/core/api/src/main/java/org/onosproject/net/resource/device/IntentSetMultimap.java
similarity index 96%
rename from core/api/src/main/java/org/onosproject/net/resource/device/DeviceResourceStore.java
rename to core/api/src/main/java/org/onosproject/net/resource/device/IntentSetMultimap.java
index 88c561f..67c539d 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/device/DeviceResourceStore.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/device/IntentSetMultimap.java
@@ -19,7 +19,7 @@
 
 import java.util.Set;
 
-public interface DeviceResourceStore {
+public interface IntentSetMultimap {
 
     /**
      * Allocates the mapping between the given intents.
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
index a54c92d..dcc20fb 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
@@ -52,7 +52,7 @@
 import org.onosproject.net.newresource.ResourceAllocation;
 import org.onosproject.net.newresource.ResourcePath;
 import org.onosproject.net.newresource.ResourceService;
-import org.onosproject.net.resource.device.DeviceResourceStore;
+import org.onosproject.net.resource.device.IntentSetMultimap;
 import org.onosproject.net.resource.link.LinkResourceAllocations;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
@@ -98,7 +98,7 @@
     protected ResourceService resourceService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DeviceResourceStore deviceResourceStore;
+    protected IntentSetMultimap intentSetMultimap;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected IntentService intentService;
@@ -208,7 +208,7 @@
         circuitIntent = new FlowRuleIntent(appId, rules, intent.resources());
 
         // Save circuit to connectivity intent mapping
-        deviceResourceStore.allocateMapping(connIntent.id(), intent.id());
+        intentSetMultimap.allocateMapping(connIntent.id(), intent.id());
         intents.add(circuitIntent);
 
         return intents;
@@ -226,7 +226,7 @@
             return true;
         }
 
-        Set<IntentId> mapping = deviceResourceStore.getMapping(resource);
+        Set<IntentId> mapping = intentSetMultimap.getMapping(resource);
 
         if (mapping == null) {
             return true;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDeviceResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentIntentSetMultimap.java
similarity index 92%
rename from core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDeviceResourceStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentIntentSetMultimap.java
index c53a6ad..87e6721 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentDeviceResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentIntentSetMultimap.java
@@ -23,7 +23,7 @@
 import org.apache.felix.scr.annotations.Service;
 import org.onosproject.net.device.DeviceService;
 import org.onosproject.net.intent.IntentId;
-import org.onosproject.net.resource.device.DeviceResourceStore;
+import org.onosproject.net.resource.device.IntentSetMultimap;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.service.ConsistentMap;
 import org.onosproject.store.service.Serializer;
@@ -37,11 +37,12 @@
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
- * Store that manages device resources using Copycat-backed TransactionalMaps.
+ * A collection that maps Intent IDs as keys to values as Intent IDs,
+ * where each key may associated with multiple values without duplication.
  */
 @Component(immediate = true, enabled = true)
 @Service
-public class ConsistentDeviceResourceStore implements DeviceResourceStore {
+public class ConsistentIntentSetMultimap implements IntentSetMultimap {
     private final Logger log = getLogger(getClass());
 
     private static final String INTENT_MAPPING = "IntentMapping";