Remove verbs from all help messages

Per current policy remove verb from all help messages in th is package

267 files changed, 267 insertions, 267 deletions

diff --git a/templates/interfaces/bonding/node.def b/templates/interfaces/bonding/node.def
index 4a944970..d541b422 100644
--- a/templates/interfaces/bonding/node.def
+++ b/templates/interfaces/bonding/node.def
@@ -1,7 +1,7 @@
 tag:
 priority: 315
 type: txt
-help: Set bonding interface name
+help: Bonding interface name
 comp_help: Enter bonding interface name (bond0 - bond99)
 syntax:expression: pattern $VAR(@) "^bond[0-9]+$" \
          ; "bonding must be (bond0-bond99)"
diff --git a/templates/interfaces/bonding/node.tag/address/node.def b/templates/interfaces/bonding/node.tag/address/node.def
index 7221232e..1c6ea9af 100644
--- a/templates/interfaces/bonding/node.tag/address/node.def
+++ b/templates/interfaces/bonding/node.tag/address/node.def
@@ -1,6 +1,6 @@
 multi:
 type: txt
-help: Set an IP address for this interface
+help: IP address
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)" \
        ; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)"
 create:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../@)
diff --git a/templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def b/templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def
index bf4d0f7f..b6c48963 100644
--- a/templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def
+++ b/templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def
@@ -1,6 +1,6 @@
 type: txt
 
-help: Set this interface to a bridge-group
+help: Bridge group interface
 
 commit:expression: exec \
    "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge"
diff --git a/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def b/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def
index 33763624..f25a36ac 100644
--- a/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: Set the path cost for this port
+help: Path cost for this port
 syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535"
 val_help:<1-65535>; Path cost value for Spanning Tree Protocol
diff --git a/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def b/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def
index d7a2f7a0..38c11131 100644
--- a/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: Set the port priority for this port
+help: Port priority for this port
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255"
 val_help:<1-255>; Bridge port priority
diff --git a/templates/interfaces/bonding/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/description/node.def
index 7f64c788..e4807d2f 100644
--- a/templates/interfaces/bonding/node.tag/description/node.def
+++ b/templates/interfaces/bonding/node.tag/description/node.def
@@ -1,4 +1,4 @@
 type: txt
-help: Set description for this interface
+help: Description
 update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias"
 delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias"
diff --git a/templates/interfaces/bonding/node.tag/disable-link-detect/node.def b/templates/interfaces/bonding/node.tag/disable-link-detect/node.def
index 83858ec1..7129ff33 100644
--- a/templates/interfaces/bonding/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/bonding/node.tag/disable-link-detect/node.def
@@ -1,3 +1,3 @@
-help: Set to ignore link state changes on this interface
+help: Ignore link state changes
 update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on
 delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off
diff --git a/templates/interfaces/bonding/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/disable/node.def
index 96325d72..6e684ebd 100644
--- a/templates/interfaces/bonding/node.tag/disable/node.def
+++ b/templates/interfaces/bonding/node.tag/disable/node.def
@@ -1,4 +1,4 @@
-help: Set interface disabled
+help: Disable interface
 create: /etc/netplug/linkdown.d/dhclient $VAR(../@)
         if ! ip link set $VAR(../@) down 2>/dev/null; then
           echo "Error disabling dev $VAR(../@)"
diff --git a/templates/interfaces/bonding/node.tag/mac/node.def b/templates/interfaces/bonding/node.tag/mac/node.def
index abafa7ab..9b5feacd 100644
--- a/templates/interfaces/bonding/node.tag/mac/node.def
+++ b/templates/interfaces/bonding/node.tag/mac/node.def
@@ -1,5 +1,5 @@
 type: macaddr
-help: Set the Media Access Control (MAC) address of this interface
+help: Media Access Control (MAC) address
 syntax:expression: exec "\
 	/opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --valid-mac $VAR(@)"
 update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --set-mac $VAR(@)
diff --git a/templates/interfaces/bonding/node.tag/mode/node.def b/templates/interfaces/bonding/node.tag/mode/node.def
index bf8a1a8c..ff9c82bc 100644
--- a/templates/interfaces/bonding/node.tag/mode/node.def
+++ b/templates/interfaces/bonding/node.tag/mode/node.def
@@ -7,7 +7,7 @@ syntax:expression: $VAR(@) in \
 		   "transmit-load-balance", "adaptive-load-balance", "xor-hash" ; \
     "mode must be 802.3ad, active-backup, broadcast, round-robin, \
 transmit-load-balance, adaptive-load-balance, or xor"
-help: Sets the bonding mode
+help: Bonding mode
 update: sudo ${vyatta_sbindir}/vyatta-bonding.pl --dev=$VAR(../@) --mode=$VAR(@)
 
 comp_help: Possible bonding mode
diff --git a/templates/interfaces/bonding/node.tag/mtu/node.def b/templates/interfaces/bonding/node.tag/mtu/node.def
index cd244402..82941ea1 100644
--- a/templates/interfaces/bonding/node.tag/mtu/node.def
+++ b/templates/interfaces/bonding/node.tag/mtu/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Set the Maximum Transmission Unit (MTU) for this interface
+help: Maximum Transmission Unit (MTU)
 syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000"
 update: ip link set $VAR(../@) mtu $VAR(@)
 delete: ip link set $VAR(../@) mtu 1500
diff --git a/templates/interfaces/bonding/node.tag/primary/node.def b/templates/interfaces/bonding/node.tag/primary/node.def
index ffa0fd6e..f80c6b8f 100644
--- a/templates/interfaces/bonding/node.tag/primary/node.def
+++ b/templates/interfaces/bonding/node.tag/primary/node.def
@@ -4,4 +4,4 @@ commit:expression: exec \
     "grep -s $VAR(@) /sys/class/net/$VAR(../@)/bonding/slaves" \
     ; "Ethernet interface must be part of the bonding group"
 update: sudo sh -c "echo $VAR(@) >/sys/class/net/$VAR(../@)/bonding/primary"
-help: Specify the primary device
+help: Primary device interface
diff --git a/templates/interfaces/bonding/node.tag/vif/node.def b/templates/interfaces/bonding/node.tag/vif/node.def
index 62e7ab95..a9cc2bfa 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.def
@@ -1,7 +1,7 @@
 tag:
 priority: 320
 type: u32
-help: Set Virtual Local Area Network (VLAN) ID
+help: Virtual Local Area Network (VLAN) ID
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094"
 create: read -a SLAVES </sys/class/net/$VAR(../@)/bonding/slaves
 	if [ ${#SLAVES[*]} -eq 0 ]; then
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def
index f48d4d5b..84bd9e3b 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def
@@ -1,6 +1,6 @@
 multi:
 type: txt
-help: Set an IP address for this interface
+help: IP address
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../../@).$VAR(../@) "\
     ; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../../@).$VAR(../@)"
 create:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../../@).$VAR(../@)
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/bridge/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/bridge/node.def
index 4e3e22ec..0766f8af 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/bridge/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/bridge/node.def
@@ -1,6 +1,6 @@
 type: txt
 
-help: Set this interface to a bridge-group
+help: Bridge group interface
 
 commit:expression: exec \
    "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge"
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def
index 33763624..f25a36ac 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: Set the path cost for this port
+help: Path cost for this port
 syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535"
 val_help:<1-65535>; Path cost value for Spanning Tree Protocol
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def
index d7a2f7a0..38c11131 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: Set the port priority for this port
+help: Port priority for this port
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255"
 val_help:<1-255>; Bridge port priority
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def
index 0ef54891..ce6c5fd0 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def
@@ -1,4 +1,4 @@
 type: txt
-help: Set description for this interface
+help: Description
 update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias"
 delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias"
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/disable-link-detect/node.def
index 897113de..5f60e6ab 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/disable-link-detect/node.def
@@ -1,3 +1,3 @@
-help: Set to ignore link state changes on this interface
+help: Ignore link state changes
 update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../../@).$VAR(../@) on
 delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../../@).$VAR(../@) off
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/disable/node.def
index b2119c9c..e9943645 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/disable/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/disable/node.def
@@ -1,4 +1,4 @@
-help: Set interface disabled
+help: Disable interface
 update: /etc/netplug/linkdown.d/dhclient $VAR(../../@).$VAR(../@)
         if ! ip link set $VAR(../../@).$VAR(../@) down 2>/dev/null; then
           echo "Error disabling dev $VAR(../../@).$VAR(../@)"
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def
index d87ad6b7..75c5447e 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.def
@@ -2,7 +2,7 @@ tag:
 type: u32
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255"
 commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)"
-help: Set VRRP group number
+help: VRRP group number
 delete:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $VAR(../../../@).$VAR(../../@) --group $VAR(@) "
 comp_help: possible completions
  <1-255>            VRRP group number
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
index 59f2b451..fa2dbced 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
@@ -1,6 +1,6 @@
 type: u32
 default: 1
-help: Set advertise interval
+help: Advertise interval
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <=255; "Advertise interval must be between 1-255"
 comp_help: possible completions
  <1-255>            Set advertise interval (default 1)
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
index adf78b3f..9869bcb3 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
@@ -1,3 +1,3 @@
-help: Set authentication
+help: Authentication
 commit:expression: $VAR(./type/@) != ""; "You must set a authentication type"
 commit:expression: $VAR(./password/@) != ""; "You must set a authentication password"
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
index 9bd2e98d..9a671375 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set password
+help: Password
 syntax:expression: exec "                              \
         if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then   \
           echo Password must be 8 characters or less ; \
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
index 7155495d..f099153f 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set authentication type
+help: Authentication type
 syntax:expression: $VAR(@) in "plaintext-password", "ah"; \
        "authentication must be plaintext-password or ah"
 comp_help: possible completions:
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def
index aeb40f0b..849e5273 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: Set description for this interface
+help: Description
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def
index 916e313b..a0e0c576 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def
@@ -1 +1 @@
-help: Set VRRP group disabled
+help: Disable VRRP group
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
index edb0d58a..9e062980 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
@@ -1,6 +1,6 @@
 type: ipv4
 
-help: Set hello-source-address
+help: Hello source address
 
 comp_help: possible completions:
   <x.x.x.x>     Set source address for vrrp hello packets (optional)
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
index 1638624e..98cd916f 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
@@ -1,6 +1,6 @@
 type: u32
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \
                    "preempt-delay must be between 0-1000"
-help: Set preempt-delay
+help: Preempt-delay
 comp_help: possible completions:
   <0-1000>            Set Preempt Delay in seconds
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
index 7b3b9cbd..e1e5aa96 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set preempt mode (default: true)
+help: Preempt mode(default: true)
 default: "true"
 syntax:expression: $VAR(@) in "true", "false"; "preempt must be true or false"
 comp_help: possible completions:
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
index 54de02c7..504eebc4 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
@@ -1,5 +1,5 @@
 type: u32
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255"
-help: Set priority
+help: Priority
 comp_help: possible completions:
  <1-255>            Set Priority
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def
index 44be2a7f..88fbb670 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def
@@ -1,4 +1,4 @@
-help: Set an executable script to run on VRRP state-transition to backup
+help: Script to run on VRRP state-transition to backup
 type: txt
 syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Backup Script should be an existing executable"
 
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def
index 9f2557b3..2d2c08d0 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def
@@ -1,4 +1,4 @@
-help: Set an executable script to run on VRRP state-transition to fault
+help: Script to run on VRRP state-transition to fault
 type: txt
 syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Fault Script should be an existing executable"
 
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def
index 7f7d8895..e3eb0175 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def
@@ -1,4 +1,4 @@
-help: Set an executable script to run on VRRP state-transition to master
+help: Script to run on VRRP state-transition to master
 type: txt
 syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Master Script should be an existing executable"
 
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def
index ed959156..90f54c0e 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def
@@ -1,2 +1,2 @@
-help: Set scripts to run on VRRP state-transitions
+help: Scripts to run on VRRP state-transitions
 
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
index 9602a842..a7d2e1fd 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: Set to add this vrrp group to a sync group
+help: Add this vrrp group to a sync group
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
index 176287aa..ab3d6290 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
@@ -1,6 +1,6 @@
 multi:
 type: txt
-help: Set virtual address
+help: Virtual address
 
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl        \
                            --vrrp-action='check-vip' --vip='$VAR(@)' "\
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def
index a3ce1395..c0efa6f4 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def
@@ -2,7 +2,7 @@ tag:
 type: u32
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255"
 commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)"
-help: Set VRRP group number
+help: VRRP group number
 delete:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $VAR(../../@) --group $VAR(@) "
 comp_help: possible completions
  <1-255>            VRRP group number
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
index 59f2b451..fa2dbced 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
@@ -1,6 +1,6 @@
 type: u32
 default: 1
