diff --git a/cli/src/main/java/org/onosproject/cli/net/AddMeter.java b/cli/src/main/java/org/onosproject/cli/net/AddMeterCommand.java
similarity index 95%
rename from cli/src/main/java/org/onosproject/cli/net/AddMeter.java
rename to cli/src/main/java/org/onosproject/cli/net/AddMeterCommand.java
index f240f43..1adeba8 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddMeter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddMeterCommand.java
@@ -30,11 +30,11 @@
 import java.util.Collections;
 
 /**
- * Add a meter.
+ * Add a meter to a device.
  */
 @Command(scope = "onos", name = "add-meter",
         description = "Adds a meter to a device (currently for testing)")
-public class AddMeter extends AbstractShellCommand {
+public class AddMeterCommand extends AbstractShellCommand {
 
     @Argument(index = 0, name = "uri", description = "Device ID",
             required = true, multiValued = false)
diff --git a/cli/src/main/java/org/onosproject/cli/net/GetFlowStatistics.java b/cli/src/main/java/org/onosproject/cli/net/GetFlowStatisticsCommand.java
similarity index 99%
rename from cli/src/main/java/org/onosproject/cli/net/GetFlowStatistics.java
rename to cli/src/main/java/org/onosproject/cli/net/GetFlowStatisticsCommand.java
index e39c6e8..1cc6019 100644
--- a/cli/src/main/java/org/onosproject/cli/net/GetFlowStatistics.java
+++ b/cli/src/main/java/org/onosproject/cli/net/GetFlowStatisticsCommand.java
@@ -43,7 +43,7 @@
  */
 @Command(scope = "onos", name = "get-flow-stats",
         description = "Fetches flow stats for a connection point with given flow type and instruction type")
-public class GetFlowStatistics extends AbstractShellCommand {
+public class GetFlowStatisticsCommand extends AbstractShellCommand {
     @Argument(index = 0, name = "devicePort",
             description = "Device[/Port] connectPoint Description",
             required = true, multiValued = false)
diff --git a/cli/src/main/java/org/onosproject/cli/net/GetStatistics.java b/cli/src/main/java/org/onosproject/cli/net/GetStatisticsCommand.java
similarity index 97%
rename from cli/src/main/java/org/onosproject/cli/net/GetStatistics.java
rename to cli/src/main/java/org/onosproject/cli/net/GetStatisticsCommand.java
index 8b705a6..7b5abd7 100644
--- a/cli/src/main/java/org/onosproject/cli/net/GetStatistics.java
+++ b/cli/src/main/java/org/onosproject/cli/net/GetStatisticsCommand.java
@@ -34,7 +34,7 @@
  */
 @Command(scope = "onos", name = "get-stats",
          description = "Fetches stats for a connection point")
-public class GetStatistics extends AbstractShellCommand {
+public class GetStatisticsCommand extends AbstractShellCommand {
 
     @Argument(index = 0, name = "connectPoint",
               description = "Device/Port Description",
diff --git a/cli/src/main/java/org/onosproject/cli/net/Meters.java b/cli/src/main/java/org/onosproject/cli/net/MetersListCommand.java
similarity index 95%
rename from cli/src/main/java/org/onosproject/cli/net/Meters.java
rename to cli/src/main/java/org/onosproject/cli/net/MetersListCommand.java
index 5f90c1b..c59014b 100644
--- a/cli/src/main/java/org/onosproject/cli/net/Meters.java
+++ b/cli/src/main/java/org/onosproject/cli/net/MetersListCommand.java
@@ -26,11 +26,11 @@
 import java.util.Collection;
 
 /**
- * Add a meter.
+ * Lists all meters.
  */
 @Command(scope = "onos", name = "meters",
         description = "Shows meters")
-public class Meters extends AbstractShellCommand {
+public class MetersListCommand extends AbstractShellCommand {
 
     @Argument(index = 0, name = "uri", description = "Device ID",
             required = false, multiValued = false)
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 db6da4f..3eefa27 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -186,13 +186,13 @@
             </completers>
         </command>
         <command>
-            <action class="org.onosproject.cli.net.AddMeter"/>
+            <action class="org.onosproject.cli.net.AddMeterCommand"/>
             <completers>
                 <ref component-id="deviceIdCompleter"/>
             </completers>
         </command>
         <command>
-            <action class="org.onosproject.cli.net.Meters"/>
+            <action class="org.onosproject.cli.net.MetersListCommand"/>
             <completers>
                 <ref component-id="deviceIdCompleter"/>
             </completers>
@@ -298,13 +298,13 @@
             </optional-completers>
         </command>
         <command>
-            <action class="org.onosproject.cli.net.GetStatistics"/>
+            <action class="org.onosproject.cli.net.GetStatisticsCommand"/>
             <completers>
                 <ref component-id="connectPointCompleter"/>
             </completers>
         </command>
         <command>
-            <action class="org.onosproject.cli.net.GetFlowStatistics"/>
+            <action class="org.onosproject.cli.net.GetFlowStatisticsCommand"/>
             <completers>
                 <ref component-id="deviceIdCompleter"/>
             </completers>