Enhanced the CLIs.
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/LinksListCommand.java b/cli/src/main/java/org/onlab/onos/cli/net/LinksListCommand.java
index 7197361..cb6fcb1 100644
--- a/cli/src/main/java/org/onlab/onos/cli/net/LinksListCommand.java
+++ b/cli/src/main/java/org/onlab/onos/cli/net/LinksListCommand.java
@@ -17,15 +17,15 @@
 
     private static final String FMT = "src=%s/%s, dst=%s/%s, type=%s";
 
-    @Argument(index = 0, name = "deviceId", description = "Device ID",
+    @Argument(index = 0, name = "uri", description = "Device ID",
               required = false, multiValued = false)
-    String deviceId = null;
+    String uri = null;
 
     @Override
     protected Object doExecute() throws Exception {
         LinkService service = getService(LinkService.class);
-        Iterable<Link> links = deviceId != null ?
-                service.getDeviceLinks(deviceId(deviceId)) : service.getLinks();
+        Iterable<Link> links = uri != null ?
+                service.getDeviceLinks(deviceId(uri)) : service.getLinks();
         for (Link link : links) {
             print(FMT, link.src().deviceId(), link.src().port(),
                   link.dst().deviceId(), link.dst().port(), link.type());