convert templates to new syntax

41 files changed, 80 insertions, 80 deletions

diff --git a/templates-cfg/service/nat/node.def b/templates-cfg/service/nat/node.def
index a06299a..b053f84 100644
--- a/templates-cfg/service/nat/node.def
+++ b/templates-cfg/service/nat/node.def
@@ -1,2 +1,2 @@
-help: "NAT configuration"
-end: "sudo /opt/vyatta/sbin/vyatta-update-nat.pl"
+help: NAT configuration
+end:expression: "sudo /opt/vyatta/sbin/vyatta-update-nat.pl"
diff --git a/templates-cfg/service/nat/rule/node.def b/templates-cfg/service/nat/rule/node.def
index 8de4c74..5a6d3c8 100644
--- a/templates-cfg/service/nat/rule/node.def
+++ b/templates-cfg/service/nat/rule/node.def
@@ -1,4 +1,4 @@
 tag:
 type: u32
-help: "Rule number for NAT"
-syntax: ($(@) > 0 && $(@) < 1025) ; "rule number must be between 1 and 1024"
+help: Rule number for NAT
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 1025) ; "rule number must be between 1 and 1024"
diff --git a/templates-cfg/service/nat/rule/node.tag/destination/address/node.def b/templates-cfg/service/nat/rule/node.tag/destination/address/node.def
index 21aa728..7244fda 100644
--- a/templates-cfg/service/nat/rule/node.tag/destination/address/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/destination/address/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: "Destination address"
-syntax: exec "/opt/vyatta/sbin/vyatta-validate-type.pl ipv4_negate '$(@)'" ; "invalid destination address \"$(@)\""
+help: Destination address
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl ipv4_negate '$VAR(@)'" ; "invalid destination address \"$VAR(@)\""
diff --git a/templates-cfg/service/nat/rule/node.tag/destination/network/node.def b/templates-cfg/service/nat/rule/node.tag/destination/network/node.def
index 90c0571..8a52eec 100644
--- a/templates-cfg/service/nat/rule/node.tag/destination/network/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/destination/network/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: "Destination network"
-syntax: exec "/opt/vyatta/sbin/vyatta-validate-type.pl ipv4net_negate '$(@)'" ; "invalid destination network \"$(@)\""
+help: Destination network
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl ipv4net_negate '$VAR(@)'" ; "invalid destination network \"$VAR(@)\""
diff --git a/templates-cfg/service/nat/rule/node.tag/destination/node.def b/templates-cfg/service/nat/rule/node.tag/destination/node.def
index 54f73b4..8fc8e75 100644
--- a/templates-cfg/service/nat/rule/node.tag/destination/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/destination/node.def
@@ -1 +1 @@
-help: "NAT destination parameters"
+help: NAT destination parameters
diff --git a/templates-cfg/service/nat/rule/node.tag/destination/port-name/node.def b/templates-cfg/service/nat/rule/node.tag/destination/port-name/node.def
index ddd9de5..8451614 100644
--- a/templates-cfg/service/nat/rule/node.tag/destination/port-name/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/destination/port-name/node.def
@@ -1,10 +1,10 @@
 multi:
 type:  txt
-help: "Named destination port (e.g., http)"
-syntax: exec "sh -c 'if grep -q '\\''^$(@)[ \t]'\\'' /etc/services; \
+help: Named destination port (e.g., http)
+syntax:expression: exec "sh -c 'if grep -q '\\''^$VAR(@)[ \t]'\\'' /etc/services; \
 then exit 0; else \
   if grep -q \
-    '\\''^[^ \t]\\+[ \t]\\+[^ \t]\\+[^#]*[ \t]$(@)\\([ \t]\\|\\$\\)'\\'' \
+    '\\''^[^ \t]\\+[ \t]\\+[^ \t]\\+[^#]*[ \t]$VAR(@)\\([ \t]\\|$\\)'\\'' \
     /etc/services; then exit 0; else exit 1; \
   fi; \
-fi' " ; "invalid port name $(@)"
+fi' " ; "invalid port name $VAR(@)"
diff --git a/templates-cfg/service/nat/rule/node.tag/destination/port-number/node.def b/templates-cfg/service/nat/rule/node.tag/destination/port-number/node.def
index 5a1c509..6294dd3 100644
--- a/templates-cfg/service/nat/rule/node.tag/destination/port-number/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/destination/port-number/node.def
@@ -1,4 +1,4 @@
 multi:
 type:  u32
