diff --git a/interface-definitions/nat64.xml.in b/interface-definitions/nat64.xml.in
index dfdd295d2..4b3c157cc 100644
--- a/interface-definitions/nat64.xml.in
+++ b/interface-definitions/nat64.xml.in
@@ -1,116 +1,116 @@
<?xml version="1.0"?>
<interfaceDefinition>
<node name="nat64" owner="${vyos_conf_scripts_dir}/nat64.py">
<properties>
- <help>IPv6-to-IPv4 Network Address Translation (NAT64) Settings</help>
+ <help>Network Address Translation (NAT64) parameters</help>
<priority>501</priority>
</properties>
<children>
<node name="source">
<properties>
<help>IPv6 source to IPv4 destination address translation</help>
</properties>
<children>
<tagNode name="rule">
<properties>
<help>Source NAT64 rule number</help>
<valueHelp>
<format>u32:1-999999</format>
<description>Number for this rule</description>
</valueHelp>
<constraint>
<validator name="numeric" argument="--range 1-999999"/>
</constraint>
<constraintErrorMessage>NAT64 rule number must be between 1 and 999999</constraintErrorMessage>
</properties>
<children>
#include <include/generic-description.xml.i>
#include <include/generic-disable-node.xml.i>
<node name="match">
<properties>
<help>Match</help>
</properties>
<children>
<leafNode name="mark">
<properties>
<help>Match fwmark value</help>
<valueHelp>
<format>u32:1-2147483647</format>
<description>Fwmark value to match against</description>
</valueHelp>
<constraint>
<validator name="numeric" argument="--range 1-2147483647"/>
</constraint>
</properties>
</leafNode>
</children>
</node>
<node name="source">
<properties>
<help>IPv6 source prefix options</help>
</properties>
<children>
<leafNode name="prefix">
<properties>
<help>IPv6 prefix to be translated</help>
<valueHelp>
<format>ipv6net</format>
<description>IPv6 prefix</description>
</valueHelp>
<constraint>
<validator name="ipv6-prefix"/>
</constraint>
</properties>
</leafNode>
</children>
</node>
<node name="translation">
<properties>
<help>Translated IPv4 address options</help>
</properties>
<children>
<tagNode name="pool">
<properties>
<help>Translation IPv4 pool number</help>
<valueHelp>
<format>u32:1-999999</format>
<description>Number for this rule</description>
</valueHelp>
<constraint>
<validator name="numeric" argument="--range 1-999999"/>
</constraint>
<constraintErrorMessage>NAT64 pool number must be between 1 and 999999</constraintErrorMessage>
</properties>
<children>
#include <include/generic-description.xml.i>
#include <include/generic-disable-node.xml.i>
#include <include/nat-translation-port.xml.i>
#include <include/nat64/protocol.xml.i>
<leafNode name="address">
<properties>
<help>IPv4 address or prefix to translate to</help>
<valueHelp>
<format>ipv4</format>
<description>IPv4 address</description>
</valueHelp>
<valueHelp>
<format>ipv4net</format>
<description>IPv4 prefix</description>
</valueHelp>
<constraint>
<validator name="ipv4-address"/>
<validator name="ipv4-prefix"/>
</constraint>
</properties>
</leafNode>
</children>
</tagNode>
</children>
</node>
</children>
</tagNode>
</children>
</node>
</children>
</node>
</interfaceDefinition>
diff --git a/interface-definitions/nat66.xml.in b/interface-definitions/nat66.xml.in
index 1518de8bd..32d501cce 100644
--- a/interface-definitions/nat66.xml.in
+++ b/interface-definitions/nat66.xml.in
@@ -1,250 +1,250 @@
<?xml version="1.0"?>
<interfaceDefinition>
<node name="nat66" owner="${vyos_conf_scripts_dir}/nat66.py">
<properties>
- <help>IPv6-to-IPv6 Network Prefix Translation (NAT66/NPT) Settings</help>
+ <help>Network Prefix Translation (NAT66/NPTv6) parameters</help>
<priority>500</priority>
</properties>
<children>
<node name="source">
<properties>
<help>Prefix mapping of IPv6 source address translation</help>
</properties>
<children>
<tagNode name="rule">
<properties>
<help>Source NAT66 rule number</help>
<valueHelp>
<format>u32:1-999999</format>
<description>Number for this rule</description>
</valueHelp>
<constraint>
<validator name="numeric" argument="--range 1-999999"/>
</constraint>
<constraintErrorMessage>NAT66 rule number must be between 1 and 999999</constraintErrorMessage>
</properties>
<children>
#include <include/generic-description.xml.i>
#include <include/generic-disable-node.xml.i>
#include <include/nat-exclude.xml.i>
#include <include/firewall/log.xml.i>
#include <include/firewall/outbound-interface-no-group.xml.i>
#include <include/nat/protocol.xml.i>
<node name="destination">
<properties>
<help>IPv6 destination prefix options</help>
</properties>
<children>
<leafNode name="prefix">
<properties>
<help>IPv6 prefix to be translated</help>
<valueHelp>
<format>ipv6net</format>
<description>IPv6 prefix</description>
</valueHelp>
<valueHelp>
<format>!ipv6net</format>
<description>Match everything except the specified IPv6 prefix</description>
</valueHelp>
<constraint>
<validator name="ipv6-prefix"/>
<validator name="ipv6-prefix-exclude"/>
</constraint>
</properties>
</leafNode>
#include <include/nat-port.xml.i>
</children>
</node>
<node name="source">
<properties>
<help>IPv6 source prefix options</help>
</properties>
<children>
<leafNode name="prefix">
<properties>
<help>IPv6 prefix to be translated</help>
<valueHelp>
<format>ipv6net</format>
<description>IPv6 prefix</description>
</valueHelp>
<valueHelp>
<format>!ipv6net</format>
<description>Match everything except the specified IPv6 prefix</description>
</valueHelp>
<constraint>
<validator name="ipv6-prefix"/>
<validator name="ipv6-prefix-exclude"/>
</constraint>
</properties>
</leafNode>
#include <include/nat-port.xml.i>
</children>
</node>
<node name="translation">
<properties>
<help>Translated IPv6 address options</help>
</properties>
<children>
<leafNode name="address">
<properties>
<help>IPv6 address to translate to</help>
<completionHelp>
<list>masquerade</list>
</completionHelp>
<valueHelp>
<format>ipv6</format>
<description>IPv6 address</description>
</valueHelp>
<valueHelp>
<format>ipv6net</format>
<description>IPv6 prefix</description>
</valueHelp>
<valueHelp>
<format>masquerade</format>
<description>NAT to the primary address of outbound-interface</description>
</valueHelp>
<constraint>
<validator name="ipv6-address"/>
<validator name="ipv6-prefix"/>
<regex>(masquerade)</regex>
</constraint>
</properties>
</leafNode>
#include <include/nat-translation-port.xml.i>
</children>
</node>
</children>
</tagNode>
</children>
</node>
<node name="destination">
<properties>
<help>Prefix mapping for IPv6 destination address translation</help>
</properties>
<children>
<tagNode name="rule">
<properties>
<help>Destination NAT66 rule number</help>
<valueHelp>
<format>u32:1-999999</format>
<description>Number for this rule</description>
</valueHelp>
<constraint>
<validator name="numeric" argument="--range 1-999999"/>
</constraint>
<constraintErrorMessage>NAT66 rule number must be between 1 and 999999</constraintErrorMessage>
</properties>
<children>
#include <include/generic-description.xml.i>
#include <include/generic-disable-node.xml.i>
#include <include/nat-exclude.xml.i>
<leafNode name="log">
<properties>
<help>NAT66 rule logging</help>
<valueless/>
</properties>
</leafNode>
#include <include/firewall/inbound-interface-no-group.xml.i>
#include <include/nat/protocol.xml.i>
<node name="destination">
<properties>
<help>IPv6 destination prefix options</help>
</properties>
<children>
<leafNode name="address">
<properties>
<help>IPv6 address or prefix to be translated</help>
<valueHelp>
<format>ipv6</format>
<description>IPv6 address</description>
</valueHelp>
<valueHelp>
<format>ipv6net</format>
<description>IPv6 prefix</description>
</valueHelp>
<valueHelp>
<format>!ipv6</format>
<description>Match everything except the specified IPv6 address</description>
</valueHelp>
<valueHelp>
<format>!ipv6net</format>
<description>Match everything except the specified IPv6 prefix</description>
</valueHelp>
<constraint>
<validator name="ipv6-address"/>
<validator name="ipv6-prefix"/>
<validator name="ipv6-address-exclude"/>
<validator name="ipv6-prefix-exclude"/>
</constraint>
</properties>
</leafNode>
#include <include/nat-port.xml.i>
</children>
</node>
<node name="source">
<properties>
<help>IPv6 source prefix options</help>
</properties>
<children>
<leafNode name="address">
<properties>
<help>IPv6 address or prefix to be translated</help>
<valueHelp>
<format>ipv6</format>
<description>IPv6 address</description>
</valueHelp>
<valueHelp>
<format>ipv6net</format>
<description>IPv6 prefix</description>
</valueHelp>
<valueHelp>
<format>!ipv6</format>
<description>Match everything except the specified IPv6 address</description>
</valueHelp>
<valueHelp>
<format>!ipv6net</format>
<description>Match everything except the specified IPv6 prefix</description>
</valueHelp>
<constraint>
<validator name="ipv6-address"/>
<validator name="ipv6-prefix"/>
<validator name="ipv6-address-exclude"/>
<validator name="ipv6-prefix-exclude"/>
</constraint>
</properties>
</leafNode>
#include <include/nat-port.xml.i>
</children>
</node>
<node name="translation">
<properties>
<help>Translated IPv6 address options</help>
</properties>
<children>
<leafNode name="address">
<properties>
<help>IPv6 address or prefix to translate to</help>
<valueHelp>
<format>ipv6</format>
<description>IPv6 address</description>
</valueHelp>
<valueHelp>
<format>ipv6net</format>
<description>IPv6 prefix</description>
</valueHelp>
<constraint>
<validator name="ipv6-address"/>
<validator name="ipv6-prefix"/>
</constraint>
</properties>
</leafNode>
#include <include/nat-translation-port.xml.i>
</children>
</node>
</children>
</tagNode>
</children>
</node>
</children>
</node>
</interfaceDefinition>