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
diff --git a/config-models/aether-2.0.x/files/yang/onf-aether-types.yang b/config-models/aether-2.0.x/files/yang/onf-aether-types.yang
index c8356a7..e825723 100755
--- a/config-models/aether-2.0.x/files/yang/onf-aether-types.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-aether-types.yang
@@ -17,6 +17,14 @@
     reference "RFC 6087";
   }
 
+  typedef aether-identifier {
+    type string {
+        length 1..63;
+        pattern '[a-z]([a-z0-9-]?[a-z0-9])*';
+    }
+    description "Identifier for objects in the Aether modeling";
+  }
+
   typedef imsi {
       type uint64 {
       }
diff --git a/config-models/aether-2.0.x/files/yang/onf-application.yang b/config-models/aether-2.0.x/files/yang/onf-application.yang
index 54dcf17..28a1f1c 100755
--- a/config-models/aether-2.0.x/files/yang/onf-application.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-application.yang
@@ -6,7 +6,6 @@
   belongs-to onf-enterprise { prefix ent; }
 
   import ietf-inet-types{ prefix ietf; }
-  import ietf-yang-types{ prefix yg; }
   import onf-aether-types{ prefix at; }
 
   include onf-traffic-class;
@@ -29,9 +28,7 @@
   }
 
   typedef application-id {
-        type yg:yang-identifier {
-            length 1..32;
-        }
+    type at:aether-identifier;
     description "The typedef for application-id";
   }
 
@@ -60,7 +57,7 @@
       list endpoint {
         key "endpoint-id";
         leaf endpoint-id {
-          type yg:yang-identifier;
+          type at:aether-identifier;
           description
               "Id of this endpoint";
         }
diff --git a/config-models/aether-2.0.x/files/yang/onf-connectivity-service.yang b/config-models/aether-2.0.x/files/yang/onf-connectivity-service.yang
index dfc8821..20bda31 100755
--- a/config-models/aether-2.0.x/files/yang/onf-connectivity-service.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-connectivity-service.yang
@@ -7,7 +7,6 @@
   prefix cs;
 
   import ietf-inet-types { prefix inet; }
-  import ietf-yang-types{ prefix yg; }
   import onf-aether-types { prefix at; }
 
   organization "Open Networking Foundation.";
@@ -27,10 +26,8 @@
   }
 
   typedef connectivity-service-id {
-        type yg:yang-identifier {
-            length 1..32;
-        }
-   description "The typedef for connectivity-service-id";
+    type at:aether-identifier;
+    description "The typedef for connectivity-service-id";
   }
 
   container connectivity-services {
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 64afd18..1e03806 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
@@ -5,7 +5,6 @@
 submodule onf-device-group {
   belongs-to onf-enterprise { prefix ent; }
 
-  import ietf-yang-types{ prefix yg; }
   import onf-aether-types { prefix at; }
 
   include onf-ip-domain;
@@ -36,9 +35,7 @@
   }
 
   typedef device-group-id {
-        type yg:yang-identifier {
-            length 1..32;
-        }
+    type at:aether-identifier;
     description "The typedef for device-group-id";
   }
 
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 cf4ad10..3a8abd8 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
@@ -5,7 +5,6 @@
 submodule onf-device {
   belongs-to onf-enterprise { prefix ent; }
 
-  import ietf-yang-types{ prefix yg; }
   import onf-aether-types { prefix at; }
   include onf-sim-card;
 
@@ -20,9 +19,7 @@
   }
 
   typedef device-id {
-        type yg:yang-identifier {
-            length 1..32;
-        }
+    type at:aether-identifier;
     description "The typedef for device-id";
   }
 
diff --git a/config-models/aether-2.0.x/files/yang/onf-enterprise.yang b/config-models/aether-2.0.x/files/yang/onf-enterprise.yang
index 00334f9..61a453e 100755
--- a/config-models/aether-2.0.x/files/yang/onf-enterprise.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-enterprise.yang
@@ -6,7 +6,6 @@
   namespace "http://opennetworking.org/aether/enterprise";
   prefix ent;
 
-  import ietf-yang-types{ prefix yg; }
   import onf-aether-types { prefix at; }
   import onf-connectivity-service { prefix cs; }
 
@@ -44,10 +43,8 @@
   }
 
   typedef enterprise-id {
-        type yg:yang-identifier {
-            length 1..32;
-        }
-   description "The typedef for enterprise-id";
+     type at:aether-identifier;
+     description "The typedef for enterprise-id";
   }
 
   container enterprises {
diff --git a/config-models/aether-2.0.x/files/yang/onf-ip-domain.yang b/config-models/aether-2.0.x/files/yang/onf-ip-domain.yang
index 9808674..dbd81ae 100755
--- a/config-models/aether-2.0.x/files/yang/onf-ip-domain.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-ip-domain.yang
@@ -6,7 +6,6 @@
   belongs-to onf-enterprise { prefix ent; }
 
   import ietf-inet-types { prefix inet; }
-  import ietf-yang-types{ prefix yg; }
   import onf-aether-types { prefix at; }
 
   organization "Open Networking Foundation.";
@@ -27,9 +26,7 @@
   }
 
   typedef ip-domain-id {
-        type yg:yang-identifier {
-            length 1..32;
-        }
+    type at:aether-identifier;
     description "The typedef for ip-domain-id";
   }
 
