diff --git a/config-models/aether-4.x/files/yang/onf-application.yang b/config-models/aether-4.x/files/yang/onf-application.yang
index 7c61fd5..cb21a6c 100755
--- a/config-models/aether-4.x/files/yang/onf-application.yang
+++ b/config-models/aether-4.x/files/yang/onf-application.yang
@@ -63,8 +63,8 @@
       }
 
       list endpoint {
-        key "id";
-        leaf id {
+        key "endpoint-id";
+        leaf endpoint-id {
           type yg:yang-identifier;
           description
               "Id of this endpoint";
diff --git a/config-models/aether-4.x/files/yang/onf-device-group.yang b/config-models/aether-4.x/files/yang/onf-device-group.yang
index db8a18a..87295db 100755
--- a/config-models/aether-4.x/files/yang/onf-device-group.yang
+++ b/config-models/aether-4.x/files/yang/onf-device-group.yang
@@ -63,8 +63,8 @@
 
       list imsis {
         // TODO: imsi-range-from cannot be used as a list index
-        key "id";
-        leaf id {
+        key "imsi-id";
+        leaf imsi-id {
           type yg:yang-identifier;
           description
               "Id of this imsi-range";
diff --git a/config-models/aether-4.x/files/yang/onf-site.yang b/config-models/aether-4.x/files/yang/onf-site.yang
index 96b99a7..7118c97 100755
--- a/config-models/aether-4.x/files/yang/onf-site.yang
+++ b/config-models/aether-4.x/files/yang/onf-site.yang
@@ -48,8 +48,8 @@
       }
 
       list small-cell {
-        key "id";
-        leaf id {
+        key "small-cell-id";
+        leaf small-cell-id {
           type yg:yang-identifier;
           description
             "Id of small cell";
@@ -93,8 +93,8 @@
             "URL of monitoring prometheus";
         }
         list edge-device {
-          key "id";
-          leaf id {
+          key "edge-device-id";
+          leaf edge-device-id {
             type yg:yang-identifier;
             description
               "Id of edge monitoring device";