12 files changed, 13 insertions, 14 deletions
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index 1efbd7d8a..586a8437d 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -4,7 +4,7 @@
     <children>
       <tagNode name="bonding" owner="${vyos_conf_scripts_dir}/interfaces-bonding.py">
         <properties>
-          <help>Bonding interface name</help>
+          <help>Bonding Interface/Link Aggregation</help>
           <priority>320</priority>
           <constraint>
             <regex>bond[0-9]+$</regex>
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index 8351723cf..e8285b16c 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -4,7 +4,7 @@
     <children>
       <tagNode name="bridge" owner="${vyos_conf_scripts_dir}/interfaces-bridge.py">
         <properties>
-          <help>Bridge interface name</help>
+          <help>Bridge Interface</help>
           <priority>470</priority>
           <constraint>
             <regex>br[0-9]+$</regex>
diff --git a/interface-definitions/interfaces-dummy.xml.in b/interface-definitions/interfaces-dummy.xml.in
index 445f6b2d4..39809a610 100644
--- a/interface-definitions/interfaces-dummy.xml.in
+++ b/interface-definitions/interfaces-dummy.xml.in
@@ -4,7 +4,7 @@
     <children>
       <tagNode name="dummy" owner="${vyos_conf_scripts_dir}/interfaces-dummy.py">
         <properties>
-          <help>Dummy interface name</help>
+          <help>Dummy Interface</help>
           <priority>300</priority>
           <constraint>
             <regex>dum[0-9]+$</regex>
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index b85b55e95..8f5d7355b 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -4,7 +4,7 @@
     <children>
       <tagNode name="ethernet" owner="${vyos_conf_scripts_dir}/interfaces-ethernet.py">
         <properties>
-          <help>Ethernet interface name</help>
+          <help>Ethernet Interface</help>
           <priority>318</priority>
           <constraint>
             <regex>((eth|lan)[0-9]+|(eno|ens|enp|enx).+)$</regex>
diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in
index 0a866143e..a6406ffc9 100644
--- a/interface-definitions/interfaces-geneve.xml.in
+++ b/interface-definitions/interfaces-geneve.xml.in
@@ -4,7 +4,7 @@
     <children>
       <tagNode name="geneve" owner="${vyos_conf_scripts_dir}/interfaces-geneve.py">
         <properties>
-          <help>Generic Network Virtualization Encapsulation (GENEVE)</help>
+          <help>Generic Network Virtualization Encapsulation (GENEVE) Interface</help>
           <priority>460</priority>
           <constraint>
             <regex>gnv[0-9]+$</regex>
diff --git a/interface-definitions/interfaces-l2tpv3.xml.in b/interface-definitions/interfaces-l2tpv3.xml.in
index 520cce283..b5c8de6b5 100644
--- a/interface-definitions/interfaces-l2tpv3.xml.in
+++ b/interface-definitions/interfaces-l2tpv3.xml.in
@@ -4,7 +4,7 @@
     <children>
       <tagNode name="l2tpv3" owner="${vyos_conf_scripts_dir}/interfaces-l2tpv3.py">
         <properties>
-          <help>Layer 2 Tunnel Protocol Version 3 (L2TPv3) interface</help>
+          <help>Layer 2 Tunnel Protocol Version 3 (L2TPv3) Interface</help>
           <priority>800</priority>
           <constraint>
             <regex>l2tpeth[0-9]+$</regex>
diff --git a/interface-definitions/interfaces-loopback.xml.in b/interface-definitions/interfaces-loopback.xml.in
index 007a0f189..ddbfad763 100644
--- a/interface-definitions/interfaces-loopback.xml.in
+++ b/interface-definitions/interfaces-loopback.xml.in
@@ -4,7 +4,7 @@
     <children>
       <tagNode name="loopback" owner="${vyos_conf_scripts_dir}/interfaces-loopback.py">
         <properties>
-          <help>Loopback interface</help>
+          <help>Loopback Interface</help>
           <priority>300</priority>
           <constraint>
             <regex>lo$</regex>
diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in
index 88b26ebf7..bc1a159a9 100644
--- a/interface-definitions/interfaces-openvpn.xml.in
+++ b/interface-definitions/interfaces-openvpn.xml.in
@@ -4,7 +4,7 @@
     <children>
       <tagNode name="openvpn" owner="${vyos_conf_scripts_dir}/interfaces-openvpn.py">
         <properties>
-          <help>OpenVPN tunnel interface name</help>
+          <help>OpenVPN Tunnel Interface</help>
           <priority>460</priority>
           <constraint>
             <regex>vtun[0-9]+$</regex>
diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in
index 7d86e1847..16cb2c169 100644
--- a/interface-definitions/interfaces-vxlan.xml.in
+++ b/interface-definitions/interfaces-vxlan.xml.in
@@ -4,7 +4,7 @@
     <children>
       <tagNode name="vxlan" owner="${vyos_conf_scripts_dir}/interfaces-vxlan.py">
         <properties>
-          <help>Virtual extensible LAN interface (VXLAN)</help>
+          <help>Virtual Extensible LAN (VXLAN) Interface</help>
           <priority>460</priority>
           <constraint>
             <regex>vxlan[0-9]+$</regex>
diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in
index 74319f705..dd4a73efd 100644
--- a/interface-definitions/interfaces-wireguard.xml.in
+++ b/interface-definitions/interfaces-wireguard.xml.in
@@ -4,13 +4,12 @@
     <children>
       <tagNode name="wireguard" owner="${vyos_conf_scripts_dir}/interfaces-wireguard.py">
         <properties>
-          <help>WireGuard interface name</help>
+          <help>WireGuard Interface</help>
           <priority>459</priority>
-          <!-- subsequent ones may be removed, just make sure ethernet ifs are present -->
           <constraint>
             <regex>wg[0-9]+$</regex>
           </constraint>
-          <constraintErrorMessage>illegal interface name</constraintErrorMessage>
+          <constraintErrorMessage>WireGuard interface must be named wgN</constraintErrorMessage>
           <valueHelp>
             <format>wgN</format>
             <description>WireGuard interface name</description>
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index e76a193a0..d6b257978 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -4,7 +4,7 @@
     <children>
       <tagNode name="wireless" owner="${vyos_conf_scripts_dir}/interfaces-wireless.py">
         <properties>
-          <help>Wireless network interface (WiFi/WLAN)</help>
+          <help>Wireless (WiFi/WLAN) Network Interface</help>
           <priority>400</priority>
           <constraint>
             <regex>wlan[0-9]+$</regex>
diff --git a/interface-definitions/ipoe-server.xml.in b/interface-definitions/service-ipoe.xml.in
index f683ac5f4..6804469cb 100644
--- a/interface-definitions/ipoe-server.xml.in
+++ b/interface-definitions/service-ipoe.xml.in
@@ -2,7 +2,7 @@
 <interfaceDefinition>
   <node name="service">
     <children>
-      <node name="ipoe-server" owner="${vyos_conf_scripts_dir}/ipoe_server.py">
+      <node name="ipoe-server" owner="${vyos_conf_scripts_dir}/service-ipoe.py">
         <properties>
           <help>Internet Protocol over Ethernet (IPoE) Server</help>
           <priority>900</priority>