From cccda3a0768680d1920e408afd44d96855a64e61 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 22 Aug 2021 09:52:04 +0200
Subject: xml: remove superfluous "interface" prefix from interface includes

(cherry picked from commit 0a8a0188033d6b27c521f082fdddae9873dd5d3d)
---
 .../include/interface/arp-cache-timeout.xml.i      | 16 +++++++++++
 .../include/interface/description.xml.i            | 11 ++++++++
 .../include/interface/dial-on-demand.xml.i         |  8 ++++++
 .../include/interface/disable-arp-filter.xml.i     |  8 ++++++
 .../include/interface/disable-forwarding.xml.i     |  8 ++++++
 .../include/interface/disable-link-detect.xml.i    |  8 ++++++
 .../include/interface/disable.xml.i                |  8 ++++++
 .../include/interface/eapol.xml.i                  | 12 ++++++++
 .../include/interface/enable-arp-accept.xml.i      |  8 ++++++
 .../include/interface/enable-arp-announce.xml.i    |  8 ++++++
 .../include/interface/enable-arp-ignore.xml.i      |  8 ++++++
 .../include/interface/enable-proxy-arp.xml.i       |  8 ++++++
 .../include/interface/hw-id.xml.i                  | 14 ++++++++++
 .../interface/interface-arp-cache-timeout.xml.i    | 16 -----------
 .../include/interface/interface-description.xml.i  | 11 --------
 .../interface/interface-dial-on-demand.xml.i       |  8 ------
 .../interface/interface-disable-arp-filter.xml.i   |  8 ------
 .../interface/interface-disable-forwarding.xml.i   |  8 ------
 .../interface/interface-disable-link-detect.xml.i  |  8 ------
 .../include/interface/interface-disable.xml.i      |  8 ------
 .../include/interface/interface-eapol.xml.i        | 12 --------
 .../interface/interface-enable-arp-accept.xml.i    |  8 ------
 .../interface/interface-enable-arp-announce.xml.i  |  8 ------
 .../interface/interface-enable-arp-ignore.xml.i    |  8 ------
 .../interface/interface-enable-proxy-arp.xml.i     |  8 ------
 .../include/interface/interface-hw-id.xml.i        | 14 ----------
 .../include/interface/interface-ipv4-options.xml.i | 18 ------------
 .../include/interface/interface-ipv6-options.xml.i | 12 --------
 .../include/interface/interface-mac.xml.i          | 14 ----------
 .../include/interface/interface-mirror.xml.i       | 25 -----------------
 .../interface/interface-mtu-1200-16000.xml.i       | 16 -----------
 .../interface/interface-mtu-1450-16000.xml.i       | 16 -----------
 .../include/interface/interface-mtu-64-8024.xml.i  | 16 -----------
 .../include/interface/interface-mtu-68-1500.xml.i  | 16 -----------
 .../include/interface/interface-mtu-68-16000.xml.i | 16 -----------
 .../interface/interface-parameters-flowlabel.xml.i | 16 -----------
 .../interface/interface-parameters-key.xml.i       | 15 ----------
 .../interface/interface-parameters-tos.xml.i       | 16 -----------
 .../interface/interface-parameters-ttl.xml.i       | 20 --------------
 .../interface/interface-proxy-arp-pvlan.xml.i      |  8 ------
 .../interface/interface-source-validation.xml.i    | 25 -----------------
 .../include/interface/interface-vrf.xml.i          | 14 ----------
 .../include/interface/ipv4-options.xml.i           | 18 ++++++++++++
 .../include/interface/ipv6-options.xml.i           | 12 ++++++++
 interface-definitions/include/interface/mac.xml.i  | 14 ++++++++++
 .../include/interface/mirror.xml.i                 | 25 +++++++++++++++++
 .../include/interface/mtu-1200-16000.xml.i         | 16 +++++++++++
 .../include/interface/mtu-1450-16000.xml.i         | 16 +++++++++++
 .../include/interface/mtu-64-8024.xml.i            | 16 +++++++++++
 .../include/interface/mtu-68-1500.xml.i            | 16 +++++++++++
 .../include/interface/mtu-68-16000.xml.i           | 16 +++++++++++
 .../include/interface/parameters-flowlabel.xml.i   | 16 +++++++++++
 .../include/interface/parameters-key.xml.i         | 15 ++++++++++
 .../include/interface/parameters-tos.xml.i         | 16 +++++++++++
 .../include/interface/parameters-ttl.xml.i         | 20 ++++++++++++++
 .../include/interface/proxy-arp-pvlan.xml.i        |  8 ++++++
 .../include/interface/source-validation.xml.i      | 25 +++++++++++++++++
 .../include/interface/vif-s.xml.i                  | 32 +++++++++++-----------
 interface-definitions/include/interface/vif.xml.i  | 16 +++++------
 interface-definitions/include/interface/vrf.xml.i  | 14 ++++++++++
 interface-definitions/interfaces-bonding.xml.in    | 18 ++++++------
 interface-definitions/interfaces-bridge.xml.in     | 18 ++++++------
 interface-definitions/interfaces-dummy.xml.in      |  8 +++---
 interface-definitions/interfaces-ethernet.xml.in   | 22 +++++++--------
 interface-definitions/interfaces-geneve.xml.in     | 12 ++++----
 interface-definitions/interfaces-l2tpv3.xml.in     | 12 ++++----
 interface-definitions/interfaces-loopback.xml.in   |  4 +--
 interface-definitions/interfaces-macsec.xml.in     | 12 ++++----
 interface-definitions/interfaces-openvpn.xml.in    |  8 +++---
 interface-definitions/interfaces-pppoe.xml.in      | 12 ++++----
 .../interfaces-pseudo-ethernet.xml.in              | 16 +++++------
 interface-definitions/interfaces-tunnel.xml.in     | 22 +++++++--------
 interface-definitions/interfaces-vxlan.xml.in      | 14 +++++-----
 interface-definitions/interfaces-wireguard.xml.in  | 12 ++++----
 interface-definitions/interfaces-wireless.xml.in   | 16 +++++------
 interface-definitions/interfaces-wwan.xml.in       | 16 +++++------
 interface-definitions/ntp.xml.in                   |  2 +-
 .../service_console-server.xml.in                  |  2 +-
 interface-definitions/snmp.xml.in                  |  2 +-
 interface-definitions/ssh.xml.in                   |  2 +-
 interface-definitions/system-login.xml.in          |  2 +-
 interface-definitions/vpn_sstp.xml.in              |  2 +-
 interface-definitions/vrf.xml.in                   |  4 +--
 83 files changed, 531 insertions(+), 531 deletions(-)
 create mode 100644 interface-definitions/include/interface/arp-cache-timeout.xml.i
 create mode 100644 interface-definitions/include/interface/description.xml.i
 create mode 100644 interface-definitions/include/interface/dial-on-demand.xml.i
 create mode 100644 interface-definitions/include/interface/disable-arp-filter.xml.i
 create mode 100644 interface-definitions/include/interface/disable-forwarding.xml.i
 create mode 100644 interface-definitions/include/interface/disable-link-detect.xml.i
 create mode 100644 interface-definitions/include/interface/disable.xml.i
 create mode 100644 interface-definitions/include/interface/eapol.xml.i
 create mode 100644 interface-definitions/include/interface/enable-arp-accept.xml.i
 create mode 100644 interface-definitions/include/interface/enable-arp-announce.xml.i
 create mode 100644 interface-definitions/include/interface/enable-arp-ignore.xml.i
 create mode 100644 interface-definitions/include/interface/enable-proxy-arp.xml.i
 create mode 100644 interface-definitions/include/interface/hw-id.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-arp-cache-timeout.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-description.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-dial-on-demand.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-disable-arp-filter.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-disable-forwarding.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-disable-link-detect.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-disable.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-eapol.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-enable-arp-accept.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-enable-arp-announce.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-enable-arp-ignore.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-enable-proxy-arp.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-hw-id.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-ipv4-options.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-ipv6-options.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-mac.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-mirror.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-mtu-1200-16000.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-mtu-1450-16000.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-mtu-64-8024.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-mtu-68-1500.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-mtu-68-16000.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-parameters-flowlabel.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-parameters-key.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-parameters-tos.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-parameters-ttl.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-source-validation.xml.i
 delete mode 100644 interface-definitions/include/interface/interface-vrf.xml.i
 create mode 100644 interface-definitions/include/interface/ipv4-options.xml.i
 create mode 100644 interface-definitions/include/interface/ipv6-options.xml.i
 create mode 100644 interface-definitions/include/interface/mac.xml.i
 create mode 100644 interface-definitions/include/interface/mirror.xml.i
 create mode 100644 interface-definitions/include/interface/mtu-1200-16000.xml.i
 create mode 100644 interface-definitions/include/interface/mtu-1450-16000.xml.i
 create mode 100644 interface-definitions/include/interface/mtu-64-8024.xml.i
 create mode 100644 interface-definitions/include/interface/mtu-68-1500.xml.i
 create mode 100644 interface-definitions/include/interface/mtu-68-16000.xml.i
 create mode 100644 interface-definitions/include/interface/parameters-flowlabel.xml.i
 create mode 100644 interface-definitions/include/interface/parameters-key.xml.i
 create mode 100644 interface-definitions/include/interface/parameters-tos.xml.i
 create mode 100644 interface-definitions/include/interface/parameters-ttl.xml.i
 create mode 100644 interface-definitions/include/interface/proxy-arp-pvlan.xml.i
 create mode 100644 interface-definitions/include/interface/source-validation.xml.i
 create mode 100644 interface-definitions/include/interface/vrf.xml.i

