convert templates to new syntax

50 files changed, 210 insertions, 210 deletions

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 b7dee25b..4d597867 100644
--- a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
@@ -1,9 +1,9 @@
-help: "ignore link state changes on this interface"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../@)\" \
+help: ignore link state changes on this interface
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../@)\" \
           -c \"no link-detect\" \
-         && \\${vyatta_sbindir}/vyatta-linkstatus.pl --add $(../@) 2>/dev/null"
+         && ${vyatta_sbindir}/vyatta-linkstatus.pl --add $VAR(../@) 2>/dev/null"
 
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../@)\" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../@)\" \
           -c \"link-detect \" \
-         && \\${vyatta_sbindir}/vyatta-linkstatus.pl --del $(../@) 2>/dev/null"
+         && ${vyatta_sbindir}/vyatta-linkstatus.pl --del $VAR(../@) 2>/dev/null"
 
diff --git a/templates/interfaces/ethernet/node.tag/ip/node.def b/templates/interfaces/ethernet/node.tag/ip/node.def
index a25158f6..713cca47 100644
--- a/templates/interfaces/ethernet/node.tag/ip/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/node.def
@@ -1 +1 @@
-help: "Interface IPv4 configuration commands"
+help: Interface IPv4 configuration commands
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def
index 40823db5..9e196ef7 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def
@@ -1,18 +1,18 @@
 tag:
 type: u32
-help: "Configure MD5 key id"
-syntax: $(@) >= 1 && $(@) <= 255; "ID must be between (1-255)"
-commit: $(md5-key/) != ""; "must add the md5-key for key-id $(@)"
-delete: "touch /tmp/ospf-md5.\\$PPID"
-end: "if [ -f \"/tmp/ospf-md5.\\$PPID\" ]; then                    \
-         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"                  \
-          -c \"interface $(../../../../../@) \"                    \
-          -c \"no ip ospf message-digest-key $(@)\";               \
-         rm /tmp/ospf-md5.\\$PPID;                                 \
+help: Configure MD5 key id
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
+commit:expression: $VAR(md5-key/) != ""; "must add the md5-key for key-id $VAR(@)"
+delete:expression: "touch /tmp/ospf-md5.$PPID"
+end:expression: "if [ -f \"/tmp/ospf-md5.$PPID\" ]; then                    \
+         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"                  \
+          -c \"interface $VAR(../../../../../@) \"                    \
+          -c \"no ip ospf message-digest-key $VAR(@)\";               \
+         rm /tmp/ospf-md5.$PPID;                                 \
       else                                                         \
-         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"                  \
-          -c \"interface $(../../../../../@) \"                    \
-          -c \"ip ospf message-digest-key $(@) md5 $(md5-key/@)\"; \
+         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"                  \
+          -c \"interface $VAR(../../../../../@) \"                    \
+          -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \
       fi; "
 
 
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
index 54bbd8f7..3efdfdd3 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: "Configure md5 key"
+help: Configure md5 key
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
index 7d644d6f..c90f5cf9 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
@@ -1 +1 @@
-help: "Configure md5 key"
+help: Configure md5 key
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def
index eb1bc11b..ca2e9a86 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def
@@ -1,10 +1,10 @@
-help: "Configure MD5 key id"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-         -c \"interface $(../../../../@) \"       \
+help: Configure MD5 key id
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+         -c \"interface $VAR(../../../../@) \"       \
          -c \"no ip ospf authentication \"        \
          -c \"ip ospf authentication message-digest\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-         -c \"interface $(../../../../@) \"       \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+         -c \"interface $VAR(../../../../@) \"       \
          -c \"no ip ospf authentication \"; "
 
 
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/node.def
index 3ae4a65e..51ef9a4f 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/node.def
@@ -1,2 +1,2 @@
-help: "Configure OSPF interface authentication"
+help: Configure OSPF interface authentication
 
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/simple/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/simple/node.def
index 90994816..4a8f5729 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/simple/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/simple/node.def
@@ -1,12 +1,12 @@
 type: txt
-help: "Configure simple password"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-         -c \"interface $(../../../../@) \"       \
+help: Configure simple password
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+         -c \"interface $VAR(../../../../@) \"       \
 	 -c \"no ip ospf authentication \"        \
 	 -c \"ip ospf authentication \"           \
-	 -c \"ip ospf authentication-key $(@) \"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-         -c \"interface $(../../../../@) \"       \
+	 -c \"ip ospf authentication-key $VAR(@) \"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+         -c \"interface $VAR(../../../../@) \"       \
 	 -c \"no ip ospf authentication \"        \
 	 -c \"no ip ospf authentication-key \"; "
 
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def
index b228a0f6..cbe96ee1 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def
@@ -1,9 +1,9 @@
 type: u32
