--- /mnt/c/Users/donfe/Downloads/ieee802-dot1q-pb.yang.txt	2020-05-21 19:34:41.235390200 -0400
+++ /mnt/c/Users/donfe/Downloads/ieee802-dot1q-pb.yang	2020-05-21 19:19:22.423593200 -0400
@@ -49,8 +49,9 @@
         "12.13.2.1 of IEEE Std 802.1Q-2018";
     }
     list cvid-registration {
-      when
-        "../dot1q:component-name = 'dot1q:c-vlan-component' and "+
+      when "/dot1q:bridges/dot1q:bridge[dot1q:name=current()" +
+        "/../dot1q:bridge-name]/dot1q:component[dot1q:name=current()" +
+        "/../dot1q:component-name]/dot1q:type = 'dot1q:c-vlan-component' and "+
         "../dot1q:port-type = 'dot1q:customer-edge-port'" {
         description
           "Applies when the component associated with this interface
@@ -104,8 +105,9 @@
       }
     }
     list service-priority-regeneration {
-      when
-        "../dot1q:component-name = 'dot1q:c-vlan-component' and "+
+      when "/dot1q:bridges/dot1q:bridge[dot1q:name=current() " +
+        "/../dot1q:bridge-name]/dot1q:component[dot1q:name=current() " +
+        "/../dot1q:component-name]/dot1q:type = 'dot1q:c-vlan-component' and "+
         "../dot1q:port-type = 'dot1q:customer-edge-port'" {
         description
           "Applies when the component associated with this interface
@@ -134,8 +136,9 @@
       }
     }
     list rcap-internal-interface {
-      when
-        "../dot1q:component-name = 'dot1q:s-vlan-component' and "+
+      when "/dot1q:bridges/dot1q:bridge[dot1q:name=current() " +
+        "/../dot1q:bridge-name]/dot1q:component[dot1q:name=current() " +
+        "/../dot1q:component-name]/dot1q:type = 'dot1q:s-vlan-component' and "+
         "../dot1q:port-type = 'dot1q:remote-customer-access-port'" {
         description
           "Applies when the component associated with this interface