diff --git a/interface-definitions/include/interface/arp-cache-timeout.xml.i b/interface-definitions/include/interface/arp-cache-timeout.xml.i
new file mode 100644
index 000000000..b269fecd8
--- /dev/null
+++ b/interface-definitions/include/interface/arp-cache-timeout.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/interface-arp-cache-timeout.xml.i -->
+<leafNode name="arp-cache-timeout">
+  <properties>
+    <help>ARP cache entry timeout in seconds</help>
+    <valueHelp>
+      <format>1-86400</format>
+      <description>ARP cache entry timout in seconds (default 30)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-86400"/>
+    </constraint>
+    <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage>
+  </properties>
+  <defaultValue>30</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/description.xml.i b/interface-definitions/include/interface/description.xml.i
new file mode 100644
index 000000000..d618b50d2
--- /dev/null
+++ b/interface-definitions/include/interface/description.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from interface/interface-description.xml.i -->
+<leafNode name="description">
+  <properties>
+    <help>Interface specific description</help>
+    <constraint>
+      <regex>.{1,256}$</regex>
+    </constraint>
+    <constraintErrorMessage>Description too long (limit 256 characters)</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/dial-on-demand.xml.i b/interface-definitions/include/interface/dial-on-demand.xml.i
new file mode 100644
index 000000000..66edd9678
--- /dev/null
+++ b/interface-definitions/include/interface/dial-on-demand.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-dial-on-demand.xml.i -->
+<leafNode name="connect-on-demand">
+  <properties>
+    <help>Establishment connection automatically when traffic is sent</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/disable-arp-filter.xml.i b/interface-definitions/include/interface/disable-arp-filter.xml.i
new file mode 100644
index 000000000..49cddaf76
--- /dev/null
+++ b/interface-definitions/include/interface/disable-arp-filter.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-disable-arp-filter.xml.i -->
+<leafNode name="disable-arp-filter">
+  <properties>
+    <help>Disable ARP filter on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/disable-forwarding.xml.i b/interface-definitions/include/interface/disable-forwarding.xml.i
new file mode 100644
index 000000000..cb6ef0475
--- /dev/null
+++ b/interface-definitions/include/interface/disable-forwarding.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-disable-forwarding.xml.i -->
+<leafNode name="disable-forwarding">
+  <properties>
+    <help>Disable IPv4 forwarding on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/disable-link-detect.xml.i b/interface-definitions/include/interface/disable-link-detect.xml.i
new file mode 100644
index 000000000..c528885b2
--- /dev/null
+++ b/interface-definitions/include/interface/disable-link-detect.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-disable-link-detect.xml.i -->
+<leafNode name="disable-link-detect">
+  <properties>
+    <help>Ignore link state changes</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/disable.xml.i b/interface-definitions/include/interface/disable.xml.i
new file mode 100644
index 000000000..d90e6395b
--- /dev/null
+++ b/interface-definitions/include/interface/disable.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-disable.xml.i -->
+<leafNode name="disable">
+  <properties>
+    <help>Administratively disable interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/eapol.xml.i b/interface-definitions/include/interface/eapol.xml.i
new file mode 100644
index 000000000..92b7a3f35
--- /dev/null
+++ b/interface-definitions/include/interface/eapol.xml.i
@@ -0,0 +1,12 @@
+<!-- include start from interface/interface-eapol.xml.i -->
+<node name="eapol">
+  <properties>
+     <help>Extensible Authentication Protocol over Local Area Network</help>
+  </properties>
+  <children>
+    #include <include/certificate.xml.i>
+    #include <include/certificate-ca.xml.i>
+    #include <include/certificate-key.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/enable-arp-accept.xml.i b/interface-definitions/include/interface/enable-arp-accept.xml.i
new file mode 100644
index 000000000..7c5d51857
--- /dev/null
+++ b/interface-definitions/include/interface/enable-arp-accept.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-enable-arp-accept.xml.i -->
+<leafNode name="enable-arp-accept">
+  <properties>
+    <help>Enable ARP accept on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/enable-arp-announce.xml.i b/interface-definitions/include/interface/enable-arp-announce.xml.i
new file mode 100644
index 000000000..f44599c54
--- /dev/null
+++ b/interface-definitions/include/interface/enable-arp-announce.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-enable-arp-announce.xml.i -->
+<leafNode name="enable-arp-announce">
+  <properties>
+    <help>Enable ARP announce on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/enable-arp-ignore.xml.i b/interface-definitions/include/interface/enable-arp-ignore.xml.i
new file mode 100644
index 000000000..3ea39613c
--- /dev/null
+++ b/interface-definitions/include/interface/enable-arp-ignore.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-enable-arp-ignore.xml.i -->
+<leafNode name="enable-arp-ignore">
+  <properties>
+    <help>Enable ARP ignore on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/enable-proxy-arp.xml.i b/interface-definitions/include/interface/enable-proxy-arp.xml.i
new file mode 100644
index 000000000..dbdeeb7a7
--- /dev/null
+++ b/interface-definitions/include/interface/enable-proxy-arp.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/interface-enable-proxy-arp.xml.i -->
+<leafNode name="enable-proxy-arp">
+  <properties>
+    <help>Enable proxy-arp on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/hw-id.xml.i b/interface-definitions/include/interface/hw-id.xml.i
new file mode 100644
index 000000000..989cd9cb7
--- /dev/null
+++ b/interface-definitions/include/interface/hw-id.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from interface/interface-hw-id.xml.i -->
+<leafNode name="hw-id">
+  <properties>
+    <help>Associate Ethernet Interface with given Media Access Control (MAC) address</help>
+    <valueHelp>
+      <format>macaddr</format>
+      <description>Hardware (MAC) address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="mac-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-arp-cache-timeout.xml.i b/interface-definitions/include/interface/interface-arp-cache-timeout.xml.i
deleted file mode 100644
index b269fecd8..000000000
--- a/interface-definitions/include/interface/interface-arp-cache-timeout.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface/interface-arp-cache-timeout.xml.i -->
-<leafNode name="arp-cache-timeout">
-  <properties>
-    <help>ARP cache entry timeout in seconds</help>
-    <valueHelp>
-      <format>1-86400</format>
-      <description>ARP cache entry timout in seconds (default 30)</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 1-86400"/>
-    </constraint>
-    <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage>
-  </properties>
-  <defaultValue>30</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-description.xml.i b/interface-definitions/include/interface/interface-description.xml.i
deleted file mode 100644
index d618b50d2..000000000
--- a/interface-definitions/include/interface/interface-description.xml.i
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- include start from interface/interface-description.xml.i -->
-<leafNode name="description">
-  <properties>
-    <help>Interface specific description</help>
-    <constraint>
-      <regex>.{1,256}$</regex>
-    </constraint>
-    <constraintErrorMessage>Description too long (limit 256 characters)</constraintErrorMessage>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-dial-on-demand.xml.i b/interface-definitions/include/interface/interface-dial-on-demand.xml.i
deleted file mode 100644
index 66edd9678..000000000
--- a/interface-definitions/include/interface/interface-dial-on-demand.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-dial-on-demand.xml.i -->
-<leafNode name="connect-on-demand">
-  <properties>
-    <help>Establishment connection automatically when traffic is sent</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-disable-arp-filter.xml.i b/interface-definitions/include/interface/interface-disable-arp-filter.xml.i
deleted file mode 100644
index 49cddaf76..000000000
--- a/interface-definitions/include/interface/interface-disable-arp-filter.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-disable-arp-filter.xml.i -->
-<leafNode name="disable-arp-filter">
-  <properties>
-    <help>Disable ARP filter on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-disable-forwarding.xml.i b/interface-definitions/include/interface/interface-disable-forwarding.xml.i
deleted file mode 100644
index cb6ef0475..000000000
--- a/interface-definitions/include/interface/interface-disable-forwarding.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-disable-forwarding.xml.i -->
-<leafNode name="disable-forwarding">
-  <properties>
-    <help>Disable IPv4 forwarding on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-disable-link-detect.xml.i b/interface-definitions/include/interface/interface-disable-link-detect.xml.i
deleted file mode 100644
index c528885b2..000000000
--- a/interface-definitions/include/interface/interface-disable-link-detect.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-disable-link-detect.xml.i -->
-<leafNode name="disable-link-detect">
-  <properties>
-    <help>Ignore link state changes</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-disable.xml.i b/interface-definitions/include/interface/interface-disable.xml.i
deleted file mode 100644
index d90e6395b..000000000
--- a/interface-definitions/include/interface/interface-disable.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-disable.xml.i -->
-<leafNode name="disable">
-  <properties>
-    <help>Administratively disable interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-eapol.xml.i b/interface-definitions/include/interface/interface-eapol.xml.i
deleted file mode 100644
index 92b7a3f35..000000000
--- a/interface-definitions/include/interface/interface-eapol.xml.i
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- include start from interface/interface-eapol.xml.i -->
-<node name="eapol">
-  <properties>
-     <help>Extensible Authentication Protocol over Local Area Network</help>
-  </properties>
-  <children>
-    #include <include/certificate.xml.i>
-    #include <include/certificate-ca.xml.i>
-    #include <include/certificate-key.xml.i>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-enable-arp-accept.xml.i b/interface-definitions/include/interface/interface-enable-arp-accept.xml.i
deleted file mode 100644
index 7c5d51857..000000000
--- a/interface-definitions/include/interface/interface-enable-arp-accept.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-enable-arp-accept.xml.i -->
-<leafNode name="enable-arp-accept">
-  <properties>
-    <help>Enable ARP accept on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-enable-arp-announce.xml.i b/interface-definitions/include/interface/interface-enable-arp-announce.xml.i
deleted file mode 100644
index f44599c54..000000000
--- a/interface-definitions/include/interface/interface-enable-arp-announce.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-enable-arp-announce.xml.i -->
-<leafNode name="enable-arp-announce">
-  <properties>
-    <help>Enable ARP announce on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-enable-arp-ignore.xml.i b/interface-definitions/include/interface/interface-enable-arp-ignore.xml.i
deleted file mode 100644
index 3ea39613c..000000000
--- a/interface-definitions/include/interface/interface-enable-arp-ignore.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-enable-arp-ignore.xml.i -->
-<leafNode name="enable-arp-ignore">
-  <properties>
-    <help>Enable ARP ignore on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-enable-proxy-arp.xml.i b/interface-definitions/include/interface/interface-enable-proxy-arp.xml.i
deleted file mode 100644
index dbdeeb7a7..000000000
--- a/interface-definitions/include/interface/interface-enable-proxy-arp.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/interface-enable-proxy-arp.xml.i -->
-<leafNode name="enable-proxy-arp">
-  <properties>
-    <help>Enable proxy-arp on this interface</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-hw-id.xml.i b/interface-definitions/include/interface/interface-hw-id.xml.i
deleted file mode 100644
index 989cd9cb7..000000000
--- a/interface-definitions/include/interface/interface-hw-id.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- include start from interface/interface-hw-id.xml.i -->
-<leafNode name="hw-id">
-  <properties>
-    <help>Associate Ethernet Interface with given Media Access Control (MAC) address</help>
-    <valueHelp>
-      <format>macaddr</format>
-      <description>Hardware (MAC) address</description>
-    </valueHelp>
-    <constraint>
-      <validator name="mac-address"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-ipv4-options.xml.i b/interface-definitions/include/interface/interface-ipv4-options.xml.i
deleted file mode 100644
index c2d0677b7..000000000
--- a/interface-definitions/include/interface/interface-ipv4-options.xml.i
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- include start from interface/interface-ipv4-options.xml.i -->
-<node name="ip">
-  <properties>
-    <help>IPv4 routing parameters</help>
-  </properties>
-  <children>
-    #include <include/interface/interface-arp-cache-timeout.xml.i>
-    #include <include/interface/interface-disable-arp-filter.xml.i>
-    #include <include/interface/interface-disable-forwarding.xml.i>
-    #include <include/interface/interface-enable-arp-accept.xml.i>
-    #include <include/interface/interface-enable-arp-announce.xml.i>
-    #include <include/interface/interface-enable-arp-ignore.xml.i>
-    #include <include/interface/interface-enable-proxy-arp.xml.i>
-    #include <include/interface/interface-proxy-arp-pvlan.xml.i>
-    #include <include/interface/interface-source-validation.xml.i>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-ipv6-options.xml.i b/interface-definitions/include/interface/interface-ipv6-options.xml.i
deleted file mode 100644
index dcd5a8710..000000000
--- a/interface-definitions/include/interface/interface-ipv6-options.xml.i
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- include start from interface/interface-ipv6-options.xml.i -->
-<node name="ipv6">
-  <properties>
-    <help>IPv6 routing parameters</help>
-  </properties>
-  <children>
-    #include <include/interface/ipv6-address.xml.i>
-    #include <include/interface/ipv6-disable-forwarding.xml.i>
-    #include <include/interface/ipv6-dup-addr-detect-transmits.xml.i>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mac.xml.i b/interface-definitions/include/interface/interface-mac.xml.i
deleted file mode 100644
index d7107ad23..000000000
--- a/interface-definitions/include/interface/interface-mac.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- include start from interface/interface-mac.xml.i -->
-<leafNode name="mac">
-  <properties>
-    <help>Media Access Control (MAC) address</help>
-    <valueHelp>
-      <format>macaddr</format>
-      <description>Hardware (MAC) address</description>
-    </valueHelp>
-    <constraint>
-      <validator name="mac-address"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mirror.xml.i b/interface-definitions/include/interface/interface-mirror.xml.i
deleted file mode 100644
index b3b45fb43..000000000
--- a/interface-definitions/include/interface/interface-mirror.xml.i
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- include start from interface/interface-mirror.xml.i -->
-<node name="mirror">
-  <properties>
-    <help>Incoming/outgoing packet mirroring destination</help>
-  </properties>
-  <children>
-    <leafNode name="ingress">
-      <properties>
-        <help>Mirror the ingress traffic of the interface to the destination interface</help>
-        <completionHelp>
-            <script>${vyos_completion_dir}/list_interfaces.py</script>
-        </completionHelp>
-      </properties>
-    </leafNode>
-    <leafNode name="egress">
-      <properties>
-        <help>Mirror the egress traffic of the interface to the destination interface</help>
-        <completionHelp>
-            <script>${vyos_completion_dir}/list_interfaces.py</script>
-        </completionHelp>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mtu-1200-16000.xml.i b/interface-definitions/include/interface/interface-mtu-1200-16000.xml.i
deleted file mode 100644
index 3241ba912..000000000
--- a/interface-definitions/include/interface/interface-mtu-1200-16000.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface/interface-mtu-1200-16000.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU)</help>
-    <valueHelp>
-      <format>1200-16000</format>
-      <description>Maximum Transmission Unit in byte</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 1200-16000"/>
-    </constraint>
-    <constraintErrorMessage>MTU must be between 1200 and 16000</constraintErrorMessage>
-  </properties>
-  <defaultValue>1500</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mtu-1450-16000.xml.i b/interface-definitions/include/interface/interface-mtu-1450-16000.xml.i
deleted file mode 100644
index 0a35bbbaa..000000000
--- a/interface-definitions/include/interface/interface-mtu-1450-16000.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface/interface-mtu-1450-16000.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU)</help>
-    <valueHelp>
-      <format>1450-16000</format>
-      <description>Maximum Transmission Unit in byte</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 1450-16000"/>
-    </constraint>
-    <constraintErrorMessage>MTU must be between 1450 and 16000</constraintErrorMessage>
-  </properties>
-  <defaultValue>1500</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mtu-64-8024.xml.i b/interface-definitions/include/interface/interface-mtu-64-8024.xml.i
deleted file mode 100644
index f75de02ba..000000000
--- a/interface-definitions/include/interface/interface-mtu-64-8024.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface/interface-mtu-68-8024.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU)</help>
-    <valueHelp>
-      <format>64-8024</format>
-      <description>Maximum Transmission Unit in byte</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 64-8024"/>
-    </constraint>
-    <constraintErrorMessage>MTU must be between 64 and 8024</constraintErrorMessage>
-  </properties>
-  <defaultValue>1500</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mtu-68-1500.xml.i b/interface-definitions/include/interface/interface-mtu-68-1500.xml.i
deleted file mode 100644
index 9e6fe8760..000000000
--- a/interface-definitions/include/interface/interface-mtu-68-1500.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface/interface-mtu-68-1500.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU)</help>
-    <valueHelp>
-      <format>68-1500</format>
-      <description>Maximum Transmission Unit in byte</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 68-1500"/>
-    </constraint>
-    <constraintErrorMessage>MTU must be between 68 and 1500</constraintErrorMessage>
-  </properties>
-  <defaultValue>1500</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-mtu-68-16000.xml.i b/interface-definitions/include/interface/interface-mtu-68-16000.xml.i
deleted file mode 100644
index 83af7bbd4..000000000
--- a/interface-definitions/include/interface/interface-mtu-68-16000.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface/interface-mtu-68-16000.xml.i -->
-<leafNode name="mtu">
-  <properties>
-    <help>Maximum Transmission Unit (MTU)</help>
-    <valueHelp>
-      <format>68-16000</format>
-      <description>Maximum Transmission Unit in byte</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 68-16000"/>
-    </constraint>
-    <constraintErrorMessage>MTU must be between 68 and 16000</constraintErrorMessage>
-  </properties>
-  <defaultValue>1500</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i b/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i
deleted file mode 100644
index f5e868a64..000000000
--- a/interface-definitions/include/interface/interface-parameters-flowlabel.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface/interface-parameters-flowlabel.xml.i -->
-<leafNode name="flowlabel">
-  <properties>
-    <help>Specifies the flow label to use in outgoing packets</help>
-    <valueHelp>
-      <format>0x0-0x0FFFFF</format>
-      <description>Tunnel key, 'inherit' or hex value</description>
-    </valueHelp>
-    <constraint>
-      <regex>^((0x){0,1}(0?[0-9A-Fa-f]{1,5})|inherit)$</regex>
-    </constraint>
-    <constraintErrorMessage>Must be 'inherit' or a number</constraintErrorMessage>
-  </properties>
-  <defaultValue>inherit</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-parameters-key.xml.i b/interface-definitions/include/interface/interface-parameters-key.xml.i
deleted file mode 100644
index 1b1d67174..000000000
--- a/interface-definitions/include/interface/interface-parameters-key.xml.i
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- include start from interface/interface-parameters-key.xml.i -->
-<leafNode name="key">
-  <properties>
-    <help>Tunnel key</help>
-    <valueHelp>
-      <format>u32</format>
-      <description>Tunnel key</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 0-4294967295"/>
-    </constraint>
-    <constraintErrorMessage>key must be between 0-4294967295</constraintErrorMessage>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-parameters-tos.xml.i b/interface-definitions/include/interface/interface-parameters-tos.xml.i
deleted file mode 100644
index 83b4e0671..000000000
--- a/interface-definitions/include/interface/interface-parameters-tos.xml.i
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- include start from interface/tunnel-parameters-tos.xml.i -->
-<leafNode name="tos">
-  <properties>
-    <help>Specifies TOS value to use in outgoing packets</help>
-    <valueHelp>
-      <format>0-99</format>
-      <description>Type of Service (TOS)</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 0-99"/>
-    </constraint>
-    <constraintErrorMessage>TOS must be between 0 and 99</constraintErrorMessage>
-  </properties>
-  <defaultValue>inherit</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-parameters-ttl.xml.i b/interface-definitions/include/interface/interface-parameters-ttl.xml.i
deleted file mode 100644
index 21a5e5cd9..000000000
--- a/interface-definitions/include/interface/interface-parameters-ttl.xml.i
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- include start from interface/interface-parameters-ttl.xml.i -->
-<leafNode name="ttl">
-  <properties>
-    <help>Specifies TTL value to use in outgoing packets</help>
-    <valueHelp>
-      <format>0</format>
-      <description>Copy value from original IP header</description>
-    </valueHelp>
-    <valueHelp>
-      <format>1-255</format>
-      <description>Time to Live</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 0-255"/>
-    </constraint>
-    <constraintErrorMessage>TTL must be between 0 and 255</constraintErrorMessage>
-  </properties>
-  <defaultValue>0</defaultValue>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i b/interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i
deleted file mode 100644
index 153dfc072..000000000
--- a/interface-definitions/include/interface/interface-proxy-arp-pvlan.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- include start from interface/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>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-source-validation.xml.i b/interface-definitions/include/interface/interface-source-validation.xml.i
deleted file mode 100644
index 70914f2e9..000000000
--- a/interface-definitions/include/interface/interface-source-validation.xml.i
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- include start from interface/interface-source-validation.xml.i -->
-<leafNode name="source-validation">
-  <properties>
-    <help>Source validation by reversed path (RFC3704)</help>
-    <completionHelp>
-      <list>strict loose disable</list>
-    </completionHelp>
-    <valueHelp>
-      <format>strict</format>
-      <description>Enable Strict Reverse Path Forwarding as defined in RFC3704</description>
-    </valueHelp>
-    <valueHelp>
-      <format>loose</format>
-      <description>Enable Loose Reverse Path Forwarding as defined in RFC3704</description>
-    </valueHelp>
-    <valueHelp>
-      <format>disable</format>
-      <description>No source validation</description>
-    </valueHelp>
-    <constraint>
-      <regex>^(strict|loose|disable)$</regex>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/interface-vrf.xml.i b/interface-definitions/include/interface/interface-vrf.xml.i
deleted file mode 100644
index ef6ca1241..000000000
--- a/interface-definitions/include/interface/interface-vrf.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- include start from interface/interface-vrf.xml.i -->
-<leafNode name="vrf">
-  <properties>
-    <help>VRF instance name</help>
-    <valueHelp>
-      <format>text</format>
-      <description>VRF instance name</description>
-    </valueHelp>
-    <completionHelp>
-      <path>vrf name</path>
-    </completionHelp>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/ipv4-options.xml.i b/interface-definitions/include/interface/ipv4-options.xml.i
new file mode 100644
index 000000000..5a45487c5
--- /dev/null
+++ b/interface-definitions/include/interface/ipv4-options.xml.i
@@ -0,0 +1,18 @@
+<!-- include start from interface/interface-ipv4-options.xml.i -->
+<node name="ip">
+  <properties>
+    <help>IPv4 routing parameters</help>
+  </properties>
+  <children>
+    #include <include/interface/arp-cache-timeout.xml.i>
+    #include <include/interface/disable-arp-filter.xml.i>
+    #include <include/interface/disable-forwarding.xml.i>
+    #include <include/interface/enable-arp-accept.xml.i>
+    #include <include/interface/enable-arp-announce.xml.i>
+    #include <include/interface/enable-arp-ignore.xml.i>
+    #include <include/interface/enable-proxy-arp.xml.i>
+    #include <include/interface/proxy-arp-pvlan.xml.i>
+    #include <include/interface/source-validation.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/ipv6-options.xml.i b/interface-definitions/include/interface/ipv6-options.xml.i
new file mode 100644
index 000000000..dcd5a8710
--- /dev/null
+++ b/interface-definitions/include/interface/ipv6-options.xml.i
@@ -0,0 +1,12 @@
+<!-- include start from interface/interface-ipv6-options.xml.i -->
+<node name="ipv6">
+  <properties>
+    <help>IPv6 routing parameters</help>
+  </properties>
+  <children>
+    #include <include/interface/ipv6-address.xml.i>
+    #include <include/interface/ipv6-disable-forwarding.xml.i>
+    #include <include/interface/ipv6-dup-addr-detect-transmits.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/mac.xml.i b/interface-definitions/include/interface/mac.xml.i
new file mode 100644
index 000000000..d7107ad23
--- /dev/null
+++ b/interface-definitions/include/interface/mac.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from interface/interface-mac.xml.i -->
+<leafNode name="mac">
+  <properties>
+    <help>Media Access Control (MAC) address</help>
+    <valueHelp>
+      <format>macaddr</format>
+      <description>Hardware (MAC) address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="mac-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/mirror.xml.i b/interface-definitions/include/interface/mirror.xml.i
new file mode 100644
index 000000000..b3b45fb43
--- /dev/null
+++ b/interface-definitions/include/interface/mirror.xml.i
@@ -0,0 +1,25 @@
+<!-- include start from interface/interface-mirror.xml.i -->
+<node name="mirror">
+  <properties>
+    <help>Incoming/outgoing packet mirroring destination</help>
+  </properties>
+  <children>
+    <leafNode name="ingress">
+      <properties>
+        <help>Mirror the ingress traffic of the interface to the destination interface</help>
+        <completionHelp>
+            <script>${vyos_completion_dir}/list_interfaces.py</script>
+        </completionHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="egress">
+      <properties>
+        <help>Mirror the egress traffic of the interface to the destination interface</help>
+        <completionHelp>
+            <script>${vyos_completion_dir}/list_interfaces.py</script>
+        </completionHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/mtu-1200-16000.xml.i b/interface-definitions/include/interface/mtu-1200-16000.xml.i
new file mode 100644
index 000000000..3241ba912
--- /dev/null
+++ b/interface-definitions/include/interface/mtu-1200-16000.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/interface-mtu-1200-16000.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>1200-16000</format>
+      <description>Maximum Transmission Unit in byte</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1200-16000"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 1200 and 16000</constraintErrorMessage>
+  </properties>
+  <defaultValue>1500</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/mtu-1450-16000.xml.i b/interface-definitions/include/interface/mtu-1450-16000.xml.i
new file mode 100644
index 000000000..0a35bbbaa
--- /dev/null
+++ b/interface-definitions/include/interface/mtu-1450-16000.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/interface-mtu-1450-16000.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>1450-16000</format>
+      <description>Maximum Transmission Unit in byte</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1450-16000"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 1450 and 16000</constraintErrorMessage>
+  </properties>
+  <defaultValue>1500</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/mtu-64-8024.xml.i b/interface-definitions/include/interface/mtu-64-8024.xml.i
new file mode 100644
index 000000000..f75de02ba
--- /dev/null
+++ b/interface-definitions/include/interface/mtu-64-8024.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/interface-mtu-68-8024.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>64-8024</format>
+      <description>Maximum Transmission Unit in byte</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 64-8024"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 64 and 8024</constraintErrorMessage>
+  </properties>
+  <defaultValue>1500</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/mtu-68-1500.xml.i b/interface-definitions/include/interface/mtu-68-1500.xml.i
new file mode 100644
index 000000000..9e6fe8760
--- /dev/null
+++ b/interface-definitions/include/interface/mtu-68-1500.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/interface-mtu-68-1500.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>68-1500</format>
+      <description>Maximum Transmission Unit in byte</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 68-1500"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 68 and 1500</constraintErrorMessage>
+  </properties>
+  <defaultValue>1500</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/mtu-68-16000.xml.i b/interface-definitions/include/interface/mtu-68-16000.xml.i
new file mode 100644
index 000000000..83af7bbd4
--- /dev/null
+++ b/interface-definitions/include/interface/mtu-68-16000.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/interface-mtu-68-16000.xml.i -->
+<leafNode name="mtu">
+  <properties>
+    <help>Maximum Transmission Unit (MTU)</help>
+    <valueHelp>
+      <format>68-16000</format>
+      <description>Maximum Transmission Unit in byte</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 68-16000"/>
+    </constraint>
+    <constraintErrorMessage>MTU must be between 68 and 16000</constraintErrorMessage>
+  </properties>
+  <defaultValue>1500</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/parameters-flowlabel.xml.i b/interface-definitions/include/interface/parameters-flowlabel.xml.i
new file mode 100644
index 000000000..f5e868a64
--- /dev/null
+++ b/interface-definitions/include/interface/parameters-flowlabel.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/interface-parameters-flowlabel.xml.i -->
+<leafNode name="flowlabel">
+  <properties>
+    <help>Specifies the flow label to use in outgoing packets</help>
+    <valueHelp>
+      <format>0x0-0x0FFFFF</format>
+      <description>Tunnel key, 'inherit' or hex value</description>
+    </valueHelp>
+    <constraint>
+      <regex>^((0x){0,1}(0?[0-9A-Fa-f]{1,5})|inherit)$</regex>
+    </constraint>
+    <constraintErrorMessage>Must be 'inherit' or a number</constraintErrorMessage>
+  </properties>
+  <defaultValue>inherit</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/parameters-key.xml.i b/interface-definitions/include/interface/parameters-key.xml.i
new file mode 100644
index 000000000..1b1d67174
--- /dev/null
+++ b/interface-definitions/include/interface/parameters-key.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from interface/interface-parameters-key.xml.i -->
+<leafNode name="key">
+  <properties>
+    <help>Tunnel key</help>
+    <valueHelp>
+      <format>u32</format>
+      <description>Tunnel key</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-4294967295"/>
+    </constraint>
+    <constraintErrorMessage>key must be between 0-4294967295</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/parameters-tos.xml.i b/interface-definitions/include/interface/parameters-tos.xml.i
new file mode 100644
index 000000000..83b4e0671
--- /dev/null
+++ b/interface-definitions/include/interface/parameters-tos.xml.i
@@ -0,0 +1,16 @@
+<!-- include start from interface/tunnel-parameters-tos.xml.i -->
+<leafNode name="tos">
+  <properties>
+    <help>Specifies TOS value to use in outgoing packets</help>
+    <valueHelp>
+      <format>0-99</format>
+      <description>Type of Service (TOS)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-99"/>
+    </constraint>
+    <constraintErrorMessage>TOS must be between 0 and 99</constraintErrorMessage>
+  </properties>
+  <defaultValue>inherit</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/parameters-ttl.xml.i b/interface-definitions/include/interface/parameters-ttl.xml.i
new file mode 100644
index 000000000..21a5e5cd9
--- /dev/null
+++ b/interface-definitions/include/interface/parameters-ttl.xml.i
@@ -0,0 +1,20 @@
+<!-- include start from interface/interface-parameters-ttl.xml.i -->
+<leafNode name="ttl">
+  <properties>
+    <help>Specifies TTL value to use in outgoing packets</help>
+    <valueHelp>
+      <format>0</format>
+      <description>Copy value from original IP header</description>
+    </valueHelp>
+    <valueHelp>
+      <format>1-255</format>
+      <description>Time to Live</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-255"/>
+    </constraint>
+    <constraintErrorMessage>TTL must be between 0 and 255</constraintErrorMessage>
+  </properties>
+  <defaultValue>0</defaultValue>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/proxy-arp-pvlan.xml.i b/interface-definitions/include/interface/proxy-arp-pvlan.xml.i
new file mode 100644
index 000000000..153dfc072
--- /dev/null
+++ b/interface-definitions/include/interface/proxy-arp-pvlan.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from interface/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>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/source-validation.xml.i b/interface-definitions/include/interface/source-validation.xml.i
new file mode 100644
index 000000000..70914f2e9
--- /dev/null
+++ b/interface-definitions/include/interface/source-validation.xml.i
@@ -0,0 +1,25 @@
+<!-- include start from interface/interface-source-validation.xml.i -->
+<leafNode name="source-validation">
+  <properties>
+    <help>Source validation by reversed path (RFC3704)</help>
+    <completionHelp>
+      <list>strict loose disable</list>
+    </completionHelp>
+    <valueHelp>
+      <format>strict</format>
+      <description>Enable Strict Reverse Path Forwarding as defined in RFC3704</description>
+    </valueHelp>
+    <valueHelp>
+      <format>loose</format>
+      <description>Enable Loose Reverse Path Forwarding as defined in RFC3704</description>
+    </valueHelp>
+    <valueHelp>
+      <format>disable</format>
+      <description>No source validation</description>
+    </valueHelp>
+    <constraint>
+      <regex>^(strict|loose|disable)$</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/vif-s.xml.i b/interface-definitions/include/interface/vif-s.xml.i
index 85885c153..a3193e77b 100644
--- a/interface-definitions/include/interface/vif-s.xml.i
+++ b/interface-definitions/include/interface/vif-s.xml.i
@@ -9,11 +9,11 @@
   </properties>
   <children>
     #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