-help: "Interface cost"
-syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
-        -c \"ip ospf cost $(@) \"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+help: Interface cost
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+        -c \"ip ospf cost $VAR(@) \"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
         -c \"no ip ospf cost \"; "
-#comp_help: <1-65535> Cost
+comp_help: <1-65535> Cost
 
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def
index 9926fe18..93bc5a1b 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def
@@ -1,9 +1,9 @@
 type: u32
-help: "Interval after which a neighbor is declared dead"
-syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
-          -c \"ip ospf dead-interval $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+help: Interval after which a neighbor is declared dead
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+          -c \"ip ospf dead-interval $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf dead-interval \"; "
-#comp_help: <1-65535> Seconds
+comp_help: <1-65535> Seconds
 
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def
index 0822c9af..dd3dd2cc 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "Interval between HELLO packets"
-syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@) \" \
-          -c \"ip ospf hello-interval $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@) \" \
+help: Interval between HELLO packets
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
+          -c \"ip ospf hello-interval $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
           -c \"no ip ospf hello-interval \"; "
-#comp_help: <1-65535> Seconds
+comp_help: <1-65535> Seconds
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def
index dbf7f5e3..9f6643e5 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def
@@ -1,5 +1,5 @@
-help: "Disable mtu mismatch detection"
-create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+help: Disable mtu mismatch detection
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"ip ospf mtu-ignore\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def
index 07587cd4..4b31e756 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def
@@ -1,8 +1,8 @@
 type: txt
-help: "Network type"
-syntax: $(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
-          -c \"ip ospf network $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+help: Network type
+syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+          -c \"ip ospf network $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf network \"; "
-#comp_help: Enter the network type (broadcast|non-broadcast|point-to-multipoint|point-to-point)
+comp_help: Enter the network type (broadcast|non-broadcast|point-to-multipoint|point-to-point)
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/node.def
index af28ce3d..a01474ec 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/node.def
@@ -1 +1 @@
-help: "OSPF interface commands"
+help: OSPF interface commands
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def
index 6e06c908..cfb73389 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "Router priority"
-syntax: $(@) >= 0 && $(@) <= 255; "Must be between 0-255"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
-          -c \"ip ospf priority $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+help: Router priority
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+          -c \"ip ospf priority $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf priority \"; "
-#comp_help: <0-255> Priority
+comp_help: <0-255> Priority
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def
index 963000a5..06a5d5e7 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "Interval between retransmitting lost link state advertisements"
-syntax: $(@) >= 3 && $(@) <= 65535; "Must be between 3-65535"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
-          -c \"ip ospf retransmit-interval $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+help: Interval between retransmitting lost link state advertisements
+syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+          -c \"ip ospf retransmit-interval $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf retransmit-interval \"; "
-#comp_help: <3-65535> Seconds
+comp_help: <3-65535> Seconds
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def
index a69d011c..a9128624 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "Link state transmit delay"
-syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
-          -c \"ip ospf transmit-delay $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+help: Link state transmit delay
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+          -c \"ip ospf transmit-delay $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf transmit-delay \"; "
-#comp_help: <1-65535> Seconds
+comp_help: <1-65535> Seconds
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.def
index 279283e3..873a4370 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.def
@@ -1,5 +1,5 @@
 tag:
 type: u32
-help: "MD5 authentication key ID"
-syntax: $(@) >= 1 && $(@) <= 255; "ID must be between 1 and 255"
+help: MD5 authentication key ID
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255"
 
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/node.def
index 8b0f3125..4306d008 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/node.def
@@ -1 +1 @@
-help: "Authentication password"
+help: Authentication password
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
index c9c97d7a..29f41aa5 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
@@ -1,8 +1,8 @@
 type: txt
-help: "Authentication password"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../../../@)\" \
-          -c \"ip rip authentication mode md5\" -c \"ip rip authentication key-chain $(../../../../../@)-rip\" \
-          -c \"key chain $(../../../../../@)-rip\" -c \"key $(../@)\" -c \"key-string $(@)\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c \"configure terminal\" -c \"interface $(../../../../../@)\" \
-          -c \"no ip rip authentication mode md5\" -c \"no ip rip authentication key-chain $(../../../../../@)-rip\" \
-          -c \"no key chain $(../../../../../@)-rip\" "
+help: Authentication password
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
+          -c \"ip rip authentication mode md5\" -c \"ip rip authentication key-chain $VAR(../../../../../@)-rip\" \
+          -c \"key chain $VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" -c \"key-string $VAR(@)\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
+          -c \"no ip rip authentication mode md5\" -c \"no ip rip authentication key-chain $VAR(../../../../../@)-rip\" \
+          -c \"no key chain $VAR(../../../../../@)-rip\" "
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/node.def
index cd07a983..22039cf7 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/node.def
@@ -1 +1 @@
-help: "Authentication method"
+help: Authentication method
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/simple-password/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/simple-password/node.def
index 39243b12..82cbc16e 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/simple-password/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/simple-password/node.def
@@ -1,6 +1,6 @@
 type: txt
