diff --git a/release/models/aft/openconfig-aft-common.yang b/release/models/aft/openconfig-aft-common.yang
index b1f4c2a06..4c86be22e 100644
--- a/release/models/aft/openconfig-aft-common.yang
+++ b/release/models/aft/openconfig-aft-common.yang
@@ -25,9 +25,9 @@ submodule openconfig-aft-common {
 
   oc-ext:openconfig-version "2.7.0";
 
-  revision "2024-07-18" {
+  revision "2024-09-05" {
     description
-        "Add container for mpls-in-udp under next-hops aft entry state.";
+        "Add encapsulate-stack under aft next-hops.";
       reference "2.7.0";
   }
 
@@ -377,12 +377,12 @@ submodule openconfig-aft-common {
     }
 
     leaf-list pushed-mpls-label-stack {
-      type oc-mplst:pushed-mpls-label-stack;
+      type oc-mplst:mpls-label-stack;
       ordered-by user;
       description
         "The MPLS label stack imposed when forwarding packets to the
          next-hop. See the description of the type
-         oc-mplst:pushed-mpls-label-stack for encoding rules.
+         oc-mplst:mpls-label-stack for encoding rules.
 
          Note: a swap operation is reflected by entries in the
          popped-mpls-label-stack and pushed-mpls-label-stack nodes.";
@@ -520,12 +520,12 @@ submodule openconfig-aft-common {
     }
 
     leaf-list pushed-mpls-label-stack {
-      type oc-mplst:pushed-mpls-label-stack;
+      type oc-mplst:mpls-label-stack;
       ordered-by user;
       description
         "The MPLS label stack imposed when forwarding packets to the
          next-hop. See the description of the type
-         oc-mplst:pushed-mpls-label-stack for encoding rules.
+         oc-mplst:mpls-label-stack for encoding rules.
 
          Note: a swap operation is reflected by entries in the
          popped-mpls-label-stack and pushed-mpls-label-stack nodes.";
diff --git a/release/models/aft/openconfig-aft-ipv4.yang b/release/models/aft/openconfig-aft-ipv4.yang
index b6693a9fc..87fb7e6fa 100644
--- a/release/models/aft/openconfig-aft-ipv4.yang
+++ b/release/models/aft/openconfig-aft-ipv4.yang
@@ -22,9 +22,9 @@ submodule openconfig-aft-ipv4 {
 
   oc-ext:openconfig-version "2.7.0";
 
-  revision "2024-07-18" {
+  revision "2024-09-05" {
     description
-        "Add container for mpls-in-udp under next-hops aft entry state.";
+        "Add encapsulate-stack under aft next-hops.";
       reference "2.7.0";
   }
 
diff --git a/release/models/aft/openconfig-aft-mpls.yang b/release/models/aft/openconfig-aft-mpls.yang
index 0c10b568d..c99e1c58f 100644
--- a/release/models/aft/openconfig-aft-mpls.yang
+++ b/release/models/aft/openconfig-aft-mpls.yang
@@ -23,9 +23,9 @@ submodule openconfig-aft-mpls {
 
   oc-ext:openconfig-version "2.7.0";
 
-  revision "2024-07-18" {
+  revision "2024-09-05" {
     description
-        "Add container for mpls-in-udp under next-hops aft entry state.";
+        "Add encapsulate-stack under aft next-hops.";
       reference "2.7.0";
   }
 
diff --git a/release/models/mpls/openconfig-mpls-types.yang b/release/models/mpls/openconfig-mpls-types.yang
index a6910fde9..8c2f439d6 100644
--- a/release/models/mpls/openconfig-mpls-types.yang
+++ b/release/models/mpls/openconfig-mpls-types.yang
@@ -23,7 +23,7 @@ module openconfig-mpls-types {
 
   revision "2024-07-24" {
     description
-      "Add pushed-mpls-label-stack typdef";
+      "Add mpls-label-stack typdef";
     reference "3.6.0";
   }
 
@@ -485,13 +485,13 @@ module openconfig-mpls-types {
     reference "RFC 3032 - MPLS Label Stack Encoding";
   }
 
-  typedef pushed-mpls-label-stack {
+  typedef mpls-label-stack {
     type mpls-label;
   description
-    "Type used to specify a stack of MPLS label values to be added to a
-     packet.  This type must be used in a leaf-list which is ordered by user.
-     The the stack of labels is encoded where the first entry in the list is
-     the label at the bottom of the stack.
+    "Type used to specify a stack of MPLS label values.  This type must be
+     used in a leaf-list which is ordered by user. The the stack of labels
+     is encoded where the first entry in the list is the label at the bottom
+     of the stack.
 
      For example, a packet with a label stack of two labels, the bottom
      label being 42 and the top label being 8072 will be represented with