-help: Set advertise interval
+help: Advertise interval
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <=255; "Advertise interval must be between 1-255"
 comp_help: possible completions
  <1-255>            Set advertise interval (default 1)
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
index adf78b3f..9869bcb3 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
@@ -1,3 +1,3 @@
-help: Set authentication
+help: Authentication
 commit:expression: $VAR(./type/@) != ""; "You must set a authentication type"
 commit:expression: $VAR(./password/@) != ""; "You must set a authentication password"
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
index 9bd2e98d..9a671375 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set password
+help: Password
 syntax:expression: exec "                              \
         if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then   \
           echo Password must be 8 characters or less ; \
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
index 687c6af6..21e2e165 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set authentication type
+help: Authentication type
 syntax:expression: $VAR(@) in "plaintext-password", "ah"; \
        "authentication must be plaintext-password or ah"
 comp_help: possible completions:
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/description/node.def
index aeb40f0b..849e5273 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/description/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/description/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: Set description for this interface
+help: Description
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def
index 916e313b..a0e0c576 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/disable/node.def
@@ -1 +1 @@
-help: Set VRRP group disabled
+help: Disable VRRP group
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
index edb0d58a..9e062980 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
@@ -1,6 +1,6 @@
 type: ipv4
 
-help: Set hello-source-address
+help: Hello source address
 
 comp_help: possible completions:
   <x.x.x.x>     Set source address for vrrp hello packets (optional)
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
index 1638624e..98cd916f 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
@@ -1,6 +1,6 @@
 type: u32
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \
                    "preempt-delay must be between 0-1000"
-help: Set preempt-delay
+help: Preempt-delay
 comp_help: possible completions:
   <0-1000>            Set Preempt Delay in seconds
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
index 4ed282ed..c3dc66cd 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set preempt mode
+help: Preempt mode
 default: "true"
 syntax:expression: $VAR(@) in "true", "false"; "preempt must be true or false"
 comp_help: possible completions:
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
index 54de02c7..504eebc4 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
@@ -1,5 +1,5 @@
 type: u32
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255"
-help: Set priority
+help: Priority
 comp_help: possible completions:
  <1-255>            Set Priority
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def
index 44be2a7f..88fbb670 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def
@@ -1,4 +1,4 @@
-help: Set an executable script to run on VRRP state-transition to backup
+help: Script to run on VRRP state-transition to backup
 type: txt
 syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Backup Script should be an existing executable"
 
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def
index 9f2557b3..2d2c08d0 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def
@@ -1,4 +1,4 @@
-help: Set an executable script to run on VRRP state-transition to fault
+help: Script to run on VRRP state-transition to fault
 type: txt
 syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Fault Script should be an existing executable"
 
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def
index 7f7d8895..e3eb0175 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def
@@ -1,4 +1,4 @@
-help: Set an executable script to run on VRRP state-transition to master
+help: Script to run on VRRP state-transition to master
 type: txt
 syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Master Script should be an existing executable"
 
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def
index 3abc1696..6d3a6c11 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def
@@ -1,2 +1,2 @@
-help: Set scripts for VRRP state-transitions
+help: Scripts for VRRP state-transitions
 
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
index 9602a842..a7d2e1fd 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: Set to add this vrrp group to a sync group
+help: Add this vrrp group to a sync group
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
index 176287aa..ab3d6290 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
@@ -1,6 +1,6 @@
 multi:
 type: txt
-help: Set virtual address
+help: Virtual address
 
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl        \
                            --vrrp-action='check-vip' --vip='$VAR(@)' "\
diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def
index 60af4bc0..e4638c44 100644
--- a/templates/interfaces/bridge/node.def
+++ b/templates/interfaces/bridge/node.def
@@ -1,7 +1,7 @@
 tag:
 priority: 310
 type: txt
-help: Set bridge interface name
+help: Bridge interface name
 comp_help: "Enter bridge interface name (br0 - br999)"
 
 syntax:expression: pattern $VAR(@) "^br[0-9]+$" ; "Must be (br0 - br999)"
diff --git a/templates/interfaces/bridge/node.tag/address/node.def b/templates/interfaces/bridge/node.tag/address/node.def
index 7a9382b7..5208faf8 100644
--- a/templates/interfaces/bridge/node.tag/address/node.def
+++ b/templates/interfaces/bridge/node.tag/address/node.def
@@ -1,7 +1,7 @@
 multi:
 priority: 320
 type: txt
-help: Set an IP address for this interface
+help: IP address
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)";\
      "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)"
 create: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../@)
diff --git a/templates/interfaces/bridge/node.tag/aging/node.def b/templates/interfaces/bridge/node.tag/aging/node.def
index cd2e5d1a..77c6a8b2 100644
--- a/templates/interfaces/bridge/node.tag/aging/node.def
+++ b/templates/interfaces/bridge/node.tag/aging/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Set the number of seconds a MAC address will be kept in the forwarding database
+help: Interval addresses are retained
 default: 300
 update: /usr/sbin/brctl setageing $VAR(../@) $VAR(@)
 delete: /usr/sbin/brctl setageing $VAR(../@) 300
diff --git a/templates/interfaces/bridge/node.tag/description/node.def b/templates/interfaces/bridge/node.tag/description/node.def
index 7f64c788..e4807d2f 100644
--- a/templates/interfaces/bridge/node.tag/description/node.def
+++ b/templates/interfaces/bridge/node.tag/description/node.def
@@ -1,4 +1,4 @@
 type: txt
-help: Set description for this interface
+help: Description
 update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias"
 delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias"
diff --git a/templates/interfaces/bridge/node.tag/disable-link-detect/node.def b/templates/interfaces/bridge/node.tag/disable-link-detect/node.def
index 83858ec1..7129ff33 100644
--- a/templates/interfaces/bridge/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/bridge/node.tag/disable-link-detect/node.def
@@ -1,3 +1,3 @@
-help: Set to ignore link state changes on this interface
+help: Ignore link state changes
 update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on
 delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off
diff --git a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def
index c273c648..e122c340 100644
--- a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def
+++ b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Set the forwarding delay
+help: Forwarding delay
 update: /usr/sbin/brctl setfd $VAR(../@) $VAR(@)
 comp_help: possible completions:
  <number>           Set the folwarding delay (default 15)
diff --git a/templates/interfaces/bridge/node.tag/hello-time/node.def b/templates/interfaces/bridge/node.tag/hello-time/node.def
index 8c6ad277..126e7020 100644
--- a/templates/interfaces/bridge/node.tag/hello-time/node.def
+++ b/templates/interfaces/bridge/node.tag/hello-time/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Set the hello packet advertisment interval
+help: Hello packet advertisment interval
 default: 2
 update: /usr/sbin/brctl sethello $VAR(../@) $VAR(@)
 delete: /usr/sbin/brctl sethello $VAR(../@) 2
diff --git a/templates/interfaces/bridge/node.tag/max-age/node.def b/templates/interfaces/bridge/node.tag/max-age/node.def
index 43a9ad04..7ce7fd9d 100644
--- a/templates/interfaces/bridge/node.tag/max-age/node.def
+++ b/templates/interfaces/bridge/node.tag/max-age/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Set the interval at which neighbor bridges are removed
+help: Interval at which neighbor bridges are removed
 default: 20
 update: /usr/sbin/brctl setmaxage $VAR(../@) $VAR(@)
 delete: /usr/sbin/brctl setmaxage $VAR(../@) 20
diff --git a/templates/interfaces/bridge/node.tag/priority/node.def b/templates/interfaces/bridge/node.tag/priority/node.def
index 41c0a682..8fc0a683 100644
--- a/templates/interfaces/bridge/node.tag/priority/node.def
+++ b/templates/interfaces/bridge/node.tag/priority/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Set the priority for this bridge
+help: Priority for this bridge
 default: 0
 syntax:expression:$VAR(@) < 65536 ; "Bridge priority must be between 0 and 65535"
 val_help:<0-65535>; Bridge priority (default 0)
diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def
index 05b2e03c..1b0a083f 100644
--- a/templates/interfaces/ethernet/node.def
+++ b/templates/interfaces/ethernet/node.def
@@ -1,7 +1,7 @@
 tag:
 priority: 318
 type: txt
-help: Set Ethernet interface name
+help: Ethernet interface name
 comp_help: Enter Ethernet interface name (eth0 - eth999)
 
 allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=ethernet
diff --git a/templates/interfaces/ethernet/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/address/node.def
index f503b174..f2bff386 100644
--- a/templates/interfaces/ethernet/node.tag/address/node.def
+++ b/templates/interfaces/ethernet/node.tag/address/node.def
@@ -2,7 +2,7 @@ multi:
 
 type: txt
 
-help: Set an IP address for this interface
+help: IP address
 
 # Syntax check at "set" time.  Give curent address value to script
 # so that it can perform syntax check.
diff --git a/templates/interfaces/ethernet/node.tag/bond-group/node.def b/templates/interfaces/ethernet/node.tag/bond-group/node.def
index c173ae3f..cb339a42 100644
--- a/templates/interfaces/ethernet/node.tag/bond-group/node.def
+++ b/templates/interfaces/ethernet/node.tag/bond-group/node.def
@@ -1,6 +1,6 @@
 priority: 319
 type: txt
-help: Add this interface to a bonding group
+help: Assign interface to bonding group
 commit:expression: exec \
     "${vyatta_sbindir}/vyatta-interfaces.pl --dev=$VAR(@) --check=bonding"
 
diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def
index a4014a29..930a5809 100644
--- a/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def
+++ b/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def
@@ -1,6 +1,6 @@
 type: txt
 
-help: Set this interface to a bridge-group
+help: Bridge group name
 
 commit:expression: exec \
    "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge"
diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def
index 33763624..2b1e6243 100644
--- a/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: Set the path cost for this port
+help: Bridge port cost
 syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535"
 val_help:<1-65535>; Path cost value for Spanning Tree Protocol
diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def
index d7a2f7a0..35bd1a3f 100644
--- a/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: Set the port priority for this port
+help: Bridge port priority
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255"
 val_help:<1-255>; Bridge port priority
diff --git a/templates/interfaces/ethernet/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/description/node.def
index 7f64c788..e4807d2f 100644
--- a/templates/interfaces/ethernet/node.tag/description/node.def
+++ b/templates/interfaces/ethernet/node.tag/description/node.def
@@ -1,4 +1,4 @@
 type: txt
-help: Set description for this interface
+help: Description
 update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias"
 delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias"
diff --git a/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def b/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def
index aaeca067..29440a09 100644
--- a/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def
+++ b/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def
@@ -9,7 +9,7 @@
 
 priority: 317 # Run before interface has been configured
 
-help: Set options for DHCPv6
+help: DHCPv6 options
 
 end:
     ifname="$VAR(../@)"
diff --git a/templates/interfaces/ethernet/node.tag/dhcpv6-options/parameters-only/node.def b/templates/interfaces/ethernet/node.tag/dhcpv6-options/parameters-only/node.def
index 0178c469..0e407f81 100644
--- a/templates/interfaces/ethernet/node.tag/dhcpv6-options/parameters-only/node.def
+++ b/templates/interfaces/ethernet/node.tag/dhcpv6-options/parameters-only/node.def
@@ -1,3 +1,3 @@
 
-help: Acquire only config parameters, not address, via DHCPv6
+help: Acquire only config parameters, not address
 
diff --git a/templates/interfaces/ethernet/node.tag/dhcpv6-options/temporary/node.def b/templates/interfaces/ethernet/node.tag/dhcpv6-options/temporary/node.def
index afb9de9c..a850ef4b 100644
--- a/templates/interfaces/ethernet/node.tag/dhcpv6-options/temporary/node.def
+++ b/templates/interfaces/ethernet/node.tag/dhcpv6-options/temporary/node.def
@@ -1,3 +1,3 @@
 
-help: Acquire a "temporary" IPv6 address
+help: IPv6 "temporary" address
 
diff --git a/templates/interfaces/ethernet/node.tag/disable-flow-control/node.def b/templates/interfaces/ethernet/node.tag/disable-flow-control/node.def
index b9884121..702e1d29 100644
--- a/templates/interfaces/ethernet/node.tag/disable-flow-control/node.def
+++ b/templates/interfaces/ethernet/node.tag/disable-flow-control/node.def
@@ -1,6 +1,6 @@
 priority: 320 # Must run after interface is configured.
 
-help: Set to disable Ethernet flow control (pause frames)
+help: Disable Ethernet flow control (pause frames)
 
 create: sudo ethtool --pause $VAR(../@) autoneg off tx off rx off
 
diff --git a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
index 83858ec1..7129ff33 100644
--- a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
@@ -1,3 +1,3 @@
-help: Set to ignore link state changes on this interface
+help: Ignore link state changes
 update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on
 delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off
diff --git a/templates/interfaces/ethernet/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/disable/node.def
index 5fe2b748..92f150dd 100644
--- a/templates/interfaces/ethernet/node.tag/disable/node.def
+++ b/templates/interfaces/ethernet/node.tag/disable/node.def
@@ -1,4 +1,4 @@
-help: Set interface disabled
+help: Disable interface
 create: /etc/netplug/linkdown.d/dhclient $VAR(../@)
         if ! ip link set $VAR(../@) down 2>/dev/null; then
           echo "Error disabling dev $VAR(../@)"
diff --git a/templates/interfaces/ethernet/node.tag/duplex/node.def b/templates/interfaces/ethernet/node.tag/duplex/node.def
index 9277729d..c4419a2c 100644
--- a/templates/interfaces/ethernet/node.tag/duplex/node.def
+++ b/templates/interfaces/ethernet/node.tag/duplex/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set the duplex mode for this interface
+help: Duplex mode
 default: "auto"
 syntax:expression: $VAR(@) in "auto", "half", "full"; "duplex must be auto, half or full"
 commit:expression: ( $VAR(@) == "auto" && $VAR(../speed/@) == "auto" ) || \
