From 576f1cb41c4d531bd16628e9b772f5ff766e3fad Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 12 Mar 2021 18:59:57 +0100
Subject: vrf: bgp: T2271: re-arrange xml include building blocks

As the amount of include files now has reached a certain amount, this also
introduces "per topic" subdirectories on the filesystem to keep a clean
structure.

This commit is related to the change in the OSPF structure done in 952c52ef01
("vrf: ospf: T2271: re-arrange xml include building blocks").
---
 .../include/bgp/bgp-disable-connected-check.xml.i                 | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 interface-definitions/include/bgp/bgp-disable-connected-check.xml.i

(limited to 'interface-definitions/include/bgp/bgp-disable-connected-check.xml.i')

diff --git a/interface-definitions/include/bgp/bgp-disable-connected-check.xml.i b/interface-definitions/include/bgp/bgp-disable-connected-check.xml.i
new file mode 100644
index 000000000..bb9098bf6
--- /dev/null
+++ b/interface-definitions/include/bgp/bgp-disable-connected-check.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from bgp-disable-connected-check.xml.i -->
+<leafNode name="disable-connected-check">
+  <properties>
+    <help>Disable check to see if eBGP peer address is a connected route</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- included end -->
-- 
cgit v1.2.3


From ee2dfee43f8319726c2225a5ad2367d936ec3176 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 12 Mar 2021 20:04:58 +0000
Subject: xml: include: fix typo on include comment

When including XML files they all contained a comment from where the snipped
had actually been included from. The comment had been "included start" and
"included end" instead of "include start" and "include end".

This commit corrects the glitch.
---
 interface-definitions/include/accel-auth-local-users.xml.i            | 4 ++--
 interface-definitions/include/accel-auth-mode.xml.i                   | 4 ++--
 interface-definitions/include/accel-auth-protocols.xml.i              | 4 ++--
 interface-definitions/include/accel-client-ip-pool-start-stop.xml.i   | 4 ++--
 interface-definitions/include/accel-client-ip-pool-subnet.xml.i       | 4 ++--
 interface-definitions/include/accel-client-ipv6-pool.xml.i            | 4 ++--
 interface-definitions/include/accel-gateway-address.xml.i             | 4 ++--
 interface-definitions/include/accel-lcp-echo-interval-failure.xml.i   | 4 ++--
 interface-definitions/include/accel-lcp-echo-timeout.xml.i            | 4 ++--
 interface-definitions/include/accel-mtu-128-16384.xml.i               | 4 ++--
 interface-definitions/include/accel-name-server.xml.i                 | 4 ++--
 interface-definitions/include/accel-ppp-mppe.xml.i                    | 4 ++--
 .../include/accel-radius-additions-disable-accounting.xml.i           | 4 ++--
 interface-definitions/include/accel-radius-additions-rate-limit.xml.i | 4 ++--
 interface-definitions/include/accel-radius-additions.xml.i            | 4 ++--
 interface-definitions/include/accel-wins-server.xml.i                 | 4 ++--
 interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i            | 4 ++--
 interface-definitions/include/address-ipv4-ipv6.xml.i                 | 4 ++--
 interface-definitions/include/bfd-common.xml.i                        | 4 ++--
 interface-definitions/include/bgp/bgp-afi-aggregate-address.xml.i     | 4 ++--
 interface-definitions/include/bgp/bgp-afi-allowas-in.xml.i            | 4 ++--
 interface-definitions/include/bgp/bgp-afi-attribute-unchanged.xml.i   | 4 ++--
 interface-definitions/include/bgp/bgp-afi-capability-orf.xml.i        | 4 ++--
 interface-definitions/include/bgp/bgp-afi-common.xml.i                | 4 ++--
 interface-definitions/include/bgp/bgp-afi-ipv4-prefix-list.xml.i      | 4 ++--
 interface-definitions/include/bgp/bgp-afi-ipv6-nexthop-local.xml.i    | 4 ++--
 interface-definitions/include/bgp/bgp-afi-ipv6-prefix-list.xml.i      | 4 ++--
 interface-definitions/include/bgp/bgp-afi-l2vpn-common.xml.i          | 4 ++--
 interface-definitions/include/bgp/bgp-afi-maximum-paths.xml.i         | 4 ++--
 interface-definitions/include/bgp/bgp-afi-nexthop-self.xml.i          | 4 ++--
 .../include/bgp/bgp-afi-redistribute-metric-route-map.xml.i           | 4 ++--
 interface-definitions/include/bgp/bgp-afi-route-map.xml.i             | 4 ++--
 .../include/bgp/bgp-afi-route-reflector-client.xml.i                  | 4 ++--
 interface-definitions/include/bgp/bgp-afi-route-server-client.xml.i   | 4 ++--
 interface-definitions/include/bgp/bgp-afi-soft-reconfiguration.xml.i  | 4 ++--
 interface-definitions/include/bgp/bgp-bfd.xml.i                       | 4 ++--
 interface-definitions/include/bgp/bgp-capability.xml.i                | 4 ++--
 interface-definitions/include/bgp/bgp-common-config.xml.i             | 4 ++--
 interface-definitions/include/bgp/bgp-description.xml.i               | 4 ++--
 .../include/bgp/bgp-disable-capability-negotiation.xml.i              | 4 ++--
 interface-definitions/include/bgp/bgp-disable-connected-check.xml.i   | 4 ++--
 interface-definitions/include/bgp/bgp-ebgp-multihop.xml.i             | 4 ++--
 interface-definitions/include/bgp/bgp-local-as.xml.i                  | 4 ++--
 interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-unicast.xml.i | 4 ++--
 interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-unicast.xml.i | 4 ++--
 interface-definitions/include/bgp/bgp-neighbor-afi-l2vpn-evpn.xml.i   | 4 ++--
 interface-definitions/include/bgp/bgp-override-capability.xml.i       | 4 ++--
 interface-definitions/include/bgp/bgp-passive.xml.i                   | 4 ++--
 interface-definitions/include/bgp/bgp-password.xml.i                  | 4 ++--
 interface-definitions/include/bgp/bgp-peer-group.xml.i                | 4 ++--
 interface-definitions/include/bgp/bgp-remote-as.xml.i                 | 4 ++--
 interface-definitions/include/bgp/bgp-route-target.xml.i              | 4 ++--
 interface-definitions/include/bgp/bgp-shutdown.xml.i                  | 4 ++--
 interface-definitions/include/bgp/bgp-timers-holdtime.xml.i           | 4 ++--
 interface-definitions/include/bgp/bgp-timers-keepalive.xml.i          | 4 ++--
 interface-definitions/include/bgp/bgp-ttl-security.xml.i              | 4 ++--
 interface-definitions/include/bgp/bgp-update-source.xml.i             | 4 ++--
 interface-definitions/include/certificate-ca.xml.i                    | 4 ++--
 interface-definitions/include/certificate-key.xml.i                   | 4 ++--
 interface-definitions/include/certificate.xml.i                       | 4 ++--
 interface-definitions/include/dhcp-options.xml.i                      | 4 ++--
 interface-definitions/include/dhcp-server-domain-search.xml.i         | 4 ++--
 interface-definitions/include/dhcpv6-options.xml.i                    | 4 ++--
 interface-definitions/include/generic-disable-node.xml.i              | 4 ++--
 interface-definitions/include/interface-arp-cache-timeout.xml.i       | 4 ++--
 interface-definitions/include/interface-description.xml.i             | 4 ++--
 interface-definitions/include/interface-dial-on-demand.xml.i          | 4 ++--
 interface-definitions/include/interface-disable-arp-filter.xml.i      | 4 ++--
 interface-definitions/include/interface-disable-forwarding.xml.i      | 4 ++--
 interface-definitions/include/interface-disable-link-detect.xml.i     | 4 ++--
 interface-definitions/include/interface-disable.xml.i                 | 4 ++--
 interface-definitions/include/interface-eapol.xml.i                   | 4 ++--
 interface-definitions/include/interface-enable-arp-accept.xml.i       | 4 ++--
 interface-definitions/include/interface-enable-arp-announce.xml.i     | 4 ++--
 interface-definitions/include/interface-enable-arp-ignore.xml.i       | 4 ++--
 interface-definitions/include/interface-enable-proxy-arp.xml.i        | 4 ++--
 interface-definitions/include/interface-hw-id.xml.i                   | 4 ++--
 interface-definitions/include/interface-ipv4-options.xml.i            | 4 ++--
 interface-definitions/include/interface-ipv6-options.xml.i            | 4 ++--
 interface-definitions/include/interface-mac.xml.i                     | 4 ++--
 interface-definitions/include/interface-mirror.xml.i                  | 4 ++--
 interface-definitions/include/interface-mtu-1200-16000.xml.i          | 4 ++--
 interface-definitions/include/interface-mtu-1450-16000.xml.i          | 4 ++--
 interface-definitions/include/interface-mtu-64-8024.xml.i             | 4 ++--
 interface-definitions/include/interface-mtu-68-1500.xml.i             | 4 ++--
 interface-definitions/include/interface-mtu-68-16000.xml.i            | 4 ++--
 .../include/interface-parameters-dont-fragment.xml.i                  | 4 ++--
 interface-definitions/include/interface-parameters-flowlabel.xml.i    | 4 ++--
 interface-definitions/include/interface-parameters-key.xml.i          | 4 ++--
 interface-definitions/include/interface-parameters-tos.xml.i          | 4 ++--
 interface-definitions/include/interface-parameters-ttl.xml.i          | 4 ++--
 interface-definitions/include/interface-proxy-arp-pvlan.xml.i         | 4 ++--
 interface-definitions/include/interface-source-validation.xml.i       | 4 ++--
 interface-definitions/include/interface-vrf.xml.i                     | 4 ++--
 interface-definitions/include/interface-xdp.xml.i                     | 4 ++--
 interface-definitions/include/ipv6-address-autoconf.xml.i             | 4 ++--
 interface-definitions/include/ipv6-address-eui64.xml.i                | 4 ++--
 .../include/ipv6-address-no-default-link-local.xml.i                  | 4 ++--
 interface-definitions/include/ipv6-address.xml.i                      | 4 ++--
 interface-definitions/include/ipv6-disable-forwarding.xml.i           | 4 ++--
 interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i    | 4 ++--
 interface-definitions/include/isis-redistribute-ipv4.xml.i            | 4 ++--
 interface-definitions/include/listen-address-ipv4.xml.i               | 4 ++--
 interface-definitions/include/listen-address.xml.i                    | 4 ++--
 interface-definitions/include/nat-address.xml.i                       | 4 ++--
 interface-definitions/include/nat-interface.xml.i                     | 4 ++--
 interface-definitions/include/nat-port.xml.i                          | 4 ++--
 interface-definitions/include/nat-rule.xml.i                          | 4 ++--
 interface-definitions/include/nat-translation-port.xml.i              | 4 ++--
 interface-definitions/include/ospf/ospf-authentication.xml.i          | 4 ++--
 interface-definitions/include/ospf/ospf-common-config.xml.i           | 4 ++--
 interface-definitions/include/ospf/ospf-distance-global.xml.i         | 2 +-
 interface-definitions/include/ospf/ospf-distance-per-protocol.xml.i   | 2 +-
 interface-definitions/include/ospf/ospf-interface-common.xml.i        | 4 ++--
 interface-definitions/include/ospf/ospf-intervals.xml.i               | 4 ++--
 interface-definitions/include/ospf/ospf-metric-type.xml.i             | 4 ++--
 interface-definitions/include/ospf/ospf-metric.xml.i                  | 4 ++--
 interface-definitions/include/ospf/ospf-router-id.xml.i               | 2 +-
 interface-definitions/include/port-number.xml.i                       | 4 ++--
 interface-definitions/include/radius-server-ipv4-ipv6.xml.i           | 4 ++--
 interface-definitions/include/radius-server-ipv4.xml.i                | 4 ++--
 interface-definitions/include/radius-server-key.xml.i                 | 4 ++--
 interface-definitions/include/radius-server-port.xml.i                | 4 ++--
 interface-definitions/include/rip-access-list.xml.i                   | 4 ++--
 interface-definitions/include/rip-access-list6.xml.i                  | 4 ++--
 interface-definitions/include/rip-default-information.xml.i           | 4 ++--
 interface-definitions/include/rip-default-metric.xml.i                | 4 ++--
 interface-definitions/include/rip-interface.xml.i                     | 4 ++--
 interface-definitions/include/rip-prefix-list.xml.i                   | 4 ++--
 interface-definitions/include/rip-prefix-list6.xml.i                  | 4 ++--
 interface-definitions/include/rip-redistribute.xml.i                  | 4 ++--
 interface-definitions/include/rip-timers.xml.i                        | 4 ++--
 interface-definitions/include/route-map.xml.i                         | 4 ++--
 interface-definitions/include/source-address-ipv4-ipv6.xml.i          | 4 ++--
 interface-definitions/include/source-address-ipv4.xml.i               | 4 ++--
 interface-definitions/include/source-interface-ethernet.xml.i         | 4 ++--
 interface-definitions/include/source-interface.xml.i                  | 4 ++--
 interface-definitions/include/static-route-blackhole.xml.i            | 4 ++--
 interface-definitions/include/static-route-distance.xml.i             | 4 ++--
 interface-definitions/include/static-route-interface.xml.i            | 4 ++--
 interface-definitions/include/static-route-map.xml.i                  | 4 ++--
 interface-definitions/include/static-route-vrf.xml.i                  | 4 ++--
 interface-definitions/include/static-route.xml.i                      | 4 ++--
 interface-definitions/include/static-route6.xml.i                     | 4 ++--
 interface-definitions/include/tunnel-remote.xml.i                     | 4 ++--
 interface-definitions/include/vif-s.xml.i                             | 4 ++--
 interface-definitions/include/vif.xml.i                               | 4 ++--
 interface-definitions/include/vpn-ipsec-encryption.xml.i              | 4 ++--
 interface-definitions/include/vpn-ipsec-hash.xml.i                    | 4 ++--
 interface-definitions/include/webproxy-url-filtering.xml.i            | 4 ++--
 150 files changed, 297 insertions(+), 297 deletions(-)