-help: "Simple password authentication key"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../../@)\" \
-          -c \"ip rip authentication mode text\" -c \"ip rip authentication string $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../../@)\" \
-          -c \"no ip rip authentication mode\" -c \"no ip rip authentication string $(@)\"; "
+help: Simple password authentication key
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \
+          -c \"ip rip authentication mode text\" -c \"ip rip authentication string $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \
+          -c \"no ip rip authentication mode\" -c \"no ip rip authentication string $VAR(@)\"; "
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/node.def
index ad32ea53..4cf2a137 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/node.def
@@ -1 +1 @@
-help: "RIP interface commands"
+help: RIP interface commands
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/node.def
index 529d6749..e2443995 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/node.def
@@ -1,9 +1,9 @@
-help: "Enable split horizon on this interface"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-          -c \"interface $(../../../@)\" \
+help: Enable split horizon on this interface
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+          -c \"interface $VAR(../../../@)\" \
           -c \"ip rip split-horizon\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-          -c \"interface $(../../../@)\" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+          -c \"interface $VAR(../../../@)\" \
           -c \"no ip rip split-horizon\" "
 
 
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def
index b6c2baf2..49034827 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def
@@ -1,8 +1,8 @@
-help: "With poison reverse"
-create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-          -c \"interface $(../../../../@)\" \
+help: With poison reverse
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+          -c \"interface $VAR(../../../../@)\" \
           -c \"ip rip split-horizon poisoned-reverse\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-          -c \"interface $(../../../../@)\" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+          -c \"interface $VAR(../../../../@)\" \
           -c \"no ip rip split-horizon\" -c \"ip rip split-horizon\" "
 
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 500e568a..4c2481ef 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,9 +1,9 @@
-help: "ignore link state changes on this interface"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../@).$(../@)\" \
+help: ignore link state changes on this interface
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../@).$VAR(../@)\" \
           -c \"no link-detect\" \
-         && \\${vyatta_sbindir}/vyatta-linkstatus.pl --add $(../../@).$(../@) 2>/dev/null"
+         && ${vyatta_sbindir}/vyatta-linkstatus.pl --add $VAR(../../@).$VAR(../@) 2>/dev/null"
 
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../@).$(../@)\" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../@).$VAR(../@)\" \
           -c \"link-detect \" \
-         && \\${vyatta_sbindir}/vyatta-linkstatus.pl --del $(../../@).$(../@) 2>/dev/null"
+         && ${vyatta_sbindir}/vyatta-linkstatus.pl --del $VAR(../../@).$VAR(../@) 2>/dev/null"
 
diff --git a/templates/interfaces/loopback/node.tag/ip/node.def b/templates/interfaces/loopback/node.tag/ip/node.def
index a25158f6..713cca47 100644
--- a/templates/interfaces/loopback/node.tag/ip/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/node.def
@@ -1 +1 @@
-help: "Interface IPv4 configuration commands"
+help: Interface IPv4 configuration commands
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def
index 40823db5..9e196ef7 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def
@@ -1,18 +1,18 @@
 tag:
 type: u32