diff --git a/templates/interfaces/ethernet/node.tag/hw-id/node.def b/templates/interfaces/ethernet/node.tag/hw-id/node.def
index 6c559f89..e2b8497d 100644
--- a/templates/interfaces/ethernet/node.tag/hw-id/node.def
+++ b/templates/interfaces/ethernet/node.tag/hw-id/node.def
@@ -1,2 +1,2 @@
 type: macaddr
-help: Set the Media Access Control (MAC) address of this interface
+help: Media Access Control (MAC) address 
diff --git a/templates/interfaces/ethernet/node.tag/ip/enable-proxy-arp/node.def b/templates/interfaces/ethernet/node.tag/ip/enable-proxy-arp/node.def
index e125e5c5..ae7ba09a 100644
--- a/templates/interfaces/ethernet/node.tag/ip/enable-proxy-arp/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/enable-proxy-arp/node.def
@@ -1,3 +1,3 @@
-help: Set to enable proxy-arp on this interface
+help: Enable proxy-arp on this interface
 create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../@)/proxy_arp\" "
 delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../@)/proxy_arp\" "
diff --git a/templates/interfaces/ethernet/node.tag/mac/node.def b/templates/interfaces/ethernet/node.tag/mac/node.def
index f3946adf..c9fbb0fe 100644
--- a/templates/interfaces/ethernet/node.tag/mac/node.def
+++ b/templates/interfaces/ethernet/node.tag/mac/node.def
@@ -1,6 +1,6 @@
 type: macaddr
 priority: 317   # must be set before dhcp client
-help: Set the Media Access Control (MAC) address of this interface
+help: Media Access Control (MAC) address
 syntax:expression: exec "\
 	/opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --valid-mac $VAR(@)"
 update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --set-mac $VAR(@)
diff --git a/templates/interfaces/ethernet/node.tag/mtu/node.def b/templates/interfaces/ethernet/node.tag/mtu/node.def
index f33158f8..043f335e 100644
--- a/templates/interfaces/ethernet/node.tag/mtu/node.def
+++ b/templates/interfaces/ethernet/node.tag/mtu/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Set the Maximum Transmission Unit (MTU) for this interface
+help: Maximum Transmission Unit (MTU)
 syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000"
 update: if ! ip link set $VAR(../@) mtu $VAR(@)
         then echo "Error setting MTU on dev $VAR(../@)"; exit 1
diff --git a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def b/templates/interfaces/ethernet/node.tag/smp_affinity/node.def
index 68f4b6f9..ae1e3da7 100644
--- a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def
+++ b/templates/interfaces/ethernet/node.tag/smp_affinity/node.def
@@ -13,7 +13,7 @@ priority: 319 # Failure barrier only - no ordering constraints
 
 type: txt
 
-help: Set CPU interrupt affinity mask for this interface
+help: CPU interrupt affinity mask
 
 comp_help: Possible completions:
   XX\tHexidecimal bitmask representing CPUs that this NIC will interrupt
diff --git a/templates/interfaces/ethernet/node.tag/speed/node.def b/templates/interfaces/ethernet/node.tag/speed/node.def
index e822df9f..932c88e5 100644
--- a/templates/interfaces/ethernet/node.tag/speed/node.def
+++ b/templates/interfaces/ethernet/node.tag/speed/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set the speed for this interface
+help: Link speed
 default: "auto"
 syntax:expression: $VAR(@) in "auto", "10", "100", "1000", "2500", "10000"; "Speed must be auto, 10, 100, 1000, 2500, or 10000"
 commit:expression: ( $VAR(@) == "auto" && $VAR(../duplex/@) == "auto" ) || \
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def
index c14ed002..1ad32323 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.def
@@ -1,7 +1,7 @@
 tag:
 priority: 319
 type: u32
-help: Set Virtual Local Area Network (VLAN) ID
+help: Virtual Local Area Network (VLAN) ID
 
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094"
 
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def
index 1e8b2f46..b3f360b6 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def
@@ -2,7 +2,7 @@ multi:
 
 type: txt
 
-help: Set an IP address for this interface
+help: IP address
 
 # Syntax check at "set" time.  Give curent address value to script
 # so that it can perform syntax check.
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def
index a4014a29..0d1f16e2 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def
@@ -1,6 +1,6 @@
 type: txt
 
-help: Set this interface to a bridge-group
+help: Bridge group interface
 
 commit:expression: exec \
    "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def
index 33763624..f25a36ac 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: Set the path cost for this port
+help: Path cost for this port
 syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535"
 val_help:<1-65535>; Path cost value for Spanning Tree Protocol
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def
index d7a2f7a0..38c11131 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: Set the port priority for this port
+help: Port priority for this port
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255"
 val_help:<1-255>; Bridge port priority
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def
index 0ef54891..ce6c5fd0 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def
@@ -1,4 +1,4 @@
 type: txt
-help: Set description for this interface
+help: Description
 update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias"
 delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
index 897113de..5f60e6ab 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
@@ -1,3 +1,3 @@
-help: Set to ignore link state changes on this interface
+help: Ignore link state changes
 update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../../@).$VAR(../@) on
 delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../../@).$VAR(../@) off
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable/node.def
index b2119c9c..e9943645 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable/node.def
@@ -1,4 +1,4 @@
-help: Set interface disabled
+help: Disable interface
 update: /etc/netplug/linkdown.d/dhclient $VAR(../../@).$VAR(../@)
         if ! ip link set $VAR(../../@).$VAR(../@) down 2>/dev/null; then
           echo "Error disabling dev $VAR(../../@).$VAR(../@)"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/enable-proxy-arp/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/enable-proxy-arp/node.def
index a45d4129..cd6d56d9 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/enable-proxy-arp/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/enable-proxy-arp/node.def
@@ -1,3 +1,3 @@
-help: Set to enable proxy-arp on this interface 
+help: Enable proxy-arp on this interface
 create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../../@).$VAR(../../@)/proxy_arp\" " 
 delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../../@).$VAR(../../@)/proxy_arp\" " 
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def
index 6d58896a..6abc6f89 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/node.def
@@ -1,3 +1,3 @@
-help: Configure Virtual Router Redundancy Protocol (VRRP) parameters
+help: Virtual Router Redundancy Protocol (VRRP) parameters
 priority: 800
 end:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $VAR(../../@).$VAR(../@) "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def
index d87ad6b7..75c5447e 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.def
@@ -2,7 +2,7 @@ tag:
 type: u32
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255"
 commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)"
-help: Set VRRP group number
+help: VRRP group number
 delete:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $VAR(../../../@).$VAR(../../@) --group $VAR(@) "
 comp_help: possible completions
  <1-255>            VRRP group number
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
index 59f2b451..fa2dbced 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
@@ -1,6 +1,6 @@
 type: u32
 default: 1
-help: Set advertise interval
+help: Advertise interval
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <=255; "Advertise interval must be between 1-255"
 comp_help: possible completions
  <1-255>            Set advertise interval (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
index adf78b3f..9869bcb3 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
@@ -1,3 +1,3 @@
-help: Set authentication
+help: Authentication
 commit:expression: $VAR(./type/@) != ""; "You must set a authentication type"
 commit:expression: $VAR(./password/@) != ""; "You must set a authentication password"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
index 9bd2e98d..9a671375 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set password
+help: Password
 syntax:expression: exec "                              \
         if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then   \
           echo Password must be 8 characters or less ; \
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
index 7155495d..f099153f 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set authentication type
+help: Authentication type
 syntax:expression: $VAR(@) in "plaintext-password", "ah"; \
        "authentication must be plaintext-password or ah"
 comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def
index aeb40f0b..849e5273 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/description/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: Set description for this interface
+help: Description
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def
index 916e313b..a0e0c576 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/disable/node.def
@@ -1 +1 @@
-help: Set VRRP group disabled
+help: Disable VRRP group
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
index edb0d58a..9e062980 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
@@ -1,6 +1,6 @@
 type: ipv4
 
-help: Set hello-source-address
+help: Hello source address
 
 comp_help: possible completions:
   <x.x.x.x>     Set source address for vrrp hello packets (optional)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
index 1638624e..98cd916f 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
@@ -1,6 +1,6 @@
 type: u32
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \
                    "preempt-delay must be between 0-1000"
-help: Set preempt-delay
+help: Preempt-delay
 comp_help: possible completions:
   <0-1000>            Set Preempt Delay in seconds
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
index 7b3b9cbd..e1e5aa96 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set preempt mode (default: true)
+help: Preempt mode(default: true)
 default: "true"
 syntax:expression: $VAR(@) in "true", "false"; "preempt must be true or false"
 comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
index 54de02c7..504eebc4 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
@@ -1,5 +1,5 @@
 type: u32
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255"
-help: Set priority
+help: Priority
 comp_help: possible completions:
  <1-255>            Set Priority
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def
index 44be2a7f..88fbb670 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def
@@ -1,4 +1,4 @@
-help: Set an executable script to run on VRRP state-transition to backup
+help: Script to run on VRRP state-transition to backup
 type: txt
 syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Backup Script should be an existing executable"
 
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def
index 9f2557b3..2d2c08d0 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def
@@ -1,4 +1,4 @@
-help: Set an executable script to run on VRRP state-transition to fault
+help: Script to run on VRRP state-transition to fault
 type: txt
 syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Fault Script should be an existing executable"
 
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def
index 7f7d8895..e3eb0175 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def
@@ -1,4 +1,4 @@
-help: Set an executable script to run on VRRP state-transition to master
+help: Script to run on VRRP state-transition to master
 type: txt
 syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Master Script should be an existing executable"
 
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def
index ed959156..6d195d07 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def
@@ -1,2 +1,2 @@
-help: Set scripts to run on VRRP state-transitions
+help: scripts to run on VRRP state-transitions
 
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
index 9602a842..a7d2e1fd 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: Set to add this vrrp group to a sync group
+help: Add this vrrp group to a sync group
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
index df9a134f..617ed1f6 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
@@ -1,6 +1,6 @@
 multi:
 type: txt
-help: Set virtual address [REQUIRED]
+help: Virtual address [REQUIRED]
 
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl        \
                            --vrrp-action='check-vip' --vip='$VAR(@)' "\
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/node.def b/templates/interfaces/ethernet/node.tag/vrrp/node.def
index 3b3e083e..a9224ed9 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/node.def
@@ -1,3 +1,3 @@
-help: Configure Virtual Router Redundancy Protocol (VRRP)
+help: Virtual Router Redundancy Protocol (VRRP)
 priority: 800
 end:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $VAR(../@) "
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def
index a3ce1395..c0efa6f4 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.def
@@ -2,7 +2,7 @@ tag:
 type: u32
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255"
 commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)"
-help: Set VRRP group number
+help: VRRP group number
 delete:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action delete --intf $VAR(../../@) --group $VAR(@) "
 comp_help: possible completions
  <1-255>            VRRP group number
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
index 59f2b451..fa2dbced 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/advertise-interval/node.def
@@ -1,6 +1,6 @@
 type: u32
 default: 1