(limited to 'interface-definitions/include/bgp/bgp-disable-connected-check.xml.i')

diff --git a/interface-definitions/include/accel-auth-local-users.xml.i b/interface-definitions/include/accel-auth-local-users.xml.i
index 35c7a2a06..70a08c10e 100644
--- a/interface-definitions/include/accel-auth-local-users.xml.i
+++ b/interface-definitions/include/accel-auth-local-users.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-auth-local-users.xml.i -->
+<!-- include start from accel-auth-local-users.xml.i -->
 <node name="local-users">
   <properties>
     <help>Local user authentication for PPPoE server</help>
@@ -48,4 +48,4 @@
     </tagNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/accel-auth-mode.xml.i b/interface-definitions/include/accel-auth-mode.xml.i
index 85c3c5e82..81d687182 100644
--- a/interface-definitions/include/accel-auth-mode.xml.i
+++ b/interface-definitions/include/accel-auth-mode.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-auth-mode.xml.i -->
+<!-- include start from accel-auth-mode.xml.i -->
 <leafNode name="mode">
   <properties>
     <help>Authentication mode used by this server</help>
@@ -19,4 +19,4 @@
   </properties>
   <defaultValue>local</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/accel-auth-protocols.xml.i b/interface-definitions/include/accel-auth-protocols.xml.i
index a6899a4d8..c5cf743c6 100644
--- a/interface-definitions/include/accel-auth-protocols.xml.i
+++ b/interface-definitions/include/accel-auth-protocols.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-auth-protocols.xml.i -->
+<!-- include start from accel-auth-protocols.xml.i -->
 <leafNode name="protocols">
   <properties>
     <help>Authentication protocol for remote access peer SSTP VPN</help>
@@ -28,4 +28,4 @@
   </properties>
   <defaultValue>pap chap mschap mschap-v2</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i b/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i
index b578f2b2c..b0668f93f 100644
--- a/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i
+++ b/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-client-ip-pool-start-stop.xml.i -->
+<!-- include start from accel-client-ip-pool-start-stop.xml.i -->
 <leafNode name="start">
   <properties>
     <help>First IP address in the pool</help>
@@ -15,4 +15,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/accel-client-ip-pool-subnet.xml.i b/interface-definitions/include/accel-client-ip-pool-subnet.xml.i
index 8e9ca0e92..72f660c39 100644
--- a/interface-definitions/include/accel-client-ip-pool-subnet.xml.i
+++ b/interface-definitions/include/accel-client-ip-pool-subnet.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-client-ip-pool-subnet.xml.i -->
+<!-- include start from accel-client-ip-pool-subnet.xml.i -->
 <leafNode name="subnet">
   <properties>
     <help>Client IP subnet (CIDR notation)</help>
@@ -13,4 +13,4 @@
     <multi />
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/accel-client-ipv6-pool.xml.i b/interface-definitions/include/accel-client-ipv6-pool.xml.i
index d15ff35d4..3608c2a0b 100644
--- a/interface-definitions/include/accel-client-ipv6-pool.xml.i
+++ b/interface-definitions/include/accel-client-ipv6-pool.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-client-ipv6-pool.xml.i -->
+<!-- include start from accel-client-ipv6-pool.xml.i -->
 <node name="client-ipv6-pool">
   <properties>
     <help>Pool of client IPv6 addresses</help>
@@ -58,4 +58,4 @@
     </tagNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/accel-gateway-address.xml.i b/interface-definitions/include/accel-gateway-address.xml.i
index c45c8b532..f7f9c721d 100644
--- a/interface-definitions/include/accel-gateway-address.xml.i
+++ b/interface-definitions/include/accel-gateway-address.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-gateway-address.xml.i -->
+<!-- include start from accel-gateway-address.xml.i -->
 <leafNode name="gateway-address">
   <properties>
     <help>Gateway IP address</help>
@@ -12,4 +12,4 @@
     </valueHelp>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/accel-lcp-echo-interval-failure.xml.i b/interface-definitions/include/accel-lcp-echo-interval-failure.xml.i
index cccf4b4f2..26f010916 100644
--- a/interface-definitions/include/accel-lcp-echo-interval-failure.xml.i
+++ b/interface-definitions/include/accel-lcp-echo-interval-failure.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-lcp-echo-interval-failure.xml.i -->
+<!-- include start from accel-lcp-echo-interval-failure.xml.i -->
 <leafNode name="lcp-echo-interval">
   <properties>
     <help>LCP echo-requests/sec</help>
@@ -17,4 +17,4 @@
   </properties>
   <defaultValue>3</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/accel-lcp-echo-timeout.xml.i b/interface-definitions/include/accel-lcp-echo-timeout.xml.i
index 888fa9d41..a60ca7ace 100644
--- a/interface-definitions/include/accel-lcp-echo-timeout.xml.i
+++ b/interface-definitions/include/accel-lcp-echo-timeout.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-lcp-echo-timeout.xml.i -->
+<!-- include start from accel-lcp-echo-timeout.xml.i -->
 <leafNode name="lcp-echo-timeout">
   <properties>
     <help>Timeout in seconds to wait for any peer activity. If this option specified it turns on adaptive lcp echo functionality and "lcp-echo-failure" is not used.</help>
@@ -8,4 +8,4 @@
   </properties>
   <defaultValue>0</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/accel-mtu-128-16384.xml.i b/interface-definitions/include/accel-mtu-128-16384.xml.i
index 6bd089823..c9cac8e45 100644
--- a/interface-definitions/include/accel-mtu-128-16384.xml.i
+++ b/interface-definitions/include/accel-mtu-128-16384.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-mtu-128-16384.xml.i -->
+<!-- include start from accel-mtu-128-16384.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU) - default 1492</help>
@@ -8,4 +8,4 @@
   </properties>
   <defaultValue>1492</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/accel-name-server.xml.i b/interface-definitions/include/accel-name-server.xml.i
index e46c75b52..68e4ae418 100644
--- a/interface-definitions/include/accel-name-server.xml.i
+++ b/interface-definitions/include/accel-name-server.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-name-server.xml.i -->
+<!-- include start from accel-name-server.xml.i -->
 <leafNode name="name-server">
   <properties>
     <help>Domain Name Server (DNS) propagated to client</help>
@@ -17,4 +17,4 @@
     <multi/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/accel-ppp-mppe.xml.i b/interface-definitions/include/accel-ppp-mppe.xml.i
index b7f9cfd92..dbf231ebe 100644
--- a/interface-definitions/include/accel-ppp-mppe.xml.i
+++ b/interface-definitions/include/accel-ppp-mppe.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-ppp-mppe.xml.i -->
+<!-- include start from accel-ppp-mppe.xml.i -->
 <leafNode name="mppe">
   <properties>
     <help>Specifies mppe negotiation preferences</help>
@@ -23,4 +23,4 @@
   </properties>
   <defaultValue>prefer</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/accel-radius-additions-disable-accounting.xml.i b/interface-definitions/include/accel-radius-additions-disable-accounting.xml.i
index dc5b9dd96..209f7a5f8 100644
--- a/interface-definitions/include/accel-radius-additions-disable-accounting.xml.i
+++ b/interface-definitions/include/accel-radius-additions-disable-accounting.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from accel-radius-additions-disable-accounting.xml.i -->
+<!-- include start from accel-radius-additions-disable-accounting.xml.i -->
 <leafNode name="disable-accounting">
   <properties>
     <help>Disable accounting</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/accel-radius-additions-rate-limit.xml.i b/interface-definitions/include/accel-radius-additions-rate-limit.xml.i
index 23a4a51cf..8c37c62d1 100644
--- a/interface-definitions/include/accel-radius-additions-rate-limit.xml.i
+++ b/interface-definitions/include/accel-radius-additions-rate-limit.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-radius-additions-rate-limit.xml.i -->
+<!-- include start from accel-radius-additions-rate-limit.xml.i -->
 <node name="rate-limit">
   <properties>
     <help>Upload/Download speed limits</help>
@@ -23,4 +23,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/accel-radius-additions.xml.i b/interface-definitions/include/accel-radius-additions.xml.i
index 0067b6d1c..3df0f88fa 100644
--- a/interface-definitions/include/accel-radius-additions.xml.i
+++ b/interface-definitions/include/accel-radius-additions.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-radius-additions.xml.i -->
+<!-- include start from accel-radius-additions.xml.i -->
 <node name="radius">
   <children>
     <leafNode name="acct-interim-jitter">
@@ -150,4 +150,4 @@
     </node>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/accel-wins-server.xml.i b/interface-definitions/include/accel-wins-server.xml.i
index 6de032981..6d5d3d301 100644
--- a/interface-definitions/include/accel-wins-server.xml.i
+++ b/interface-definitions/include/accel-wins-server.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from accel-wins-server.xml.i -->
+<!-- include start from accel-wins-server.xml.i -->
 <leafNode name="wins-server">
   <properties>
     <help>Windows Internet Name Service (WINS) servers propagated to client</help>