-help: "Configure MD5 key id"
-syntax: $(@) >= 1 && $(@) <= 255; "ID must be between (1-255)"
-commit: $(md5-key/) != ""; "must add the md5-key for key-id $(@)"
-delete: "touch /tmp/ospf-md5.\\$PPID"
-end: "if [ -f \"/tmp/ospf-md5.\\$PPID\" ]; then                    \
-         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"                  \
-          -c \"interface $(../../../../../@) \"                    \
-          -c \"no ip ospf message-digest-key $(@)\";               \
-         rm /tmp/ospf-md5.\\$PPID;                                 \
+help: Configure MD5 key id
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
+commit:expression: $VAR(md5-key/) != ""; "must add the md5-key for key-id $VAR(@)"
+delete:expression: "touch /tmp/ospf-md5.$PPID"
+end:expression: "if [ -f \"/tmp/ospf-md5.$PPID\" ]; then                    \
+         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"                  \
+          -c \"interface $VAR(../../../../../@) \"                    \
+          -c \"no ip ospf message-digest-key $VAR(@)\";               \
+         rm /tmp/ospf-md5.$PPID;                                 \
       else                                                         \
-         \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"                  \
-          -c \"interface $(../../../../../@) \"                    \
-          -c \"ip ospf message-digest-key $(@) md5 $(md5-key/@)\"; \
+         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"                  \
+          -c \"interface $VAR(../../../../../@) \"                    \
+          -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \
       fi; "
 
 
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
index 54bbd8f7..3efdfdd3 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: "Configure md5 key"
+help: Configure md5 key
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
index 7d644d6f..c90f5cf9 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
@@ -1 +1 @@
-help: "Configure md5 key"
+help: Configure md5 key
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def
index eb1bc11b..ca2e9a86 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def
@@ -1,10 +1,10 @@
-help: "Configure MD5 key id"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-         -c \"interface $(../../../../@) \"       \
+help: Configure MD5 key id
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+         -c \"interface $VAR(../../../../@) \"       \
          -c \"no ip ospf authentication \"        \
          -c \"ip ospf authentication message-digest\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-         -c \"interface $(../../../../@) \"       \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+         -c \"interface $VAR(../../../../@) \"       \
          -c \"no ip ospf authentication \"; "
 
 
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/node.def
index 3ae4a65e..51ef9a4f 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/node.def
@@ -1,2 +1,2 @@
-help: "Configure OSPF interface authentication"
+help: Configure OSPF interface authentication
 
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/simple/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/simple/node.def
index 90994816..4a8f5729 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/simple/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/simple/node.def
@@ -1,12 +1,12 @@
 type: txt
-help: "Configure simple password"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-         -c \"interface $(../../../../@) \"       \
+help: Configure simple password
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+         -c \"interface $VAR(../../../../@) \"       \
 	 -c \"no ip ospf authentication \"        \
 	 -c \"ip ospf authentication \"           \
-	 -c \"ip ospf authentication-key $(@) \"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-         -c \"interface $(../../../../@) \"       \
+	 -c \"ip ospf authentication-key $VAR(@) \"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+         -c \"interface $VAR(../../../../@) \"       \
 	 -c \"no ip ospf authentication \"        \
 	 -c \"no ip ospf authentication-key \"; "
 
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def
index b228a0f6..cbe96ee1 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def
@@ -1,9 +1,9 @@
 type: u32
-help: "Interface cost"
-syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
-        -c \"ip ospf cost $(@) \"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+help: Interface cost
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+        -c \"ip ospf cost $VAR(@) \"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
         -c \"no ip ospf cost \"; "
-#comp_help: <1-65535> Cost
+comp_help: <1-65535> Cost
 
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def
index 9926fe18..93bc5a1b 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def
@@ -1,9 +1,9 @@
 type: u32
-help: "Interval after which a neighbor is declared dead"
-syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
-          -c \"ip ospf dead-interval $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+help: Interval after which a neighbor is declared dead
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+          -c \"ip ospf dead-interval $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf dead-interval \"; "
-#comp_help: <1-65535> Seconds
+comp_help: <1-65535> Seconds
 
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def
index 0822c9af..dd3dd2cc 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "Interval between HELLO packets"
-syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@) \" \
-          -c \"ip ospf hello-interval $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@) \" \
+help: Interval between HELLO packets
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
+          -c \"ip ospf hello-interval $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
           -c \"no ip ospf hello-interval \"; "
-#comp_help: <1-65535> Seconds
+comp_help: <1-65535> Seconds
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def
index dbf7f5e3..9f6643e5 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def
@@ -1,5 +1,5 @@
-help: "Disable mtu mismatch detection"
-create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+help: Disable mtu mismatch detection
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"ip ospf mtu-ignore\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def
index 07587cd4..4b31e756 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def
@@ -1,8 +1,8 @@
 type: txt