-    #include <include/interface/interface-description.xml.i>
+    #include <include/interface/description.xml.i>
     #include <include/interface/dhcp-options.xml.i>
     #include <include/interface/dhcpv6-options.xml.i>
-    #include <include/interface/interface-disable-link-detect.xml.i>
-    #include <include/interface/interface-disable.xml.i>
+    #include <include/interface/disable-link-detect.xml.i>
+    #include <include/interface/disable.xml.i>
     <leafNode name="protocol">
       <properties>
         <help>Protocol used for service VLAN (default: 802.1ad)</help>
@@ -35,10 +35,10 @@
       </properties>
       <defaultValue>802.1ad</defaultValue>
     </leafNode>
-    #include <include/interface/interface-ipv4-options.xml.i>
-    #include <include/interface/interface-ipv6-options.xml.i>
-    #include <include/interface/interface-mac.xml.i>
-    #include <include/interface/interface-mtu-68-16000.xml.i>
+    #include <include/interface/ipv4-options.xml.i>
+    #include <include/interface/ipv6-options.xml.i>
+    #include <include/interface/mac.xml.i>
+    #include <include/interface/mtu-68-16000.xml.i>
     <tagNode name="vif-c">
       <properties>
         <help>QinQ TAG-C Virtual Local Area Network (VLAN) ID</help>