-help: "Numbered destination port (ex. 80)"
-syntax: ($(@) > 0 && $(@) < 65536) ; "port must be between 1 and 65535"
+help: Numbered destination port (ex. 80)
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
diff --git a/templates-cfg/service/nat/rule/node.tag/destination/port-range/node.def b/templates-cfg/service/nat/rule/node.tag/destination/port-range/node.def
index 62f0ac8..643d751 100644
--- a/templates-cfg/service/nat/rule/node.tag/destination/port-range/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/destination/port-range/node.def
@@ -1 +1 @@
-help: "Range of destination ports (ex. 80-110)"
+help: Range of destination ports (ex. 80-110)
diff --git a/templates-cfg/service/nat/rule/node.tag/destination/port-range/start/node.def b/templates-cfg/service/nat/rule/node.tag/destination/port-range/start/node.def
index 59ade24..59ba6bb 100644
--- a/templates-cfg/service/nat/rule/node.tag/destination/port-range/start/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/destination/port-range/start/node.def
@@ -1,3 +1,3 @@
 type:  u32
-help: "Starting destination port range"
-syntax: ($(@) > 0 && $(@) < 65536) ; "port must be between 1 and 65535"
+help: Starting destination port range
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
diff --git a/templates-cfg/service/nat/rule/node.tag/destination/port-range/stop/node.def b/templates-cfg/service/nat/rule/node.tag/destination/port-range/stop/node.def
index d745455..a13fefd 100644
--- a/templates-cfg/service/nat/rule/node.tag/destination/port-range/stop/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/destination/port-range/stop/node.def
@@ -1,3 +1,3 @@
 type:  u32
-help: "Ending destination port range"
-syntax: ($(@) > 0 && $(@) < 65536) ; "port must be between 1 and 65535"
+help: Ending destination port range
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
diff --git a/templates-cfg/service/nat/rule/node.tag/exclude/node.def b/templates-cfg/service/nat/rule/node.tag/exclude/node.def
index b6a2991..3fc118a 100644
--- a/templates-cfg/service/nat/rule/node.tag/exclude/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/exclude/node.def
@@ -1 +1 @@
-help: "Exclude packets matching this rule from NAT"
+help: Exclude packets matching this rule from NAT
diff --git a/templates-cfg/service/nat/rule/node.tag/inbound-interface/node.def b/templates-cfg/service/nat/rule/node.tag/inbound-interface/node.def
index 533a592..05f556a 100644
--- a/templates-cfg/service/nat/rule/node.tag/inbound-interface/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/inbound-interface/node.def
@@ -1,4 +1,4 @@
 type:  txt
-help: "Inbound interface of NAT traffic"
-#allowed: ls /sys/class/net 2>/dev/null
-#comp_help:Enter a network interface name, for example, "eth0"
+help: Inbound interface of NAT traffic
+allowed: ls /sys/class/net 2>/dev/null
+comp_help:Enter a network interface name, for example, "eth0"
diff --git a/templates-cfg/service/nat/rule/node.tag/inside-address/address/node.def b/templates-cfg/service/nat/rule/node.tag/inside-address/address/node.def
index 8ff9c72..023988a 100644
--- a/templates-cfg/service/nat/rule/node.tag/inside-address/address/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/inside-address/address/node.def
@@ -1,2 +1,2 @@
 type:  ipv4
