diff --git a/experimental/ietf-extracted-YANG-modules/ietf-bgp-origin-as-validation@2022-10-18.yang b/experimental/ietf-extracted-YANG-modules/ietf-bgp-origin-as-validation@2022-10-18.yang
index c58432830..e42f4ec94 100644
--- a/experimental/ietf-extracted-YANG-modules/ietf-bgp-origin-as-validation@2022-10-18.yang
+++ b/experimental/ietf-extracted-YANG-modules/ietf-bgp-origin-as-validation@2022-10-18.yang
@@ -40,7 +40,6 @@ module ietf-bgp-origin-as-validation {
     reference
       "RFC XXXX: YANG Model for Border Gateway Protocol (BGP-4)";
   }
-
   import ietf-routing-policy {
     prefix rt-pol;
     reference
@@ -328,7 +327,7 @@ invalid.";
   augment "/rt:routing/rt:control-plane-protocols"
         + "/rt:control-plane-protocol/bgp:bgp/bgp:rib"
         + "/bgp:afi-safis/bgp:afi-safi/bgp:ipv4-unicast"
-           + "/bgp:rib-in-pre" {
+           + "/bgp:neighbors/bgp:neighbor/bgp:adj-rib-in-pre" {
        description
          "Augmentation of BGP IPv4 Unicast route statistics.";
 
@@ -338,7 +337,7 @@ invalid.";
      augment "/rt:routing/rt:control-plane-protocols"
            + "/rt:control-plane-protocol/bgp:bgp/bgp:rib"
            + "/bgp:afi-safis/bgp:afi-safi/bgp:ipv6-unicast"
-           + "/bgp:rib-in-pre" {
+           + "/bgp:neighbors/bgp:neighbor/bgp:adj-rib-in-pre" {
        description
          "Augmentation of BGP IPv6 Unicast route statistics.";
 
@@ -348,7 +347,7 @@ invalid.";
      augment "/rt:routing/rt:control-plane-protocols"
            + "/rt:control-plane-protocol/bgp:bgp/bgp:rib"
            + "/bgp:afi-safis/bgp:afi-safi/bgp:ipv4-unicast"
-           + "/bgp:rib-in-post" {
+           + "/bgp:neighbors/bgp:neighbor/bgp:adj-rib-in-post" {
        description
          "Augmentation of BGP IPv4 Unicast route statistics.";
 
@@ -358,7 +357,7 @@ invalid.";
      augment "/rt:routing/rt:control-plane-protocols"
            + "/rt:control-plane-protocol/bgp:bgp/bgp:rib"
            + "/bgp:afi-safis/bgp:afi-safi/bgp:ipv6-unicast"
-           + "/bgp:rib-in-post" {
+           + "/bgp:neighbors/bgp:neighbor/bgp:adj-rib-in-post" {
        description
          "Augmentation of BGP IPv6 Unicast route statistics.";
 
@@ -388,7 +387,7 @@ invalid.";
      augment "/rt:routing/rt:control-plane-protocols"
            + "/rt:control-plane-protocol/bgp:bgp/bgp:rib"
            + "/bgp:afi-safis/bgp:afi-safi/bgp:ipv4-unicast"
-           + "/bgp:rib-out-pre" {
+           + "/bgp:neighbors/bgp:neighbor/bgp:adj-rib-out-pre" {
        description
          "Augmentation of BGP IPv4 Unicast route statistics.";
 
@@ -398,7 +397,7 @@ invalid.";
      augment "/rt:routing/rt:control-plane-protocols"
            + "/rt:control-plane-protocol/bgp:bgp/bgp:rib"
            + "/bgp:afi-safis/bgp:afi-safi/bgp:ipv6-unicast"
-           + "/bgp:rib-out-pre" {
+           + "/bgp:neighbors/bgp:neighbor/bgp:adj-rib-out-pre" {
        description
          "Augmentation of BGP IPv6 Unicast route statistics.";
 
@@ -408,7 +407,7 @@ invalid.";
      augment "/rt:routing/rt:control-plane-protocols"
            + "/rt:control-plane-protocol/bgp:bgp/bgp:rib"
            + "/bgp:afi-safis/bgp:afi-safi/bgp:ipv4-unicast"
-           + "/bgp:rib-out-post" {
+           + "/bgp:neighbors/bgp:neighbor/bgp:adj-rib-out-post" {
        description
          "Augmentation of BGP IPv4 Unicast route statistics.";
 
@@ -418,13 +417,12 @@ invalid.";
      augment "/rt:routing/rt:control-plane-protocols"
            + "/rt:control-plane-protocol/bgp:bgp/bgp:rib"
            + "/bgp:afi-safis/bgp:afi-safi/bgp:ipv6-unicast"
-           + "/bgp:rib-out-post" {
+           + "/bgp:neighbors/bgp:neighbor/bgp:adj-rib-out-post" {
        description
          "Augmentation of BGP IPv6 Unicast route statistics.";
 
        uses origin-as-validity-statistics;
      }
-
      augment "/rt:routing/rt:control-plane-protocols"
            + "/rt:control-plane-protocol/bgp:bgp/bgp:rib"
            + "/bgp:afi-safis/bgp:afi-safi/bgp:ipv4-unicast"