@@ -49,19 +49,19 @@
       </properties>
       <children>
         #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
-        #include <include/interface/interface-description.xml.i>
+        #include <include/interface/description.xml.i>
         #include <include/interface/dhcp-options.xml.i>
         #include <include/interface/dhcpv6-options.xml.i>
-        #include <include/interface/interface-disable-link-detect.xml.i>
-        #include <include/interface/interface-disable.xml.i>
-        #include <include/interface/interface-ipv4-options.xml.i>
-        #include <include/interface/interface-ipv6-options.xml.i>
-        #include <include/interface/interface-mac.xml.i>
-        #include <include/interface/interface-mtu-68-16000.xml.i>
-        #include <include/interface/interface-vrf.xml.i>
+        #include <include/interface/disable-link-detect.xml.i>
+        #include <include/interface/disable.xml.i>
+        #include <include/interface/ipv4-options.xml.i>
+        #include <include/interface/ipv6-options.xml.i>
+        #include <include/interface/mac.xml.i>
+        #include <include/interface/mtu-68-16000.xml.i>
+        #include <include/interface/vrf.xml.i>
       </children>
     </tagNode>
-    #include <include/interface/interface-vrf.xml.i>
+    #include <include/interface/vrf.xml.i>
   </children>
 </tagNode>
 <!-- include end -->