-help: "Inside address to NAT"
+help: Inside address to NAT
diff --git a/templates-cfg/service/nat/rule/node.tag/inside-address/node.def b/templates-cfg/service/nat/rule/node.tag/inside-address/node.def
index 113c11a..e13cd32 100644
--- a/templates-cfg/service/nat/rule/node.tag/inside-address/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/inside-address/node.def
@@ -1 +1 @@
-help: "Inside NAT IP (used by destination NAT only)"
+help: Inside NAT IP (used by destination NAT only)
diff --git a/templates-cfg/service/nat/rule/node.tag/inside-address/port-number/node.def b/templates-cfg/service/nat/rule/node.tag/inside-address/port-number/node.def
index 0ff1b43..b080b3c 100644
--- a/templates-cfg/service/nat/rule/node.tag/inside-address/port-number/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/inside-address/port-number/node.def
@@ -1,3 +1,3 @@
 type:  u32
-help: "Inside port to NAT"
-syntax: ($(@) > 0 && $(@) < 65536) ; "port must be between 1 and 65535"
+help: Inside port to NAT
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
diff --git a/templates-cfg/service/nat/rule/node.tag/inside-address/port-range/node.def b/templates-cfg/service/nat/rule/node.tag/inside-address/port-range/node.def
index 4dbd32c..fe4dfd1 100644
--- a/templates-cfg/service/nat/rule/node.tag/inside-address/port-range/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/inside-address/port-range/node.def
@@ -1 +1 @@
-help: "Inside port range to NAT"
+help: Inside port range to NAT
diff --git a/templates-cfg/service/nat/rule/node.tag/inside-address/port-range/start/node.def b/templates-cfg/service/nat/rule/node.tag/inside-address/port-range/start/node.def
index 8658b46..fe0d60b 100644
--- a/templates-cfg/service/nat/rule/node.tag/inside-address/port-range/start/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/inside-address/port-range/start/node.def
@@ -1,3 +1,3 @@
 type:  u32
-help: "Inside port range start"
-syntax: ($(@) > 0 && $(@) < 65536) ; "port must be between 1 and 65535"
+help: Inside port range start
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
diff --git a/templates-cfg/service/nat/rule/node.tag/inside-address/port-range/stop/node.def b/templates-cfg/service/nat/rule/node.tag/inside-address/port-range/stop/node.def
index 182a362..ba772c6 100644
--- a/templates-cfg/service/nat/rule/node.tag/inside-address/port-range/stop/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/inside-address/port-range/stop/node.def
@@ -1,3 +1,3 @@
 type:  u32
-help: "Inside port range stop"
-syntax: ($(@) > 0 && $(@) < 65536) ; "port must be between 1 and 65535"
+help: Inside port range stop
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
diff --git a/templates-cfg/service/nat/rule/node.tag/inside-address/range/node.def b/templates-cfg/service/nat/rule/node.tag/inside-address/range/node.def
index f8ef0ea..ca078b2 100644
--- a/templates-cfg/service/nat/rule/node.tag/inside-address/range/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/inside-address/range/node.def
@@ -1 +1 @@
-help: "Inside address range"
+help: Inside address range
diff --git a/templates-cfg/service/nat/rule/node.tag/inside-address/range/start/node.def b/templates-cfg/service/nat/rule/node.tag/inside-address/range/start/node.def
index 473d565..5295026 100644
--- a/templates-cfg/service/nat/rule/node.tag/inside-address/range/start/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/inside-address/range/start/node.def
@@ -1,2 +1,2 @@
 type:  ipv4
-help: "Inside address range start"
+help: Inside address range start
diff --git a/templates-cfg/service/nat/rule/node.tag/inside-address/range/stop/node.def b/templates-cfg/service/nat/rule/node.tag/inside-address/range/stop/node.def
index 4c3ebb0..82d8698 100644
--- a/templates-cfg/service/nat/rule/node.tag/inside-address/range/stop/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/inside-address/range/stop/node.def
@@ -1,2 +1,2 @@
 type:  ipv4
-help: "Inside address range stop"
+help: Inside address range stop
diff --git a/templates-cfg/service/nat/rule/node.tag/outbound-interface/node.def b/templates-cfg/service/nat/rule/node.tag/outbound-interface/node.def
index 096629f..4aaf5b7 100644
--- a/templates-cfg/service/nat/rule/node.tag/outbound-interface/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/outbound-interface/node.def
@@ -1,4 +1,4 @@
 type:  txt