diff --git a/config-models/aether-2.0.x/files/yang/onf-priority-traffic-rule.yang b/config-models/aether-2.0.x/files/yang/onf-priority-traffic-rule.yang
index 4c8db55..2706eba 100755
--- a/config-models/aether-2.0.x/files/yang/onf-priority-traffic-rule.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-priority-traffic-rule.yang
@@ -5,7 +5,6 @@
 submodule onf-priority-traffic-rule {
   belongs-to onf-enterprise { prefix ent; }
 
-  import ietf-yang-types{ prefix yg; }
   import onf-aether-types{ prefix at; }
   include onf-device;
   include onf-traffic-class;
@@ -23,9 +22,7 @@
   }
 
   typedef priority-traffic-rule-id {
-        type yg:yang-identifier {
-            length 1..32;
-        }
+    type at:aether-identifier;
     description "The typedef for priority traffic rule id";
   }
 
diff --git a/config-models/aether-2.0.x/files/yang/onf-sim-card.yang b/config-models/aether-2.0.x/files/yang/onf-sim-card.yang
index c8ae80a..b263f33 100644
--- a/config-models/aether-2.0.x/files/yang/onf-sim-card.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-sim-card.yang
@@ -5,7 +5,6 @@
 submodule onf-sim-card {
   belongs-to onf-enterprise { prefix ent; }
 
-  import ietf-yang-types{ prefix yg; }
   import onf-aether-types { prefix at; }
 
   organization "Open Networking Foundation.";
@@ -19,9 +18,7 @@
   }
 
   typedef sim-card-id {
-        type yg:yang-identifier {
-            length 1..32;
-        }
+    type at:aether-identifier;
     description "The typedef for device-id";
   }
 
diff --git a/config-models/aether-2.0.x/files/yang/onf-site.yang b/config-models/aether-2.0.x/files/yang/onf-site.yang
index 53e2677..ae89379 100755
--- a/config-models/aether-2.0.x/files/yang/onf-site.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-site.yang
@@ -6,7 +6,6 @@
   belongs-to onf-enterprise { prefix ent; }
 
   import ietf-inet-types { prefix inet; }
-  import ietf-yang-types{ prefix yg; }
   import onf-aether-types{ prefix at; }
 
   include onf-device;
@@ -32,9 +31,7 @@
   }
 
   typedef site-id {
-        type yg:yang-identifier {
-            length 1..32;
-        }
+    type at:aether-identifier;
     description "The typedef for site-id";
   }
 
@@ -56,7 +53,7 @@
       list small-cell {
         key "small-cell-id";
         leaf small-cell-id {
-          type yg:yang-identifier;
+          type at:aether-identifier;
           description
             "Id of small cell";
         }
@@ -98,7 +95,7 @@
         list edge-device {
           key "edge-device-id";
           leaf edge-device-id {
-            type yg:yang-identifier;
+            type at:aether-identifier;
             description
               "Id of edge monitoring device";
           }
diff --git a/config-models/aether-2.0.x/files/yang/onf-slice.yang b/config-models/aether-2.0.x/files/yang/onf-slice.yang
index f59619a..cad763f 100755
--- a/config-models/aether-2.0.x/files/yang/onf-slice.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-slice.yang
@@ -5,7 +5,6 @@
 submodule onf-slice {
   belongs-to onf-enterprise { prefix ent; }
 
-  import ietf-yang-types{ prefix yg; }
   import onf-aether-types{ prefix at; }
 
   include onf-upf;
@@ -30,9 +29,7 @@
   }
 
   typedef slice-id {
-        type yg:yang-identifier {
-            length 1..32;
-        }
+    type at:aether-identifier;
     description "The typedef for slice-id";
   }
 
diff --git a/config-models/aether-2.0.x/files/yang/onf-template.yang b/config-models/aether-2.0.x/files/yang/onf-template.yang
index 3734093..a96b9bc 100755
--- a/config-models/aether-2.0.x/files/yang/onf-template.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-template.yang
@@ -5,7 +5,6 @@
 submodule onf-template {
   belongs-to onf-enterprise { prefix ent; }
 
-  import ietf-yang-types{ prefix yg; }
   import onf-aether-types{ prefix at; }
 
   organization "Open Networking Foundation.";
@@ -26,9 +25,7 @@
   }
 
   typedef template-id {
-        type yg:yang-identifier {
-            length 1..32;
-        }
+    type at:aether-identifier;
     description "The typedef for template-id";
   }
 
diff --git a/config-models/aether-2.0.x/files/yang/onf-traffic-class.yang b/config-models/aether-2.0.x/files/yang/onf-traffic-class.yang
index f8658fb..5f1e021 100755
--- a/config-models/aether-2.0.x/files/yang/onf-traffic-class.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-traffic-class.yang
@@ -5,7 +5,6 @@
 submodule onf-traffic-class {
   belongs-to onf-enterprise { prefix ent; }
 
-  import ietf-yang-types{ prefix yg; }
   import onf-aether-types{ prefix at; }
 
   organization "Open Networking Foundation.";
@@ -25,9 +24,7 @@
   }
 
   typedef traffic-class-id {
-        type yg:yang-identifier {
-            length 1..32;
-        }
+    type at:aether-identifier;
     description "The typedef for traffic-class-id";
   }
 
diff --git a/config-models/aether-2.0.x/files/yang/onf-upf.yang b/config-models/aether-2.0.x/files/yang/onf-upf.yang
index 72a7ec9..fdfbafc 100755
--- a/config-models/aether-2.0.x/files/yang/onf-upf.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-upf.yang
@@ -6,7 +6,6 @@
   belongs-to onf-enterprise { prefix ent; }
 
   import ietf-inet-types { prefix inet; }
-  import ietf-yang-types{ prefix yg; }
   import onf-aether-types { prefix at; }
 
   organization "Open Networking Foundation.";
@@ -24,10 +23,8 @@
   }
 
   typedef upf-id {
-        type yg:yang-identifier {
-            length 1..32;
-        }
-   description "The typedef for upf-id";
+    type at:aether-identifier;
+    description "The typedef for upf-id";
   }
 
   grouping upf {