diff --git a/experimental/ietf-extracted-YANG-modules/iana-icmpv4-types@2020-09-25.yang b/experimental/ietf-extracted-YANG-modules/iana-icmpv4-types@2020-09-25.yang
index b215730d2..1c1378416 100644
--- a/experimental/ietf-extracted-YANG-modules/iana-icmpv4-types@2020-09-25.yang
+++ b/experimental/ietf-extracted-YANG-modules/iana-icmpv4-types@2020-09-25.yang
@@ -31,6 +31,9 @@ module iana-icmpv4-types {
      Relating to IETF Documents
      (https://trustee.ietf.org/license-info).
 
+     The initial version of this YANG module is part of RFC XXXX;
+     see the RFC itself for full legal notices.
+
      This version of this YANG module was generated from the
      corresponding IANA registry using an XSLT stylesheet from the
      'iana-yang' project (https://github.com/llhotka/iana-yang).";
diff --git a/experimental/ietf-extracted-YANG-modules/iana-icmpv6-types@2023-04-28.yang b/experimental/ietf-extracted-YANG-modules/iana-icmpv6-types@2023-04-28.yang
index 16e13dded..a5fd2c23d 100644
--- a/experimental/ietf-extracted-YANG-modules/iana-icmpv6-types@2023-04-28.yang
+++ b/experimental/ietf-extracted-YANG-modules/iana-icmpv6-types@2023-04-28.yang
@@ -20,7 +20,6 @@ module iana-icmpv6-types {
   description
     "This YANG module translates IANA registry 'ICMPv6 \"type\"
      Numbers' to YANG derived types.
-
      Copyright (c) 2023 IETF Trust and the persons identified as
      authors of the code. All rights reserved.
 
@@ -31,6 +30,9 @@ module iana-icmpv6-types {
      Relating to IETF Documents
      (https://trustee.ietf.org/license-info).
 
+     The initial version of this YANG module is part of RFC XXXX;
+     see the RFC itself for full legal notices.
+
      This version of this YANG module was generated from the
      corresponding IANA registry using an XSLT stylesheet from the
      'iana-yang' project (https://github.com/llhotka/iana-yang).";
diff --git a/experimental/ietf-extracted-YANG-modules/iana-ipv6-ext-types@2023-09-29.yang b/experimental/ietf-extracted-YANG-modules/iana-ipv6-ext-types@2023-09-29.yang
index 764eb1cdf..e0736bea7 100644
--- a/experimental/ietf-extracted-YANG-modules/iana-ipv6-ext-types@2023-09-29.yang
+++ b/experimental/ietf-extracted-YANG-modules/iana-ipv6-ext-types@2023-09-29.yang
@@ -23,7 +23,6 @@ module iana-ipv6-ext-types {
 
      Copyright (c) 2023 IETF Trust and the persons identified as
      authors of the code. All rights reserved.
-
      Redistribution and use in source and binary forms, with or
      without modification, is permitted pursuant to, and subject to
      the license terms contained in, the Revised BSD License set
diff --git a/experimental/ietf-extracted-YANG-modules/ietf-acl-enh@2022-10-24.yang b/experimental/ietf-extracted-YANG-modules/ietf-acl-enh@2022-10-24.yang
index 5831b8c15..a4b1fe56a 100644
--- a/experimental/ietf-extracted-YANG-modules/ietf-acl-enh@2022-10-24.yang
+++ b/experimental/ietf-extracted-YANG-modules/ietf-acl-enh@2022-10-24.yang
@@ -28,17 +28,20 @@ module ietf-acl-enh {
   import iana-icmpv4-types {
     prefix iana-icmpv4-types;
     reference
-      "TBC";
+      "RFC XXXX: Extensions to the Access Control Lists (ACLs)
+                 YANG Model";
   }
   import iana-icmpv6-types {
     prefix iana-icmpv6-types;
     reference
-      "TBC";
+      "RFC XXXX: Extensions to the Access Control Lists (ACLs)
+                 YANG Model";
   }
   import iana-ipv6-ext-types {
     prefix iana-ipv6-ext-types;
     reference
-      "TBC";
+      "RFC XXXX: Extensions to the Access Control Lists (ACLs)
+                 YANG Model";
   }
 
   organization
@@ -243,10 +246,9 @@ module ietf-acl-enh {
     description
       "A local log is used to record the ACL results.";
   }
-
   identity counter-type {
     description
-      "Base identity for deriving the Counter actions.";
+      "Base identity for deriving the counter actions.";
   }
 
   identity counter-name {
@@ -651,7 +653,8 @@ grouping mpls-match-parameters-config {
           "The type of log action to be performed.";
       }
       leaf log-id {
-        when "../log-type = 'local-log'" {
+        when "derived-from-or-self(../log-type, "
+           + "'acl-enh:local-log')" {
           description
             "Name of the log file updated when type is 'local-log'.";
         }
@@ -673,7 +676,8 @@ grouping mpls-match-parameters-config {
           "The type of counter action to be performed.";
       }
       leaf-list counter-name {
-        when "../counter-type = 'counter-name'" {
+        when "derived-from-or-self(../counter-type, "
+           + "'acl-enh:counter-name')" {
           description
             "Name for the counter or variable to update when counter-type
             is 'counter-name'.";