Fix naming convention issues in preparation for stricter checkstyle enforcement

Change-Id: I918b7b1dcf6424a526b6b26b89acc9a57d807fec
diff --git a/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceDescription.java b/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceDescription.java
index 3a8c8c1..0fcc800 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceDescription.java
@@ -71,7 +71,7 @@
      */
     public DefaultDeviceDescription(DeviceDescription base,
                                     SparseAnnotations... annotations) {
-        this(base.deviceURI(), base.type(), base.manufacturer(),
+        this(base.deviceUri(), base.type(), base.manufacturer(),
              base.hwVersion(), base.swVersion(), base.serialNumber(),
              base.chassisId(), annotations);
     }
@@ -83,13 +83,13 @@
      * @param annotations Annotations to use.
      */
     public DefaultDeviceDescription(DeviceDescription base, Type type, SparseAnnotations... annotations) {
-        this(base.deviceURI(), type, base.manufacturer(),
+        this(base.deviceUri(), type, base.manufacturer(),
                 base.hwVersion(), base.swVersion(), base.serialNumber(),
                 base.chassisId(), annotations);
     }
 
     @Override
-    public URI deviceURI() {
+    public URI deviceUri() {
         return uri;
     }