diff --git a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index e2f0764..ab588d0 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -137,7 +137,7 @@
             <action class="org.onosproject.cli.net.IntentRemoveCommand"/>
             <completers>
                 <ref component-id="appIdWithIntentNameCompleter"/>
-                <ref component-id="intentIdCompleter"/>
+                <ref component-id="intentKeyCompleter"/>
             </completers>
         </command>
         <command>
@@ -413,7 +413,7 @@
     <bean id="clusterIdCompleter" class="org.onosproject.cli.net.ClusterIdCompleter"/>
     <bean id="roleCompleter" class="org.onosproject.cli.net.RoleCompleter"/>
     <bean id="hostIdCompleter" class="org.onosproject.cli.net.HostIdCompleter"/>
-    <bean id="intentIdCompleter" class="org.onosproject.cli.net.IntentIdCompleter"/>
+    <bean id="intentKeyCompleter" class="org.onosproject.cli.net.IntentKeyCompleter"/>
     <bean id="flowRuleStatusCompleter" class="org.onosproject.cli.net.FlowRuleStatusCompleter"/>
     <bean id="connectPointCompleter" class="org.onosproject.cli.net.ConnectPointCompleter"/>
     <bean id="nullCompleter" class="org.apache.karaf.shell.console.completer.NullCompleter"/>