diff --git a/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang b/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang
index 53eb2a4c0..7fd7a63c9 100644
--- a/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang
+++ b/release/models/policy-forwarding/openconfig-pf-forwarding-policies.yang
@@ -580,7 +580,7 @@ submodule openconfig-pf-forwarding-policies {
           uses pf-encap-headers-config;
         }
 
-        container udp {
+        container udp-v4 {
           when "../config/type = 'oc-types:UDP'";
           description
             "Container of nodes for UDP in IPv4 encapsulation.  When this
@@ -592,7 +592,7 @@ submodule openconfig-pf-forwarding-policies {
               "Config parameters relating to UDP in IPv4 encapsulation
               headers.";
 
-            uses pf-encap-udp-config;
+            uses pf-encap-udp-v4-config;
           }
 
           container state {
@@ -601,7 +601,7 @@ submodule openconfig-pf-forwarding-policies {
               "State parameters relating to UDP in IPv4 encapsulation
               headers.";
 
-            uses pf-encap-udp-config;
+            uses pf-encap-udp-v4-config;
           }
         }
       }
@@ -625,7 +625,7 @@ submodule openconfig-pf-forwarding-policies {
     }
   }
 
-  grouping pf-encap-udp-config {
+  grouping pf-encap-udp-v4-config {
     description
       "Configuration parameters relating to UDP in IPv4 encapsulation headers.";