@@ -12,4 +12,4 @@
     <multi/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i b/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
index 7805110bc..b9dd59bea 100644
--- a/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
+++ b/interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from address-ipv4-ipv6-dhcp.xml.i -->
+<!-- include start from address-ipv4-ipv6-dhcp.xml.i -->
 <leafNode name="address">
   <properties>
     <help>IP address</help>
@@ -28,4 +28,4 @@
     <multi/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/address-ipv4-ipv6.xml.i b/interface-definitions/include/address-ipv4-ipv6.xml.i
index b11610104..519622050 100644
--- a/interface-definitions/include/address-ipv4-ipv6.xml.i
+++ b/interface-definitions/include/address-ipv4-ipv6.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from address-ipv4-ipv6.xml.i -->
+<!-- include start from address-ipv4-ipv6.xml.i -->
 <leafNode name="address">
   <properties>
     <help>IP address</help>
@@ -16,4 +16,4 @@
     <multi/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bfd-common.xml.i b/interface-definitions/include/bfd-common.xml.i
index ff73e4b20..b47b47612 100644
--- a/interface-definitions/include/bfd-common.xml.i
+++ b/interface-definitions/include/bfd-common.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bfd-common.xml.i -->
+<!-- include start from bfd-common.xml.i -->
 <leafNode name="echo-mode">
   <properties>
     <help>Enables the echo transmission mode</help>
@@ -69,4 +69,4 @@
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-aggregate-address.xml.i b/interface-definitions/include/bgp/bgp-afi-aggregate-address.xml.i
index c33d1097c..c731e970b 100644
--- a/interface-definitions/include/bgp/bgp-afi-aggregate-address.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-aggregate-address.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-aggregate-address.xml.i -->
+<!-- include start from bgp-afi-aggregate-address.xml.i -->
 <leafNode name="as-set">
   <properties>
     <help>Generate AS-set path information for this aggregate address</help>
@@ -11,4 +11,4 @@
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-allowas-in.xml.i b/interface-definitions/include/bgp/bgp-afi-allowas-in.xml.i
index 77de04ed7..738bf0211 100644
--- a/interface-definitions/include/bgp/bgp-afi-allowas-in.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-allowas-in.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-allowas-in.xml.i -->
+<!-- include start from bgp-afi-allowas-in.xml.i -->
 <node name="allowas-in">
   <properties>
     <help>Accept route that contains the local-as in the as-path</help>
@@ -18,4 +18,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-attribute-unchanged.xml.i b/interface-definitions/include/bgp/bgp-afi-attribute-unchanged.xml.i
index fef53dd9d..f407c3f74 100644
--- a/interface-definitions/include/bgp/bgp-afi-attribute-unchanged.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-attribute-unchanged.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-attribute-unchanged.xml.i -->
+<!-- include start from bgp-afi-attribute-unchanged.xml.i -->
 <node name="attribute-unchanged">
   <properties>
     <help>BGP attributes are sent unchanged</help>
@@ -24,4 +24,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-capability-orf.xml.i b/interface-definitions/include/bgp/bgp-afi-capability-orf.xml.i
index 9bd265f93..dd5c5f8b2 100644
--- a/interface-definitions/include/bgp/bgp-afi-capability-orf.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-capability-orf.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-capability-orf.xml.i -->
+<!-- include start from bgp-afi-capability-orf.xml.i -->
 <node name="orf">
   <properties>
     <help>Advertise ORF capability to this peer</help>
@@ -25,4 +25,4 @@
     </node>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-common.xml.i b/interface-definitions/include/bgp/bgp-afi-common.xml.i
index 9126b36e7..7782e7ef2 100644
--- a/interface-definitions/include/bgp/bgp-afi-common.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-common.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-common.xml.i -->
+<!-- include start from bgp-afi-common.xml.i -->
 <leafNode name="addpath-tx-all">
   <properties>
     <help>Use addpath to advertise all paths to a neighbor</help>
@@ -149,4 +149,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-ipv4-prefix-list.xml.i b/interface-definitions/include/bgp/bgp-afi-ipv4-prefix-list.xml.i
index bbbada6bd..133b5da28 100644
--- a/interface-definitions/include/bgp/bgp-afi-ipv4-prefix-list.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-ipv4-prefix-list.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-ipv4-prefix-list.xml.i -->
+<!-- include start from bgp-afi-ipv4-prefix-list.xml.i -->
 <node name="prefix-list">
   <properties>
     <help>IPv4-Prefix-list to filter route updates to/from this peer</help>
@@ -22,4 +22,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-ipv6-nexthop-local.xml.i b/interface-definitions/include/bgp/bgp-afi-ipv6-nexthop-local.xml.i
index 4778b392f..c74d81b1f 100644
--- a/interface-definitions/include/bgp/bgp-afi-ipv6-nexthop-local.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-ipv6-nexthop-local.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-ipv6-nexthop-local.xml.i -->
+<!-- include start from bgp-afi-ipv6-nexthop-local.xml.i -->
     <node name="nexthop-local">
       <properties>
         <help>Nexthop attributes</help>
@@ -12,4 +12,4 @@
         </leafNode>
       </children>
     </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-ipv6-prefix-list.xml.i b/interface-definitions/include/bgp/bgp-afi-ipv6-prefix-list.xml.i
index 8ae7837e9..d597b7c99 100644
--- a/interface-definitions/include/bgp/bgp-afi-ipv6-prefix-list.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-ipv6-prefix-list.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-ipv6-prefix-list.xml.i -->
+<!-- include start from bgp-afi-ipv6-prefix-list.xml.i -->
 <node name="prefix-list">
   <properties>
     <help>Prefix-list to filter route updates to/from this peer</help>
@@ -22,4 +22,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-l2vpn-common.xml.i b/interface-definitions/include/bgp/bgp-afi-l2vpn-common.xml.i
index 0b804f9cd..3e7e4ef78 100644
--- a/interface-definitions/include/bgp/bgp-afi-l2vpn-common.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-l2vpn-common.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-l2vpn-common.xml.i -->
+<!-- include start from bgp-afi-l2vpn-common.xml.i -->
 <leafNode name="advertise-default-gw">
   <properties>
     <help>Advertise All default g/w mac-ip routes in EVPN</help>
@@ -24,4 +24,4 @@
   </properties>
 </leafNode>
 #include <include/bgp/bgp-route-target.xml.i>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-maximum-paths.xml.i b/interface-definitions/include/bgp/bgp-afi-maximum-paths.xml.i
index 62133c375..6b220caa5 100644
--- a/interface-definitions/include/bgp/bgp-afi-maximum-paths.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-maximum-paths.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-maximum-paths.xml.i -->
+<!-- include start from bgp-afi-maximum-paths.xml.i -->
 <node name="maximum-paths">
   <properties>
     <help>Forward packets over multiple paths</help>
@@ -30,4 +30,4 @@
     </leafNode>
     </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-nexthop-self.xml.i b/interface-definitions/include/bgp/bgp-afi-nexthop-self.xml.i
index 0bcc4e937..a299f561e 100644
--- a/interface-definitions/include/bgp/bgp-afi-nexthop-self.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-nexthop-self.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-nexthop-self.xml.i -->
+<!-- include start from bgp-afi-nexthop-self.xml.i -->
 <node name="nexthop-self">
   <properties>
     <help>Disable the next hop calculation for this peer</help>
@@ -12,4 +12,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-redistribute-metric-route-map.xml.i b/interface-definitions/include/bgp/bgp-afi-redistribute-metric-route-map.xml.i
index cb930ed70..4382901c8 100644
--- a/interface-definitions/include/bgp/bgp-afi-redistribute-metric-route-map.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-redistribute-metric-route-map.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-redistribute-metric-route-map.xml.i -->
+<!-- include start from bgp-afi-redistribute-metric-route-map.xml.i -->
 <leafNode name="metric">
   <properties>
     <help>Metric for redistributed routes</help>
@@ -9,4 +9,4 @@
   </properties>
 </leafNode>
 #include <include/route-map.xml.i>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-route-map.xml.i b/interface-definitions/include/bgp/bgp-afi-route-map.xml.i
index 5549f56ca..7fac98586 100644
--- a/interface-definitions/include/bgp/bgp-afi-route-map.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-route-map.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-route-map.xml.i -->
+<!-- include start from bgp-afi-route-map.xml.i -->
 <node name="route-map">
   <properties>
     <help>Route-map to filter route updates to/from this peer</help>
@@ -22,4 +22,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-route-reflector-client.xml.i b/interface-definitions/include/bgp/bgp-afi-route-reflector-client.xml.i
index f6a9caa61..70fee40f0 100644
--- a/interface-definitions/include/bgp/bgp-afi-route-reflector-client.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-route-reflector-client.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from bgp-afi-route-reflector-client.xml.i -->
+<!-- include start from bgp-afi-route-reflector-client.xml.i -->
 <leafNode name="route-reflector-client">
   <properties>
     <help>Peer is a route reflector client</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-afi-route-server-client.xml.i b/interface-definitions/include/bgp/bgp-afi-route-server-client.xml.i
index 60de553fe..29719c463 100644
--- a/interface-definitions/include/bgp/bgp-afi-route-server-client.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-route-server-client.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from bgp-afi-route-server-client.xml.i -->
+<!-- include start from bgp-afi-route-server-client.xml.i -->
 <leafNode name="route-server-client">
   <properties>
     <help>Peer is a route server client</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
\ No newline at end of file
+<!-- include end -->
\ No newline at end of file
diff --git a/interface-definitions/include/bgp/bgp-afi-soft-reconfiguration.xml.i b/interface-definitions/include/bgp/bgp-afi-soft-reconfiguration.xml.i
index 7af11f8f4..c3f050bb8 100644
--- a/interface-definitions/include/bgp/bgp-afi-soft-reconfiguration.xml.i
+++ b/interface-definitions/include/bgp/bgp-afi-soft-reconfiguration.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-afi-soft-reconfiguration.xml.i -->
+<!-- include start from bgp-afi-soft-reconfiguration.xml.i -->
 <node name="soft-reconfiguration">
   <properties>
     <help>Soft reconfiguration for peer</help>
@@ -12,4 +12,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-bfd.xml.i b/interface-definitions/include/bgp/bgp-bfd.xml.i
index fe52b12f2..d918fd673 100644
--- a/interface-definitions/include/bgp/bgp-bfd.xml.i
+++ b/interface-definitions/include/bgp/bgp-bfd.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-bfd.xml.i -->
+<!-- include start from bgp-bfd.xml.i -->
 <node name="bfd">
   <properties>
     <help>Enable Bidirectional Forwarding Detection (BFD) support</help>
@@ -12,4 +12,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-capability.xml.i b/interface-definitions/include/bgp/bgp-capability.xml.i
index 8de5bd8ab..89ce19ca6 100644
--- a/interface-definitions/include/bgp/bgp-capability.xml.i
+++ b/interface-definitions/include/bgp/bgp-capability.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-capability.xml.i -->
+<!-- include start from bgp-capability.xml.i -->
 <node name="capability">
   <properties>
     <help>Advertise capabilities to this peer-group</help>