-help: "Outbound interface for NAT traffic"
-#allowed: ls /sys/class/net 2>/dev/null
-#comp_help:Enter a network interface name, for example, "eth0"
+help: Outbound interface for NAT traffic
+allowed: ls /sys/class/net 2>/dev/null
+comp_help:Enter a network interface name, for example, "eth0"
diff --git a/templates-cfg/service/nat/rule/node.tag/outside-address/address/node.def b/templates-cfg/service/nat/rule/node.tag/outside-address/address/node.def
index d6ee617..b6aa4ed 100644
--- a/templates-cfg/service/nat/rule/node.tag/outside-address/address/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/outside-address/address/node.def
@@ -1,2 +1,2 @@
 type:  ipv4
-help: "Outside address to NAT"
+help: Outside address to NAT
diff --git a/templates-cfg/service/nat/rule/node.tag/outside-address/node.def b/templates-cfg/service/nat/rule/node.tag/outside-address/node.def
index 466af5c..b8e1e19 100644
--- a/templates-cfg/service/nat/rule/node.tag/outside-address/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/outside-address/node.def
@@ -1 +1 @@
-help: "Outside NAT IP (used by source NAT only)"
+help: Outside NAT IP (used by source NAT only)
diff --git a/templates-cfg/service/nat/rule/node.tag/outside-address/port-number/node.def b/templates-cfg/service/nat/rule/node.tag/outside-address/port-number/node.def
index d30ea94..4253066 100644
--- a/templates-cfg/service/nat/rule/node.tag/outside-address/port-number/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/outside-address/port-number/node.def
@@ -1,3 +1,3 @@
 type:  u32
-help: "Outside port to NAT"
-syntax: ($(@) > 0 && $(@) < 65536) ; "port must be between 1 and 65535"
+help: Outside port to NAT
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
diff --git a/templates-cfg/service/nat/rule/node.tag/outside-address/port-range/node.def b/templates-cfg/service/nat/rule/node.tag/outside-address/port-range/node.def
index aa13b4a..0145cee 100644
--- a/templates-cfg/service/nat/rule/node.tag/outside-address/port-range/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/outside-address/port-range/node.def
@@ -1 +1 @@
-help: "Outside port range to NAT"
+help: Outside port range to NAT
diff --git a/templates-cfg/service/nat/rule/node.tag/outside-address/port-range/start/node.def b/templates-cfg/service/nat/rule/node.tag/outside-address/port-range/start/node.def
index 09a987a..9905c7a 100644
--- a/templates-cfg/service/nat/rule/node.tag/outside-address/port-range/start/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/outside-address/port-range/start/node.def
@@ -1,3 +1,3 @@
 type:  u32
-help: "Outside port range start"
-syntax: ($(@) > 0 && $(@) < 65536) ; "port must be between 1 and 65535"
+help: Outside port range start
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
diff --git a/templates-cfg/service/nat/rule/node.tag/outside-address/port-range/stop/node.def b/templates-cfg/service/nat/rule/node.tag/outside-address/port-range/stop/node.def
index 3ce8342..a84522c 100644
--- a/templates-cfg/service/nat/rule/node.tag/outside-address/port-range/stop/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/outside-address/port-range/stop/node.def
@@ -1,3 +1,3 @@
 type:  u32
-help: "Outside port range stop"
-syntax: ($(@) > 0 && $(@) < 65536) ; "port must be between 1 and 65535"
+help: Outside port range stop
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
diff --git a/templates-cfg/service/nat/rule/node.tag/outside-address/range/node.def b/templates-cfg/service/nat/rule/node.tag/outside-address/range/node.def
index b28186e..5a053ea 100644
--- a/templates-cfg/service/nat/rule/node.tag/outside-address/range/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/outside-address/range/node.def
@@ -1 +1 @@
-help: "Outside address range"
+help: Outside address range
diff --git a/templates-cfg/service/nat/rule/node.tag/outside-address/range/start/node.def b/templates-cfg/service/nat/rule/node.tag/outside-address/range/start/node.def
index 27395f1..cc5a8d1 100644
--- a/templates-cfg/service/nat/rule/node.tag/outside-address/range/start/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/outside-address/range/start/node.def
@@ -1,2 +1,2 @@
 type:  ipv4
