diff --git a/config-models/aether-2.0.x/files/yang/onf-device-group.yang b/config-models/aether-2.0.x/files/yang/onf-device-group.yang
index 2e01e17..41f0b70 100755
--- a/config-models/aether-2.0.x/files/yang/onf-device-group.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-device-group.yang
@@ -46,32 +46,22 @@
     description "The device-group grouping";
 
     list device-group {
-      key "dg-id";
+      key "device-group-id";
       description
         "List of device groups";
 
-      leaf dg-id {
+      leaf device-group-id {
         type device-group-id;
         description "ID for this device group.";
       }
 
-      leaf description {
-        type at:description;
-        description "description of this device group";
-      }
-
-      leaf display-name {
-        type string {
-            length 1..80;
-        }
-        description "display name to use in GUI or CLI";
-      }
+      uses at:desc-display-name;
 
       list device {
         key "device-id";
         leaf device-id {
           type leafref {
-            path "../../../device/dev-id";
+            path "../../../device/device-id";
           }
           description
              "Link to device";
@@ -87,7 +77,7 @@
 
       leaf ip-domain {
         type leafref {
-          path "../../ip-domain/ip-id";
+          path "../../ip-domain/ip-domain-id";
         }
         description
           "Link to ip-domain settings that determine the pool of IP addresses,
@@ -113,7 +103,7 @@
 
       leaf traffic-class {
         type leafref {
-          path "../../../traffic-class/tc-id";
+          path "../../../traffic-class/traffic-class-id";
         }
         mandatory true;
         description