@@ -18,4 +18,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-common-config.xml.i b/interface-definitions/include/bgp/bgp-common-config.xml.i
index b474e5240..ae0e8b178 100644
--- a/interface-definitions/include/bgp/bgp-common-config.xml.i
+++ b/interface-definitions/include/bgp/bgp-common-config.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp/bgp-common-config.xml.i -->
+<!-- include start from bgp/bgp-common-config.xml.i -->
 <node name="address-family">
   <properties>
     <help>BGP address-family parameters</help>
@@ -822,4 +822,4 @@
     #include <include/bgp/bgp-timers-keepalive.xml.i>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-description.xml.i b/interface-definitions/include/bgp/bgp-description.xml.i
index e1766cb9f..308bbec12 100644
--- a/interface-definitions/include/bgp/bgp-description.xml.i
+++ b/interface-definitions/include/bgp/bgp-description.xml.i
@@ -1,7 +1,7 @@
-<!-- included start from bgp-description.xml.i -->
+<!-- include start from bgp-description.xml.i -->
 <leafNode name="description">
   <properties>
     <help>Neighbor specific description</help>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-disable-capability-negotiation.xml.i b/interface-definitions/include/bgp/bgp-disable-capability-negotiation.xml.i
index a43c6e8b9..74c3321d9 100644
--- a/interface-definitions/include/bgp/bgp-disable-capability-negotiation.xml.i
+++ b/interface-definitions/include/bgp/bgp-disable-capability-negotiation.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from bgp-disable-capability-negotiation.xml.i -->
+<!-- include start from bgp-disable-capability-negotiation.xml.i -->
 <leafNode name="disable-capability-negotiation">
   <properties>
     <help>Disable capability negotiation with this neighbor</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-disable-connected-check.xml.i b/interface-definitions/include/bgp/bgp-disable-connected-check.xml.i
index bb9098bf6..15142b0ac 100644
--- a/interface-definitions/include/bgp/bgp-disable-connected-check.xml.i
+++ b/interface-definitions/include/bgp/bgp-disable-connected-check.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from bgp-disable-connected-check.xml.i -->
+<!-- include start from bgp-disable-connected-check.xml.i -->
 <leafNode name="disable-connected-check">
   <properties>
     <help>Disable check to see if eBGP peer address is a connected route</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-ebgp-multihop.xml.i b/interface-definitions/include/bgp/bgp-ebgp-multihop.xml.i
index 6459fcf47..48580af3c 100644
--- a/interface-definitions/include/bgp/bgp-ebgp-multihop.xml.i
+++ b/interface-definitions/include/bgp/bgp-ebgp-multihop.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-ebgp-multihop.xml.i -->
+<!-- include start from bgp-ebgp-multihop.xml.i -->
 <leafNode name="ebgp-multihop">
   <properties>
     <help>Allow this EBGP neighbor to not be on a directly connected network</help>
@@ -11,4 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-local-as.xml.i b/interface-definitions/include/bgp/bgp-local-as.xml.i
index cf55ce476..7fc896a31 100644
--- a/interface-definitions/include/bgp/bgp-local-as.xml.i
+++ b/interface-definitions/include/bgp/bgp-local-as.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-local-as.xml.i -->
+<!-- include start from bgp-local-as.xml.i -->
 <tagNode name="local-as">
   <properties>
     <help>Local AS number [REQUIRED]</help>
@@ -19,4 +19,4 @@
     </leafNode>
   </children>
 </tagNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-unicast.xml.i b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-unicast.xml.i
index 964bc6264..945483276 100644
--- a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-unicast.xml.i
+++ b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv4-unicast.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-neighbor-afi-ipv4-unicast.xml.i -->
+<!-- include start from bgp-neighbor-afi-ipv4-unicast.xml.i -->
 <node name="ipv4-unicast">
   <properties>
     <help>IPv4 BGP neighbor parameters</help>
@@ -16,4 +16,4 @@
     #include <include/bgp/bgp-afi-common.xml.i>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-unicast.xml.i b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-unicast.xml.i
index c31863320..4cd676cb4 100644
--- a/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-unicast.xml.i
+++ b/interface-definitions/include/bgp/bgp-neighbor-afi-ipv6-unicast.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-neighbor-afi-ipv6-unicast.xml.i -->
+<!-- include start from bgp-neighbor-afi-ipv6-unicast.xml.i -->
 <node name="ipv6-unicast">
   <properties>
     <help>IPv6 BGP neighbor parameters</help>
@@ -17,4 +17,4 @@
     #include <include/bgp/bgp-afi-common.xml.i>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-neighbor-afi-l2vpn-evpn.xml.i b/interface-definitions/include/bgp/bgp-neighbor-afi-l2vpn-evpn.xml.i
index 35e11ad2c..0a9c599fa 100644
--- a/interface-definitions/include/bgp/bgp-neighbor-afi-l2vpn-evpn.xml.i
+++ b/interface-definitions/include/bgp/bgp-neighbor-afi-l2vpn-evpn.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-neighbor-afi-l2vpn-evpn.xml.i -->
+<!-- include start from bgp-neighbor-afi-l2vpn-evpn.xml.i -->
 <node name="l2vpn-evpn">
   <properties>
     <help>L2VPN EVPN BGP settings</help>
@@ -13,4 +13,4 @@
     #include <include/bgp/bgp-afi-soft-reconfiguration.xml.i>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-override-capability.xml.i b/interface-definitions/include/bgp/bgp-override-capability.xml.i
index 88c277c8b..1e51a49d5 100644
--- a/interface-definitions/include/bgp/bgp-override-capability.xml.i
+++ b/interface-definitions/include/bgp/bgp-override-capability.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from bgp-override-capability.xml.i -->
+<!-- include start from bgp-override-capability.xml.i -->
 <leafNode name="override-capability">
   <properties>
     <help>Ignore capability negotiation with specified neighbor</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-passive.xml.i b/interface-definitions/include/bgp/bgp-passive.xml.i
index ada961866..033cf8231 100644
--- a/interface-definitions/include/bgp/bgp-passive.xml.i
+++ b/interface-definitions/include/bgp/bgp-passive.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from bgp-passive.xml.i -->
+<!-- include start from bgp-passive.xml.i -->
 <leafNode name="passive">
   <properties>
     <help>Do not initiate a session with this neighbor</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-password.xml.i b/interface-definitions/include/bgp/bgp-password.xml.i
index 5b68a2d71..f5878cce9 100644
--- a/interface-definitions/include/bgp/bgp-password.xml.i
+++ b/interface-definitions/include/bgp/bgp-password.xml.i
@@ -1,7 +1,7 @@
-<!-- included start from bgp-password.xml.i -->
+<!-- include start from bgp-password.xml.i -->
 <leafNode name="password">
   <properties>
     <help>BGP MD5 password</help>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-peer-group.xml.i b/interface-definitions/include/bgp/bgp-peer-group.xml.i
index 6ee90b17f..8fc50794d 100644
--- a/interface-definitions/include/bgp/bgp-peer-group.xml.i
+++ b/interface-definitions/include/bgp/bgp-peer-group.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-peer-group.xml.i -->
+<!-- include start from bgp-peer-group.xml.i -->
 <leafNode name="peer-group">
   <properties>
     <help>Peer group for this peer</help>
@@ -11,4 +11,4 @@
     </valueHelp>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-remote-as.xml.i b/interface-definitions/include/bgp/bgp-remote-as.xml.i
index de3f4d2ad..f036fe13d 100644
--- a/interface-definitions/include/bgp/bgp-remote-as.xml.i
+++ b/interface-definitions/include/bgp/bgp-remote-as.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-remote-as.xml.i -->
+<!-- include start from bgp-remote-as.xml.i -->
 <leafNode name="remote-as">
   <properties>
     <help>Neighbor BGP AS number [REQUIRED]</help>
@@ -24,4 +24,4 @@
     <constraintErrorMessage>Invalid AS number</constraintErrorMessage>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-route-target.xml.i b/interface-definitions/include/bgp/bgp-route-target.xml.i
index c3df56a74..c05ac5dc2 100644
--- a/interface-definitions/include/bgp/bgp-route-target.xml.i
+++ b/interface-definitions/include/bgp/bgp-route-target.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-route-target.xml.i -->
+<!-- include start from bgp-route-target.xml.i -->
 <node name="route-target">
   <properties>
     <help>Route Target</help>
@@ -42,4 +42,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-shutdown.xml.i b/interface-definitions/include/bgp/bgp-shutdown.xml.i
index fefbfcebb..f920e9579 100644
--- a/interface-definitions/include/bgp/bgp-shutdown.xml.i
+++ b/interface-definitions/include/bgp/bgp-shutdown.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from bgp-shutdown.xml.i -->
+<!-- include start from bgp-shutdown.xml.i -->
 <leafNode name="shutdown">
   <properties>
     <help>Administratively shut down this neighbor</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-timers-holdtime.xml.i b/interface-definitions/include/bgp/bgp-timers-holdtime.xml.i
index 09924574b..9c16127b5 100644
--- a/interface-definitions/include/bgp/bgp-timers-holdtime.xml.i
+++ b/interface-definitions/include/bgp/bgp-timers-holdtime.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-timers-holdtime.xml.i -->
+<!-- include start from bgp-timers-holdtime.xml.i -->
 <leafNode name="holdtime">
   <properties>
     <help>BGP hold timer for this neighbor</help>
@@ -15,4 +15,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-timers-keepalive.xml.i b/interface-definitions/include/bgp/bgp-timers-keepalive.xml.i
index 7d294c9d6..8c3e66c6a 100644
--- a/interface-definitions/include/bgp/bgp-timers-keepalive.xml.i
+++ b/interface-definitions/include/bgp/bgp-timers-keepalive.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-timers-keepalive.xml.i -->
+<!-- include start from bgp-timers-keepalive.xml.i -->
 <leafNode name="keepalive">
   <properties>
     <help>BGP keepalive interval for this neighbor</help>
@@ -11,4 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-ttl-security.xml.i b/interface-definitions/include/bgp/bgp-ttl-security.xml.i
index 3f4d1786d..1fb1c2c55 100644
--- a/interface-definitions/include/bgp/bgp-ttl-security.xml.i
+++ b/interface-definitions/include/bgp/bgp-ttl-security.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-ttl-security.xml.i -->
+<!-- include start from bgp-ttl-security.xml.i -->
 <node name="ttl-security">
   <properties>
     <help>Ttl security mechanism</help>
@@ -18,4 +18,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/bgp-update-source.xml.i b/interface-definitions/include/bgp/bgp-update-source.xml.i
index 3bb79598d..f4ccc3553 100644
--- a/interface-definitions/include/bgp/bgp-update-source.xml.i
+++ b/interface-definitions/include/bgp/bgp-update-source.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from bgp-update-source.xml.i -->
+<!-- include start from bgp-update-source.xml.i -->
 <leafNode name="update-source">
   <!-- Need to check format interfaces -->
   <properties>
@@ -26,4 +26,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/certificate-ca.xml.i b/interface-definitions/include/certificate-ca.xml.i
index df12746aa..b97378658 100644
--- a/interface-definitions/include/certificate-ca.xml.i
+++ b/interface-definitions/include/certificate-ca.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from certificate-ca.xml.i -->
+<!-- include start from certificate-ca.xml.i -->
 <leafNode name="ca-cert-file">
   <properties>
     <help>Certificate Authority in x509 PEM format</help>
@@ -11,4 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/certificate-key.xml.i b/interface-definitions/include/certificate-key.xml.i
index 924823c76..1db9dd069 100644
--- a/interface-definitions/include/certificate-key.xml.i
+++ b/interface-definitions/include/certificate-key.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from certificate-key.xml.i -->
+<!-- include start from certificate-key.xml.i -->
 <leafNode name="key-file">
   <properties>
     <help>Certificate private key in x509 PEM format</help>