diff --git a/interface-definitions/include/interface/vif.xml.i b/interface-definitions/include/interface/vif.xml.i
index 4e7aeb0f9..f58fbff84 100644
--- a/interface-definitions/include/interface/vif.xml.i
+++ b/interface-definitions/include/interface/vif.xml.i
@@ -13,12 +13,12 @@
   </properties>
   <children>
     #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
-    #include <include/interface/interface-description.xml.i>
+    #include <include/interface/description.xml.i>
     #include <include/interface/dhcp-options.xml.i>
     #include <include/interface/dhcpv6-options.xml.i>
-    #include <include/interface/interface-disable-link-detect.xml.i>
-    #include <include/interface/interface-disable.xml.i>
-    #include <include/interface/interface-vrf.xml.i>
+    #include <include/interface/disable-link-detect.xml.i>
+    #include <include/interface/disable.xml.i>
+    #include <include/interface/vrf.xml.i>
     <leafNode name="egress-qos">
       <properties>
         <help>VLAN egress QoS</help>
@@ -43,10 +43,10 @@
         <constraintErrorMessage>QoS mapping should be in the format of '0:7 2:3' with numbers 0-9</constraintErrorMessage>
       </properties>
     </leafNode>
-    #include <include/interface/interface-ipv4-options.xml.i>
-    #include <include/interface/interface-ipv6-options.xml.i>
-    #include <include/interface/interface-mac.xml.i>
-    #include <include/interface/interface-mtu-68-16000.xml.i>
+    #include <include/interface/ipv4-options.xml.i>
+    #include <include/interface/ipv6-options.xml.i>
+    #include <include/interface/mac.xml.i>
+    #include <include/interface/mtu-68-16000.xml.i>
   </children>
 </tagNode>
 <!-- include end -->