-help: Set advertise interval
+help: Advertise interval
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <=255; "Advertise interval must be between 1-255"
 comp_help: possible completions
  <1-255>            Set advertise interval (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
index adf78b3f..9869bcb3 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/node.def
@@ -1,3 +1,3 @@
-help: Set authentication
+help: Authentication
 commit:expression: $VAR(./type/@) != ""; "You must set a authentication type"
 commit:expression: $VAR(./password/@) != ""; "You must set a authentication password"
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
index 9bd2e98d..9a671375 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/password/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set password
+help: Password
 syntax:expression: exec "                              \
         if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then   \
           echo Password must be 8 characters or less ; \
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
index 687c6af6..21e2e165 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/authentication/type/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set authentication type
+help: Authentication type
 syntax:expression: $VAR(@) in "plaintext-password", "ah"; \
        "authentication must be plaintext-password or ah"
 comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def
index aeb40f0b..849e5273 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/description/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: Set description for this interface
+help: Description
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/disable/node.def
index 916e313b..93e4cc3e 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/disable/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/disable/node.def
@@ -1 +1 @@
-help: Set VRRP group disabled
+help: VRRP group disabled
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
index edb0d58a..9e062980 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/hello-source-address/node.def
@@ -1,6 +1,6 @@
 type: ipv4
 
-help: Set hello-source-address
+help: Hello source address
 
 comp_help: possible completions:
   <x.x.x.x>     Set source address for vrrp hello packets (optional)
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
index 1638624e..2018ff44 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt-delay/node.def
@@ -1,6 +1,6 @@
 type: u32
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 1000; \
                    "preempt-delay must be between 0-1000"
-help: Set preempt-delay
+help: Preempt delay
 comp_help: possible completions:
   <0-1000>            Set Preempt Delay in seconds
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
index 4ed282ed..c3dc66cd 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/preempt/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set preempt mode
+help: Preempt mode
 default: "true"
 syntax:expression: $VAR(@) in "true", "false"; "preempt must be true or false"
 comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
index 54de02c7..504eebc4 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
@@ -1,5 +1,5 @@
 type: u32
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255"
-help: Set priority
+help: Priority
 comp_help: possible completions:
  <1-255>            Set Priority
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def
index 44be2a7f..88fbb670 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/backup/node.def
@@ -1,4 +1,4 @@
-help: Set an executable script to run on VRRP state-transition to backup
+help: Script to run on VRRP state-transition to backup
 type: txt
 syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Backup Script should be an existing executable"
 
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def
index 9f2557b3..2d2c08d0 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/fault/node.def
@@ -1,4 +1,4 @@
-help: Set an executable script to run on VRRP state-transition to fault
+help: Script to run on VRRP state-transition to fault
 type: txt
 syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Fault Script should be an existing executable"
 
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def
index 7f7d8895..e3eb0175 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/master/node.def
@@ -1,4 +1,4 @@
-help: Set an executable script to run on VRRP state-transition to master
+help: Script to run on VRRP state-transition to master
 type: txt
 syntax:expression: exec "[ -x $VAR(@) ] || exit 1"; "Master Script should be an existing executable"
 
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def
index 3abc1696..6d3a6c11 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/run-transition-scripts/node.def
@@ -1,2 +1,2 @@
-help: Set scripts for VRRP state-transitions
+help: Scripts for VRRP state-transitions
 
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
index 9602a842..a7d2e1fd 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/sync-group/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: Set to add this vrrp group to a sync group
+help: Add this vrrp group to a sync group
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
index df9a134f..617ed1f6 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/virtual-address/node.def
@@ -1,6 +1,6 @@
 multi:
 type: txt
-help: Set virtual address [REQUIRED]
+help: Virtual address [REQUIRED]
 
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-keepalived.pl        \
                            --vrrp-action='check-vip' --vip='$VAR(@)' "\
diff --git a/templates/interfaces/input/node.def b/templates/interfaces/input/node.def
index 1873190c..8aadec8a 100644
--- a/templates/interfaces/input/node.def
+++ b/templates/interfaces/input/node.def
@@ -1,7 +1,7 @@
 tag:
 priority: 310 # before real devices that redirect
 type: txt
-help: Set input functional block (IFB) interface
+help: Input functional block (IFB) interface name
 comp_help: Enter input functional block interface name (ifb0 - ifb999)
 
 syntax:expression: pattern $VAR(@) "^ifb[0-9]+$" ; "name must be (ifb0-ifb999)"
diff --git a/templates/interfaces/input/node.tag/description/node.def b/templates/interfaces/input/node.tag/description/node.def
index 7f64c788..e4807d2f 100644
--- a/templates/interfaces/input/node.tag/description/node.def
+++ b/templates/interfaces/input/node.tag/description/node.def
@@ -1,4 +1,4 @@
 type: txt
-help: Set description for this interface
+help: Description
 update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias"
 delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias"
diff --git a/templates/interfaces/loopback/node.def b/templates/interfaces/loopback/node.def
index b78cf10b..828f70ec 100644
--- a/templates/interfaces/loopback/node.def
+++ b/templates/interfaces/loopback/node.def
@@ -1,7 +1,7 @@
 tag:
 priority: 300
 type: txt
-help: Set loopback interface name
+help: Loopback interface name
 comp_help: Enter looback interface name (lo)
 syntax:expression: exec \
    "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=loopback"
diff --git a/templates/interfaces/loopback/node.tag/address/node.def b/templates/interfaces/loopback/node.tag/address/node.def
index 76c2e76e..3fb6d38c 100644
--- a/templates/interfaces/loopback/node.tag/address/node.def
+++ b/templates/interfaces/loopback/node.tag/address/node.def
@@ -2,7 +2,7 @@ multi:
 
 type: txt
 
-help: Set an IP address for this interface
+help: IP address
 
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr-set $VAR(@) --dev $VAR(../@)"; \
        "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)"
diff --git a/templates/interfaces/loopback/node.tag/description/node.def b/templates/interfaces/loopback/node.tag/description/node.def
index 7f64c788..e4807d2f 100644
--- a/templates/interfaces/loopback/node.tag/description/node.def
+++ b/templates/interfaces/loopback/node.tag/description/node.def
@@ -1,4 +1,4 @@
 type: txt
-help: Set description for this interface
+help: Description
 update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias"
 delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias"
diff --git a/templates/interfaces/node.def b/templates/interfaces/node.def
index 286b8786..ee75b174 100644
--- a/templates/interfaces/node.def
+++ b/templates/interfaces/node.def
@@ -1,2 +1,2 @@
 priority: 850
-help: Configure network interfaces
+help: Network interfaces
diff --git a/templates/interfaces/pseudo-ethernet/link/node.def b/templates/interfaces/pseudo-ethernet/link/node.def
index 844cb8d8..40818d54 100644
--- a/templates/interfaces/pseudo-ethernet/link/node.def
+++ b/templates/interfaces/pseudo-ethernet/link/node.def
@@ -2,4 +2,4 @@ type: txt
 syntax:expression: exec \
 	"/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=ethernet"
 allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=ethernet
-help: Specify the lower link device
+help: Lower link device
diff --git a/templates/interfaces/pseudo-ethernet/node.def b/templates/interfaces/pseudo-ethernet/node.def
index bf88b047..b0c00a27 100644
--- a/templates/interfaces/pseudo-ethernet/node.def
+++ b/templates/interfaces/pseudo-ethernet/node.def
@@ -1,7 +1,7 @@
 tag:
 priority: 390
 type: txt
-help: Set Pseudo Ethernet device name
+help: Pseudo Ethernet device name
 comp_help: Enter Pseudo Ethernet interface name (peth0 - peth999)
 syntax:expression: pattern $VAR(@) "^peth[0-9]+$" \
          ; "name must be (peth0-peth999)"
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/address/node.def b/templates/interfaces/pseudo-ethernet/node.tag/address/node.def
index 7221232e..1c6ea9af 100644
--- a/templates/interfaces/pseudo-ethernet/node.tag/address/node.def
+++ b/templates/interfaces/pseudo-ethernet/node.tag/address/node.def
@@ -1,6 +1,6 @@
 multi:
 type: txt
-help: Set an IP address for this interface
+help: IP address
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)" \
        ; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)"
 create:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../@)
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/description/node.def b/templates/interfaces/pseudo-ethernet/node.tag/description/node.def
index 7f64c788..e2a1534b 100644
--- a/templates/interfaces/pseudo-ethernet/node.tag/description/node.def
+++ b/templates/interfaces/pseudo-ethernet/node.tag/description/node.def
@@ -1,4 +1,4 @@
 type: txt
-help: Set description for this interface
+help: Description for this interface
 update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias"
 delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias"
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/disable-link-detect/node.def b/templates/interfaces/pseudo-ethernet/node.tag/disable-link-detect/node.def
index 83858ec1..7129ff33 100644
--- a/templates/interfaces/pseudo-ethernet/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/pseudo-ethernet/node.tag/disable-link-detect/node.def
@@ -1,3 +1,3 @@
-help: Set to ignore link state changes on this interface
+help: Ignore link state changes
 update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on
 delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/disable/node.def b/templates/interfaces/pseudo-ethernet/node.tag/disable/node.def
index 9dafeacf..91c60323 100644
--- a/templates/interfaces/pseudo-ethernet/node.tag/disable/node.def
+++ b/templates/interfaces/pseudo-ethernet/node.tag/disable/node.def
@@ -1,4 +1,4 @@
-help: Set interface disabled
+help: Disable interface
 create: vif=`/opt/vyatta/sbin/vyatta-interfaces.pl --vif=$VAR(../@) --show=all`
         if [ ! -z "$vif" ]; then
           echo "Can not disable interface " $VAR(../@) " with vif:" $vif
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/link/node.def b/templates/interfaces/pseudo-ethernet/node.tag/link/node.def
index f16b0ec4..13d4c612 100644
--- a/templates/interfaces/pseudo-ethernet/node.tag/link/node.def
+++ b/templates/interfaces/pseudo-ethernet/node.tag/link/node.def
@@ -2,4 +2,4 @@ type: txt
 commit:expression: exec \
     "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=ethernet"
 allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=ethernet
-help: Specify the lower link device
+help: Lower link device
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/mac/node.def b/templates/interfaces/pseudo-ethernet/node.tag/mac/node.def
index e1202aca..8d9e2f16 100644
--- a/templates/interfaces/pseudo-ethernet/node.tag/mac/node.def
+++ b/templates/interfaces/pseudo-ethernet/node.tag/mac/node.def
@@ -1,5 +1,5 @@
 type: macaddr
-help: Set the Media Access Control (MAC) address of this interface
+help: Media Access Control (MAC) address
 syntax:expression: exec "\
 	/opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --valid-mac $VAR(@)"
 update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --set-mac $VAR(@)
diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def
index a90c01f9..c0e871a1 100644
--- a/templates/interfaces/tunnel/node.def
+++ b/templates/interfaces/tunnel/node.def
@@ -1,7 +1,7 @@
 tag:
 priority: 380
 type: txt
-help: Set tunnel interface
+help: Tunnel interface
 comp_help: Enter tunnel interface name (tun0 - tun999)
 syntax:expression: pattern $VAR(@) "^tun[0-9]+$" \
 		   ; "tunnel must be (tun0-tun999)"
diff --git a/templates/interfaces/tunnel/node.tag/address/node.def b/templates/interfaces/tunnel/node.tag/address/node.def
index c7c564fd..747347b3 100644
--- a/templates/interfaces/tunnel/node.tag/address/node.def
+++ b/templates/interfaces/tunnel/node.tag/address/node.def
@@ -1,6 +1,6 @@
 multi:
 type: txt
-help: Set an IP address for this interface
+help: IP address
 
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)"; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)"
 
diff --git a/templates/interfaces/tunnel/node.tag/bridge-group/bridge/node.def b/templates/interfaces/tunnel/node.tag/bridge-group/bridge/node.def
index 9c28ed63..5100a190 100644
--- a/templates/interfaces/tunnel/node.tag/bridge-group/bridge/node.def
+++ b/templates/interfaces/tunnel/node.tag/bridge-group/bridge/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set this interface to a bridge-group
+help: Bridge group interface
 allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge
 commit:expression: exec \
    "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge"
diff --git a/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def b/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def
index 33763624..f25a36ac 100644
--- a/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: Set the path cost for this port
+help: Path cost for this port
 syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535"
 val_help:<1-65535>; Path cost value for Spanning Tree Protocol
diff --git a/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def b/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def
index d7a2f7a0..38c11131 100644
--- a/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: Set the port priority for this port
+help: Port priority for this port
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255"
 val_help:<1-255>; Bridge port priority
diff --git a/templates/interfaces/tunnel/node.tag/description/node.def b/templates/interfaces/tunnel/node.tag/description/node.def
index 7f64c788..e4807d2f 100644
--- a/templates/interfaces/tunnel/node.tag/description/node.def
+++ b/templates/interfaces/tunnel/node.tag/description/node.def
@@ -1,4 +1,4 @@
 type: txt
-help: Set description for this interface
+help: Description
 update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias"
 delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias"
diff --git a/templates/interfaces/tunnel/node.tag/disable-link-detect/node.def b/templates/interfaces/tunnel/node.tag/disable-link-detect/node.def
index 83858ec1..7129ff33 100644
--- a/templates/interfaces/tunnel/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/tunnel/node.tag/disable-link-detect/node.def
@@ -1,3 +1,3 @@
-help: Set to ignore link state changes on this interface
+help: Ignore link state changes
 update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on
 delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off
diff --git a/templates/interfaces/tunnel/node.tag/encapsulation/node.def b/templates/interfaces/tunnel/node.tag/encapsulation/node.def
index 5374568c..50480b93 100644
--- a/templates/interfaces/tunnel/node.tag/encapsulation/node.def
+++ b/templates/interfaces/tunnel/node.tag/encapsulation/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set the encapsulation of this tunnel interface [REQUIRED]
+help: Encapsulation of this tunnel interface [REQUIRED]
 
 syntax:expression: $VAR(@) in "ipip", "gre", "sit", "gre-bridge"; "Must be (ipip, gre, gre-bridge, sit)"
 
diff --git a/templates/interfaces/tunnel/node.tag/key/node.def b/templates/interfaces/tunnel/node.tag/key/node.def
index c137107c..2362423f 100644
--- a/templates/interfaces/tunnel/node.tag/key/node.def
+++ b/templates/interfaces/tunnel/node.tag/key/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Set the tunnel key
+help: Tunnel key
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 999999; \
                    "Must be between 0-999999 for $VAR(../@)"
 syntax:expression: exec "                                                                  \
diff --git a/templates/interfaces/tunnel/node.tag/local-ip/node.def b/templates/interfaces/tunnel/node.tag/local-ip/node.def
index 425a8a57..ea11f6e1 100644
--- a/templates/interfaces/tunnel/node.tag/local-ip/node.def
+++ b/templates/interfaces/tunnel/node.tag/local-ip/node.def
@@ -1,5 +1,5 @@
 type: ipv4
-help: Set the local IP address for this tunnel [REQUIRED]
+help: Local IP address for this tunnel [REQUIRED]
 
 syntax:expression: exec \
        "if [ -z \"`ip addr list | grep $VAR(@) `\" ]; then                   \
diff --git a/templates/interfaces/tunnel/node.tag/mtu/node.def b/templates/interfaces/tunnel/node.tag/mtu/node.def
index 400533f9..44989a92 100644
--- a/templates/interfaces/tunnel/node.tag/mtu/node.def
+++ b/templates/interfaces/tunnel/node.tag/mtu/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Set the tunnel Maximum Transmission Unit (MTU)
+help: Maximum Transmission Unit (MTU)
 syntax:expression: $VAR(@) >= 64 && $VAR(@) <= 8024; "Must be between 64-8024"
 update: ip link set $VAR(../@) mtu $VAR(@)
 delete: ip link set $VAR(../@) mtu 1476
