5 files changed, 12 insertions, 12 deletions
diff --git a/interface-definitions/include/bgp-update-source.xml.i b/interface-definitions/include/bgp-update-source.xml.i
index c1db2e2c1..a8b212720 100644
--- a/interface-definitions/include/bgp-update-source.xml.i
+++ b/interface-definitions/include/bgp-update-source.xml.i
@@ -21,7 +21,7 @@
     <constraint>
       <validator name="ipv4-address"/>
       <validator name="ipv6-address"/>
-      <regex>^(br|bond|dum|en|eth|gnv|peth|tun|vti|vxlan|wg|wlan)[0-9]+|lo$</regex>
+      <validator name="interface-name"/>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/static-route-next-hop-interface.xml.i b/interface-definitions/include/static-route-interface.xml.i
index 01c253597..0f10837df 100644
--- a/interface-definitions/include/static-route-next-hop-interface.xml.i
+++ b/interface-definitions/include/static-route-interface.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from static-route-next-hop-interface.xml.i -->
+<!-- included start from static-route-interface.xml.i -->
 <leafNode name="interface">
   <properties>
     <help>Gateway interface name</help>
@@ -10,7 +10,7 @@
       <description>Gateway interface name</description>
     </valueHelp>
     <constraint>
-      <regex>^(br|bond|dum|en|eth|gnv|peth|tun|vti|vxlan|wg|wlan)[0-9]+|lo$</regex>
+      <validator name="interface-name"/>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/static-route-next-hop-vrf.xml.i b/interface-definitions/include/static-route-vrf.xml.i
index ae2515a12..70f8b0be8 100644
--- a/interface-definitions/include/static-route-next-hop-vrf.xml.i
+++ b/interface-definitions/include/static-route-vrf.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from static-route-next-hop-vrf.xml.i -->
+<!-- included start from static-route-vrf.xml.i -->
 <leafNode name="vrf">
   <properties>
     <help>VRF to leak route</help>
diff --git a/interface-definitions/include/static-route.xml.i b/interface-definitions/include/static-route.xml.i
index 1f79aaca8..6225025ca 100644
--- a/interface-definitions/include/static-route.xml.i
+++ b/interface-definitions/include/static-route.xml.i
@@ -42,13 +42,13 @@
           <description>Gateway interface name</description>
         </valueHelp>
         <constraint>
-          <regex>^(br|bond|dum|en|eth|gnv|peth|tun|vti|vxlan|wg|wlan)[0-9]+|lo$</regex>
+          <validator name="interface-name"/>
         </constraint>
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
         #include <include/static-route-distance.xml.i>
-        #include <include/static-route-next-hop-vrf.xml.i>
+        #include <include/static-route-vrf.xml.i>
       </children>
     </tagNode>
     <tagNode name="next-hop">
@@ -65,8 +65,8 @@
       <children>
         #include <include/generic-disable-node.xml.i>
         #include <include/static-route-distance.xml.i>
-        #include <include/static-route-next-hop-interface.xml.i>
-        #include <include/static-route-next-hop-vrf.xml.i>
+        #include <include/static-route-interface.xml.i>
+        #include <include/static-route-vrf.xml.i>
       </children>
     </tagNode>
   </children>
diff --git a/interface-definitions/include/static-route6.xml.i b/interface-definitions/include/static-route6.xml.i
index 1ff6bbead..25d4d22a2 100644
--- a/interface-definitions/include/static-route6.xml.i
+++ b/interface-definitions/include/static-route6.xml.i
@@ -42,13 +42,13 @@
           <description>Gateway interface name</description>
         </valueHelp>
         <constraint>
-          <regex>^(br|bond|dum|en|eth|gnv|peth|tun|vti|vxlan|wg|wlan)[0-9]+|lo$</regex>
+          <validator name="interface-name"/>
         </constraint>
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
         #include <include/static-route-distance.xml.i>
-        #include <include/static-route-next-hop-vrf.xml.i>
+        #include <include/static-route-vrf.xml.i>
       </children>
     </tagNode>
     <tagNode name="next-hop">
@@ -65,8 +65,8 @@
       <children>
         #include <include/generic-disable-node.xml.i>
         #include <include/static-route-distance.xml.i>
-        #include <include/static-route-next-hop-interface.xml.i>
-        #include <include/static-route-next-hop-vrf.xml.i>
+        #include <include/static-route-interface.xml.i>
+        #include <include/static-route-vrf.xml.i>
       </children>
     </tagNode>
   </children>