diff --git a/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
index 992c528..cdae9b5 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
@@ -76,7 +76,7 @@
             print("%s", json(service, service.getIntents()));
         } else {
             for (Intent intent : service.getIntents()) {
-                IntentState state = service.getIntentState(intent.id());
+                IntentState state = service.getIntentState(intent.key());
                 if (state != null) {
                     print("id=%s, state=%s, type=%s, appId=%s",
                           intent.id(), state, intent.getClass().getSimpleName(),
@@ -130,7 +130,7 @@
 
             // Collect the summary for each intent type intents
             for (Intent intent : intents) {
-                IntentState intentState = service.getIntentState(intent.id());
+                IntentState intentState = service.getIntentState(intent.key());
                 if (intentState == null) {
                     continue;
                 }
@@ -365,7 +365,7 @@
             print("    egress=%s", li.egressPoints());
         }
 
-        List<Intent> installable = service.getInstallableIntents(intent.id());
+        List<Intent> installable = service.getInstallableIntents(intent.key());
         if (showInstallable && installable != null && !installable.isEmpty()) {
             print("    installable=%s", installable);
         }
@@ -387,7 +387,7 @@
                 .put("type", intent.getClass().getSimpleName())
                 .put("appId", intent.appId().name());
 
-        IntentState state = service.getIntentState(intent.id());
+        IntentState state = service.getIntentState(intent.key());
         if (state != null) {
             result.put("state", state.toString());
         }
@@ -438,7 +438,7 @@
             result.set("links", LinksListCommand.json(li.links()));
         }
 
-        List<Intent> installable = service.getInstallableIntents(intent.id());
+        List<Intent> installable = service.getInstallableIntents(intent.key());
         if (installable != null && !installable.isEmpty()) {
             result.set("installable", json(service, installable));
         }
