diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ResourcePath.java b/core/api/src/main/java/org/onosproject/net/newresource/ResourcePath.java
index 35a66d8..2e86509 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ResourcePath.java
+++ b/core/api/src/main/java/org/onosproject/net/newresource/ResourcePath.java
@@ -108,9 +108,9 @@
     }
 
     /**
-     * Creates an resource path from the specified key.
+     * Creates an resource path from the specified id.
      *
-     * @param id key of the path
+     * @param id id of the path
      */
     protected ResourcePath(ResourceId id) {
         checkNotNull(id);
@@ -190,9 +190,9 @@
     }
 
     /**
-     * Returns the key of this resource path.
+     * Returns the ID of this resource path.
      *
-     * @return the key of this resource path
+     * @return the ID of this resource path
      */
     public ResourceId id() {
         return id;
@@ -218,7 +218,7 @@
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
-                .add("key", id)
+                .add("id", id)
                 .toString();
     }
 
@@ -236,8 +236,8 @@
             super();
         }
 
-        private Discrete(ResourceId key) {
-            super(key);
+        private Discrete(ResourceId id) {
+            super(id);
         }
     }
 
@@ -252,8 +252,8 @@
     public static final class Continuous extends ResourcePath {
         private final double value;
 
-        private Continuous(ResourceId key, double value) {
-            super(key);
+        private Continuous(ResourceId id, double value) {
+            super(id);
             this.value = value;
         }
 
