diff --git a/apps/routing/src/main/java/org/onosproject/routing/cli/AddPeerCommand.java b/apps/routing/src/main/java/org/onosproject/routing/cli/AddPeerCommand.java
index f169be7..5a83f96 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/cli/AddPeerCommand.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/cli/AddPeerCommand.java
@@ -30,7 +30,7 @@
 /**
  * Command to add new BGP peer to existing internal speaker.
  */
-@Command(scope = "onos", name = "add-bgp-peer",
+@Command(scope = "onos", name = "bgp-peer-add",
         description = "Adds an external BGP router as peer to an existing BGP speaker")
 public class AddPeerCommand extends AbstractShellCommand {
 
diff --git a/apps/routing/src/main/java/org/onosproject/routing/cli/AddSpeakerCommand.java b/apps/routing/src/main/java/org/onosproject/routing/cli/AddSpeakerCommand.java
index 2790adc..55dc168 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/cli/AddSpeakerCommand.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/cli/AddSpeakerCommand.java
@@ -34,7 +34,7 @@
 /**
  * Command to add a new internal BGP speaker.
  */
-@Command(scope = "onos", name = "add-bgp-speaker",
+@Command(scope = "onos", name = "bgp-speaker-add",
         description = "Adds an internal BGP speaker")
 public class AddSpeakerCommand extends AbstractShellCommand {
 
diff --git a/apps/routing/src/main/java/org/onosproject/routing/cli/RemovePeerCommand.java b/apps/routing/src/main/java/org/onosproject/routing/cli/RemovePeerCommand.java
index 00ec080..06293ef 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/cli/RemovePeerCommand.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/cli/RemovePeerCommand.java
@@ -29,7 +29,7 @@
 /**
  * Command to remove existing BGP peer.
  */
-@Command(scope = "onos", name = "remove-bgp-peer",
+@Command(scope = "onos", name = "bgp-peer-remove",
         description = "Removes a BGP peer")
 public class RemovePeerCommand extends AbstractShellCommand {
 
diff --git a/apps/routing/src/main/java/org/onosproject/routing/cli/RemoveSpeakerCommand.java b/apps/routing/src/main/java/org/onosproject/routing/cli/RemoveSpeakerCommand.java
index 1b4ef80..33120b9 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/cli/RemoveSpeakerCommand.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/cli/RemoveSpeakerCommand.java
@@ -28,7 +28,7 @@
 /**
  * Command to remove a internal BGP speaker.
  */
-@Command(scope = "onos", name = "remove-bgp-speaker",
+@Command(scope = "onos", name = "bgp-speaker-remove",
         description = "Removes an internal BGP speaker")
 public class RemoveSpeakerCommand extends AbstractShellCommand {
 
diff --git a/cli/src/main/java/org/onosproject/cli/net/InterfaceAddCommand.java b/cli/src/main/java/org/onosproject/cli/net/InterfaceAddCommand.java
index d949369..3005eef 100644
--- a/cli/src/main/java/org/onosproject/cli/net/InterfaceAddCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/InterfaceAddCommand.java
@@ -33,7 +33,7 @@
 /**
  * Adds a new interface configuration.
  */
-@Command(scope = "onos", name = "add-interface",
+@Command(scope = "onos", name = "interface-add",
         description = "Adds a new configured interface")
 public class InterfaceAddCommand extends AbstractShellCommand {
 
diff --git a/cli/src/main/java/org/onosproject/cli/net/InterfaceRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/net/InterfaceRemoveCommand.java
index 61296a0..b4abc67 100644
--- a/cli/src/main/java/org/onosproject/cli/net/InterfaceRemoveCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/InterfaceRemoveCommand.java
@@ -25,7 +25,7 @@
 /**
  * Removes an interface configuration.
  */
-@Command(scope = "onos", name = "remove-interface",
+@Command(scope = "onos", name = "interface-remove",
         description = "Removes a configured interface")
 public class InterfaceRemoveCommand extends AbstractShellCommand {