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 6648e7e..38547ac 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
@@ -44,12 +44,11 @@
         |  +--rw display-name?       string
         |  +--rw sst?                at:sst
         |  +--rw sd?                 at:sd
-        |  +--rw slice
-        |  |  +--rw mbr
-        |  |     +--rw uplink?                at:bitrate
-        |  |     +--rw downlink?              at:bitrate
-        |  |     +--rw uplink-burst-size?     at:burst
-        |  |     +--rw downlink-burst-size?   at:burst
+        |  +--rw mbr
+        |  |  +--rw uplink?                at:bitrate
+        |  |  +--rw downlink?              at:bitrate
+        |  |  +--rw uplink-burst-size?     at:burst
+        |  |  +--rw downlink-burst-size?   at:burst
         |  +--rw default-behavior    at:behavior
         |  +--rw description?        at:description
         +--rw site* [site-id]
@@ -84,6 +83,7 @@
            |  +--rw ptr-id           priority-traffic-rule-id
            |  +--rw display-name?    string
            |  +--rw device           -> ../../device/dev-id
+           |  +--rw application      -> ../../../application/app-id
            |  +--rw endpoint         -> ../../../application/endpoint/endpoint-id
            |  +--rw mbr
            |  |  +--rw uplink?     at:bitrate
@@ -106,8 +106,8 @@
            |  +--rw config-endpoint?   inet:uri
            |  +--rw display-name?      string
            |  +--rw description?       at:description
-           +--rw vcs* [vcs-id]
-           |  +--rw vcs-id              vcs-id
+           +--rw slice* [slice-id]
+           |  +--rw slice-id            slice-id
            |  +--rw display-name?       string
            |  +--rw device-group* [device-group]
            |  |  +--rw device-group    -> ../../../device-group/dg-id
@@ -121,12 +121,11 @@
            |  +--rw description?        at:description
            |  +--rw sst                 at:sst
            |  +--rw sd                  at:sd
-           |  +--rw slice
-           |     +--rw mbr
-           |        +--rw uplink?                at:bitrate
-           |        +--rw downlink?              at:bitrate
-           |        +--rw uplink-burst-size?     at:burst
-           |        +--rw downlink-burst-size?   at:burst
+           |  +--rw mbr
+           |     +--rw uplink?                at:bitrate
+           |     +--rw downlink?              at:bitrate
+           |     +--rw uplink-burst-size?     at:burst
+           |     +--rw downlink-burst-size?   at:burst
            +--rw device-group* [dg-id]
            |  +--rw dg-id           device-group-id
            |  +--rw description?    at:description
@@ -149,4 +148,3 @@
               +--rw admin-status?    at:admin-status
               +--rw mtu?             at:mtu
               +--rw description?     at:description
-
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 aba447f..4cb25fa 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
@@ -12,7 +12,7 @@
 
   include onf-site;
   include onf-upf;
-  include onf-vcs;
+  include onf-slice;
   include onf-device-group;
   include onf-ip-domain;
   include onf-application;
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 68f862c..f8fe5bd 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
@@ -59,13 +59,22 @@
           "Link to device";
       }
 