diff --git a/interface-definitions/include/interface/vrf.xml.i b/interface-definitions/include/interface/vrf.xml.i
new file mode 100644
index 000000000..ef6ca1241
--- /dev/null
+++ b/interface-definitions/include/interface/vrf.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from interface/interface-vrf.xml.i -->
+<leafNode name="vrf">
+  <properties>
+    <help>VRF instance name</help>
+    <valueHelp>
+      <format>text</format>
+      <description>VRF instance name</description>
+    </valueHelp>
+    <completionHelp>
+      <path>vrf name</path>
+    </completionHelp>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index 6c5e2abcc..c63453588 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -49,13 +49,13 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/description.xml.i>
           #include <include/interface/dhcp-options.xml.i>
           #include <include/interface/dhcpv6-options.xml.i>
-          #include <include/interface/interface-disable-link-detect.xml.i>
-          #include <include/interface/interface-disable.xml.i>
-          #include <include/interface/interface-vrf.xml.i>
-          #include <include/interface/interface-mirror.xml.i>
+          #include <include/interface/disable-link-detect.xml.i>
+          #include <include/interface/disable.xml.i>
+          #include <include/interface/vrf.xml.i>
+          #include <include/interface/mirror.xml.i>
           <leafNode name="hash-policy">
             <properties>
               <help>Bonding transmit hash policy</help>
@@ -89,9 +89,9 @@
             </properties>
             <defaultValue>layer2</defaultValue>
           </leafNode>
-          #include <include/interface/interface-ipv4-options.xml.i>
-          #include <include/interface/interface-ipv6-options.xml.i>
-          #include <include/interface/interface-mac.xml.i>
+          #include <include/interface/ipv4-options.xml.i>
+          #include <include/interface/ipv6-options.xml.i>
+          #include <include/interface/mac.xml.i>
           <leafNode name="min-links">
             <properties>
               <help>Minimum number of member interfaces required up before enabling bond</help>
@@ -182,7 +182,7 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface/interface-mtu-68-16000.xml.i>
+          #include <include/interface/mtu-68-16000.xml.i>
           <leafNode name="primary">
             <properties>
               <help>Primary device interface</help>
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index 15feedca1..91ce00ba6 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -34,13 +34,13 @@
             </properties>
             <defaultValue>300</defaultValue>
           </leafNode>
-          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/description.xml.i>
           #include <include/interface/dhcp-options.xml.i>
           #include <include/interface/dhcpv6-options.xml.i>
-          #include <include/interface/interface-disable-link-detect.xml.i>
-          #include <include/interface/interface-disable.xml.i>
-          #include <include/interface/interface-vrf.xml.i>
-          #include <include/interface/interface-mtu-68-16000.xml.i>
+          #include <include/interface/disable-link-detect.xml.i>
+          #include <include/interface/disable.xml.i>
+          #include <include/interface/vrf.xml.i>
+          #include <include/interface/mtu-68-16000.xml.i>
           <leafNode name="forwarding-delay">
             <properties>
               <help>Forwarding delay</help>
@@ -82,10 +82,10 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface/interface-ipv4-options.xml.i>
-          #include <include/interface/interface-ipv6-options.xml.i>
-          #include <include/interface/interface-mac.xml.i>
-          #include <include/interface/interface-mirror.xml.i>
+          #include <include/interface/ipv4-options.xml.i>
+          #include <include/interface/ipv6-options.xml.i>
+          #include <include/interface/mac.xml.i>
+          #include <include/interface/mirror.xml.i>
           <leafNode name="max-age">
             <properties>
               <help>Interval at which neighbor bridges are removed</help>
diff --git a/interface-definitions/interfaces-dummy.xml.in b/interface-definitions/interfaces-dummy.xml.in
index 84c6903c7..2bc88c1a7 100644
--- a/interface-definitions/interfaces-dummy.xml.in
+++ b/interface-definitions/interfaces-dummy.xml.in
@@ -17,17 +17,17 @@
         </properties>
         <children>
           #include <include/interface/address-ipv4-ipv6.xml.i>
-          #include <include/interface/interface-description.xml.i>
-          #include <include/interface/interface-disable.xml.i>
+          #include <include/interface/description.xml.i>
+          #include <include/interface/disable.xml.i>
           <node name="ip">
             <properties>
               <help>IPv4 routing parameters</help>
             </properties>
             <children>
-              #include <include/interface/interface-source-validation.xml.i>
+              #include <include/interface/source-validation.xml.i>
             </children>
           </node>
-          #include <include/interface/interface-vrf.xml.i>
+          #include <include/interface/vrf.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index 9857e6c8d..ec20bca8d 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -17,7 +17,7 @@
         </properties>
         <children>
           #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
-          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/description.xml.i>
           #include <include/interface/dhcp-options.xml.i>
           #include <include/interface/dhcpv6-options.xml.i>
           <leafNode name="disable-flow-control">
@@ -26,8 +26,8 @@
               <valueless/>
             </properties>
           </leafNode>
-          #include <include/interface/interface-disable-link-detect.xml.i>
-          #include <include/interface/interface-disable.xml.i>
+          #include <include/interface/disable-link-detect.xml.i>
+          #include <include/interface/disable.xml.i>
           <leafNode name="duplex">
             <properties>
               <help>Duplex mode</help>
@@ -53,13 +53,13 @@
             </properties>
             <defaultValue>auto</defaultValue>
           </leafNode>
-          #include <include/interface/interface-eapol.xml.i>
-          #include <include/interface/interface-hw-id.xml.i>
-          #include <include/interface/interface-ipv4-options.xml.i>
-          #include <include/interface/interface-ipv6-options.xml.i>
-          #include <include/interface/interface-mac.xml.i>
-          #include <include/interface/interface-mtu-68-16000.xml.i>
-          #include <include/interface/interface-mirror.xml.i>
+          #include <include/interface/eapol.xml.i>
+          #include <include/interface/hw-id.xml.i>
+          #include <include/interface/ipv4-options.xml.i>
+          #include <include/interface/ipv6-options.xml.i>
+          #include <include/interface/mac.xml.i>
+          #include <include/interface/mtu-68-16000.xml.i>
+          #include <include/interface/mirror.xml.i>
           <node name="offload">
             <properties>
               <help>Configurable offload options</help>
@@ -199,7 +199,7 @@
           </node>
           #include <include/interface/vif-s.xml.i>
           #include <include/interface/vif.xml.i>
-          #include <include/interface/interface-vrf.xml.i>
+          #include <include/interface/vrf.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in
index 50031b8b3..6620c8aff 100644
--- a/interface-definitions/interfaces-geneve.xml.in
+++ b/interface-definitions/interfaces-geneve.xml.in
@@ -17,12 +17,12 @@
         </properties>
         <children>
           #include <include/interface/address-ipv4-ipv6.xml.i>
-          #include <include/interface/interface-description.xml.i>
-          #include <include/interface/interface-disable.xml.i>
-          #include <include/interface/interface-ipv4-options.xml.i>
-          #include <include/interface/interface-ipv6-options.xml.i>
-          #include <include/interface/interface-mac.xml.i>
-          #include <include/interface/interface-mtu-1450-16000.xml.i>
+          #include <include/interface/description.xml.i>
+          #include <include/interface/disable.xml.i>
+          #include <include/interface/ipv4-options.xml.i>
+          #include <include/interface/ipv6-options.xml.i>
+          #include <include/interface/mac.xml.i>
+          #include <include/interface/mtu-1450-16000.xml.i>
           #include <include/tunnel-remote.xml.i>
           <leafNode name="vni">
             <properties>
diff --git a/interface-definitions/interfaces-l2tpv3.xml.in b/interface-definitions/interfaces-l2tpv3.xml.in
index 2edf08070..d3e18fe6e 100644
--- a/interface-definitions/interfaces-l2tpv3.xml.in
+++ b/interface-definitions/interfaces-l2tpv3.xml.in
@@ -17,7 +17,7 @@
         </properties>
         <children>
           #include <include/interface/address-ipv4-ipv6.xml.i>
-          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/description.xml.i>
           <leafNode name="destination-port">
             <properties>
               <help>UDP destination port for L2TPv3 tunnel (default: 5000)</help>
@@ -31,7 +31,7 @@
             </properties>
             <defaultValue>5000</defaultValue>
           </leafNode>
-          #include <include/interface/interface-disable.xml.i>
+          #include <include/interface/disable.xml.i>
           <leafNode name="encapsulation">
             <properties>
               <help>Encapsulation type (default: UDP)</help>
@@ -53,10 +53,10 @@
             </properties>
             <defaultValue>udp</defaultValue>
           </leafNode>
-          #include <include/interface/interface-ipv4-options.xml.i>
-          #include <include/interface/interface-ipv6-options.xml.i>
+          #include <include/interface/ipv4-options.xml.i>
+          #include <include/interface/ipv6-options.xml.i>
           #include <include/source-address-ipv4-ipv6.xml.i>
-          #include <include/interface/interface-mtu-68-16000.xml.i>
+          #include <include/interface/mtu-68-16000.xml.i>
           <leafNode name="mtu">
             <defaultValue>1488</defaultValue>
           </leafNode>
