diff --git a/config-models/aether-2.0.x/files/yang/onf-device.yang b/config-models/aether-2.0.x/files/yang/onf-device.yang
index ce49e2c..b79844a 100644
--- a/config-models/aether-2.0.x/files/yang/onf-device.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-device.yang
@@ -30,34 +30,24 @@
     description "The top level container";
 
     list device {
-      key "dev-id";
+      key "device-id";
       unique "imei";
       description
         "List of devices";
 
-      leaf dev-id {
+      leaf device-id {
         type device-id;
         description "ID for this device.";
       }
 
+      uses at:desc-display-name;
+
       leaf imei {
         type at:imei;
         description
            "IMEI for this device";
       }
 
-      leaf description {
-        type at:description;
-        description "description of this device";
-      }
-
-      leaf display-name {
-        type string {
-            length 1..80;
-        }
-        description "display name to use in GUI or CLI";
-      }
-
       // TODO: Device Type
 
       leaf sim-card {