diff --git a/config-models/aether-2.0.x/files/aether-2.0.0.tree b/config-models/aether-2.0.x/files/aether-2.0.0.tree
index 808e65b..c818e22 100644
--- a/config-models/aether-2.0.x/files/aether-2.0.0.tree
+++ b/config-models/aether-2.0.x/files/aether-2.0.0.tree
@@ -22,7 +22,7 @@
         |  +--rw description?      description
         |  +--rw address           at:host-or-network
         |  +--rw endpoint* [endpoint-id]
-        |     +--rw endpoint-id      yg:yang-identifier
+        |     +--rw endpoint-id      at:aether-identifier
         |     +--rw display-name?    string
         |     +--rw description?     description
         |     +--rw port-start?      ietf:port-number
@@ -57,7 +57,7 @@
            +--rw display-name?      string
            +--rw description?       description
            +--rw small-cell* [small-cell-id]
-           |  +--rw small-cell-id    yg:yang-identifier
+           |  +--rw small-cell-id    at:aether-identifier
            |  +--rw display-name?    string
            |  +--rw description?     description
            |  +--rw address?         inet:host
@@ -67,7 +67,7 @@
            |  +--rw edge-cluster-prometheus-url?      inet:uri
            |  +--rw edge-monitoring-prometheus-url?   inet:uri
            |  +--rw edge-device* [edge-device-id]
-           |     +--rw edge-device-id    yg:yang-identifier
+           |     +--rw edge-device-id    at:aether-identifier
            |     +--rw display-name?     string
            |     +--rw description?      description
            +--rw imsi-definition