@@ -11,4 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/certificate.xml.i b/interface-definitions/include/certificate.xml.i
index 724a8a27f..fb5be45cc 100644
--- a/interface-definitions/include/certificate.xml.i
+++ b/interface-definitions/include/certificate.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from certificate.xml.i -->
+<!-- include start from certificate.xml.i -->
 <leafNode name="cert-file">
   <properties>
     <help>Certificate public key in x509 PEM format</help>
@@ -11,4 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/dhcp-options.xml.i b/interface-definitions/include/dhcp-options.xml.i
index 774714251..8972b53e9 100644
--- a/interface-definitions/include/dhcp-options.xml.i
+++ b/interface-definitions/include/dhcp-options.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from dhcp-options.xml.i -->
+<!-- include start from dhcp-options.xml.i -->
 <node name="dhcp-options">
   <properties>
     <help>DHCP client settings/options</help>
@@ -39,4 +39,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/dhcp-server-domain-search.xml.i b/interface-definitions/include/dhcp-server-domain-search.xml.i
index 9b3568b72..4fc55097b 100644
--- a/interface-definitions/include/dhcp-server-domain-search.xml.i
+++ b/interface-definitions/include/dhcp-server-domain-search.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from dhcp-server-domain-search.xml.i -->
+<!-- include start from dhcp-server-domain-search.xml.i -->
 <leafNode name="domain-search">
   <properties>
     <help>Client Domain Name search list</help>
@@ -9,4 +9,4 @@
     <multi/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i
index 33ba39592..a569659a4 100644
--- a/interface-definitions/include/dhcpv6-options.xml.i
+++ b/interface-definitions/include/dhcpv6-options.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from dhcpv6-options.xml.i -->
+<!-- include start from dhcpv6-options.xml.i -->
 <node name="dhcpv6-options">
   <properties>
     <help>DHCPv6 client settings/options</help>
@@ -97,4 +97,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/generic-disable-node.xml.i b/interface-definitions/include/generic-disable-node.xml.i
index 520383afb..bb4fa5c4b 100644
--- a/interface-definitions/include/generic-disable-node.xml.i
+++ b/interface-definitions/include/generic-disable-node.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from generic-disable-node.xml.i -->
+<!-- include start from generic-disable-node.xml.i -->
 <leafNode name="disable">
   <properties>
     <help>Temporary disable</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-arp-cache-timeout.xml.i b/interface-definitions/include/interface-arp-cache-timeout.xml.i
index 6dfebfee4..09fd70afc 100644
--- a/interface-definitions/include/interface-arp-cache-timeout.xml.i
+++ b/interface-definitions/include/interface-arp-cache-timeout.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-arp-cache-timeout.xml.i -->
+<!-- include start from interface-arp-cache-timeout.xml.i -->
 <leafNode name="arp-cache-timeout">
   <properties>
     <help>ARP cache entry timeout in seconds</help>
@@ -13,4 +13,4 @@
   </properties>
   <defaultValue>30</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-description.xml.i b/interface-definitions/include/interface-description.xml.i
index daf09d8bc..b16c562bb 100644
--- a/interface-definitions/include/interface-description.xml.i
+++ b/interface-definitions/include/interface-description.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-description.xml.i -->
+<!-- include start from interface-description.xml.i -->
 <leafNode name="description">
   <properties>
     <help>Interface specific description</help>
@@ -8,4 +8,4 @@
     <constraintErrorMessage>Description too long (limit 256 characters)</constraintErrorMessage>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-dial-on-demand.xml.i b/interface-definitions/include/interface-dial-on-demand.xml.i
index 8fba8099d..5067e45df 100644
--- a/interface-definitions/include/interface-dial-on-demand.xml.i
+++ b/interface-definitions/include/interface-dial-on-demand.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from interface-dial-on-demand.xml.i -->
+<!-- include start from interface-dial-on-demand.xml.i -->
 <leafNode name="connect-on-demand">
   <properties>
     <help>Establishment connection automatically when traffic is sent</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-disable-arp-filter.xml.i b/interface-definitions/include/interface-disable-arp-filter.xml.i
index 4de3ca893..5f118d49c 100644
--- a/interface-definitions/include/interface-disable-arp-filter.xml.i
+++ b/interface-definitions/include/interface-disable-arp-filter.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from interface-disable-arp-filter.xml.i -->
+<!-- include start from interface-disable-arp-filter.xml.i -->
 <leafNode name="disable-arp-filter">
   <properties>
     <help>Disable ARP filter on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-disable-forwarding.xml.i b/interface-definitions/include/interface-disable-forwarding.xml.i
index 7cbb726ec..fdce8f846 100644
--- a/interface-definitions/include/interface-disable-forwarding.xml.i
+++ b/interface-definitions/include/interface-disable-forwarding.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from interface-disable-forwarding.xml.i -->
+<!-- include start from interface-disable-forwarding.xml.i -->
 <leafNode name="disable-forwarding">
   <properties>
     <help>Disable IPv4 forwarding on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-disable-link-detect.xml.i b/interface-definitions/include/interface-disable-link-detect.xml.i
index 4298b4b5d..60c5f635b 100644
--- a/interface-definitions/include/interface-disable-link-detect.xml.i
+++ b/interface-definitions/include/interface-disable-link-detect.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from interface-disable-link-detect.xml.i -->
+<!-- include start from interface-disable-link-detect.xml.i -->
 <leafNode name="disable-link-detect">
   <properties>
     <help>Ignore link state changes</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-disable.xml.i b/interface-definitions/include/interface-disable.xml.i
index 5d73d54ba..5a058df01 100644
--- a/interface-definitions/include/interface-disable.xml.i
+++ b/interface-definitions/include/interface-disable.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from interface-disable.xml.i -->
+<!-- include start from interface-disable.xml.i -->
 <leafNode name="disable">
   <properties>
     <help>Administratively disable interface</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-eapol.xml.i b/interface-definitions/include/interface-eapol.xml.i
index 8b33b4acf..fafa75f1a 100644
--- a/interface-definitions/include/interface-eapol.xml.i
+++ b/interface-definitions/include/interface-eapol.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-eapol.xml.i -->
+<!-- include start from interface-eapol.xml.i -->
 <node name="eapol">
   <properties>
      <help>Extensible Authentication Protocol over Local Area Network</help>
@@ -9,4 +9,4 @@
     #include <include/certificate-key.xml.i>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-enable-arp-accept.xml.i b/interface-definitions/include/interface-enable-arp-accept.xml.i
index 688b3572e..bec08a708 100644
--- a/interface-definitions/include/interface-enable-arp-accept.xml.i
+++ b/interface-definitions/include/interface-enable-arp-accept.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from interface-enable-arp-accept.xml.i -->
+<!-- include start from interface-enable-arp-accept.xml.i -->
 <leafNode name="enable-arp-accept">
   <properties>
     <help>Enable ARP accept on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-enable-arp-announce.xml.i b/interface-definitions/include/interface-enable-arp-announce.xml.i
index c84bb7ea9..ef9e5db1e 100644
--- a/interface-definitions/include/interface-enable-arp-announce.xml.i
+++ b/interface-definitions/include/interface-enable-arp-announce.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from interface-enable-arp-announce.xml.i -->
+<!-- include start from interface-enable-arp-announce.xml.i -->
 <leafNode name="enable-arp-announce">
   <properties>
     <help>Enable ARP announce on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-enable-arp-ignore.xml.i b/interface-definitions/include/interface-enable-arp-ignore.xml.i
index 741771a89..0a33a2c9a 100644
--- a/interface-definitions/include/interface-enable-arp-ignore.xml.i
+++ b/interface-definitions/include/interface-enable-arp-ignore.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from interface-enable-arp-ignore.xml.i -->
+<!-- include start from interface-enable-arp-ignore.xml.i -->
 <leafNode name="enable-arp-ignore">
   <properties>
     <help>Enable ARP ignore on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-enable-proxy-arp.xml.i b/interface-definitions/include/interface-enable-proxy-arp.xml.i
index 08351e673..a0993539f 100644
--- a/interface-definitions/include/interface-enable-proxy-arp.xml.i
+++ b/interface-definitions/include/interface-enable-proxy-arp.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from interface-enable-proxy-arp.xml.i -->
+<!-- include start from interface-enable-proxy-arp.xml.i -->
 <leafNode name="enable-proxy-arp">
   <properties>
     <help>Enable proxy-arp on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-hw-id.xml.i b/interface-definitions/include/interface-hw-id.xml.i
index 55ef55add..78e8613d8 100644
--- a/interface-definitions/include/interface-hw-id.xml.i
+++ b/interface-definitions/include/interface-hw-id.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-hw-id.xml.i -->
+<!-- include start from interface-hw-id.xml.i -->
 <leafNode name="hw-id">
   <properties>
     <help>Associate Ethernet Interface with given Media Access Control (MAC) address</help>
@@ -11,4 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-ipv4-options.xml.i b/interface-definitions/include/interface-ipv4-options.xml.i
index c63f89890..64672f164 100644
--- a/interface-definitions/include/interface-ipv4-options.xml.i
+++ b/interface-definitions/include/interface-ipv4-options.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-ipv4-options.xml.i -->
+<!-- include start from interface-ipv4-options.xml.i -->
 <node name="ip">
   <properties>
     <help>IPv4 routing parameters</help>
@@ -15,4 +15,4 @@
     #include <include/interface-source-validation.xml.i>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-ipv6-options.xml.i b/interface-definitions/include/interface-ipv6-options.xml.i
index a94c6572b..a15aea9c1 100644
--- a/interface-definitions/include/interface-ipv6-options.xml.i
+++ b/interface-definitions/include/interface-ipv6-options.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-ipv6-options.xml.i -->
+<!-- include start from interface-ipv6-options.xml.i -->
 <node name="ipv6">
   <properties>
     <help>IPv6 routing parameters</help>
@@ -9,4 +9,4 @@
     #include <include/ipv6-dup-addr-detect-transmits.xml.i>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-mac.xml.i b/interface-definitions/include/interface-mac.xml.i
index 87dc5fb60..160b42b2e 100644
--- a/interface-definitions/include/interface-mac.xml.i
+++ b/interface-definitions/include/interface-mac.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from mac.xml.i -->
+<!-- include start from mac.xml.i -->
 <leafNode name="mac">
   <properties>
     <help>Media Access Control (MAC) address</help>
@@ -11,4 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-mirror.xml.i b/interface-definitions/include/interface-mirror.xml.i
index d34132a9c..445e214fe 100644
--- a/interface-definitions/include/interface-mirror.xml.i
+++ b/interface-definitions/include/interface-mirror.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-mirror.xml.i -->
+<!-- include start from interface-mirror.xml.i -->
 <node name="mirror">
   <properties>
     <help>Incoming/outgoing packet mirroring destination</help>
@@ -22,4 +22,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-mtu-1200-16000.xml.i b/interface-definitions/include/interface-mtu-1200-16000.xml.i
index 04b5ec8ac..0187c5991 100644
--- a/interface-definitions/include/interface-mtu-1200-16000.xml.i
+++ b/interface-definitions/include/interface-mtu-1200-16000.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-mtu-1200-16000.xml.i -->
+<!-- include start from interface-mtu-1200-16000.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
@@ -13,4 +13,4 @@
   </properties>
   <defaultValue>1500</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-mtu-1450-16000.xml.i b/interface-definitions/include/interface-mtu-1450-16000.xml.i
