diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/resource/impl/DistributedLinkResourceStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/resource/impl/DistributedLinkResourceStore.java
index b8039da..d035c2d 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/resource/impl/DistributedLinkResourceStore.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/resource/impl/DistributedLinkResourceStore.java
@@ -29,6 +29,7 @@
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
+import org.onlab.onos.net.AnnotationKeys;
 import org.onlab.onos.net.Link;
 import org.onlab.onos.net.LinkKey;
 import org.onlab.onos.net.intent.IntentId;
@@ -99,9 +100,9 @@
     protected LinkService linkService;
 
     // Link annotation key name to use as bandwidth
-    private String bandwidthAnnotation = "bandwidth";
+    private String bandwidthAnnotation = AnnotationKeys.BANDWIDTH;
     // Link annotation key name to use as max lambda
-    private String wavesAnnotation = "optical.waves";
+    private String wavesAnnotation = AnnotationKeys.OPTICAL_WAVES;
 
     private StoreSerializer serializer;
 
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/resource/impl/HazelcastLinkResourceStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/resource/impl/HazelcastLinkResourceStore.java
index e14b57e..b40ec81 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/resource/impl/HazelcastLinkResourceStore.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/resource/impl/HazelcastLinkResourceStore.java
@@ -30,6 +30,7 @@
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
+import org.onlab.onos.net.AnnotationKeys;
 import org.onlab.onos.net.Link;
 import org.onlab.onos.net.LinkKey;
 import org.onlab.onos.net.intent.IntentId;
@@ -95,9 +96,9 @@
     protected LinkService linkService;
 
     // Link annotation key name to use as bandwidth
-    private String bandwidthAnnotation = "bandwidth";
+    private String bandwidthAnnotation = AnnotationKeys.BANDWIDTH;
     // Link annotation key name to use as max lambda
-    private String wavesAnnotation = "optical.waves";
+    private String wavesAnnotation = AnnotationKeys.OPTICAL_WAVES;
 
     @Override
     @Activate