-help: "Outside address range start"
+help: Outside address range start
diff --git a/templates-cfg/service/nat/rule/node.tag/outside-address/range/stop/node.def b/templates-cfg/service/nat/rule/node.tag/outside-address/range/stop/node.def
index f441522..dee5ac6 100644
--- a/templates-cfg/service/nat/rule/node.tag/outside-address/range/stop/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/outside-address/range/stop/node.def
@@ -1,2 +1,2 @@
 type:  ipv4
-help: "Outside address range stop"
+help: Outside address range stop
diff --git a/templates-cfg/service/nat/rule/node.tag/protocols/node.def b/templates-cfg/service/nat/rule/node.tag/protocols/node.def
index 619fad9..e2e6e84 100644
--- a/templates-cfg/service/nat/rule/node.tag/protocols/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/protocols/node.def
@@ -1,8 +1,8 @@
 type:  txt
-help: "Protocol to NAT (this can be a protocol name in /etc/protocols, a protocol number, or \"all\")"
-syntax: exec "/opt/vyatta/sbin/vyatta-validate-type.pl protocol_negate '$(@)'" ; "invalid protocol \"$(@)\""
-#comp_help:Possible completions:
-#  <name>        A protocol name, for example, "tcp"
-#  <number>      A protocol number
-#  all           All protocols
-#(Note: a protocol can also be negated, for example, "!tcp")
+help: Protocol to NAT (this can be a protocol name in /etc/protocols, a protocol number, or "all")
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl protocol_negate '$VAR(@)'" ; "invalid protocol \"$VAR(@)\""
+comp_help:Possible completions:
+  <name>        A protocol name, for example, "tcp"
+  <number>      A protocol number
+  all           All protocols
+(Note: a protocol can also be negated, for example, "!tcp")
diff --git a/templates-cfg/service/nat/rule/node.tag/source/address/node.def b/templates-cfg/service/nat/rule/node.tag/source/address/node.def
index 6b88193..6be2e29 100644
--- a/templates-cfg/service/nat/rule/node.tag/source/address/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/source/address/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: "Source address"
-syntax: exec "/opt/vyatta/sbin/vyatta-validate-type.pl ipv4_negate '$(@)'" ; "invalid source address \"$(@)\""
+help: Source address
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl ipv4_negate '$VAR(@)'" ; "invalid source address \"$VAR(@)\""
diff --git a/templates-cfg/service/nat/rule/node.tag/source/network/node.def b/templates-cfg/service/nat/rule/node.tag/source/network/node.def
index 9306c53..2da1647 100644
--- a/templates-cfg/service/nat/rule/node.tag/source/network/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/source/network/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: "Inside network"
-syntax: exec "/opt/vyatta/sbin/vyatta-validate-type.pl ipv4net_negate '$(@)'" ; "invalid source network \"$(@)\""
+help: Inside network
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl ipv4net_negate '$VAR(@)'" ; "invalid source network \"$VAR(@)\""
diff --git a/templates-cfg/service/nat/rule/node.tag/source/node.def b/templates-cfg/service/nat/rule/node.tag/source/node.def
index 3aad309..299f6e5 100644
--- a/templates-cfg/service/nat/rule/node.tag/source/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/source/node.def
@@ -1 +1 @@
-help: "NAT source parameters"
+help: NAT source parameters
diff --git a/templates-cfg/service/nat/rule/node.tag/source/port-name/node.def b/templates-cfg/service/nat/rule/node.tag/source/port-name/node.def
index 1ead23b..01f25da 100644
--- a/templates-cfg/service/nat/rule/node.tag/source/port-name/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/source/port-name/node.def
@@ -1,10 +1,10 @@
 multi:
 type:  txt