@@ -122,7 +122,7 @@
               </constraint>
             </properties>
           </leafNode>
-          #include <include/interface/interface-vrf.xml.i>
+          #include <include/interface/vrf.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-loopback.xml.in b/interface-definitions/interfaces-loopback.xml.in
index 5d0ca5b0a..7be15ab89 100644
--- a/interface-definitions/interfaces-loopback.xml.in
+++ b/interface-definitions/interfaces-loopback.xml.in
@@ -17,13 +17,13 @@
         </properties>
         <children>
           #include <include/interface/address-ipv4-ipv6.xml.i>
-          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/description.xml.i>
           <node name="ip">
             <properties>
               <help>IPv4 routing parameters</help>
             </properties>
             <children>
-              #include <include/interface/interface-source-validation.xml.i>
+              #include <include/interface/source-validation.xml.i>
             </children>
           </node>
         </children>
diff --git a/interface-definitions/interfaces-macsec.xml.in b/interface-definitions/interfaces-macsec.xml.in
index fce88b21c..e88cb4794 100644
--- a/interface-definitions/interfaces-macsec.xml.in
+++ b/interface-definitions/interfaces-macsec.xml.in
@@ -17,8 +17,8 @@
         </properties>
         <children>
           #include <include/interface/address-ipv4-ipv6.xml.i>
-          #include <include/interface/interface-ipv4-options.xml.i>
-          #include <include/interface/interface-ipv6-options.xml.i>
+          #include <include/interface/ipv4-options.xml.i>
+          #include <include/interface/ipv6-options.xml.i>
           <node name="security">
             <properties>
               <help>Security/Encryption Settings</help>
@@ -111,14 +111,14 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface/interface-description.xml.i>
-          #include <include/interface/interface-disable.xml.i>
-          #include <include/interface/interface-mtu-68-16000.xml.i>
+          #include <include/interface/description.xml.i>
+          #include <include/interface/disable.xml.i>
+          #include <include/interface/mtu-68-16000.xml.i>
           <leafNode name="mtu">
             <defaultValue>1460</defaultValue>
           </leafNode>
           #include <include/source-interface-ethernet.xml.i>
-          #include <include/interface/interface-vrf.xml.i>
+          #include <include/interface/vrf.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in
index 681290570..b7727f356 100644
--- a/interface-definitions/interfaces-openvpn.xml.in
+++ b/interface-definitions/interfaces-openvpn.xml.in
@@ -33,7 +33,7 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/description.xml.i>
           <leafNode name="device-type">
             <properties>
               <help>OpenVPN interface device-type (default: tun)</help>
@@ -54,7 +54,7 @@
             </properties>
             <defaultValue>tun</defaultValue>
           </leafNode>
-          #include <include/interface/interface-disable.xml.i>
+          #include <include/interface/disable.xml.i>
           <node name="encryption">
             <properties>
               <help>Data Encryption settings</help>
@@ -165,7 +165,7 @@
               </leafNode>
             </children>
           </node>
-          #include <include/interface/interface-ipv6-options.xml.i>
+          #include <include/interface/ipv6-options.xml.i>
           <leafNode name="hash">
             <properties>
               <help>Hashing Algorithm</help>
@@ -755,7 +755,7 @@
               <valueless/>
             </properties>
           </leafNode>
-          #include <include/interface/interface-vrf.xml.i>
+          #include <include/interface/vrf.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in
index 96479e057..1bbfa63af 100644
--- a/interface-definitions/interfaces-pppoe.xml.in
+++ b/interface-definitions/interfaces-pppoe.xml.in
@@ -26,7 +26,7 @@
             </properties>
           </leafNode>
           #include <include/interface/authentication.xml.i>
-          #include <include/interface/interface-dial-on-demand.xml.i>
+          #include <include/interface/dial-on-demand.xml.i>
           <leafNode name="default-route">
             <properties>
               <help>Default route insertion behaviour (default: auto)</help>
@@ -53,9 +53,9 @@
             <defaultValue>auto</defaultValue>
           </leafNode>
           #include <include/interface/dhcpv6-options.xml.i>
-          #include <include/interface/interface-description.xml.i>
-          #include <include/interface/interface-disable.xml.i>
-          #include <include/interface/interface-vrf.xml.i>
+          #include <include/interface/description.xml.i>
+          #include <include/interface/disable.xml.i>
+          #include <include/interface/vrf.xml.i>
           <leafNode name="idle-timeout">
             <properties>
               <help>Delay before disconnecting idle session (in seconds)</help>
@@ -70,7 +70,7 @@
               <help>IPv4 routing parameters</help>
             </properties>
             <children>
-              #include <include/interface/interface-source-validation.xml.i>
+              #include <include/interface/source-validation.xml.i>
             </children>
           </node>
           <node name="ipv6">
@@ -108,7 +108,7 @@
               </constraint>
             </properties>
           </leafNode>
-          #include <include/interface/interface-mtu-68-1500.xml.i>
+          #include <include/interface/mtu-68-1500.xml.i>
           <leafNode name="mtu">
             <defaultValue>1492</defaultValue>
           </leafNode>
diff --git a/interface-definitions/interfaces-pseudo-ethernet.xml.in b/interface-definitions/interfaces-pseudo-ethernet.xml.in
index 136841290..366892032 100644
--- a/interface-definitions/interfaces-pseudo-ethernet.xml.in
+++ b/interface-definitions/interfaces-pseudo-ethernet.xml.in
@@ -17,16 +17,16 @@
         </properties>
         <children>
           #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
-          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/description.xml.i>
           #include <include/interface/dhcp-options.xml.i>
           #include <include/interface/dhcpv6-options.xml.i>
-          #include <include/interface/interface-disable-link-detect.xml.i>
-          #include <include/interface/interface-disable.xml.i>
-          #include <include/interface/interface-vrf.xml.i>
-          #include <include/interface/interface-ipv4-options.xml.i>
-          #include <include/interface/interface-ipv6-options.xml.i>
+          #include <include/interface/disable-link-detect.xml.i>
+          #include <include/interface/disable.xml.i>
+          #include <include/interface/vrf.xml.i>
+          #include <include/interface/ipv4-options.xml.i>
+          #include <include/interface/ipv6-options.xml.i>
           #include <include/source-interface-ethernet.xml.i>
-          #include <include/interface/interface-mac.xml.i>
+          #include <include/interface/mac.xml.i>
           <leafNode name="mode">
             <properties>
               <help>Receive mode (default: private)</help>
@@ -56,7 +56,7 @@
             </properties>
             <defaultValue>private</defaultValue>
           </leafNode>
-          #include <include/interface/interface-mtu-68-16000.xml.i>
+          #include <include/interface/mtu-68-16000.xml.i>
           #include <include/interface/vif-s.xml.i>
           #include <include/interface/vif.xml.i>
         </children>
diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in
index bc1f3092d..d0256a64a 100644
--- a/interface-definitions/interfaces-tunnel.xml.in
+++ b/interface-definitions/interfaces-tunnel.xml.in
@@ -16,17 +16,17 @@
           </valueHelp>
         </properties>
         <children>
-          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/description.xml.i>
           #include <include/interface/address-ipv4-ipv6.xml.i>
-          #include <include/interface/interface-disable.xml.i>
-          #include <include/interface/interface-disable-link-detect.xml.i>
-          #include <include/interface/interface-vrf.xml.i>
-          #include <include/interface/interface-mtu-64-8024.xml.i>
+          #include <include/interface/disable.xml.i>
+          #include <include/interface/disable-link-detect.xml.i>
+          #include <include/interface/vrf.xml.i>
+          #include <include/interface/mtu-64-8024.xml.i>
           <leafNode name="mtu">
             <defaultValue>1476</defaultValue>
           </leafNode>
-          #include <include/interface/interface-ipv4-options.xml.i>
-          #include <include/interface/interface-ipv6-options.xml.i>
+          #include <include/interface/ipv4-options.xml.i>
+          #include <include/interface/ipv6-options.xml.i>
           #include <include/source-address-ipv4-ipv6.xml.i>
           #include <include/tunnel-remote.xml.i>
           #include <include/source-interface.xml.i>
@@ -151,9 +151,9 @@
                       <valueless/>
                     </properties>
                   </leafNode>
-                  #include <include/interface/interface-parameters-key.xml.i>
-                  #include <include/interface/interface-parameters-tos.xml.i>
-                  #include <include/interface/interface-parameters-ttl.xml.i>
+                  #include <include/interface/parameters-key.xml.i>
+                  #include <include/interface/parameters-tos.xml.i>
+                  #include <include/interface/parameters-ttl.xml.i>
                   <leafNode name="ttl">
                     <defaultValue>64</defaultValue>
                   </leafNode>
@@ -186,7 +186,7 @@
                     </properties>
                     <defaultValue>4</defaultValue>
                   </leafNode>
-                  #include <include/interface/interface-parameters-flowlabel.xml.i>
+                  #include <include/interface/parameters-flowlabel.xml.i>
                   <leafNode name="hoplimit">
                     <properties>
                       <help>Hoplimit</help>
diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in
index 848c6259e..a637baf3f 100644
--- a/interface-definitions/interfaces-vxlan.xml.in
+++ b/interface-definitions/interfaces-vxlan.xml.in
@@ -17,8 +17,8 @@
         </properties>
         <children>
           #include <include/interface/address-ipv4-ipv6.xml.i>