index 41dd5fb00..84268586e 100644
--- a/interface-definitions/include/interface-mtu-1450-16000.xml.i
+++ b/interface-definitions/include/interface-mtu-1450-16000.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-mtu-1450-16000.xml.i -->
+<!-- include start from interface-mtu-1450-16000.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
@@ -13,4 +13,4 @@
   </properties>
   <defaultValue>1500</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-mtu-64-8024.xml.i b/interface-definitions/include/interface-mtu-64-8024.xml.i
index 0a455bc64..6a7ab8a80 100644
--- a/interface-definitions/include/interface-mtu-64-8024.xml.i
+++ b/interface-definitions/include/interface-mtu-64-8024.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-mtu-68-8024.xml.i -->
+<!-- include start from interface-mtu-68-8024.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
@@ -13,4 +13,4 @@
   </properties>
   <defaultValue>1500</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-mtu-68-1500.xml.i b/interface-definitions/include/interface-mtu-68-1500.xml.i
index 78c2c6920..ea333edcc 100644
--- a/interface-definitions/include/interface-mtu-68-1500.xml.i
+++ b/interface-definitions/include/interface-mtu-68-1500.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-mtu-68-1500.xml.i -->
+<!-- include start from interface-mtu-68-1500.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
@@ -13,4 +13,4 @@
   </properties>
   <defaultValue>1500</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-mtu-68-16000.xml.i b/interface-definitions/include/interface-mtu-68-16000.xml.i
index 9f18464bf..a9107c027 100644
--- a/interface-definitions/include/interface-mtu-68-16000.xml.i
+++ b/interface-definitions/include/interface-mtu-68-16000.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-mtu-68-16000.xml.i -->
+<!-- include start from interface-mtu-68-16000.xml.i -->
 <leafNode name="mtu">
   <properties>
     <help>Maximum Transmission Unit (MTU)</help>
@@ -13,4 +13,4 @@
   </properties>
   <defaultValue>1500</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-parameters-dont-fragment.xml.i b/interface-definitions/include/interface-parameters-dont-fragment.xml.i
index a16cc5dee..d6c276d67 100644
--- a/interface-definitions/include/interface-parameters-dont-fragment.xml.i
+++ b/interface-definitions/include/interface-parameters-dont-fragment.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from interface-parameters-df.xml.i -->
+<!-- include start from interface-parameters-df.xml.i -->
 <leafNode name="dont-fragment">
   <properties>
     <help>Specifies the usage of the dont fragment (DF) bit</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-parameters-flowlabel.xml.i b/interface-definitions/include/interface-parameters-flowlabel.xml.i
index 0723c4b47..dc651bc9c 100644
--- a/interface-definitions/include/interface-parameters-flowlabel.xml.i
+++ b/interface-definitions/include/interface-parameters-flowlabel.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-parameters-flowlabel.xml.i -->
+<!-- include start from interface-parameters-flowlabel.xml.i -->
 <leafNode name="flowlabel">
   <properties>
     <help>Specifies the flow label to use in outgoing packets</help>
@@ -12,4 +12,4 @@
     <constraintErrorMessage>Must be 'inherit' or a number</constraintErrorMessage>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-parameters-key.xml.i b/interface-definitions/include/interface-parameters-key.xml.i
index e918ff0e8..1891b44b0 100644
--- a/interface-definitions/include/interface-parameters-key.xml.i
+++ b/interface-definitions/include/interface-parameters-key.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-parameters-key.xml.i -->
+<!-- include start from interface-parameters-key.xml.i -->
 <leafNode name="key">
   <properties>
     <help>Tunnel key</help>
@@ -12,4 +12,4 @@
     <constraintErrorMessage>key must be between 0-4294967295</constraintErrorMessage>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-parameters-tos.xml.i b/interface-definitions/include/interface-parameters-tos.xml.i
index ebb537bed..06ec2febb 100644
--- a/interface-definitions/include/interface-parameters-tos.xml.i
+++ b/interface-definitions/include/interface-parameters-tos.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from tunnel-parameters-tos.xml.i -->
+<!-- include start from tunnel-parameters-tos.xml.i -->
 <leafNode name="tos">
   <properties>
     <help>Specifies TOS value to use in outgoing packets</help>
@@ -13,4 +13,4 @@
   </properties>
   <defaultValue>inherit</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-parameters-ttl.xml.i b/interface-definitions/include/interface-parameters-ttl.xml.i
index 83563ecb1..a2e13d8d1 100644
--- a/interface-definitions/include/interface-parameters-ttl.xml.i
+++ b/interface-definitions/include/interface-parameters-ttl.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-parameters-ttl.xml.i -->
+<!-- include start from interface-parameters-ttl.xml.i -->
 <leafNode name="ttl">
   <properties>
     <help>Specifies TTL value to use in outgoing packets</help>
@@ -17,4 +17,4 @@
   </properties>
   <defaultValue>0</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-proxy-arp-pvlan.xml.i b/interface-definitions/include/interface-proxy-arp-pvlan.xml.i
index 02b96e353..484f8fd69 100644
--- a/interface-definitions/include/interface-proxy-arp-pvlan.xml.i
+++ b/interface-definitions/include/interface-proxy-arp-pvlan.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from interface-proxy-arp-pvlan.xml.i -->
+<!-- include start from interface-proxy-arp-pvlan.xml.i -->
 <leafNode name="proxy-arp-pvlan">
   <properties>
     <help>Enable private VLAN proxy ARP on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-source-validation.xml.i b/interface-definitions/include/interface-source-validation.xml.i
index 32cec464e..be58bce87 100644
--- a/interface-definitions/include/interface-source-validation.xml.i
+++ b/interface-definitions/include/interface-source-validation.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-source-validation.xml.i -->
+<!-- include start from interface-source-validation.xml.i -->
 <leafNode name="source-validation">
   <properties>
     <help>Source validation by reversed path (RFC3704)</help>
@@ -22,4 +22,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-vrf.xml.i b/interface-definitions/include/interface-vrf.xml.i
index e3d6b53e0..81ca0972b 100644
--- a/interface-definitions/include/interface-vrf.xml.i
+++ b/interface-definitions/include/interface-vrf.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from interface-vrf.xml.i -->
+<!-- include start from interface-vrf.xml.i -->
 <leafNode name="vrf">
   <properties>
     <help>VRF instance name</help>
@@ -11,4 +11,4 @@
     </completionHelp>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/interface-xdp.xml.i b/interface-definitions/include/interface-xdp.xml.i
index d224c177f..21fcf131d 100644
--- a/interface-definitions/include/interface-xdp.xml.i
+++ b/interface-definitions/include/interface-xdp.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from interface-vrf.xml.i -->
+<!-- include start from interface-vrf.xml.i -->
 <leafNode name="xdp">
   <properties>
     <help>Enable eXpress Data Path</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/ipv6-address-autoconf.xml.i b/interface-definitions/include/ipv6-address-autoconf.xml.i
index 580f060d7..a84293067 100644
--- a/interface-definitions/include/ipv6-address-autoconf.xml.i
+++ b/interface-definitions/include/ipv6-address-autoconf.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from ipv6-address-autoconf.xml.i -->
+<!-- include start from ipv6-address-autoconf.xml.i -->
 <leafNode name="autoconf">
   <properties>
     <help>Enable acquisition of IPv6 address using stateless autoconfig (SLAAC)</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/ipv6-address-eui64.xml.i b/interface-definitions/include/ipv6-address-eui64.xml.i
index 093a1dc79..e06e88d52 100644
--- a/interface-definitions/include/ipv6-address-eui64.xml.i
+++ b/interface-definitions/include/ipv6-address-eui64.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from ipv6-address-eui64.xml.i -->
+<!-- include start from ipv6-address-eui64.xml.i -->
 <leafNode name="eui64">
   <properties>
     <help>Prefix for IPv6 address with MAC-based EUI-64</help>
@@ -12,4 +12,4 @@
     <multi/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/ipv6-address-no-default-link-local.xml.i b/interface-definitions/include/ipv6-address-no-default-link-local.xml.i
index 1c9e832dc..e803a4d60 100644
--- a/interface-definitions/include/ipv6-address-no-default-link-local.xml.i
+++ b/interface-definitions/include/ipv6-address-no-default-link-local.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from ipv6-address-no-default-link-local.xml.i -->
+<!-- include start from ipv6-address-no-default-link-local.xml.i -->
 <leafNode name="no-default-link-local">
   <properties>
     <help>Remove the default link-local address from the interface</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/ipv6-address.xml.i b/interface-definitions/include/ipv6-address.xml.i
index 276456248..d934f9021 100644
--- a/interface-definitions/include/ipv6-address.xml.i
+++ b/interface-definitions/include/ipv6-address.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from ipv6-address.xml.i -->
+<!-- include start from ipv6-address.xml.i -->
 <node name="address">
   <properties>
     <help>IPv6 address configuration modes</help>
@@ -9,4 +9,4 @@
     #include <include/ipv6-address-no-default-link-local.xml.i>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/ipv6-disable-forwarding.xml.i b/interface-definitions/include/ipv6-disable-forwarding.xml.i
index 14d9eada9..5f368256b 100644
--- a/interface-definitions/include/ipv6-disable-forwarding.xml.i
+++ b/interface-definitions/include/ipv6-disable-forwarding.xml.i
@@ -1,8 +1,8 @@
-<!-- included start from ipv6-disable-forwarding.xml.i -->
+<!-- include start from ipv6-disable-forwarding.xml.i -->
 <leafNode name="disable-forwarding">
   <properties>
     <help>Disable IPv6 forwarding on this interface</help>
     <valueless/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i b/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i
index 61e6669c4..c6265d71a 100644
--- a/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i
+++ b/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from ipv6-dup-addr-detect-transmits.xml.i -->
+<!-- include start from ipv6-dup-addr-detect-transmits.xml.i -->
 <leafNode name="dup-addr-detect-transmits">
   <properties>
     <help>Number of NS messages to send while performing DAD (default: 1)</help>
@@ -15,4 +15,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/isis-redistribute-ipv4.xml.i b/interface-definitions/include/isis-redistribute-ipv4.xml.i
index 97ab64250..774086a81 100644
--- a/interface-definitions/include/isis-redistribute-ipv4.xml.i
+++ b/interface-definitions/include/isis-redistribute-ipv4.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from isis-redistribute-ipv4.xml.i -->
+<!-- include start from isis-redistribute-ipv4.xml.i -->
 <node name="level-1">
   <properties>
     <help>Redistribute into level-1</help>
@@ -53,4 +53,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/listen-address-ipv4.xml.i b/interface-definitions/include/listen-address-ipv4.xml.i
index 530dbf619..ee52cebe8 100644
--- a/interface-definitions/include/listen-address-ipv4.xml.i
+++ b/interface-definitions/include/listen-address-ipv4.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from listen-address-ipv4.xml.i -->
+<!-- include start from listen-address-ipv4.xml.i -->
 <leafNode name="listen-address">
   <properties>
     <help>Local IPv4 addresses for service to listen on</help>
@@ -15,4 +15,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/listen-address.xml.i b/interface-definitions/include/listen-address.xml.i
index 5bfb7eb38..9b86851c7 100644
--- a/interface-definitions/include/listen-address.xml.i
+++ b/interface-definitions/include/listen-address.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from listen-address.xml.i -->
+<!-- include start from listen-address.xml.i -->
 <leafNode name="listen-address">
   <properties>
     <help>Local IP addresses for service to listen on</help>
