diff --git a/cli/src/main/java/org/onosproject/cli/net/AddFlowsCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddFlowsCommand.java
index 3c02779..08f1fa4 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddFlowsCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddFlowsCommand.java
@@ -45,7 +45,7 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * Installs many many flows.
+ * Installs bulk flows.
  */
 @Command(scope = "onos", name = "add-flows",
          description = "Installs a number of test flow rules - for testing only")
diff --git a/cli/src/main/java/org/onosproject/cli/net/AddMplsIntent.java b/cli/src/main/java/org/onosproject/cli/net/AddMplsIntent.java
index ebaf89b..8396e9d 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddMplsIntent.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddMplsIntent.java
@@ -19,6 +19,9 @@
 import static org.onosproject.net.DeviceId.deviceId;
 import static org.onosproject.net.PortNumber.portNumber;
 
+/**
+ * Installs MPLS intents.
+ */
 @Command(scope = "onos", name = "add-mpls-intent", description = "Installs mpls connectivity intent")
 public class AddMplsIntent extends ConnectivityIntentCommand {
 
diff --git a/cli/src/main/java/org/onosproject/cli/net/AddMultiPointToSinglePointIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddMultiPointToSinglePointIntentCommand.java
index e25873d..66083b8 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddMultiPointToSinglePointIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddMultiPointToSinglePointIntentCommand.java
@@ -35,10 +35,10 @@
 import static org.onosproject.net.PortNumber.portNumber;
 
 /**
- * Installs point-to-point connectivity intents.
+ * Installs connectivity intent between multiple ingress devices and a single egress device.
  */
 @Command(scope = "onos", name = "add-multi-to-single-intent",
-         description = "Installs point-to-point connectivity intent")
+         description = "Installs connectivity intent between multiple ingress devices and a single egress device")
 public class AddMultiPointToSinglePointIntentCommand extends ConnectivityIntentCommand {
 
     @Argument(index = 0, name = "ingressDevices egressDevice",
diff --git a/cli/src/main/java/org/onosproject/cli/net/AddSinglePointToMultiPointIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddSinglePointToMultiPointIntentCommand.java
index e694d51..cdf4a73 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AddSinglePointToMultiPointIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AddSinglePointToMultiPointIntentCommand.java
@@ -34,7 +34,9 @@
 import static org.onosproject.net.DeviceId.deviceId;
 import static org.onosproject.net.PortNumber.portNumber;
 
-
+/**
+ * Installs connectivity intent between a single ingress device and multiple egress devices.
+ */
 @Command(scope = "onos", name = "add-single-to-multi-intent",
         description = "Installs connectivity intent between a single ingress device and multiple egress devices")
 public class AddSinglePointToMultiPointIntentCommand extends ConnectivityIntentCommand {
diff --git a/cli/src/main/java/org/onosproject/cli/net/CountersListCommand.java b/cli/src/main/java/org/onosproject/cli/net/CountersListCommand.java
index 039702d..9706e0e 100644
--- a/cli/src/main/java/org/onosproject/cli/net/CountersListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/CountersListCommand.java
@@ -38,7 +38,7 @@
     /**
      * Displays counters as text.
      *
-     * @param mapInfo map descriptions
+     * @param counters counter info
      */
     private void displayCounters(Map<String, Long> counters) {
         counters.forEach((name, value) -> print(FMT, name, value));
diff --git a/cli/src/main/java/org/onosproject/cli/net/FlowRuleStatusCompleter.java b/cli/src/main/java/org/onosproject/cli/net/FlowRuleStatusCompleter.java
index 38a8485..ce910c9 100644
--- a/cli/src/main/java/org/onosproject/cli/net/FlowRuleStatusCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/FlowRuleStatusCompleter.java
@@ -23,7 +23,7 @@
 import org.onosproject.net.flow.FlowEntry.FlowEntryState;
 
 /**
- * Device ID completer.
+ * Flow rule status completer.
  */
 public class FlowRuleStatusCompleter implements Completer {
     @Override
diff --git a/cli/src/main/java/org/onosproject/cli/net/HostIdCompleter.java b/cli/src/main/java/org/onosproject/cli/net/HostIdCompleter.java
index 3ce16d2..4694425 100644
--- a/cli/src/main/java/org/onosproject/cli/net/HostIdCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/HostIdCompleter.java
@@ -25,6 +25,9 @@
 import org.onosproject.net.Host;
 import org.onosproject.net.host.HostService;
 
+/**
+ * Host ID completer.
+ */
 public class HostIdCompleter implements Completer {
 
     @Override
diff --git a/cli/src/main/java/org/onosproject/cli/net/IntentPushTestCommand.java b/cli/src/main/java/org/onosproject/cli/net/IntentPushTestCommand.java
index c68b06d..15921fe 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IntentPushTestCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IntentPushTestCommand.java
@@ -47,7 +47,7 @@
 import static org.onosproject.net.PortNumber.portNumber;
 
 /**
- * Installs point-to-point connectivity intents.
+ * Installs bulk point-to-point connectivity intents between given ingress/egress devices.
  */
 @Command(scope = "onos", name = "push-test-intents",
          description = "Installs random intents to test throughput")
diff --git a/cli/src/main/java/org/onosproject/cli/net/LinkDstCompleter.java b/cli/src/main/java/org/onosproject/cli/net/LinkDstCompleter.java
index fbf116f..0f5ad07 100644
--- a/cli/src/main/java/org/onosproject/cli/net/LinkDstCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/LinkDstCompleter.java
@@ -31,7 +31,7 @@
 import static org.onosproject.net.PortNumber.portNumber;
 
 /**
- * Link end-point completer.
+ * Link destination end-point completer.
  */
 public class LinkDstCompleter extends AbstractCompleter {
     @Override
diff --git a/cli/src/main/java/org/onosproject/cli/net/LinkSrcCompleter.java b/cli/src/main/java/org/onosproject/cli/net/LinkSrcCompleter.java
index dec8c6b..f957f77 100644
--- a/cli/src/main/java/org/onosproject/cli/net/LinkSrcCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/net/LinkSrcCompleter.java
@@ -24,7 +24,7 @@
 import java.util.SortedSet;
 
 /**
- * Link end-point completer.
+ * Link source end-point completer.
  */
 public class LinkSrcCompleter extends AbstractCompleter {
     @Override
diff --git a/cli/src/main/java/org/onosproject/cli/net/RandomIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/RandomIntentCommand.java
index ca52700..d917f90 100644
--- a/cli/src/main/java/org/onosproject/cli/net/RandomIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/RandomIntentCommand.java
@@ -33,7 +33,7 @@
 import com.google.common.collect.Lists;
 
 /**
- * Installs point-to-point connectivity intents.
+ * Installs bulk point-to-point connectivity intents between random ingress/egress devices.
  */
 @Command(scope = "onos", name = "push-random-intents",
          description = "Installs random intents to test throughput")