diff --git a/templates/interfaces/tunnel/node.tag/multicast/node.def b/templates/interfaces/tunnel/node.tag/multicast/node.def
index d7662306..dbe117de 100644
--- a/templates/interfaces/tunnel/node.tag/multicast/node.def
+++ b/templates/interfaces/tunnel/node.tag/multicast/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set multicast operation over tunnel
+help: Multicast operation over tunnel
 default: "disable"
 
 syntax:expression: $VAR(@) in "enable", "disable"; \
diff --git a/templates/interfaces/tunnel/node.tag/remote-ip/node.def b/templates/interfaces/tunnel/node.tag/remote-ip/node.def
index 6468f5fc..30f4e4d4 100644
--- a/templates/interfaces/tunnel/node.tag/remote-ip/node.def
+++ b/templates/interfaces/tunnel/node.tag/remote-ip/node.def
@@ -1,5 +1,5 @@
 type: ipv4
-help: Set the remote IP address for this tunnel [REQUIRED]
+help: Remote IP address for this tunnel [REQUIRED]
 create:expression: "true"
 update:expression: "false" ; \
                    "Remote IP can only be set at tunnel creation for $VAR(../@)"
diff --git a/templates/interfaces/tunnel/node.tag/tos/node.def b/templates/interfaces/tunnel/node.tag/tos/node.def
index 58a4cee0..d276319b 100644
--- a/templates/interfaces/tunnel/node.tag/tos/node.def
+++ b/templates/interfaces/tunnel/node.tag/tos/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Set the tunnel Type of Service (TOS)
+help: Type of Service (TOS)
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 99; "Must be between 0-99"
 update: ip tunnel change $VAR(../@) tos $VAR(@)
 delete: ip tunnel change $VAR(../@) tos inherit
diff --git a/templates/interfaces/tunnel/node.tag/ttl/node.def b/templates/interfaces/tunnel/node.tag/ttl/node.def
index cfab7264..6e5f5f4f 100644
--- a/templates/interfaces/tunnel/node.tag/ttl/node.def
+++ b/templates/interfaces/tunnel/node.tag/ttl/node.def
@@ -1,6 +1,6 @@
 type: u32
 default: 255
-help: Set the tunnel time to live field
+help: Time to live field
 comp_help: possible completions:
  <0-255>            Set time to live (default 255)
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
diff --git a/templates/service/dns/dynamic/interface/node.def b/templates/service/dns/dynamic/interface/node.def
index 3567134f..1610cc64 100644
--- a/templates/service/dns/dynamic/interface/node.def
+++ b/templates/service/dns/dynamic/interface/node.def
@@ -1,5 +1,5 @@
 tag:
-help: Set interface to send DDNS updates for [REQUIRED]
+help: Interface to send DDNS updates for [REQUIRED]
 type: txt
 allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=all
 commit:expression: $VAR(./@/service/@@) != ""; "At least one service must be set to send DDNS updates for $VAR(@)"
diff --git a/templates/service/dns/dynamic/interface/node.tag/service/node.def b/templates/service/dns/dynamic/interface/node.tag/service/node.def
index 9e933850..2bdb796a 100644
--- a/templates/service/dns/dynamic/interface/node.tag/service/node.def
+++ b/templates/service/dns/dynamic/interface/node.tag/service/node.def
@@ -1,5 +1,5 @@
 tag:
-help: Set service being used for Dynamic DNS [REQUIRED]
+help: Service being used for Dynamic DNS [REQUIRED]
 type: txt
 syntax:expression: exec "
         service_array=(dnspark dslreports dyndns easydns namecheap sitelutions zoneedit)
diff --git a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/host-name/node.def b/templates/service/dns/dynamic/interface/node.tag/service/node.tag/host-name/node.def
index 7e306c3f..9c2647fb 100644
--- a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/host-name/node.def
+++ b/templates/service/dns/dynamic/interface/node.tag/service/node.tag/host-name/node.def
@@ -1,3 +1,3 @@
 multi:
-help: Set host-name registered with DDNS service [REQUIRED]
+help: Hostname registered with DDNS service [REQUIRED]
 type: txt
diff --git a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/login/node.def b/templates/service/dns/dynamic/interface/node.tag/service/node.tag/login/node.def
index 1543df82..9ddb1b75 100644
--- a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/login/node.def
+++ b/templates/service/dns/dynamic/interface/node.tag/service/node.tag/login/node.def
@@ -1,2 +1,2 @@
-help: Set login for DDNS service [REQUIRED]
+help: Login for DDNS service [REQUIRED]
 type: txt
diff --git a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/password/node.def b/templates/service/dns/dynamic/interface/node.tag/service/node.tag/password/node.def
index 4e75323b..48507c49 100644
--- a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/password/node.def
+++ b/templates/service/dns/dynamic/interface/node.tag/service/node.tag/password/node.def
@@ -1,2 +1,2 @@
-help: Set password for DDNS service [REQUIRED]
+help: Password for DDNS service [REQUIRED]
 type: txt
diff --git a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/server/node.def b/templates/service/dns/dynamic/interface/node.tag/service/node.tag/server/node.def
index b9f195c4..04ef5e18 100644
--- a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/server/node.def
+++ b/templates/service/dns/dynamic/interface/node.tag/service/node.tag/server/node.def
@@ -1,2 +1,2 @@
-help: Set server to send DDNS update to (IP address|hostname)
+help: Server to send DDNS update to (IP address|hostname)
 type: txt
diff --git a/templates/service/dns/dynamic/node.def b/templates/service/dns/dynamic/node.def
index 54615bea..af9186fd 100644
--- a/templates/service/dns/dynamic/node.def
+++ b/templates/service/dns/dynamic/node.def
@@ -1,3 +1,3 @@
 priority: 919
-help: Configure Dynamic DNS
+help: Dynamic DNS
 commit:expression: $VAR(./interface/@@) != ""; "At least one interface must be set to send DDNS updates for"
diff --git a/templates/service/dns/forwarding/cache-size/node.def b/templates/service/dns/forwarding/cache-size/node.def
index 3a73f308..1b1a33e6 100644
--- a/templates/service/dns/forwarding/cache-size/node.def
+++ b/templates/service/dns/forwarding/cache-size/node.def
@@ -1,4 +1,4 @@
 type: u32
 default:150
-help: Set DNS forwarding cache size
+help: DNS forwarding cache size
 syntax:expression: ($VAR(@) >=0 && $VAR(@) < 10001) ; "Cache size must be between 0 and 10000"
diff --git a/templates/service/dns/forwarding/dhcp/node.def b/templates/service/dns/forwarding/dhcp/node.def
index 8ce8c83f..700f703e 100644
--- a/templates/service/dns/forwarding/dhcp/node.def
+++ b/templates/service/dns/forwarding/dhcp/node.def
@@ -1,6 +1,6 @@
 multi:
 type: txt
-help: Set to use nameservers received from DHCP server for specified interface
+help: Use nameservers received from DHCP server for specified interface
 commit:expression: exec "/opt/vyatta/sbin/vyatta-dns-forwarding.pl --dhcp-interface $VAR(@)"
 allowed:
          local -a array ;
diff --git a/templates/service/dns/forwarding/listen-on/node.def b/templates/service/dns/forwarding/listen-on/node.def
index 58dd1363..3d1c748f 100644
--- a/templates/service/dns/forwarding/listen-on/node.def
+++ b/templates/service/dns/forwarding/listen-on/node.def
@@ -1,5 +1,5 @@
 multi:
 type: txt
-help: Set interface to listen for DNS queries [REQUIRED]
+help: Interface to listen for DNS queries [REQUIRED]
 allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=all
 commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --warn"
diff --git a/templates/service/dns/forwarding/name-server/node.def b/templates/service/dns/forwarding/name-server/node.def
index ad67c6de..3ed4c459 100644
--- a/templates/service/dns/forwarding/name-server/node.def
+++ b/templates/service/dns/forwarding/name-server/node.def
@@ -1,3 +1,3 @@
 multi:
 type: ipv4
-help: Set DNS server to forward queries
+help: DNS server to forward queries
diff --git a/templates/service/dns/forwarding/node.def b/templates/service/dns/forwarding/node.def
index 2c42b1c3..ae7a9d3c 100644
--- a/templates/service/dns/forwarding/node.def
+++ b/templates/service/dns/forwarding/node.def
@@ -1,5 +1,5 @@
 priority: 918
-help: Configure DNS forwarding
+help: DNS forwarding
 commit:expression: $VAR(./listen-on) != ""; "At least one interface must be configured for DNS forwarding parameter 'listen-on'"
 delete:expression: "touch /tmp/dnsmasq.$PPID"
 end:expression: "if [ -f \"/tmp/dnsmasq.$PPID\" ]; then \
diff --git a/templates/service/dns/forwarding/system/node.def b/templates/service/dns/forwarding/system/node.def
index e92a7ad6..a37676de 100644
--- a/templates/service/dns/forwarding/system/node.def
+++ b/templates/service/dns/forwarding/system/node.def
@@ -1,2 +1,2 @@
-help: Set DNS forwarding to system nameservers
+help: DNS forwarding to system nameservers
 commit:expression: exec "/opt/vyatta/sbin/vyatta-dns-forwarding.pl --system-nameserver"
diff --git a/templates/service/dns/node.def b/templates/service/dns/node.def
index d7040d0d..8600e279 100644
--- a/templates/service/dns/node.def
+++ b/templates/service/dns/node.def
@@ -1 +1 @@
-help: Configure Domain Name Server (DNS) parameters
+help: Domain Name Server (DNS) parameters
diff --git a/templates/service/node.def b/templates/service/node.def
index e9040da1..c88bc349 100644
--- a/templates/service/node.def
+++ b/templates/service/node.def
@@ -1,2 +1,2 @@
 priority: 900
-help: Configure specified service
+help: Services
diff --git a/templates/service/snmp/community/node.def b/templates/service/snmp/community/node.def
index 32eb4800..d7e3ade7 100644
--- a/templates/service/snmp/community/node.def
+++ b/templates/service/snmp/community/node.def
@@ -1,5 +1,5 @@
 tag:
 type: txt
-help: Set community name [REQUIRED]
+help: Community name [REQUIRED]
 syntax:expression: pattern $VAR(@) "^[^%]+$" ; \
 		   "Community string may not contain %"
diff --git a/templates/service/snmp/community/node.tag/authorization/node.def b/templates/service/snmp/community/node.tag/authorization/node.def
index c8918d43..aac6b0b2 100644
--- a/templates/service/snmp/community/node.tag/authorization/node.def
+++ b/templates/service/snmp/community/node.tag/authorization/node.def
@@ -1,6 +1,6 @@
 type: txt
 default: "ro"
-help: Set authorization type (rw or ro) (default: ro)
+help: Authorization type (rw or ro) (default: ro)
 syntax:expression: $VAR(@) in "ro", "rw"; "Authorization type must be either rw or ro"
 
 
diff --git a/templates/service/snmp/community/node.tag/client/node.def b/templates/service/snmp/community/node.tag/client/node.def
index 427a9939..37493268 100644
--- a/templates/service/snmp/community/node.tag/client/node.def
+++ b/templates/service/snmp/community/node.tag/client/node.def
@@ -1,3 +1,3 @@
 multi:
 type: ipv4,ipv6
-help: Set IP address of SNMP client allowed to contact system
+help: IP address of SNMP client allowed to contact system
diff --git a/templates/service/snmp/community/node.tag/network/node.def b/templates/service/snmp/community/node.tag/network/node.def
index 4b80a51b..d9afa4e5 100644
--- a/templates/service/snmp/community/node.tag/network/node.def
+++ b/templates/service/snmp/community/node.tag/network/node.def
@@ -1,4 +1,4 @@
 multi:
 type: ipv4net,ipv6net
-help: Set subnet of SNMP client(s) allowed to contact system
+help: Subnet of SNMP client(s) allowed to contact system
 syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
diff --git a/templates/service/snmp/contact/node.def b/templates/service/snmp/contact/node.def
index 4251291e..039cd548 100644
--- a/templates/service/snmp/contact/node.def
+++ b/templates/service/snmp/contact/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: Set contact information
+help: Contact information
diff --git a/templates/service/snmp/description/node.def b/templates/service/snmp/description/node.def
index 6324a96b..61ec96b6 100644
--- a/templates/service/snmp/description/node.def
+++ b/templates/service/snmp/description/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: Set description information
+help: Description information
diff --git a/templates/service/snmp/listen-address/node.def b/templates/service/snmp/listen-address/node.def
index f234edc8..9a9c591f 100644
--- a/templates/service/snmp/listen-address/node.def
+++ b/templates/service/snmp/listen-address/node.def
@@ -1,3 +1,3 @@
 tag:
 type: ipv4,ipv6
