diff --git a/config-models/aether-4.x/files/aether-4.0.0.tree b/config-models/aether-4.x/files/aether-4.0.0.tree
index 0c7954a..03213f6 100644
--- a/config-models/aether-4.x/files/aether-4.0.0.tree
+++ b/config-models/aether-4.x/files/aether-4.0.0.tree
@@ -5,8 +5,8 @@
         +--rw display-name?   string
         +--rw description?    at:description
         +--rw address         ietf:host
-        +--rw endpoint* [id]
-        |  +--rw id               yg:yang-identifier
+        +--rw endpoint* [endpoint-id]
+        |  +--rw endpoint-id      yg:yang-identifier
         |  +--rw port-start       ietf:port-number
         |  +--rw port-end?        ietf:port-number
         |  +--rw protocol?        at:protocol
@@ -35,8 +35,8 @@
         +--rw id              device-group-id
         +--rw description?    at:description
         +--rw display-name?   string
-        +--rw imsis* [id]
-        |  +--rw id                 yg:yang-identifier
+        +--rw imsis* [imsi-id]
+        |  +--rw imsi-id            yg:yang-identifier
         |  +--rw imsi-range-from?   uint64
         |  +--rw imsi-range-to?     uint64
         |  +--rw display-name?      string
@@ -77,19 +77,19 @@
      +--rw site* [id]
         +--rw id                 site-id
         +--rw display-name?      string
-        +--rw small-cell* [id]
-        |  +--rw id              yg:yang-identifier
-        |  +--rw address?        inet:host
-        |  +--rw tac             at:tac
-        |  +--rw enable?         boolean
-        |  +--rw display-name?   string
+        +--rw small-cell* [small-cell-id]
+        |  +--rw small-cell-id    yg:yang-identifier
+        |  +--rw address?         inet:host
+        |  +--rw tac              at:tac
+        |  +--rw enable?          boolean
+        |  +--rw display-name?    string
         +--rw monitoring
         |  +--rw edge-cluster-prometheus-url?      inet:uri
         |  +--rw edge-monitoring-prometheus-url?   inet:uri
-        |  +--rw edge-device* [id]
-        |     +--rw id              yg:yang-identifier
-        |     +--rw display-name?   string
-        |     +--rw description?    at:description
+        |  +--rw edge-device* [edge-device-id]
+        |     +--rw edge-device-id    yg:yang-identifier
+        |     +--rw display-name?     string
+        |     +--rw description?      at:description
         +--rw enterprise         -> /ent:enterprise/enterprise/id
         +--rw imsi-definition
         |  +--rw mcc           at:mcc
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";