@@ -20,4 +20,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/nat-address.xml.i b/interface-definitions/include/nat-address.xml.i
index 846ef3dec..a6460ac0f 100644
--- a/interface-definitions/include/nat-address.xml.i
+++ b/interface-definitions/include/nat-address.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from nat-address.xml.i -->
+<!-- include start from nat-address.xml.i -->
 <leafNode name="address">
   <properties>
     <help>IP address, subnet, or range</help>
@@ -36,4 +36,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/nat-interface.xml.i b/interface-definitions/include/nat-interface.xml.i
index e42003530..68969472f 100644
--- a/interface-definitions/include/nat-interface.xml.i
+++ b/interface-definitions/include/nat-interface.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from nat-interface.xml.i -->
+<!-- include start from nat-interface.xml.i -->
 <leafNode name="outbound-interface">
   <properties>
     <help>Outbound interface of NAT traffic</help>
@@ -8,4 +8,4 @@
     </completionHelp>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/nat-port.xml.i b/interface-definitions/include/nat-port.xml.i
index 6465c00e9..ebba43712 100644
--- a/interface-definitions/include/nat-port.xml.i
+++ b/interface-definitions/include/nat-port.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from nat-port.xml.i -->
+<!-- include start from nat-port.xml.i -->
 <leafNode name="port">
   <properties>
     <help>Port number</help>
@@ -16,4 +16,4 @@
     </valueHelp>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/nat-rule.xml.i b/interface-definitions/include/nat-rule.xml.i
index 7ef90f07e..579d19bdd 100644
--- a/interface-definitions/include/nat-rule.xml.i
+++ b/interface-definitions/include/nat-rule.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from nat-rule.xml.i -->
+<!-- include start from nat-rule.xml.i -->
 <tagNode name="rule">
   <properties>
     <help>Rule number for NAT</help>
@@ -298,4 +298,4 @@
     </node>
   </children>
 </tagNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/nat-translation-port.xml.i b/interface-definitions/include/nat-translation-port.xml.i
index a3e05316f..6e507353c 100644
--- a/interface-definitions/include/nat-translation-port.xml.i
+++ b/interface-definitions/include/nat-translation-port.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from nat-translation-port.xml.i -->
+<!-- include start from nat-translation-port.xml.i -->
 <leafNode name="port">
   <properties>
     <help>Port number</help>
@@ -12,4 +12,4 @@
     </valueHelp>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/ospf-authentication.xml.i b/interface-definitions/include/ospf/ospf-authentication.xml.i
index 5ade318de..322c002e4 100644
--- a/interface-definitions/include/ospf/ospf-authentication.xml.i
+++ b/interface-definitions/include/ospf/ospf-authentication.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from ospf/ospf-authentication.xml.i -->
+<!-- include start from ospf/ospf-authentication.xml.i -->
 <node name="authentication">
   <properties>
     <help>Authentication</help>
@@ -53,4 +53,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/ospf-common-config.xml.i b/interface-definitions/include/ospf/ospf-common-config.xml.i
index a9b2f0a2b..7316af670 100644
--- a/interface-definitions/include/ospf/ospf-common-config.xml.i
+++ b/interface-definitions/include/ospf/ospf-common-config.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from ospf/ospf-common-config.xml.i -->
+<!-- include start from ospf/ospf-common-config.xml.i -->
 <tagNode name="access-list">
   <properties>
     <help>Access list to filter networks in routing updates</help>
@@ -758,4 +758,4 @@
     </node>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/ospf-distance-global.xml.i b/interface-definitions/include/ospf/ospf-distance-global.xml.i
index 930bd9640..08cd76cba 100644
--- a/interface-definitions/include/ospf/ospf-distance-global.xml.i
+++ b/interface-definitions/include/ospf/ospf-distance-global.xml.i
@@ -11,4 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/ospf-distance-per-protocol.xml.i b/interface-definitions/include/ospf/ospf-distance-per-protocol.xml.i
index 19debdea2..d2c4b8b52 100644
--- a/interface-definitions/include/ospf/ospf-distance-per-protocol.xml.i
+++ b/interface-definitions/include/ospf/ospf-distance-per-protocol.xml.i
@@ -35,4 +35,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/ospf-interface-common.xml.i b/interface-definitions/include/ospf/ospf-interface-common.xml.i
index a34795cd5..c0069ccb5 100644
--- a/interface-definitions/include/ospf/ospf-interface-common.xml.i
+++ b/interface-definitions/include/ospf/ospf-interface-common.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from ospf/ospf-interface-common.xml.i -->
+<!-- include start from ospf/ospf-interface-common.xml.i -->
 <leafNode name="bfd">
   <properties>
     <help>Enable Bidirectional Forwarding Detection (BFD) support</help>
@@ -36,4 +36,4 @@
   </properties>
   <defaultValue>1</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/ospf-intervals.xml.i b/interface-definitions/include/ospf/ospf-intervals.xml.i
index 62a4a58e1..fe220eceb 100644
--- a/interface-definitions/include/ospf/ospf-intervals.xml.i
+++ b/interface-definitions/include/ospf/ospf-intervals.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from ospf/ospf-intervals.xml.i -->
+<!-- include start from ospf/ospf-intervals.xml.i -->
 <leafNode name="dead-interval">
   <properties>
     <help>Interval after which a neighbor is declared dead (default: 40)</help>
@@ -51,4 +51,4 @@
   </properties>
   <defaultValue>1</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/ospf-metric-type.xml.i b/interface-definitions/include/ospf/ospf-metric-type.xml.i
index b354e3661..1e982c4bc 100644
--- a/interface-definitions/include/ospf/ospf-metric-type.xml.i
+++ b/interface-definitions/include/ospf/ospf-metric-type.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from ospf/ospf-metric-type.xml.i -->
+<!-- include start from ospf/ospf-metric-type.xml.i -->
 <leafNode name="metric-type">
   <properties>
     <help>OSPF metric type for default routes (default: 2)</help>
@@ -12,4 +12,4 @@
   </properties>
   <defaultValue>2</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/ospf-metric.xml.i b/interface-definitions/include/ospf/ospf-metric.xml.i
index 8d06bb159..125aedea7 100644
--- a/interface-definitions/include/ospf/ospf-metric.xml.i
+++ b/interface-definitions/include/ospf/ospf-metric.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from ospf/ospf-metric.xml.i -->
+<!-- include start from ospf/ospf-metric.xml.i -->
 <leafNode name="metric">
   <properties>
     <help>OSPF default metric</help>
@@ -11,4 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/ospf-router-id.xml.i b/interface-definitions/include/ospf/ospf-router-id.xml.i
index a719f40dc..5dbb52a36 100644
--- a/interface-definitions/include/ospf/ospf-router-id.xml.i
+++ b/interface-definitions/include/ospf/ospf-router-id.xml.i
@@ -11,4 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/port-number.xml.i b/interface-definitions/include/port-number.xml.i
index 81c192628..b62aef32b 100644
--- a/interface-definitions/include/port-number.xml.i
+++ b/interface-definitions/include/port-number.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from port-number.xml.i -->
+<!-- include start from port-number.xml.i -->
 <leafNode name="port">
   <properties>
     <help>Port number used by connection</help>
@@ -11,4 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/radius-server-ipv4-ipv6.xml.i b/interface-definitions/include/radius-server-ipv4-ipv6.xml.i
index c57d39b6b..5b12bec62 100644
--- a/interface-definitions/include/radius-server-ipv4-ipv6.xml.i
+++ b/interface-definitions/include/radius-server-ipv4-ipv6.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from radius-server-ipv4-ipv6.xml.i -->
+<!-- include start from radius-server-ipv4-ipv6.xml.i -->
 <node name="radius">
   <properties>
     <help>RADIUS based user authentication</help>
@@ -49,4 +49,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/radius-server-ipv4.xml.i b/interface-definitions/include/radius-server-ipv4.xml.i
index 15a421b9a..ab4c8e10e 100644
--- a/interface-definitions/include/radius-server-ipv4.xml.i
+++ b/interface-definitions/include/radius-server-ipv4.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from radius-server-ipv4.xml.i -->
+<!-- include start from radius-server-ipv4.xml.i -->
 <node name="radius">
   <properties>
     <help>RADIUS based user authentication</help>
@@ -24,4 +24,4 @@
     </tagNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/radius-server-key.xml.i b/interface-definitions/include/radius-server-key.xml.i
index 32a01b402..c6301646b 100644
--- a/interface-definitions/include/radius-server-key.xml.i
+++ b/interface-definitions/include/radius-server-key.xml.i
@@ -1,7 +1,7 @@
-<!-- included start from radius-server-key.xml.i -->
+<!-- include start from radius-server-key.xml.i -->
 <leafNode name="key">
   <properties>
     <help>Shared secret key</help>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/radius-server-port.xml.i b/interface-definitions/include/radius-server-port.xml.i
index 71b6bddb7..4e5d906bc 100644
--- a/interface-definitions/include/radius-server-port.xml.i
+++ b/interface-definitions/include/radius-server-port.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from radius-server-port.xml.i -->
+<!-- include start from radius-server-port.xml.i -->
 <leafNode name="port">
   <properties>
     <help>Authentication port</help>
@@ -12,4 +12,4 @@
   </properties>
   <defaultValue>1812</defaultValue>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/rip-access-list.xml.i b/interface-definitions/include/rip-access-list.xml.i
index 0db6863e5..9d5366a0d 100644
--- a/interface-definitions/include/rip-access-list.xml.i
+++ b/interface-definitions/include/rip-access-list.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from rip-access-list.xml.i -->
+<!-- include start from rip-access-list.xml.i -->
 <node name="access-list">
   <properties>
     <help>Access-list</help>
@@ -36,4 +36,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/rip-access-list6.xml.i b/interface-definitions/include/rip-access-list6.xml.i
index 6a8a37607..a57f2038d 100644
--- a/interface-definitions/include/rip-access-list6.xml.i
+++ b/interface-definitions/include/rip-access-list6.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from rip-access-list.xml.i -->
+<!-- include start from rip-access-list.xml.i -->
 <node name="access-list">
   <properties>
     <help>Access-list</help>
@@ -36,4 +36,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/rip-default-information.xml.i b/interface-definitions/include/rip-default-information.xml.i
index 22a2f6ac7..9dbe744a1 100644
--- a/interface-definitions/include/rip-default-information.xml.i
+++ b/interface-definitions/include/rip-default-information.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from rip-default-information.xml.i -->
+<!-- include start from rip-default-information.xml.i -->
 <node name="default-information">
   <properties>
     <help>Control distribution of default route</help>
@@ -12,4 +12,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/rip-default-metric.xml.i b/interface-definitions/include/rip-default-metric.xml.i
index a5e6016d6..e021e47dd 100644
--- a/interface-definitions/include/rip-default-metric.xml.i
+++ b/interface-definitions/include/rip-default-metric.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from rip-default-metric.xml.i -->
+<!-- include start from rip-default-metric.xml.i -->
 <leafNode name="default-metric">
   <properties>
     <help>Metric of redistributed routes</help>
@@ -11,4 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/rip-interface.xml.i b/interface-definitions/include/rip-interface.xml.i
index 6279c16c8..1807a944a 100644
--- a/interface-definitions/include/rip-interface.xml.i
+++ b/interface-definitions/include/rip-interface.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from rip-interface.xml.i -->
+<!-- include start from rip-interface.xml.i -->
 <tagNode name="interface">
   <properties>
     <help>Interface name</help>