-help: Set IP address to listen for incoming SNMP requests
+help: IP address to listen for incoming SNMP requests
diff --git a/templates/service/snmp/listen-address/node.tag/port/node.def b/templates/service/snmp/listen-address/node.tag/port/node.def
index 5a21b1d8..2bbdae09 100644
--- a/templates/service/snmp/listen-address/node.tag/port/node.def
+++ b/templates/service/snmp/listen-address/node.tag/port/node.def
@@ -1,3 +1,3 @@
 type:  u32 
 default:  161
-help: Set port for SNMP service
+help: Port for SNMP service
diff --git a/templates/service/snmp/location/node.def b/templates/service/snmp/location/node.def
index f4bcef7c..a5b234ea 100644
--- a/templates/service/snmp/location/node.def
+++ b/templates/service/snmp/location/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: Set location information
+help: Location information
 
diff --git a/templates/service/snmp/node.def b/templates/service/snmp/node.def
index 2952eb34..183cc5c3 100644
--- a/templates/service/snmp/node.def
+++ b/templates/service/snmp/node.def
@@ -1,5 +1,5 @@
 priority: 980
-help: Configure Simple Network Management Protocol (SNMP)
+help: Simple Network Management Protocol (SNMP)
 commit:expression: $VAR(community/) != "" || $VAR(community6/) != "" \
 		   ; "must configure a community or community6"
 
diff --git a/templates/service/snmp/trap-source/node.def b/templates/service/snmp/trap-source/node.def
index 61a8cd6a..a4b2617f 100644
--- a/templates/service/snmp/trap-source/node.def
+++ b/templates/service/snmp/trap-source/node.def
@@ -1,2 +1,2 @@
 type: ipv4,ipv6
-help: Set SNMP trap source address
+help: SNMP trap source address
diff --git a/templates/service/snmp/trap-target/node.def b/templates/service/snmp/trap-target/node.def
index 561bc1ac..cf0c963c 100644
--- a/templates/service/snmp/trap-target/node.def
+++ b/templates/service/snmp/trap-target/node.def
@@ -1,3 +1,3 @@
 tag:
 type: ipv4,ipv6
-help: Set address of trap target
+help: Address of trap target
diff --git a/templates/service/snmp/trap-target/node.tag/community/node.def b/templates/service/snmp/trap-target/node.tag/community/node.def
index dceff369..3b4068a8 100644
--- a/templates/service/snmp/trap-target/node.tag/community/node.def
+++ b/templates/service/snmp/trap-target/node.tag/community/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: set community used when sending trap information
+help: Community used when sending trap information
diff --git a/templates/service/snmp/trap-target/node.tag/port/node.def b/templates/service/snmp/trap-target/node.tag/port/node.def
index 4a79e794..f3157d77 100644
--- a/templates/service/snmp/trap-target/node.tag/port/node.def
+++ b/templates/service/snmp/trap-target/node.tag/port/node.def
@@ -1,2 +1,2 @@
 type: u32
-help: Set destination port used for trap notification
+help: Destination port used for trap notification
diff --git a/templates/service/ssh/node.def b/templates/service/ssh/node.def
index ecf54e41..458fa270 100644
--- a/templates/service/ssh/node.def
+++ b/templates/service/ssh/node.def
@@ -1,5 +1,5 @@
 priority: 915
-help: Enable/disable Secure SHell (SSH) protocol
+help: Secure SHell (SSH) protocol
 delete:sudo /usr/sbin/invoke-rc.d ssh stop 
        sudo sh -c "echo 'SSHD_OPTS=' > /etc/default/ssh"
 end: if [ -z "$VAR(port/@)" ]; then exit 0; fi;
diff --git a/templates/service/ssh/port/node.def b/templates/service/ssh/port/node.def
index db07b07a..1b1248f4 100644
--- a/templates/service/ssh/port/node.def
+++ b/templates/service/ssh/port/node.def
@@ -1,3 +1,3 @@
 type:  u32 
 default:  22
-help: Set port for SSH service
+help: Port for SSH service
diff --git a/templates/service/ssh/protocol-version/node.def b/templates/service/ssh/protocol-version/node.def
index d025015b..cc1dbd87 100644
--- a/templates/service/ssh/protocol-version/node.def
+++ b/templates/service/ssh/protocol-version/node.def
@@ -1,4 +1,4 @@
 type:  txt 
 allowed: echo "v1 v2 all"
 default:  "v2"
-help: Set SSH version (default: v2)
+help: SSH version (default: v2)
diff --git a/templates/service/telnet/port/node.def b/templates/service/telnet/port/node.def
index 2613f413..f3920831 100644
--- a/templates/service/telnet/port/node.def
+++ b/templates/service/telnet/port/node.def
@@ -1,3 +1,3 @@
 type:  u32
 default:  23
-help: Set port for TELNET service
+help: Port for TELNET service
diff --git a/templates/system/domain-name/node.def b/templates/system/domain-name/node.def
index fa8527d9..ff3c2ebf 100644
--- a/templates/system/domain-name/node.def
+++ b/templates/system/domain-name/node.def
@@ -1,6 +1,6 @@
 priority: 400
 type: txt
-help: Set system domain name
+help: System domain name
 syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9.]{0,63}$" ; "invalid domain name $VAR(@)"
 
 # also add localhost line into /etc/hosts (see host-name template)?
diff --git a/templates/system/domain-search/domain/node.def b/templates/system/domain-search/domain/node.def
index 46248127..d455745b 100644
--- a/templates/system/domain-search/domain/node.def
+++ b/templates/system/domain-search/domain/node.def
@@ -1,6 +1,6 @@
 multi:
 type: txt
-help: Set DNS domain completion order
+help: DNS domain completion order
 syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9.]+$" ; "invalid domain name $VAR(@)"
 create:expression: "sudo /opt/vyatta/sbin/vyatta_update_resolv.pl"
 delete:expression: "sudo /opt/vyatta/sbin/vyatta_update_resolv.pl"
diff --git a/templates/system/domain-search/node.def b/templates/system/domain-search/node.def
index 49c7d171..4bc32c52 100644
--- a/templates/system/domain-search/node.def
+++ b/templates/system/domain-search/node.def
@@ -1,2 +1,2 @@
 priority: 400
-help: Set Domain Name Server (DNS) domain completion order
+help: Domain Name Server (DNS) domain completion order
diff --git a/templates/system/host-name/node.def b/templates/system/host-name/node.def
index a119c362..df266fad 100644
--- a/templates/system/host-name/node.def
+++ b/templates/system/host-name/node.def
@@ -1,6 +1,6 @@
 priority: 100
 type: txt
-help: Set system host name (default: vyatta)
+help: System host name (default: vyatta)
 default: "vyatta"
 syntax:expression: pattern $VAR(@) "^[[:alnum:]][-.[:alnum:]]*[[:alnum:]]$"
                    ; "invalid host name $VAR(@)"
diff --git a/templates/system/ip/arp/node.def b/templates/system/ip/arp/node.def
index 056a284f..2d3aa69a 100644
--- a/templates/system/ip/arp/node.def
+++ b/templates/system/ip/arp/node.def
@@ -1 +1 @@
-help: Set parameters for ARP cache
+help: Parameters for ARP cache
diff --git a/templates/system/ip/arp/table-size/node.def b/templates/system/ip/arp/table-size/node.def
index 8c548f5b..bdeea371 100644
--- a/templates/system/ip/arp/table-size/node.def
+++ b/templates/system/ip/arp/table-size/node.def
@@ -1,4 +1,4 @@
-help: Set maximum number of entries to keep in the ARP cache
+help: Maximum number of entries to keep in the ARP cache
 
 type: u32
 
diff --git a/templates/system/ip/node.def b/templates/system/ip/node.def
index 3b495f3d..c1359b50 100644
--- a/templates/system/ip/node.def
+++ b/templates/system/ip/node.def
@@ -1,2 +1,2 @@
 priority: 400
-help: Set IPv4 settings
+help: IPv4 settings
diff --git a/templates/system/ipv6/neighbor/node.def b/templates/system/ipv6/neighbor/node.def
index 4e51677e..ed434588 100644
--- a/templates/system/ipv6/neighbor/node.def
+++ b/templates/system/ipv6/neighbor/node.def
@@ -1 +1 @@
-help: Set parameters for Neighbor cache
+help: Parameters for Neighbor cache
diff --git a/templates/system/ipv6/neighbor/table-size/node.def b/templates/system/ipv6/neighbor/table-size/node.def
index e8a55ac8..cf4d066d 100644
--- a/templates/system/ipv6/neighbor/table-size/node.def
+++ b/templates/system/ipv6/neighbor/table-size/node.def
@@ -1,4 +1,4 @@
-help: Set maximum number of entries to keep in the Neighbor cache
+help: Maximum number of entries to keep in the Neighbor cache
 
 type: u32
 
diff --git a/templates/system/ipv6/node.def b/templates/system/ipv6/node.def
index 587c3b2b..4801c82d 100644
--- a/templates/system/ipv6/node.def
+++ b/templates/system/ipv6/node.def
@@ -1,2 +1,2 @@
 priority: 400
-help: Set IPv6 settings
+help: IPv6 settings
diff --git a/templates/system/login/banner/node.def b/templates/system/login/banner/node.def
index 2aef97a4..f6857109 100644
--- a/templates/system/login/banner/node.def
+++ b/templates/system/login/banner/node.def
@@ -1 +1 @@
-help: Set system login banners
+help: System login banners
diff --git a/templates/system/login/banner/post-login/node.def b/templates/system/login/banner/post-login/node.def
index 98c139b8..d6cf6cff 100644
--- a/templates/system/login/banner/post-login/node.def
+++ b/templates/system/login/banner/post-login/node.def
@@ -1,4 +1,4 @@
-help: Set system loging banner post-login
+help: System loging banner post-login
 type: txt
 
 update: sudo /opt/vyatta/sbin/vyatta-banner.pl \
diff --git a/templates/system/login/banner/pre-login/node.def b/templates/system/login/banner/pre-login/node.def
index 7cb80380..54aa3473 100644
--- a/templates/system/login/banner/pre-login/node.def
+++ b/templates/system/login/banner/pre-login/node.def
@@ -1,4 +1,4 @@
-help: Set system loging banner pre-login
+help: System loging banner pre-login
 type: txt
 
 update: sudo /opt/vyatta/sbin/vyatta-banner.pl \
diff --git a/templates/system/login/node.def b/templates/system/login/node.def
index c1330b0b..09255a76 100644
--- a/templates/system/login/node.def
+++ b/templates/system/login/node.def
@@ -1,4 +1,4 @@
 priority: 400
-help: Set user access
+help: User login
 delete: echo 'All login methods can not be deleted' 1>&2; exit 1
 end: sudo /opt/vyatta/sbin/vyatta_update_login.pl
diff --git a/templates/system/login/radius-server/node.def b/templates/system/login/radius-server/node.def
index 137a92a0..efc917ef 100644
--- a/templates/system/login/radius-server/node.def
+++ b/templates/system/login/radius-server/node.def
@@ -1,6 +1,6 @@
 tag:
 type: ipv4
-help: Set radius server authentication
+help: Radius server authentication
 commit:expression: $VAR(port) != "" && $VAR(secret) != ""
                    && $VAR(timeout) != ""
                      ; "Port, secret, and timeout must be specified for Radius"
diff --git a/templates/system/login/radius-server/node.tag/port/node.def b/templates/system/login/radius-server/node.tag/port/node.def
index 026b73a0..f5eae942 100644
--- a/templates/system/login/radius-server/node.tag/port/node.def
+++ b/templates/system/login/radius-server/node.tag/port/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: Set radius port [REQUIRED]
+help: Radius port [REQUIRED]
 syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535"
 default: 1812
diff --git a/templates/system/login/radius-server/node.tag/secret/node.def b/templates/system/login/radius-server/node.tag/secret/node.def
index 9d4e042a..90420518 100644
--- a/templates/system/login/radius-server/node.tag/secret/node.def
+++ b/templates/system/login/radius-server/node.tag/secret/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: Set secret for radius access [REQUIRED]
+help: Secret for radius access [REQUIRED]
diff --git a/templates/system/login/radius-server/node.tag/timeout/node.def b/templates/system/login/radius-server/node.tag/timeout/node.def
index ab506233..34fcbdb0 100644
--- a/templates/system/login/radius-server/node.tag/timeout/node.def
+++ b/templates/system/login/radius-server/node.tag/timeout/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Set timeout for radius session [REQUIRED]
+help: Timeout for radius session [REQUIRED]
 default: 2
 syntax:expression: $VAR(@) > 0 && $VAR(@) <= 30 \
 		   ; "Timeout must be between 1 and 30 seconds"
diff --git a/templates/system/login/user/node.def b/templates/system/login/user/node.def
index 3b9b570a..caa53f1b 100644
--- a/templates/system/login/user/node.def
+++ b/templates/system/login/user/node.def
@@ -1,6 +1,6 @@
 tag:
 type: txt
-help: Set user account information
+help: User account information
 
 syntax:expression: exec "/opt/vyatta/sbin/vyatta_check_username.pl $VAR(@)"
 
diff --git a/templates/system/login/user/node.tag/authentication/encrypted-password/node.def b/templates/system/login/user/node.tag/authentication/encrypted-password/node.def
index 49b7fd04..823fc45f 100644
--- a/templates/system/login/user/node.tag/authentication/encrypted-password/node.def
+++ b/templates/system/login/user/node.tag/authentication/encrypted-password/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set encrypted password
+help: Encrypted password
 # Allow * or ! to disable account
 #  DES format password (13 characters)
 #  MD5 format ($1) and SHA format passwords