-          #include <include/interface/interface-description.xml.i>
-          #include <include/interface/interface-disable.xml.i>
+          #include <include/interface/description.xml.i>
+          #include <include/interface/disable.xml.i>
           <leafNode name="group">
             <properties>
               <help>Multicast group address for VXLAN interface</help>
@@ -35,10 +35,10 @@
               </constraint>
             </properties>
           </leafNode>
-          #include <include/interface/interface-ipv4-options.xml.i>
-          #include <include/interface/interface-ipv6-options.xml.i>
-          #include <include/interface/interface-mac.xml.i>
-          #include <include/interface/interface-mtu-1200-16000.xml.i>
+          #include <include/interface/ipv4-options.xml.i>
+          #include <include/interface/ipv6-options.xml.i>
+          #include <include/interface/mac.xml.i>
+          #include <include/interface/mtu-1200-16000.xml.i>
           <leafNode name="mtu">
             <defaultValue>1450</defaultValue>
           </leafNode>
@@ -70,7 +70,7 @@
               </constraint>
             </properties>
           </leafNode>
-          #include <include/interface/interface-vrf.xml.i>
+          #include <include/interface/vrf.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in
index 378251fed..5255ce3a2 100644
--- a/interface-definitions/interfaces-wireguard.xml.in
+++ b/interface-definitions/interfaces-wireguard.xml.in
@@ -17,16 +17,16 @@
         </properties>
         <children>
           #include <include/interface/address-ipv4-ipv6.xml.i>
-          #include <include/interface/interface-description.xml.i>
-          #include <include/interface/interface-disable.xml.i>
-          #include <include/interface/interface-vrf.xml.i>
+          #include <include/interface/description.xml.i>
+          #include <include/interface/disable.xml.i>
+          #include <include/interface/vrf.xml.i>
           #include <include/port-number.xml.i>
-          #include <include/interface/interface-mtu-68-16000.xml.i>
+          #include <include/interface/mtu-68-16000.xml.i>
           <leafNode name="mtu">
             <defaultValue>1420</defaultValue>
           </leafNode>
-          #include <include/interface/interface-ipv4-options.xml.i>
-          #include <include/interface/interface-ipv6-options.xml.i>
+          #include <include/interface/ipv4-options.xml.i>
+          #include <include/interface/ipv6-options.xml.i>
           <leafNode name="fwmark">
             <properties>
               <help>A 32-bit fwmark value set on all outgoing packets</help>
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index aaeb285f1..c96d9b78d 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -464,7 +464,7 @@
               <constraintErrorMessage>Invalid ISO/IEC 3166-1 Country Code</constraintErrorMessage>
             </properties>
           </leafNode>
-          #include <include/interface/interface-description.xml.i>
+          #include <include/interface/description.xml.i>
           #include <include/interface/dhcp-options.xml.i>
           #include <include/interface/dhcpv6-options.xml.i>
           <leafNode name="disable-broadcast-ssid">
@@ -473,25 +473,25 @@
               <valueless/>
             </properties>
           </leafNode>
-          #include <include/interface/interface-disable-link-detect.xml.i>
-          #include <include/interface/interface-disable.xml.i>
-          #include <include/interface/interface-vrf.xml.i>
+          #include <include/interface/disable-link-detect.xml.i>
+          #include <include/interface/disable.xml.i>
+          #include <include/interface/vrf.xml.i>
           <leafNode name="expunge-failing-stations">
             <properties>
               <help>Disassociate stations based on excessive transmission failures</help>
               <valueless/>
             </properties>
           </leafNode>
-          #include <include/interface/interface-ipv4-options.xml.i>
-          #include <include/interface/interface-ipv6-options.xml.i>
-          #include <include/interface/interface-hw-id.xml.i>
+          #include <include/interface/ipv4-options.xml.i>
+          #include <include/interface/ipv6-options.xml.i>
+          #include <include/interface/hw-id.xml.i>
           <leafNode name="isolate-stations">
             <properties>
               <help>Isolate stations on the AP so they cannot see each other</help>
               <valueless/>
             </properties>
           </leafNode>
-          #include <include/interface/interface-mac.xml.i>
+          #include <include/interface/mac.xml.i>
           <leafNode name="max-stations">
             <properties>
               <help>Maximum number of wireless radio stations. Excess stations will be rejected upon authentication request.</help>
diff --git a/interface-definitions/interfaces-wwan.xml.in b/interface-definitions/interfaces-wwan.xml.in
index 647ce0bc1..19f152a06 100644
--- a/interface-definitions/interfaces-wwan.xml.in
+++ b/interface-definitions/interfaces-wwan.xml.in
@@ -28,17 +28,17 @@
           #include <include/interface/authentication.xml.i>
           #include <include/interface/dhcp-options.xml.i>
           #include <include/interface/dhcpv6-options.xml.i>
-          #include <include/interface/interface-description.xml.i>
-          #include <include/interface/interface-disable.xml.i>
-          #include <include/interface/interface-vrf.xml.i>
-          #include <include/interface/interface-disable-link-detect.xml.i>
-          #include <include/interface/interface-mtu-68-1500.xml.i>
+          #include <include/interface/description.xml.i>
+          #include <include/interface/disable.xml.i>
+          #include <include/interface/vrf.xml.i>
+          #include <include/interface/disable-link-detect.xml.i>
+          #include <include/interface/mtu-68-1500.xml.i>
           <leafNode name="mtu">
             <defaultValue>1430</defaultValue>
           </leafNode>
-          #include <include/interface/interface-ipv4-options.xml.i>
-          #include <include/interface/interface-ipv6-options.xml.i>
-          #include <include/interface/interface-dial-on-demand.xml.i>
+          #include <include/interface/ipv4-options.xml.i>
+          #include <include/interface/ipv6-options.xml.i>
+          #include <include/interface/dial-on-demand.xml.i>
         </children>
       </tagNode>
     </children>
diff --git a/interface-definitions/ntp.xml.in b/interface-definitions/ntp.xml.in
index 2bfac900b..a518a9def 100644
--- a/interface-definitions/ntp.xml.in
+++ b/interface-definitions/ntp.xml.in
@@ -82,7 +82,7 @@
             </children>
           </node>
           #include <include/listen-address.xml.i>
-          #include <include/interface/interface-vrf.xml.i>
+          #include <include/interface/vrf.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/service_console-server.xml.in b/interface-definitions/service_console-server.xml.in
index 78eb2d0ba..28aa7ea71 100644
--- a/interface-definitions/service_console-server.xml.in
+++ b/interface-definitions/service_console-server.xml.in
@@ -27,7 +27,7 @@
               </constraint>
             </properties>
             <children>
-              #include <include/interface/interface-description.xml.i>
+              #include <include/interface/description.xml.i>
               <leafNode name="speed">
                 <properties>
                   <help>Serial port baud rate</help>
diff --git a/interface-definitions/snmp.xml.in b/interface-definitions/snmp.xml.in
index f57103eac..3cb736bf7 100644
--- a/interface-definitions/snmp.xml.in
+++ b/interface-definitions/snmp.xml.in
@@ -626,7 +626,7 @@
               </tagNode>
             </children>
           </node>
-          #include <include/interface/interface-vrf.xml.i>
+          #include <include/interface/vrf.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/ssh.xml.in b/interface-definitions/ssh.xml.in
index 54742f1d0..c447f144d 100644
--- a/interface-definitions/ssh.xml.in
+++ b/interface-definitions/ssh.xml.in
@@ -146,7 +146,7 @@
               </constraint>
             </properties>
           </leafNode>
-          #include <include/interface/interface-vrf.xml.i>
+          #include <include/interface/vrf.xml.i>
         </children>
       </node>
     </children>
diff --git a/interface-definitions/system-login.xml.in b/interface-definitions/system-login.xml.in
index 86db3f368..fb34b7199 100644
--- a/interface-definitions/system-login.xml.in
+++ b/interface-definitions/system-login.xml.in
@@ -145,7 +145,7 @@
                   </leafNode>
                 </children>
               </tagNode>
-              #include <include/interface/interface-vrf.xml.i>
+              #include <include/interface/vrf.xml.i>
             </children>
           </node>
         </children>
diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in
index e4ade844d..840e237cc 100644
--- a/interface-definitions/vpn_sstp.xml.in
+++ b/interface-definitions/vpn_sstp.xml.in
@@ -25,7 +25,7 @@
               </node>
             </children>
           </node>
-          #include <include/interface/interface-mtu-68-1500.xml.i>
+          #include <include/interface/mtu-68-1500.xml.i>
           #include <include/accel-ppp/gateway-address.xml.i>
           #include <include/accel-ppp/name-server.xml.i>
           <node name="client-ip-pool">
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index 5fd758a44..8cddc3012 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -39,8 +39,8 @@
               <constraintErrorMessage>VRF routing table must be in range from 100 to 2147483647</constraintErrorMessage>
             </properties>
           </leafNode>
-          #include <include/interface/interface-description.xml.i>
-          #include <include/interface/interface-disable.xml.i>
+          #include <include/interface/description.xml.i>
+          #include <include/interface/disable.xml.i>
         </children>
       </tagNode>
     </children>
-- 
cgit v1.2.3