4 files changed, 25 insertions, 22 deletions
diff --git a/interface-definitions/include/dhcp-dhcpv6-options.xml.i b/interface-definitions/include/dhcp-options.xml.i
index e4387863b..0f71d9321 100644
--- a/interface-definitions/include/dhcp-dhcpv6-options.xml.i
+++ b/interface-definitions/include/dhcp-options.xml.i
@@ -20,22 +20,3 @@
     </leafNode>
   </children>
 </node>
-<node name="dhcpv6-options">
-  <properties>
-    <help>DHCPv6 options</help>
-  </properties>
-  <children>
-    <leafNode name="parameters-only">
-      <properties>
-        <help>Acquire only config parameters, no address</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="temporary">
-      <properties>
-        <help>IPv6 "temporary" address</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-  </children>
-</node>
diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i
new file mode 100644
index 000000000..c55a5271f
--- /dev/null
+++ b/interface-definitions/include/dhcpv6-options.xml.i
@@ -0,0 +1,19 @@
+<node name="dhcpv6-options">
+  <properties>
+    <help>DHCPv6 options</help>
+  </properties>
+  <children>
+    <leafNode name="parameters-only">
+      <properties>
+        <help>Acquire only config parameters, no address</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="temporary">
+      <properties>
+        <help>IPv6 "temporary" address</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i
index ab2dcd955..a6d7c81ce 100644
--- a/interface-definitions/include/vif-s.xml.i
+++ b/interface-definitions/include/vif-s.xml.i
@@ -9,7 +9,8 @@
   <children>
     #include <include/address-ipv4-ipv6-dhcp.xml.i>
     #include <include/interface-description.xml.i>
-    #include <include/dhcp-dhcpv6-options.xml.i>
+    #include <include/dhcp-options.xml.i>
+    #include <include/dhcpv6-options.xml.i>
     #include <include/interface-disable-link-detect.xml.i>
     #include <include/interface-disable.xml.i>
     <leafNode name="ethertype">
@@ -53,7 +54,8 @@
       <children>
         #include <include/address-ipv4-ipv6-dhcp.xml.i>
         #include <include/interface-description.xml.i>
-        #include <include/dhcp-dhcpv6-options.xml.i>
+        #include <include/dhcp-options.xml.i>
+        #include <include/dhcpv6-options.xml.i>
         #include <include/interface-disable-link-detect.xml.i>
         #include <include/interface-disable.xml.i>
         #include <include/interface-mac.xml.i>
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
index 819534dc1..5a4e52122 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/vif.xml.i
@@ -13,7 +13,8 @@
   <children>
     #include <include/address-ipv4-ipv6-dhcp.xml.i>
     #include <include/interface-description.xml.i>
-    #include <include/dhcp-dhcpv6-options.xml.i>
+    #include <include/dhcp-options.xml.i>
+    #include <include/dhcpv6-options.xml.i>
     #include <include/interface-disable-link-detect.xml.i>
     #include <include/interface-disable.xml.i>
     #include <include/interface-vrf.xml.i>