diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/AbstractElementCommand.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/AbstractUiCacheElementCommand.java
similarity index 95%
rename from web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/AbstractElementCommand.java
rename to web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/AbstractUiCacheElementCommand.java
index 820ddf0..2edd396 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/AbstractElementCommand.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/AbstractUiCacheElementCommand.java
@@ -28,7 +28,7 @@
 /**
  * Base class for model cache CLI commands.
  */
-abstract class AbstractElementCommand extends AbstractShellCommand {
+abstract class AbstractUiCacheElementCommand extends AbstractShellCommand {
 
     /**
      * Built in comparator for elements.
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/ListDevices.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheDevicesCommand.java
similarity index 93%
rename from web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/ListDevices.java
rename to web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheDevicesCommand.java
index 9544bcb..7f5ada5 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/ListDevices.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheDevicesCommand.java
@@ -24,7 +24,7 @@
  */
 @Command(scope = "onos", name = "ui-cache-devices",
         description = "Lists UiDevices in the Model Cache")
-public class ListDevices extends AbstractElementCommand {
+public class UiCacheDevicesCommand extends AbstractUiCacheElementCommand {
 
     @Override
     protected void execute() {
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/ListHosts.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheHostsCommand.java
similarity index 93%
rename from web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/ListHosts.java
rename to web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheHostsCommand.java
index 9de0159..1b4189a 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/ListHosts.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheHostsCommand.java
@@ -24,7 +24,7 @@
  */
 @Command(scope = "onos", name = "ui-cache-hosts",
         description = "Lists UiHosts in the Model Cache")
-public class ListHosts extends AbstractElementCommand {
+public class UiCacheHostsCommand extends AbstractUiCacheElementCommand {
 
     @Override
     protected void execute() {
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/ListLinks.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheLinksCommand.java
similarity index 93%
rename from web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/ListLinks.java
rename to web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheLinksCommand.java
index 245aab3..9590640 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/ListLinks.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheLinksCommand.java
@@ -24,7 +24,7 @@
  */
 @Command(scope = "onos", name = "ui-cache-links",
         description = "Lists UiLinks in the Model Cache")
-public class ListLinks extends AbstractElementCommand {
+public class UiCacheLinksCommand extends AbstractUiCacheElementCommand {
 
     @Override
     protected void execute() {
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/ListMembers.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheMembersCommand.java
similarity index 93%
rename from web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/ListMembers.java
rename to web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheMembersCommand.java
index a6f5617..846c24c 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/ListMembers.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheMembersCommand.java
@@ -24,7 +24,7 @@
  */
 @Command(scope = "onos", name = "ui-cache-members",
         description = "Lists UiClusterMembers in the Model Cache")
-public class ListMembers extends AbstractElementCommand {
+public class UiCacheMembersCommand extends AbstractUiCacheElementCommand {
 
     @Override
     protected void execute() {
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/ListRegions.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheRegionsCommand.java
similarity index 93%
rename from web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/ListRegions.java
rename to web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheRegionsCommand.java
index 70e0826..aab4dae 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/ListRegions.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheRegionsCommand.java
@@ -24,7 +24,7 @@
  */
 @Command(scope = "onos", name = "ui-cache-regions",
         description = "Lists UiRegions in the Model Cache")
-public class ListRegions extends AbstractElementCommand {
+public class UiCacheRegionsCommand extends AbstractUiCacheElementCommand {
 
     @Override
     protected void execute() {
diff --git a/web/gui/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/web/gui/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 6b8633c..bd4a2ca 100644
--- a/web/gui/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/web/gui/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -18,19 +18,19 @@
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.onosproject.ui.impl.topo.cli.ListMembers"/>
+            <action class="org.onosproject.ui.impl.topo.cli.UiCacheMembersCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.ui.impl.topo.cli.ListRegions"/>
+            <action class="org.onosproject.ui.impl.topo.cli.UiCacheRegionsCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.ui.impl.topo.cli.ListDevices"/>
+            <action class="org.onosproject.ui.impl.topo.cli.UiCacheDevicesCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.ui.impl.topo.cli.ListHosts"/>
+            <action class="org.onosproject.ui.impl.topo.cli.UiCacheHostsCommand"/>
         </command>
         <command>
-            <action class="org.onosproject.ui.impl.topo.cli.ListLinks"/>
+            <action class="org.onosproject.ui.impl.topo.cli.UiCacheLinksCommand"/>
         </command>
     </command-bundle>