diff --git a/release/models/gnsi/openconfig-gnsi-pathz.yang b/release/models/gnsi/openconfig-gnsi-pathz.yang
index 962ea79c4..46510c19c 100644
--- a/release/models/gnsi/openconfig-gnsi-pathz.yang
+++ b/release/models/gnsi/openconfig-gnsi-pathz.yang
@@ -129,10 +129,10 @@ module openconfig-gnsi-pathz {
       list path {
         description
           "List for a collection of per-OpenConfig path counters.";
-        key "name";
-        leaf name {
+        key "xpath";
+        leaf xpath {
           type leafref {
-            path "../state/name";
+            path "../state/xpath";
           }
           description
             "A OpenConfig schema path the counter were
@@ -144,7 +144,7 @@ module openconfig-gnsi-pathz {
         container state {
           description
             "Operational state for per-OpenConfig path counters.";
-          leaf name {
+          leaf xpath {
             type string;
             description
               "A OpenConfig schema path the counter were