diff --git a/templates/system/login/user/node.tag/authentication/node.def b/templates/system/login/user/node.tag/authentication/node.def
index 488acd8c..4306d008 100644
--- a/templates/system/login/user/node.tag/authentication/node.def
+++ b/templates/system/login/user/node.tag/authentication/node.def
@@ -1 +1 @@
-help: Set authentication password
+help: Authentication password
diff --git a/templates/system/login/user/node.tag/authentication/plaintext-password/node.def b/templates/system/login/user/node.tag/authentication/plaintext-password/node.def
index d712db20..12a74a36 100644
--- a/templates/system/login/user/node.tag/authentication/plaintext-password/node.def
+++ b/templates/system/login/user/node.tag/authentication/plaintext-password/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set plaintext password for encryption
+help: Plaintext password for encryption
 # if plaintext is empty, assume this is left-over from blanking the plaintext
 # and do nothing. to set password to empty, user needs to set the
 # "encrypted-password" to an empty string (which actually allows login without
diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.def
index 6c1ffbc2..a9089d6f 100644
--- a/templates/system/login/user/node.tag/authentication/public-keys/node.def
+++ b/templates/system/login/user/node.tag/authentication/public-keys/node.def
@@ -1,6 +1,6 @@
 tag:
 type: txt
-help: Set remote access public keys
+help: Remote access public keys
 comp_help: The key identifier is a usually user@host as generated by ssh-keygen
 
 commit:expression: $VAR(./type/) != "" ; \
diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/key/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/key/node.def
index 70af5961..a5744bfe 100644
--- a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/key/node.def
+++ b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/key/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set public key value (base64)
+help: Public key value (base64)
 syntax:expression: pattern $VAR(@) "^[0-9A-Za-z+/=]*$" ; \
 		   "Invalid public key character not base-64"
 
diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/options/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/options/node.def
index e24d9fca..2677594b 100644
--- a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/options/node.def
+++ b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/options/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: Set additional public key options
+help: Additional public key options
 
diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/type/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/type/node.def
index 30138fe6..5ad1c58b 100644
--- a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/type/node.def
+++ b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/type/node.def
@@ -1,4 +1,4 @@
 type: txt
-help: Set public key type
+help: Public key type
 allowed: echo "ssh-dss ssh-rsa"
 syntax:expression: $VAR(@) in "ssh-rsa", "ssh-dss" ; "Unknown key type"
diff --git a/templates/system/login/user/node.tag/full-name/node.def b/templates/system/login/user/node.tag/full-name/node.def
index c3cba58b..42d9dfac 100644
--- a/templates/system/login/user/node.tag/full-name/node.def
+++ b/templates/system/login/user/node.tag/full-name/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: Set full name of the user (use quotes for names with spaces)
+help: Full name of the user (use quotes for names with spaces)
 syntax:expression: pattern $VAR(@) "^[^:]*$"; "Cannot use ':' in full name"
diff --git a/templates/system/login/user/node.tag/group/node.def b/templates/system/login/user/node.tag/group/node.def
index 77af8199..2dc0abc9 100644
--- a/templates/system/login/user/node.tag/group/node.def
+++ b/templates/system/login/user/node.tag/group/node.def
@@ -1,6 +1,6 @@
 multi:
 type: txt
-help: Set additional group membership
+help: Additional group membership
 syntax:expression: pattern $VAR(@) "^[a-zA-Z_][a-zA-Z0-9_-]*\\$?$"
    ; "Invalid group name $VAR(@)"
 syntax:expression: ! $VAR(@) in \
diff --git a/templates/system/login/user/node.tag/home-directory/node.def b/templates/system/login/user/node.tag/home-directory/node.def
index 3dbd8a19..90b62195 100644
--- a/templates/system/login/user/node.tag/home-directory/node.def
+++ b/templates/system/login/user/node.tag/home-directory/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: Set home directory
+help: Home directory
diff --git a/templates/system/login/user/node.tag/level/node.def b/templates/system/login/user/node.tag/level/node.def
index d64a6441..2596bd7a 100644
--- a/templates/system/login/user/node.tag/level/node.def
+++ b/templates/system/login/user/node.tag/level/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set user privilege level
+help: User privilege level
 default: "admin"
 syntax:expression: $VAR(@) in "admin", "operator"; "Allowed levels are \"admin\" and \"operator\""
 comp_help:Possible completions:
diff --git a/templates/system/name-server/node.def b/templates/system/name-server/node.def
index 88fb618c..b036e56a 100644
--- a/templates/system/name-server/node.def
+++ b/templates/system/name-server/node.def
@@ -1,6 +1,6 @@
 multi:
 priority: 400
 type: ipv4
-help: Set Domain Name Server (DNS)
+help: Domain Name Server (DNS)
 create: sudo /opt/vyatta/sbin/vyatta-system-nameservers update $VAR(@)
 delete: sudo /opt/vyatta/sbin/vyatta-system-nameservers delete $VAR(@)
diff --git a/templates/system/node.def b/templates/system/node.def
index 2317e7dd..156b6317 100644
--- a/templates/system/node.def
+++ b/templates/system/node.def
@@ -1,2 +1,2 @@
 priority: 405
-help: Configure system parameters
+help: System parameters
diff --git a/templates/system/ntp-server/node.def b/templates/system/ntp-server/node.def
index c4532526..e1596161 100644
--- a/templates/system/ntp-server/node.def
+++ b/templates/system/ntp-server/node.def
@@ -1,7 +1,7 @@
 multi:
 priority: 400
 type: txt
-help: Set name or IP address of Network Time Protocol (NTP) server
+help: Network Time Protocol (NTP) server
 create: if ! grep -q '^server $VAR(@) ' /etc/ntp.conf
         then sudo sh -c \
 	   "echo \"server $VAR(@) iburst\" >> /etc/ntp.conf; \
diff --git a/templates/system/options/node.def b/templates/system/options/node.def
index ace7abbe..a878887c 100644
--- a/templates/system/options/node.def
+++ b/templates/system/options/node.def
@@ -1,2 +1,2 @@
 priority: 400
-help: Set system options
+help: System options
diff --git a/templates/system/options/reboot-on-panic/node.def b/templates/system/options/reboot-on-panic/node.def
index f75f4c68..f768d5ae 100644
--- a/templates/system/options/reboot-on-panic/node.def
+++ b/templates/system/options/reboot-on-panic/node.def
@@ -1,5 +1,5 @@
 type: bool
-help: Set if kernel panic causes reboot
+help: Reboot system on kernel panic
 default: true
 update:expression: "sudo sh -c \"if [ x$VAR(@) == xfalse ]; \
 then \
diff --git a/templates/system/package/auto-sync/node.def b/templates/system/package/auto-sync/node.def
index 299b43bf..9eec0faa 100644
--- a/templates/system/package/auto-sync/node.def
+++ b/templates/system/package/auto-sync/node.def
@@ -6,7 +6,7 @@ type: u32
 
 default: 1
 
-help: Set to update the the repository cache every n days (0 disables auto-update)
+help: Update the the repository cache every n days (0 disables auto-update)
 
 syntax:expression: $VAR(@) >= 0 && $VAR(@) < 32 ; "auto-sync must be between 0 and 32 days"
 
diff --git a/templates/system/package/node.def b/templates/system/package/node.def
index 3ed94f80..c19c92de 100644
--- a/templates/system/package/node.def
+++ b/templates/system/package/node.def
@@ -1,2 +1,2 @@
 priority: 400
-help: Set package update repository parameters
+help: Package update repository parameters
diff --git a/templates/system/package/repository/node.def b/templates/system/package/repository/node.def
index 40504bf1..c84060e2 100644
--- a/templates/system/package/repository/node.def
+++ b/templates/system/package/repository/node.def
@@ -2,7 +2,7 @@ tag:
 
 type: txt
 
-help: Set the name of a debian archive
+help: Debian archive name
 
 commit:expression: $VAR(./url/) != ""; "Must configure the repository URL"
 commit:expression: $VAR(./distribution/) != ""; "Must configure the repository distribution"
diff --git a/templates/system/package/repository/node.tag/components/node.def b/templates/system/package/repository/node.tag/components/node.def
index 313ab614..606f7bb6 100644
--- a/templates/system/package/repository/node.tag/components/node.def
+++ b/templates/system/package/repository/node.tag/components/node.def
@@ -1,6 +1,6 @@
 type: txt
 
-help: Set repository component names
+help: Repository component names
 
 # need to prohibit '!' in repo name (sed delimiter)
 syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in component name"
diff --git a/templates/system/package/repository/node.tag/description/node.def b/templates/system/package/repository/node.tag/description/node.def
index 613b0d28..8b686f06 100644
--- a/templates/system/package/repository/node.tag/description/node.def
+++ b/templates/system/package/repository/node.tag/description/node.def
@@ -1,3 +1,3 @@
 type: txt
 
-help: Set repository description
+help: Repository description
diff --git a/templates/system/package/repository/node.tag/distribution/node.def b/templates/system/package/repository/node.tag/distribution/node.def
index 353f59b6..ae88cb42 100644
--- a/templates/system/package/repository/node.tag/distribution/node.def
+++ b/templates/system/package/repository/node.tag/distribution/node.def
@@ -1,6 +1,6 @@
 type: txt
 
-help: Set distribution name
+help: Distribution name
 
 # need to prohibit '!' in repo name (sed delimiter)
 syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in distribution name"
diff --git a/templates/system/static-host-mapping/host-name/node.def b/templates/system/static-host-mapping/host-name/node.def
index edd286c8..04abf871 100644
--- a/templates/system/static-host-mapping/host-name/node.def
+++ b/templates/system/static-host-mapping/host-name/node.def
@@ -1,6 +1,6 @@
 tag:
 type: txt
-help: Set to map host name to address
+help: Map host name to address
 
 syntax:expression: pattern $VAR(@) "^[[:alnum:]][-.[:alnum:]]*[[:alnum:]]$"
                    ; "invalid host name $VAR(@)"
diff --git a/templates/system/static-host-mapping/host-name/node.tag/alias/node.def b/templates/system/static-host-mapping/host-name/node.tag/alias/node.def
index 7b07ff1a..2f340fc7 100644
--- a/templates/system/static-host-mapping/host-name/node.tag/alias/node.def
+++ b/templates/system/static-host-mapping/host-name/node.tag/alias/node.def
@@ -1,3 +1,3 @@
 multi:
 type: txt
-help: Set alias for this address
+help: Alias for this address
diff --git a/templates/system/static-host-mapping/host-name/node.tag/inet/node.def b/templates/system/static-host-mapping/host-name/node.tag/inet/node.def
index 63e611a8..db66bfd1 100644
--- a/templates/system/static-host-mapping/host-name/node.tag/inet/node.def
+++ b/templates/system/static-host-mapping/host-name/node.tag/inet/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set address [REQUIRED]
+help: Address [REQUIRED]
 syntax:expression: exec "/opt/vyatta/sbin/check-ipv4-ipv6.pl $VAR(@)"
 
 comp_help: Possible completions:
diff --git a/templates/system/static-host-mapping/node.def b/templates/system/static-host-mapping/node.def
index 33f33a4c..f1fe94a7 100644
--- a/templates/system/static-host-mapping/node.def
+++ b/templates/system/static-host-mapping/node.def
@@ -1,2 +1,2 @@
 priority: 400
-help: Set to map host names to addresses
+help: Map host names to addresses
diff --git a/templates/system/syslog/console/facility/node.def b/templates/system/syslog/console/facility/node.def
index 98b207d5..0b12ac8e 100644
--- a/templates/system/syslog/console/facility/node.def
+++ b/templates/system/syslog/console/facility/node.def
@@ -1,6 +1,6 @@
 tag:
 type: txt
-help: Set facility for console logging
+help: Facility for console logging
 syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
 comp_help:Available logging facilities:
   all           All facilities excluding "mark"
diff --git a/templates/system/syslog/console/facility/node.tag/level/node.def b/templates/system/syslog/console/facility/node.tag/level/node.def
index 42e6c148..e8a45ea1 100644
--- a/templates/system/syslog/console/facility/node.tag/level/node.def
+++ b/templates/system/syslog/console/facility/node.tag/level/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set the logging level
+help: Logging level
 syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
 default: "err"
 comp_help:Logging levels in descending order of severity:
diff --git a/templates/system/syslog/console/node.def b/templates/system/syslog/console/node.def
index 3f76dcfc..a4aa259f 100644
--- a/templates/system/syslog/console/node.def
+++ b/templates/system/syslog/console/node.def
@@ -1,2 +1,2 @@
-help: Set console logging
+help: Console logging
 commit:expression: $VAR(./facility/@@) != ""; "At least one facility must be configured to log messages to $VAR(.)"
diff --git a/templates/system/syslog/file/node.def b/templates/system/syslog/file/node.def
index f8a57f66..97e60a75 100644
--- a/templates/system/syslog/file/node.def
+++ b/templates/system/syslog/file/node.def
@@ -1,6 +1,6 @@
 tag:
 type: txt