-help: "Named source port (e.g., http)"
-syntax: exec "sh -c 'if grep -q '\\''^$(@)[ \t]'\\'' /etc/services; \
+help: Named source port (e.g., http)
+syntax:expression: exec "sh -c 'if grep -q '\\''^$VAR(@)[ \t]'\\'' /etc/services; \
 then exit 0; else \
   if grep -q \
-    '\\''^[^ \t]\\+[ \t]\\+[^ \t]\\+[^#]*[ \t]$(@)\\([ \t]\\|\\$\\)'\\'' \
+    '\\''^[^ \t]\\+[ \t]\\+[^ \t]\\+[^#]*[ \t]$VAR(@)\\([ \t]\\|$\\)'\\'' \
     /etc/services; then exit 0; else exit 1; \
   fi; \
-fi' " ; "invalid port name $(@)"
+fi' " ; "invalid port name $VAR(@)"
diff --git a/templates-cfg/service/nat/rule/node.tag/source/port-number/node.def b/templates-cfg/service/nat/rule/node.tag/source/port-number/node.def
index 8b8be63..1db91e0 100644
--- a/templates-cfg/service/nat/rule/node.tag/source/port-number/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/source/port-number/node.def
@@ -1,4 +1,4 @@
 multi:
 type:  u32
-help: "Numbered source port (ex. 80)"
-syntax: ($(@) > 0 && $(@) < 65536) ; "port must be between 1 and 65535"
+help: Numbered source port (ex. 80)
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
diff --git a/templates-cfg/service/nat/rule/node.tag/source/port-range/node.def b/templates-cfg/service/nat/rule/node.tag/source/port-range/node.def
index b21d6e8..eb2aadb 100644
--- a/templates-cfg/service/nat/rule/node.tag/source/port-range/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/source/port-range/node.def
@@ -1 +1 @@
-help: "Range of source ports (ex. 80-110)"
+help: Range of source ports (ex. 80-110)
diff --git a/templates-cfg/service/nat/rule/node.tag/source/port-range/start/node.def b/templates-cfg/service/nat/rule/node.tag/source/port-range/start/node.def
index 4ad95f4..ec67963 100644
--- a/templates-cfg/service/nat/rule/node.tag/source/port-range/start/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/source/port-range/start/node.def
@@ -1,3 +1,3 @@
 type:  u32
-help: "Starting source port range"
-syntax: ($(@) > 0 && $(@) < 65536) ; "port must be between 1 and 65535"
+help: Starting source port range
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
diff --git a/templates-cfg/service/nat/rule/node.tag/source/port-range/stop/node.def b/templates-cfg/service/nat/rule/node.tag/source/port-range/stop/node.def
index 74a308b..94c573e 100644
--- a/templates-cfg/service/nat/rule/node.tag/source/port-range/stop/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/source/port-range/stop/node.def
@@ -1,3 +1,3 @@
 type:  u32
-help: "Ending source port range"
-syntax: ($(@) > 0 && $(@) < 65536) ; "port must be between 1 and 65535"
+help: Ending source port range
+syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
diff --git a/templates-cfg/service/nat/rule/node.tag/type/node.def b/templates-cfg/service/nat/rule/node.tag/type/node.def
index 831dd3b..f8191cf 100644
--- a/templates-cfg/service/nat/rule/node.tag/type/node.def
+++ b/templates-cfg/service/nat/rule/node.tag/type/node.def
@@ -1,7 +1,7 @@
 type:  txt
-help: "Source, destination, or masquerade NAT"
-syntax: $(@) in "source", "destination", "masquerade"; "invalid type $(@)"
-#comp_help:Possible completions:
-#  source        Source NAT
-#  destination   Destination NAT
-#  masquerade    Masquerade NAT
+help: Source, destination, or masquerade NAT
+syntax:expression: $VAR(@) in "source", "destination", "masquerade"; "invalid type $VAR(@)"
+comp_help:Possible completions:
+  source        Source NAT
+  destination   Destination NAT
+  masquerade    Masquerade NAT