@@ -35,4 +35,4 @@
     </node>
   </children>
 </tagNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/rip-prefix-list.xml.i b/interface-definitions/include/rip-prefix-list.xml.i
index 58969a86b..ec8a34266 100644
--- a/interface-definitions/include/rip-prefix-list.xml.i
+++ b/interface-definitions/include/rip-prefix-list.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from rip-prefix-list.xml.i -->
+<!-- include start from rip-prefix-list.xml.i -->
 <node name="prefix-list">
   <properties>
     <help>Prefix-list</help>
@@ -30,4 +30,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/rip-prefix-list6.xml.i b/interface-definitions/include/rip-prefix-list6.xml.i
index f73f77d05..b1026bcd2 100644
--- a/interface-definitions/include/rip-prefix-list6.xml.i
+++ b/interface-definitions/include/rip-prefix-list6.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from rip-prefix-list.xml.i -->
+<!-- include start from rip-prefix-list.xml.i -->
 <node name="prefix-list">
   <properties>
     <help>Prefix-list</help>
@@ -30,4 +30,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/rip-redistribute.xml.i b/interface-definitions/include/rip-redistribute.xml.i
index c31be6fe5..1e47125e9 100644
--- a/interface-definitions/include/rip-redistribute.xml.i
+++ b/interface-definitions/include/rip-redistribute.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from rip-redistribute.xml.i -->
+<!-- include start from rip-redistribute.xml.i -->
 <leafNode name="metric">
   <properties>
     <help>Metric for redistributed routes</help>
@@ -12,4 +12,4 @@
   </properties>
 </leafNode>
 #include <include/route-map.xml.i>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/rip-timers.xml.i b/interface-definitions/include/rip-timers.xml.i
index 5ba19bb06..f43ea3f5f 100644
--- a/interface-definitions/include/rip-timers.xml.i
+++ b/interface-definitions/include/rip-timers.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from rip-timers.xml.i -->
+<!-- include start from rip-timers.xml.i -->
 <node name="timers">
   <properties>
     <help>RIPng timer values</help>
@@ -45,4 +45,4 @@
     </leafNode>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/route-map.xml.i b/interface-definitions/include/route-map.xml.i
index 943a477c0..5a1c137b9 100644
--- a/interface-definitions/include/route-map.xml.i
+++ b/interface-definitions/include/route-map.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from ospf-route-map.xml.i -->
+<!-- include start from route-map.xml.i -->
 <leafNode name="route-map">
   <properties>
     <help>Route map reference</help>
@@ -11,4 +11,4 @@
     </completionHelp>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/source-address-ipv4-ipv6.xml.i b/interface-definitions/include/source-address-ipv4-ipv6.xml.i
index 93cfd7c63..af3f9bb68 100644
--- a/interface-definitions/include/source-address-ipv4-ipv6.xml.i
+++ b/interface-definitions/include/source-address-ipv4-ipv6.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from source-address-ipv4-ipv6.xml.i -->
+<!-- include start from source-address-ipv4-ipv6.xml.i -->
 <leafNode name="source-address">
   <properties>
     <help>Source IP address used to initiate connection</help>
@@ -18,4 +18,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/source-address-ipv4.xml.i b/interface-definitions/include/source-address-ipv4.xml.i
index 2dff2c65e..86235df61 100644
--- a/interface-definitions/include/source-address-ipv4.xml.i
+++ b/interface-definitions/include/source-address-ipv4.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from source-address-ipv4.xml.i -->
+<!-- include start from source-address-ipv4.xml.i -->
 <leafNode name="source-address">
   <properties>
     <help>IPv4 source address used to initiiate connection</help>
@@ -14,4 +14,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/source-interface-ethernet.xml.i b/interface-definitions/include/source-interface-ethernet.xml.i
index d641f3cb1..ee04f2cd5 100644
--- a/interface-definitions/include/source-interface-ethernet.xml.i
+++ b/interface-definitions/include/source-interface-ethernet.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from source-interface-ethernet.xml.i -->
+<!-- include start from source-interface-ethernet.xml.i -->
 <leafNode name="source-interface">
   <properties>
     <help>Physical interface the traffic will go through</help>
@@ -11,4 +11,4 @@
     </completionHelp>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/source-interface.xml.i b/interface-definitions/include/source-interface.xml.i
index 797206430..a9c2a0f9d 100644
--- a/interface-definitions/include/source-interface.xml.i
+++ b/interface-definitions/include/source-interface.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from source-interface.xml.i -->
+<!-- include start from source-interface.xml.i -->
 <leafNode name="source-interface">
   <properties>
     <help>Interface used to establish connection</help>
@@ -14,4 +14,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/static-route-blackhole.xml.i b/interface-definitions/include/static-route-blackhole.xml.i
index d0a0c2079..838a475d3 100644
--- a/interface-definitions/include/static-route-blackhole.xml.i
+++ b/interface-definitions/include/static-route-blackhole.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from static-route-blackhole.xml.i -->
+<!-- include start from static-route-blackhole.xml.i -->
 <node name="blackhole">
   <properties>
     <help>Silently discard packets when matched</help>
@@ -7,4 +7,4 @@
     #include <include/static-route-distance.xml.i>
   </children>
 </node>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/static-route-distance.xml.i b/interface-definitions/include/static-route-distance.xml.i
index d6c0d3d82..da171fe1f 100644
--- a/interface-definitions/include/static-route-distance.xml.i
+++ b/interface-definitions/include/static-route-distance.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from static-route-distance.xml.i -->
+<!-- include start from static-route-distance.xml.i -->
 <leafNode name="distance">
   <properties>
     <help>Distance for this route</help>
@@ -11,4 +11,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/static-route-interface.xml.i b/interface-definitions/include/static-route-interface.xml.i
index 0f10837df..6670c0e33 100644
--- a/interface-definitions/include/static-route-interface.xml.i
+++ b/interface-definitions/include/static-route-interface.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from static-route-interface.xml.i -->
+<!-- include start from static-route-interface.xml.i -->
 <leafNode name="interface">
   <properties>
     <help>Gateway interface name</help>
@@ -14,4 +14,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/static-route-map.xml.i b/interface-definitions/include/static-route-map.xml.i
index 25542b8b1..48f5055aa 100644
--- a/interface-definitions/include/static-route-map.xml.i
+++ b/interface-definitions/include/static-route-map.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from static-route-map.xml.i -->
+<!-- include start from static-route-map.xml.i -->
 <leafNode name="route-map">
   <properties>
     <help>Filter routes installed in local route map</help>
@@ -7,4 +7,4 @@
     </completionHelp>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/static-route-vrf.xml.i b/interface-definitions/include/static-route-vrf.xml.i
index 70f8b0be8..eda4d7aee 100644
--- a/interface-definitions/include/static-route-vrf.xml.i
+++ b/interface-definitions/include/static-route-vrf.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from static-route-vrf.xml.i -->
+<!-- include start from static-route-vrf.xml.i -->
 <leafNode name="vrf">
   <properties>
     <help>VRF to leak route</help>
@@ -16,4 +16,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/static-route.xml.i b/interface-definitions/include/static-route.xml.i
index 21fcbcd3f..94fbdd3d6 100644
--- a/interface-definitions/include/static-route.xml.i
+++ b/interface-definitions/include/static-route.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from static-route.xml.i -->
+<!-- include start from static-route.xml.i -->
 <tagNode name="route">
   <properties>
     <help>VRF static IPv4 route</help>
@@ -86,5 +86,5 @@
     </tagNode>
   </children>
 </tagNode>
-<!-- included end -->
+<!-- include end -->
 
diff --git a/interface-definitions/include/static-route6.xml.i b/interface-definitions/include/static-route6.xml.i
index fcf97cd03..4522ef39b 100644
--- a/interface-definitions/include/static-route6.xml.i
+++ b/interface-definitions/include/static-route6.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from static-route6.xml.i -->
+<!-- include start from static-route6.xml.i -->
 <tagNode name="route6">
   <properties>
     <help>VRF static IPv6 route</help>
@@ -71,5 +71,5 @@
     </tagNode>
   </children>
 </tagNode>
-<!-- included end -->
+<!-- include end -->
 
diff --git a/interface-definitions/include/tunnel-remote.xml.i b/interface-definitions/include/tunnel-remote.xml.i
index d5b50d3f6..324d100d4 100644
--- a/interface-definitions/include/tunnel-remote.xml.i
+++ b/interface-definitions/include/tunnel-remote.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from tunnel-remote.xml.i -->
+<!-- include start from tunnel-remote.xml.i -->
 <leafNode name="remote">
   <properties>
     <help>Tunnel remote address</help>
@@ -15,4 +15,4 @@
     </constraint>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i
index 01cb59efc..5760bb000 100644
--- a/interface-definitions/include/vif-s.xml.i
+++ b/interface-definitions/include/vif-s.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from vif-s.xml.i -->
+<!-- include start from vif-s.xml.i -->
 <tagNode name="vif-s">
   <properties>
     <help>QinQ TAG-S Virtual Local Area Network (VLAN) ID</help>
@@ -64,4 +64,4 @@
     #include <include/interface-vrf.xml.i>
   </children>
 </tagNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
index bc60dd04d..0f09b993d 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/vif.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from vif.xml.i -->
+<!-- include start from vif.xml.i -->
 <tagNode name="vif">
   <properties>
     <help>Virtual Local Area Network (VLAN) ID</help>
@@ -49,4 +49,4 @@
     #include <include/interface-mtu-68-16000.xml.i>
   </children>
 </tagNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/vpn-ipsec-encryption.xml.i b/interface-definitions/include/vpn-ipsec-encryption.xml.i
index 1c1d728fc..041ba9902 100644
--- a/interface-definitions/include/vpn-ipsec-encryption.xml.i
+++ b/interface-definitions/include/vpn-ipsec-encryption.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from vpn-ipsec-encryption.xml.i -->
+<!-- include start from vpn-ipsec-encryption.xml.i -->
                   <leafNode name="encryption">
                     <properties>
                       <help>Encryption algorithm</help>
@@ -230,4 +230,4 @@
                       </constraint>
                     </properties>
                   </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/vpn-ipsec-hash.xml.i b/interface-definitions/include/vpn-ipsec-hash.xml.i
index ca5976d27..93d57b622 100644
--- a/interface-definitions/include/vpn-ipsec-hash.xml.i
+++ b/interface-definitions/include/vpn-ipsec-hash.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from pn-ipsec-hash.xml.i -->
+<!-- include start from pn-ipsec-hash.xml.i -->
                   <leafNode name="hash">
                     <properties>
                       <help>Hash algorithm</help>
@@ -62,4 +62,4 @@
                       </constraint>
                     </properties>
                   </leafNode>
-<!-- included end -->
+<!-- include end -->
diff --git a/interface-definitions/include/webproxy-url-filtering.xml.i b/interface-definitions/include/webproxy-url-filtering.xml.i
index 07db0948f..265bbff94 100644
--- a/interface-definitions/include/webproxy-url-filtering.xml.i
+++ b/interface-definitions/include/webproxy-url-filtering.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from webproxy-url-filtering.xml.i -->
+<!-- include start from webproxy-url-filtering.xml.i -->
 <leafNode name="allow-category">
   <properties>
     <help>Category to allow</help>
@@ -116,4 +116,4 @@
     <multi/>
   </properties>
 </leafNode>
-<!-- included end -->
+<!-- include end -->
-- 
cgit v1.2.3