-help: Set the name of  syslog file to save log messages to
+help: Logging to a file
 syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9_.]+$" ; "invalid file name $VAR(@)"
 commit:expression: $VAR(./@/facility/@@) != ""; \
    "At least one facility must be configured to log messages to file $VAR(./@)"
diff --git a/templates/system/syslog/file/node.tag/archive/files/node.def b/templates/system/syslog/file/node.tag/archive/files/node.def
index bb897995..09eea916 100644
--- a/templates/system/syslog/file/node.tag/archive/files/node.def
+++ b/templates/system/syslog/file/node.tag/archive/files/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: Set number of saved files
+help: Number of saved files
 
 default: 5
 
diff --git a/templates/system/syslog/file/node.tag/archive/node.def b/templates/system/syslog/file/node.tag/archive/node.def
index 45ac48b0..873cd0a6 100644
--- a/templates/system/syslog/file/node.tag/archive/node.def
+++ b/templates/system/syslog/file/node.tag/archive/node.def
@@ -1,4 +1,4 @@
-help: Set log file size and rotation characteristics
+help: Log file size and rotation characteristics
 
 delete:
 	sudo sh -c "/opt/vyatta/sbin/vyatta_update_logrotate.pl \
diff --git a/templates/system/syslog/file/node.tag/archive/size/node.def b/templates/system/syslog/file/node.tag/archive/size/node.def
index 7a73a4cf..f3e7e52f 100644
--- a/templates/system/syslog/file/node.tag/archive/size/node.def
+++ b/templates/system/syslog/file/node.tag/archive/size/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: Set size of log files (kbytes)
+help: Size of log files (kbytes)
 
 default: 0
 
diff --git a/templates/system/syslog/file/node.tag/facility/node.def b/templates/system/syslog/file/node.tag/facility/node.def
index 37188925..eaa00304 100644
--- a/templates/system/syslog/file/node.tag/facility/node.def
+++ b/templates/system/syslog/file/node.tag/facility/node.def
@@ -1,6 +1,6 @@
 tag:
 type: txt
-help: Set facility for file logging
+help: Facility for file logging
 syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
 comp_help:Available logging facilities:
   all           All facilities excluding "mark"
diff --git a/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def
index a8eaa0e6..e8ba6fe5 100644
--- a/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def
+++ b/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set the logging level
+help: Logging level
 syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
 default: "err"
 comp_help:Logging levels in descending order of severity:
diff --git a/templates/system/syslog/global/archive/files/node.def b/templates/system/syslog/global/archive/files/node.def
index 8755bbe6..d4e8af82 100644
--- a/templates/system/syslog/global/archive/files/node.def
+++ b/templates/system/syslog/global/archive/files/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: Set number of saved files
+help: Number of saved files
 
 default: 5
 
diff --git a/templates/system/syslog/global/archive/node.def b/templates/system/syslog/global/archive/node.def
index 8c6110d3..82bc9e86 100644
--- a/templates/system/syslog/global/archive/node.def
+++ b/templates/system/syslog/global/archive/node.def
@@ -1,4 +1,4 @@
-help: Set log file size and rotation characteristics
+help: Log file size and rotation characteristics
 
 delete:
 	sudo sh -c "/opt/vyatta/sbin/vyatta_update_logrotate.pl \
diff --git a/templates/system/syslog/global/archive/size/node.def b/templates/system/syslog/global/archive/size/node.def
index 30f6427f..341f4a5b 100644
--- a/templates/system/syslog/global/archive/size/node.def
+++ b/templates/system/syslog/global/archive/size/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: Set size of log files (kbytes)
+help: Size of log files (kbytes)
 
 default: 250
 
diff --git a/templates/system/syslog/global/facility/node.def b/templates/system/syslog/global/facility/node.def
index bc8c094a..fa44538a 100644
--- a/templates/system/syslog/global/facility/node.def
+++ b/templates/system/syslog/global/facility/node.def
@@ -1,6 +1,6 @@
 tag:
 type: txt
-help: Set facility for system logging
+help: Facility for system logging
 syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all" ; "\"$VAR(@)\" is not a valid logging facility"
 comp_help:Available logging facilities:
   all           All facilities excluding "mark"
diff --git a/templates/system/syslog/global/facility/node.tag/level/node.def b/templates/system/syslog/global/facility/node.tag/level/node.def
index 42e6c148..e8a45ea1 100644
--- a/templates/system/syslog/global/facility/node.tag/level/node.def
+++ b/templates/system/syslog/global/facility/node.tag/level/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set the logging level
+help: Logging level
 syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
 default: "err"
 comp_help:Logging levels in descending order of severity:
diff --git a/templates/system/syslog/global/node.def b/templates/system/syslog/global/node.def
index e5c441a8..5d917e1d 100644
--- a/templates/system/syslog/global/node.def
+++ b/templates/system/syslog/global/node.def
@@ -1,2 +1,2 @@
-help: Set system logging
+help: System logging
 commit:expression: $VAR(./facility/) != "" || $VAR(./archive/) != ""; "Must specify either facility or archive for syslog file"
diff --git a/templates/system/syslog/host/node.def b/templates/system/syslog/host/node.def
index a22c6528..24033520 100644
--- a/templates/system/syslog/host/node.def
+++ b/templates/system/syslog/host/node.def
@@ -1,4 +1,4 @@
 tag:
 type: txt
-help: Set IP address or hostname of remote syslog server
+help: IP address or hostname of remote syslog server
 commit:expression: $VAR(./@/facility/@@) != ""; "At least one facility must be configured to log messages to host $VAR(./@)"
diff --git a/templates/system/syslog/host/node.tag/facility/node.def b/templates/system/syslog/host/node.tag/facility/node.def
index d5f6ef9b..1c485f1f 100644
--- a/templates/system/syslog/host/node.tag/facility/node.def
+++ b/templates/system/syslog/host/node.tag/facility/node.def
@@ -1,6 +1,6 @@
 tag:
 type: txt
-help: Set facility for host logging
+help: Facility for host logging
 syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
 comp_help:Available logging facilities:
   all           All facilities excluding "mark"
diff --git a/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def
index 42e6c148..e8a45ea1 100644
--- a/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def
+++ b/templates/system/syslog/host/node.tag/facility/node.tag/level/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set the logging level
+help: Logging level
 syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
 default: "err"
 comp_help:Logging levels in descending order of severity:
diff --git a/templates/system/syslog/node.def b/templates/system/syslog/node.def
index 90000f8c..91c1295b 100644
--- a/templates/system/syslog/node.def
+++ b/templates/system/syslog/node.def
@@ -1,5 +1,5 @@
 priority: 400
-help: Configure syslog daemon
+help: System logging daemon
 end: if /opt/vyatta/sbin/vyatta_update_syslog.pl; then
           sudo /usr/sbin/invoke-rc.d sysklogd reload
      fi
diff --git a/templates/system/syslog/user/node.def b/templates/system/syslog/user/node.def
index 805abd6a..1161149a 100644
--- a/templates/system/syslog/user/node.def
+++ b/templates/system/syslog/user/node.def
@@ -1,6 +1,6 @@
 tag:
 type: txt
-help: Set logging to specific user's terminal
+help: Logging to specific user's terminal
 syntax:expression: pattern $VAR(@) "^[a-zA-Z_][a-zA-Z0-9_-]*$"
                      ; "invalid user name $VAR(@)"
 commit:expression: $VAR(./@/facility/@@) != ""; "At least one facility must be configured to log messages to user $VAR(./@)"
diff --git a/templates/system/syslog/user/node.tag/facility/node.def b/templates/system/syslog/user/node.tag/facility/node.def
index 91a3f2a6..8367b3ca 100644
--- a/templates/system/syslog/user/node.tag/facility/node.def
+++ b/templates/system/syslog/user/node.tag/facility/node.def
@@ -1,6 +1,6 @@
 tag:
 type: txt
-help: Set facility for user logging
+help: Facility for user logging
 syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "protocols", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
 comp_help:Available logging facilities:
   all           All facilities excluding "mark"
diff --git a/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def
index 42e6c148..e8a45ea1 100644
--- a/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def
+++ b/templates/system/syslog/user/node.tag/facility/node.tag/level/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set the logging level
+help: Logging level
 syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
 default: "err"
 comp_help:Logging levels in descending order of severity:
diff --git a/templates/system/time-zone/node.def b/templates/system/time-zone/node.def
index 15de6043..fcbad601 100644
--- a/templates/system/time-zone/node.def
+++ b/templates/system/time-zone/node.def
@@ -1,6 +1,6 @@
 priority: 100
 type: txt
-help: Set local timezone
+help: Local time zone
 default: "GMT"
 update: LTF="/usr/share/zoneinfo"
   case "$VAR(@)" in
diff --git a/templates/zone-policy/zone/node.def b/templates/zone-policy/zone/node.def
index a27f90a9..eb8c3c87 100644
--- a/templates/zone-policy/zone/node.def
+++ b/templates/zone-policy/zone/node.def
@@ -1,6 +1,6 @@
 tag:
 type: txt
-help: Set zone name
+help: Zone name
 
 syntax:expression: pattern $VAR(@) "^[[:print:]]{1,20}$" ;
                 "Zone name must be 20 characters or less"
diff --git a/templates/zone-policy/zone/node.tag/default-action/node.def b/templates/zone-policy/zone/node.tag/default-action/node.def
index 82a5a595..8322efdc 100644
--- a/templates/zone-policy/zone/node.tag/default-action/node.def
+++ b/templates/zone-policy/zone/node.tag/default-action/node.def
@@ -1,6 +1,6 @@
 type: txt
 
-help: Set default-action for traffic coming into this zone
+help: Default-action for traffic coming into this zone
 
 default: "drop"
 
diff --git a/templates/zone-policy/zone/node.tag/description/node.def b/templates/zone-policy/zone/node.tag/description/node.def
index eab0fc80..7acb96dc 100644
--- a/templates/zone-policy/zone/node.tag/description/node.def
+++ b/templates/zone-policy/zone/node.tag/description/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: Set zone description
+help: Zone description
diff --git a/templates/zone-policy/zone/node.tag/from/node.def b/templates/zone-policy/zone/node.tag/from/node.def
index fcbaf38c..3ce5a328 100644
--- a/templates/zone-policy/zone/node.tag/from/node.def
+++ b/templates/zone-policy/zone/node.tag/from/node.def
@@ -1,7 +1,7 @@
 tag:
 priority: 970
 type: txt
-help: Set zone from which to filter traffic
+help: Zone from which to filter traffic
 
 allowed:
         local -a zones ;
diff --git a/templates/zone-policy/zone/node.tag/from/node.tag/firewall/ipv6-name/node.def b/templates/zone-policy/zone/node.tag/from/node.tag/firewall/ipv6-name/node.def
index b1ca94bc..329c7877 100644
--- a/templates/zone-policy/zone/node.tag/from/node.tag/firewall/ipv6-name/node.def
+++ b/templates/zone-policy/zone/node.tag/from/node.tag/firewall/ipv6-name/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set IPv6 firewall ruleset
+help: IPv6 firewall ruleset
 
 allowed:
         local -a params ;
diff --git a/templates/zone-policy/zone/node.tag/from/node.tag/firewall/name/node.def b/templates/zone-policy/zone/node.tag/from/node.tag/firewall/name/node.def
index 46328f0f..62a5d4cc 100644
--- a/templates/zone-policy/zone/node.tag/from/node.tag/firewall/name/node.def
+++ b/templates/zone-policy/zone/node.tag/from/node.tag/firewall/name/node.def
@@ -1,5 +1,5 @@
 type: txt
-help: Set IPv4 firewall ruleset
+help: IPv4 firewall ruleset
 
 allowed:
         local -a params ;
diff --git a/templates/zone-policy/zone/node.tag/from/node.tag/firewall/node.def b/templates/zone-policy/zone/node.tag/from/node.tag/firewall/node.def
index 11748d20..bb7fff53 100644
--- a/templates/zone-policy/zone/node.tag/from/node.tag/firewall/node.def
+++ b/templates/zone-policy/zone/node.tag/from/node.tag/firewall/node.def
@@ -1 +1 @@
-help: Set firewall options
+help: Firewall options
diff --git a/templates/zone-policy/zone/node.tag/interface/node.def b/templates/zone-policy/zone/node.tag/interface/node.def
index 64a3c2fc..36ff3e29 100644
--- a/templates/zone-policy/zone/node.tag/interface/node.def
+++ b/templates/zone-policy/zone/node.tag/interface/node.def
@@ -1,6 +1,6 @@
 multi:
 type: txt
-help: Set interface associated with zone
+help: Interface associated with zone
 allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=all | sed -e s/'lo '//
 
 syntax:expression: $VAR(@) != "lo" ; "Cannot assign loopback interface to a transit zone. It's part of local-zone"
diff --git a/templates/zone-policy/zone/node.tag/local-zone/node.def b/templates/zone-policy/zone/node.tag/local-zone/node.def
index 4b045302..4db0f63e 100644
--- a/templates/zone-policy/zone/node.tag/local-zone/node.def
+++ b/templates/zone-policy/zone/node.tag/local-zone/node.def
@@ -1,4 +1,4 @@
-help: Set zone to be local-zone
+help: Zone to be local-zone
 
 create: 
 	if ! /opt/vyatta/sbin/vyatta-zone.pl	\