+      leaf application {
+        type leafref {
+          path "../../../application/app-id";
+        }
+        mandatory true;
+        description
+          "Link to application";
+      }
+
       leaf endpoint {
         type leafref {
           path "../../../application/endpoint/endpoint-id";
         }
         mandatory true;
         description
-          "Link to application";
+          "Link to endpoint in application";
       }
 
       container mbr {
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 17cf478..8e63c00 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
@@ -13,7 +13,7 @@
   include onf-priority-traffic-rule;
   include onf-sim-card;
   include onf-upf;
-  include onf-vcs;
+  include onf-slice;
   include onf-device-group;
   include onf-ip-domain;
 
@@ -178,7 +178,7 @@
 
       uses upf;
 
-      uses vcs;
+      uses slice;
 
       uses device-group;
 
diff --git a/config-models/aether-2.0.x/files/yang/onf-vcs.yang b/config-models/aether-2.0.x/files/yang/onf-slice.yang
similarity index 69%
rename from config-models/aether-2.0.x/files/yang/onf-vcs.yang
rename to config-models/aether-2.0.x/files/yang/onf-slice.yang
index d050ed1..98bfdd8 100755
--- a/config-models/aether-2.0.x/files/yang/onf-vcs.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-slice.yang
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
 
-submodule onf-vcs {
+submodule onf-slice {
   belongs-to onf-enterprise { prefix ent; }
 
   import ietf-yang-types{ prefix yg; }
@@ -15,7 +15,7 @@
   organization "Open Networking Foundation.";
   contact "Scott Baker";
   description
-    "An Aether Virtual Cellular Service (VCS) is
+    "An Aether Slice is
      used to connect devices with applications";
 
   revision "2022-01-14" {
@@ -24,28 +24,28 @@
   }
 
   revision "2021-09-10" {
-    description "An Aether Virtual Cellular Service";
+    description "An Aether Slice";
     reference "RFC 6087";
   }
 
-  typedef vcs-id {
+  typedef slice-id {
         type yg:yang-identifier {
             length 1..32;
         }
-    description "The typedef for vcs-id";
+    description "The typedef for slice-id";
   }
 
-  grouping vcs {
-    description "The vcs grouping";
+  grouping slice {
+    description "The slice grouping";
 
-    list vcs {
-      key "vcs-id";
+    list slice {
+      key "slice-id";
       description
-        "List of virtual cellular services";
+        "List of Slices";
 
-      leaf vcs-id {
-        type vcs-id;
-        description "ID for this vcs.";
+      leaf slice-id {
+        type slice-id;
+        description "ID for this slice.";
       }
 
       leaf display-name {
@@ -72,7 +72,7 @@
         }
         description
           "A list of device groups. Groups will only participate in
-           the VCS if the enable field is set to True";
+           the Slice if the enable field is set to True";
       }
 
       leaf default-behavior {
@@ -120,7 +120,7 @@
 
       leaf description {
         type at:description;
-        description "description of this vcs";
+        description "description of this slice";
       }
 
       // the following are populated from the template
@@ -136,33 +136,30 @@
         description "Slice differentiator. Immutable.";
       }
 
-      container slice {
-        description "Per-Slice QOS Settings";
-        container mbr {
-          description "Maximum bitrate";
-          leaf uplink {
-            type at:bitrate;
-            units bps;
-            description "Per-Slice MBR uplink data rate in bps";
-          }
+      container mbr {
+        description "Per slice Maximum Bit Rate";
+        leaf uplink {
+          type at:bitrate;
+          units bps;
+          description "Per-Slice MBR uplink data rate in bps";
+        }
 
-          leaf downlink {
-            type at:bitrate;
-            units bps;
-            description "Per-Slice MBR downlink data rate in bps";
-          }
+        leaf downlink {
+          type at:bitrate;
+          units bps;
+          description "Per-Slice MBR downlink data rate in bps";
+        }
 
-          leaf uplink-burst-size {
-            type at:burst;
-            units bytes;
-            description "Per-Slice Uplink burst size";
-          }
+        leaf uplink-burst-size {
+          type at:burst;
+          units bytes;
+          description "Per-Slice Uplink burst size";
+        }
 
-          leaf downlink-burst-size {
-            type at:burst;
-            units bytes;
-            description "Per-Slice Downlink burst size";
-          }
+        leaf downlink-burst-size {
+          type at:burst;
+          units bytes;
+          description "Per-Slice Downlink burst size";
         }
       }
 
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 7c1f1b9..2dd853c 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
@@ -11,9 +11,9 @@
   organization "Open Networking Foundation.";
   contact "Scott Baker";
   description
-    "The aether vcs-template holds common parameters used
-     by a virtual connectivity service. Templates are used to
-     populate a VCS.";
+    "The aether slice-template holds common parameters used
+     by a Slice. Templates are used to
+     populate a Slice.";
 
   revision "2022-01-14" {
     description "Refactored as submodule";
@@ -21,7 +21,7 @@
   }
 
   revision "2021-09-10" {
-    description "An Aether Virtual Cellular Service Template";
+    description "An Aether Slice Template";
     reference "RFC 6087";
   }
 
@@ -38,11 +38,11 @@
     list template {
       key "tp-id";
       description
-        "List of vcs templates";
+        "List of slice templates";
 
       leaf tp-id {
         type template-id;
-        description "ID for this vcs template.";
+        description "ID for this slice template.";
       }
 
       leaf display-name {
@@ -62,33 +62,30 @@
         description "Slice differentiator";
       }
 
-      container slice {
-        description "Per-Slice QOS Settings";
-        container mbr {
-          description "Maximum bitrate";
-          leaf uplink {
-            type at:bitrate;
-            units bps;
-            description "Per-Slice MBR uplink data rate in bps";
-          }
+      container mbr {
+        description "Per-Slice QOS Settings Maximum Bit Rate";
+        leaf uplink {
+          type at:bitrate;
+          units bps;
+          description "Per-Slice MBR uplink data rate in bps";
+        }
 
-          leaf downlink {
-            type at:bitrate;
-            units bps;
-            description "Per-Slice MBR downlink data rate in bps";
-          }
+        leaf downlink {
+          type at:bitrate;
+          units bps;
+          description "Per-Slice MBR downlink data rate in bps";
+        }
 
-          leaf uplink-burst-size {
-            type at:burst;
-            units bytes;
-            description "Per-Slice Uplink burst size";
-          }
+        leaf uplink-burst-size {
+          type at:burst;
+          units bytes;
+          description "Per-Slice Uplink burst size";
+        }
 
-          leaf downlink-burst-size {
-            type at:burst;
-            units bytes;
-            description "Per-Slice Downlink burst size";
-          }
+        leaf downlink-burst-size {
+          type at:burst;
+          units bytes;
+          description "Per-Slice Downlink burst size";
         }
       }
 
@@ -101,7 +98,7 @@
 
       leaf description {
         type at:description;
-        description "description of this vcs template";
+        description "description of this slice template";
       }
     }
   }