-help: "Network type"
-syntax: $(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
-          -c \"ip ospf network $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+help: Network type
+syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+          -c \"ip ospf network $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf network \"; "
-#comp_help: Enter the network type (broadcast|non-broadcast|point-to-multipoint|point-to-point)
+comp_help: Enter the network type (broadcast|non-broadcast|point-to-multipoint|point-to-point)
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/node.def
index af28ce3d..a01474ec 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/node.def
@@ -1 +1 @@
-help: "OSPF interface commands"
+help: OSPF interface commands
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def
index 6e06c908..cfb73389 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "Router priority"
-syntax: $(@) >= 0 && $(@) <= 255; "Must be between 0-255"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
-          -c \"ip ospf priority $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+help: Router priority
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+          -c \"ip ospf priority $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf priority \"; "
-#comp_help: <0-255> Priority
+comp_help: <0-255> Priority
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def
index 963000a5..06a5d5e7 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "Interval between retransmitting lost link state advertisements"
-syntax: $(@) >= 3 && $(@) <= 65535; "Must be between 3-65535"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
-          -c \"ip ospf retransmit-interval $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+help: Interval between retransmitting lost link state advertisements
+syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+          -c \"ip ospf retransmit-interval $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf retransmit-interval \"; "
-#comp_help: <3-65535> Seconds
+comp_help: <3-65535> Seconds
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def
index a69d011c..a9128624 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "Link state transmit delay"
-syntax: $(@) >= 1 && $(@) <= 65535; "Must be between 1-65535"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
-          -c \"ip ospf transmit-delay $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../@)\" \
+help: Link state transmit delay
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+          -c \"ip ospf transmit-delay $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf transmit-delay \"; "
-#comp_help: <1-65535> Seconds
+comp_help: <1-65535> Seconds
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.def
index 279283e3..873a4370 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.def
@@ -1,5 +1,5 @@
 tag:
 type: u32
-help: "MD5 authentication key ID"
-syntax: $(@) >= 1 && $(@) <= 255; "ID must be between 1 and 255"
+help: MD5 authentication key ID
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255"
 
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/node.def
index 8b0f3125..4306d008 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/node.def
@@ -1 +1 @@
-help: "Authentication password"
+help: Authentication password
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
index e5e140be..97f7b8df 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
@@ -1,8 +1,8 @@
 type: txt
-help: "Authentication password"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../../../@)\" \
-          -c \"ip rip authentication mode md5\" -c \"ip rip authentication key-chain $(../../../../../@)-rip\" \
-          -c \"key chain $(../../../../../@)-rip\" -c \"key $(../@)\" -c \"key-string $(@)\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../../../@)\" \
-          -c \"no ip rip authentication mode md5\" -c \"no ip rip authentication key-chain $(../../../../../@)-rip\" \
-          -c \"no key chain $(../../../../../@)-rip\" "
+help: Authentication password
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
+          -c \"ip rip authentication mode md5\" -c \"ip rip authentication key-chain $VAR(../../../../../@)-rip\" \
+          -c \"key chain $VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" -c \"key-string $VAR(@)\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
+          -c \"no ip rip authentication mode md5\" -c \"no ip rip authentication key-chain $VAR(../../../../../@)-rip\" \
+          -c \"no key chain $VAR(../../../../../@)-rip\" "
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/node.def
index cd07a983..22039cf7 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/node.def
@@ -1 +1 @@
-help: "Authentication method"
+help: Authentication method
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/simple-password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/simple-password/node.def
index 39243b12..82cbc16e 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/simple-password/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/simple-password/node.def
@@ -1,6 +1,6 @@
 type: txt
-help: "Simple password authentication key"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../../@)\" \
-          -c \"ip rip authentication mode text\" -c \"ip rip authentication string $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $(../../../../@)\" \
-          -c \"no ip rip authentication mode\" -c \"no ip rip authentication string $(@)\"; "
+help: Simple password authentication key
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \
+          -c \"ip rip authentication mode text\" -c \"ip rip authentication string $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../../@)\" \
+          -c \"no ip rip authentication mode\" -c \"no ip rip authentication string $VAR(@)\"; "
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/node.def b/templates/interfaces/loopback/node.tag/ip/rip/node.def
index ad32ea53..4cf2a137 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/node.def
@@ -1 +1 @@
-help: "RIP interface commands"
+help: RIP interface commands
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def
index 529d6749..e2443995 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def
@@ -1,9 +1,9 @@
-help: "Enable split horizon on this interface"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-          -c \"interface $(../../../@)\" \
+help: Enable split horizon on this interface
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+          -c \"interface $VAR(../../../@)\" \
           -c \"ip rip split-horizon\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-          -c \"interface $(../../../@)\" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+          -c \"interface $VAR(../../../@)\" \
           -c \"no ip rip split-horizon\" "
 
 
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def
index b6c2baf2..49034827 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def
@@ -1,8 +1,8 @@
-help: "With poison reverse"
-create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-          -c \"interface $(../../../../@)\" \
+help: With poison reverse
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+          -c \"interface $VAR(../../../../@)\" \
           -c \"ip rip split-horizon poisoned-reverse\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-          -c \"interface $(../../../../@)\" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+          -c \"interface $VAR(../../../../@)\" \
           -c \"no ip rip split-horizon\" -c \"ip rip split-horizon\" "