convert templates to new syntax

48 files changed, 229 insertions, 229 deletions

diff --git a/templates/protocols/rip/default-distance/node.def b/templates/protocols/rip/default-distance/node.def
index a8ff5914..5ad7b7b9 100644
--- a/templates/protocols/rip/default-distance/node.def
+++ b/templates/protocols/rip/default-distance/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "Administrative distance"
-syntax: $(@) >= 1 && $(@) <= 255; "must be between 1 and 255"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ 
-          -c \"distance $(@) \" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ 
-          -c \"no distance $(@) \" "
-#comp_help: Enter a distance valude between 1-255
+help: Administrative distance
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "must be between 1 and 255"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+          -c \"distance $VAR(@) \" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+          -c \"no distance $VAR(@) \" "
+comp_help: Enter a distance valude between 1-255
diff --git a/templates/protocols/rip/default-information/node.def b/templates/protocols/rip/default-information/node.def
index e7e295cd..7d35a646 100644
--- a/templates/protocols/rip/default-information/node.def
+++ b/templates/protocols/rip/default-information/node.def
@@ -1 +1 @@
-help: "Control distribution of default route"
+help: Control distribution of default route
diff --git a/templates/protocols/rip/default-information/originate/node.def b/templates/protocols/rip/default-information/originate/node.def
index d5b7b20e..bfd93a81 100644
--- a/templates/protocols/rip/default-information/originate/node.def
+++ b/templates/protocols/rip/default-information/originate/node.def
@@ -1,6 +1,6 @@
-help: "Distribute a default route"
-create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+help: Distribute a default route
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
           -c \"default-information originate\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
           -c \"no default-information originate\" "
 
diff --git a/templates/protocols/rip/default-metric/node.def b/templates/protocols/rip/default-metric/node.def
index 16ec94c0..81a2610a 100644
--- a/templates/protocols/rip/default-metric/node.def
+++ b/templates/protocols/rip/default-metric/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "Set metric of redistributed routes"
-syntax: $(@) >= 1 && $(@) <= 16; "Must be between 1-16"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-        -c \"default-metric $(@) \"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-        -c \"no default-metric $(@) \"; "
+help: Set metric of redistributed routes
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "Must be between 1-16"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+        -c \"default-metric $VAR(@) \"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+        -c \"no default-metric $VAR(@) \"; "
 #comp_help <1-16>  Default metric
diff --git a/templates/protocols/rip/distribute-list/access-list/in/node.def b/templates/protocols/rip/distribute-list/access-list/in/node.def
index c78ad2fb..87eddf90 100644
--- a/templates/protocols/rip/distribute-list/access-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/access-list/in/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "access-list to apply to input packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list $(@) in\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list $(@) in\" "
+help: access-list to apply to input packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list $VAR(@) in\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list $VAR(@) in\" "
                      
diff --git a/templates/protocols/rip/distribute-list/access-list/node.def b/templates/protocols/rip/distribute-list/access-list/node.def
index a76ae356..dd7917a7 100644
--- a/templates/protocols/rip/distribute-list/access-list/node.def
+++ b/templates/protocols/rip/distribute-list/access-list/node.def
@@ -1 +1 @@
-help: "Access-list"
+help: Access-list
diff --git a/templates/protocols/rip/distribute-list/access-list/out/node.def b/templates/protocols/rip/distribute-list/access-list/out/node.def
index 96855ca4..4b7f6b85 100644
--- a/templates/protocols/rip/distribute-list/access-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/access-list/out/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "access-list to apply to output packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list $(@) out\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list $(@) out\" "
+help: access-list to apply to output packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list $VAR(@) out\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list $VAR(@) out\" "
 
diff --git a/templates/protocols/rip/distribute-list/interface/node.def b/templates/protocols/rip/distribute-list/interface/node.def
index ce00fdc9..70009e14 100644
--- a/templates/protocols/rip/distribute-list/interface/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.def
@@ -1,10 +1,10 @@
 tag:
 type: txt
-help: "Apply filtering to an interface"
-syntax: exec "if [ -z \"`ip addr | grep $(@) `\" ]; then                       \
-                 echo ethernet interface $(@) doesn\\'t exist on this system ; \
+help: Apply filtering to an interface
+syntax:expression: exec "if [ -z \"`ip addr | grep $VAR(@) `\" ]; then                       \
+                 echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \
                  exit 1 ;                                                      \
               fi ; "
-#allowed: local -a array;
-# array=( /sys/class/net/{eth,vmnet}* ) ;
-# echo -n ${array[@]##*/}
+allowed: local -a array;
+ array=( /sys/class/net/{eth,vmnet}* ) ;
+ echo -n ${array[@]##*/}
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
index 4c0b0c1f..4b2bad82 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
@@ -1,8 +1,8 @@
 type: u32
-help: "access-list to apply to input packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list $(@) in $(../../@)\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list $(@) in $(../../@)\" "
+help: access-list to apply to input packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list $VAR(@) in $VAR(../../@)\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list $VAR(@) in $VAR(../../@)\" "
 
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def
index a76ae356..dd7917a7 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def
@@ -1 +1 @@
-help: "Access-list"
+help: Access-list
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
index a3d4477c..5362c410 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
@@ -1,7 +1,7 @@
 type: u32
-help: "access-list to apply to output packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list $(@) out $(../../@) \" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list $(@) out $(../../@) \" "
+help: access-list to apply to output packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list $VAR(@) out $VAR(../../@) \" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list $VAR(@) out $VAR(../../@) \" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
index ce3de387..2c02beba 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
@@ -1,7 +1,7 @@
 type: txt
-help: "prefix-list to apply to input packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" ";"prefix-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list prefix $(@) in $(../../@) \" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list prefix $(@) in $(../../@) \" "
+help: prefix-list to apply to input packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list prefix $VAR(@) in $VAR(../../@) \" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list prefix $VAR(@) in $VAR(../../@) \" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def
index f30db7e7..2aa289c3 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def
@@ -1 +1 @@
-help: "Prefix-list"
+help: Prefix-list
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
index 48a97014..bd441e02 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
@@ -1,7 +1,7 @@
 type: txt
-help: "prefix-list to apply to output packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" ";"prefix-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list prefix $(@) out $(../../@) \" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list prefix $(@) out $(../../@)\" "
+help: prefix-list to apply to output packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list prefix $VAR(@) out $VAR(../../@) \" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list prefix $VAR(@) out $VAR(../../@)\" "
diff --git a/templates/protocols/rip/distribute-list/node.def b/templates/protocols/rip/distribute-list/node.def
index 89d561fe..34c3cd35 100644
--- a/templates/protocols/rip/distribute-list/node.def
+++ b/templates/protocols/rip/distribute-list/node.def
@@ -1,2 +1,2 @@
-help: "Filter networks in routing updates"
+help: Filter networks in routing updates
 
diff --git a/templates/protocols/rip/distribute-list/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/prefix-list/in/node.def
index 2a79d94e..c4966d6f 100644
--- a/templates/protocols/rip/distribute-list/prefix-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/prefix-list/in/node.def
@@ -1,8 +1,8 @@
 type: txt
-help: "prefix-list to apply to input packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" ";"prefix-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list prefix $(@) in\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list prefix $(@) in\" "
+help: prefix-list to apply to input packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list prefix $VAR(@) in\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list prefix $VAR(@) in\" "
                     
diff --git a/templates/protocols/rip/distribute-list/prefix-list/node.def b/templates/protocols/rip/distribute-list/prefix-list/node.def
index f30db7e7..2aa289c3 100644
--- a/templates/protocols/rip/distribute-list/prefix-list/node.def
+++ b/templates/protocols/rip/distribute-list/prefix-list/node.def
@@ -1 +1 @@
-help: "Prefix-list"
+help: Prefix-list
diff --git a/templates/protocols/rip/distribute-list/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/prefix-list/out/node.def
index 78d3f8bd..b488ffdb 100644
--- a/templates/protocols/rip/distribute-list/prefix-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/prefix-list/out/node.def
@@ -1,7 +1,7 @@
 type: txt
-help: "prefix-list to apply to output packets"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" ";"prefix-list $(@) doesn't exist"
-update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"distribute-list prefix $(@) out\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
-           -c \"no distribute-list prefix $(@) out\" "
+help: prefix-list to apply to output packets
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"distribute-list prefix $VAR(@) out\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\"  \
+           -c \"no distribute-list prefix $VAR(@) out\" "
diff --git a/templates/protocols/rip/interface/node.def b/templates/protocols/rip/interface/node.def
index e9e6fc8e..c5c730c2 100644
--- a/templates/protocols/rip/interface/node.def
+++ b/templates/protocols/rip/interface/node.def
@@ -1,13 +1,13 @@
 multi:
 type: txt
-help: "Interface name"
-syntax: exec " \
-        if [ -z \"`ip addr | grep $(@) `\" ]; then \
-          echo ethernet interface $(@) doesn\\'t exist on this system ; \
+help: Interface name
+syntax:expression: exec " \
+        if [ -z \"`ip addr | grep $VAR(@) `\" ]; then \
+          echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \
           exit 1 ; \
         fi ; "
-create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" -c \"network $(@)\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" -c \"no network $(@)\" "
-#allowed: local -a array;
-# array=( /sys/class/net/{eth,vmnet}* ) ;
-# echo -n ${array[@]##*/}
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" -c \"network $VAR(@)\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" -c \"no network $VAR(@)\" "
+allowed: local -a array;
+ array=( /sys/class/net/{eth,vmnet}* ) ;
+ echo -n ${array[@]##*/}
diff --git a/templates/protocols/rip/neighbor/node.def b/templates/protocols/rip/neighbor/node.def
index c20ddc56..1b694564 100644
--- a/templates/protocols/rip/neighbor/node.def
+++ b/templates/protocols/rip/neighbor/node.def
@@ -1,8 +1,8 @@
 multi:
 type: ipv4
-help: "Specify a neighbor router"
-create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-        -c \"neighbor $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-        -c \"no neighbor $(@)\"; "
+help: Specify a neighbor router
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+        -c \"neighbor $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+        -c \"no neighbor $VAR(@)\"; "
 
diff --git a/templates/protocols/rip/network-distance/node.def b/templates/protocols/rip/network-distance/node.def
index 480e1f26..1caa6b04 100644
--- a/templates/protocols/rip/network-distance/node.def
+++ b/templates/protocols/rip/network-distance/node.def
@@ -1,18 +1,18 @@
 tag:
 type: ipv4net
-help: "Source network"
-syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)"
-commit: $(./distance/) != ""; "Must specify distance for network $(@)"
-delete: "touch /tmp/rip-dist.\\$PPID"
-end: "if [ -n \"$(./access-list/@)\" ]; then \
-	 ACL=\"$(./access-list/@)\"; \
+help: Source network
+syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
+commit:expression: $VAR(./distance/) != ""; "Must specify distance for network $VAR(@)"
+delete:expression: "touch /tmp/rip-dist.$PPID"
+end:expression: "if [ -n \"$VAR(./access-list/@)\" ]; then \
+	 ACL=\"$VAR(./access-list/@)\"; \
       fi; \
-      if [ -f \"/tmp/rip-dist.\\$PPID\" ]; then \
-          dist=\\$(cat /tmp/rip-network-distance.\\$PPID); \
-          \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ 
-          -c \"no distance \\$dist $(@) \\$ACL \" ;
-          rm -f \"/tmp/rip-dist.\\$PPID\";
+      if [ -f \"/tmp/rip-dist.$PPID\" ]; then \
+          dist=$(cat /tmp/rip-network-distance.$PPID); \
+          ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+          -c \"no distance $dist $VAR(@) $ACL \" ;
+          rm -f \"/tmp/rip-dist.$PPID\";
       else \
-        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \ 
-          -c \"distance $(./distance/@) $(@) \\$ACL \" ;
+        ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+          -c \"distance $VAR(./distance/@) $VAR(@) $ACL \" ;
       fi; "
diff --git a/templates/protocols/rip/network-distance/node.tag/access-list/node.def b/templates/protocols/rip/network-distance/node.tag/access-list/node.def
index ab225ff4..3003e718 100644
--- a/templates/protocols/rip/network-distance/node.tag/access-list/node.def
+++ b/templates/protocols/rip/network-distance/node.tag/access-list/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: "Access list"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" ";"access-list $(@) doesn't exist"
+help: Access list
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/network-distance/node.tag/distance/node.def b/templates/protocols/rip/network-distance/node.tag/distance/node.def
index da83eed5..96d3042e 100644
--- a/templates/protocols/rip/network-distance/node.tag/distance/node.def
+++ b/templates/protocols/rip/network-distance/node.tag/distance/node.def
@@ -1,6 +1,6 @@
 type: u32
-help: "Administrative distance for network"
-syntax: $(@) >= 1 && $(@) <= 255; "must be between 1 and 255"
-delete: "echo $(@) > /tmp/rip-network-distance.\\$PPID"
-#comp_help: Enter a distance valude between 1-255
+help: Administrative distance for network
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "must be between 1 and 255"
+delete:expression: "echo $VAR(@) > /tmp/rip-network-distance.$PPID"
+comp_help: Enter a distance valude between 1-255
 
diff --git a/templates/protocols/rip/network-distance/node.tag/node.def b/templates/protocols/rip/network-distance/node.tag/node.def
index c82cb253..7e9c8d59 100644
--- a/templates/protocols/rip/network-distance/node.tag/node.def
+++ b/templates/protocols/rip/network-distance/node.tag/node.def
@@ -1 +1 @@
-help: "Set distance for a given network"
+help: Set distance for a given network
diff --git a/templates/protocols/rip/network/node.def b/templates/protocols/rip/network/node.def
index 7feec8ae..e01ee3fe 100644
--- a/templates/protocols/rip/network/node.def
+++ b/templates/protocols/rip/network/node.def
@@ -1,8 +1,8 @@
 multi:
 type: ipv4net
-help: "RIP network"
-syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)"
-create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-          -c \"network $(@)\"; "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-          -c \"no network $(@)\"; "
+help: RIP network
+syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+          -c \"network $VAR(@)\"; "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+          -c \"no network $VAR(@)\"; "
diff --git a/templates/protocols/rip/node.def b/templates/protocols/rip/node.def
index 888686cf..c5442b5c 100644
--- a/templates/protocols/rip/node.def
+++ b/templates/protocols/rip/node.def
@@ -1,4 +1,4 @@
-help: "RIP options"
-create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no router rip\" "
+help: RIP options
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no router rip\" "
 
diff --git a/templates/protocols/rip/passive-interface/node.def b/templates/protocols/rip/passive-interface/node.def
index 85a1bf22..5a4001b5 100644
--- a/templates/protocols/rip/passive-interface/node.def
+++ b/templates/protocols/rip/passive-interface/node.def
@@ -1,25 +1,25 @@
 multi:
 type: txt
-help: "Suppress routing updates on an interface"
-syntax: exec " \
-        if [ -z \"`ip addr | grep $(@) `\" ] && [ x$(@) != xdefault ]; then \
-          echo ethernet interface $(@) doesn\\'t exist on this system ; \
+help: Suppress routing updates on an interface
+syntax:expression: exec " \
+        if [ -z \"`ip addr | grep $VAR(@) `\" ] && [ x$VAR(@) != xdefault ]; then \
+          echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \
           exit 1 ; \
         fi ; "
-update: "if [ x$(x) == xdefault ]; then \
-            \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+update:expression: "if [ x$VAR(x) == xdefault ]; then \
+            ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
             -c \"passive-interface default\"; \
          else \
-            \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-            -c \"passive-interface $(@)\"; \
+            ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+            -c \"passive-interface $VAR(@)\"; \
          fi; "
-delete: "if [ x$(x) == xdefault ]; then \
-            \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "if [ x$VAR(x) == xdefault ]; then \
+            ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
             -c \"no passive-interface default\"; \
          else \
-            \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-            -c \"no passive-interface $(@)\"; \
+            ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+            -c \"no passive-interface $VAR(@)\"; \
          fi; "
-#allowed: local -a array;
-# array=( /sys/class/net/{eth,vmnet}* ) ;
-# echo -n ${array[@]##*/}
+allowed: local -a array;
+ array=( /sys/class/net/{eth,vmnet}* ) ;
+ echo -n ${array[@]##*/}
diff --git a/templates/protocols/rip/redistribute/bgp/metric/node.def b/templates/protocols/rip/redistribute/bgp/metric/node.def
index 270a810e..549cfdf1 100644
--- a/templates/protocols/rip/redistribute/bgp/metric/node.def
+++ b/templates/protocols/rip/redistribute/bgp/metric/node.def
@@ -1,3 +1,3 @@
 type: u32
-help: "Metric for redistributed routes"
-syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16"
+help: Metric for redistributed routes
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
diff --git a/templates/protocols/rip/redistribute/bgp/node.def b/templates/protocols/rip/redistribute/bgp/node.def
index d69e22b2..84317dcd 100644
--- a/templates/protocols/rip/redistribute/bgp/node.def
+++ b/templates/protocols/rip/redistribute/bgp/node.def
@@ -1,16 +1,16 @@
-help: "Redistribute BGP routes"
-delete: "touch /tmp/rip-redist-bgp.\\$PPID" 
-end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+help: Redistribute BGP routes
+delete:expression: "touch /tmp/rip-redist-bgp.$PPID" 
+end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"no redistribute bgp \"; \
-      if [ -f \"/tmp/rip-redist-bgp.\\$PPID\" ]; then \
-        rm -rf /tmp/rip-redist-bgp.\\$PPID; \
+      if [ -f \"/tmp/rip-redist-bgp.$PPID\" ]; then \
+        rm -rf /tmp/rip-redist-bgp.$PPID; \
       else \
-        if [ -n \"$(./metric/@)\" ]; then \
-          COND=\"metric $(./metric/@)\";
+        if [ -n \"$VAR(./metric/@)\" ]; then \
+          COND=\"metric $VAR(./metric/@)\";
         fi; \
-        if [ -n \"$(./route-map/@)\" ]; then \
-          COND=\"\\$COND route-map $(./route-map/@)\"; \
+        if [ -n \"$VAR(./route-map/@)\" ]; then \
+          COND=\"$COND route-map $VAR(./route-map/@)\"; \
         fi; \
-        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-          -c \"redistribute bgp \\$COND\"; \
+        ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+          -c \"redistribute bgp $COND\"; \
       fi; "
diff --git a/templates/protocols/rip/redistribute/bgp/route-map/node.def b/templates/protocols/rip/redistribute/bgp/route-map/node.def
index f6e81288..a56f5668 100644
--- a/templates/protocols/rip/redistribute/bgp/route-map/node.def
+++ b/templates/protocols/rip/redistribute/bgp/route-map/node.def
@@ -1,4 +1,4 @@
 type: txt
-help: "Route map reference"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist"
+help: Route map reference
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
 
diff --git a/templates/protocols/rip/redistribute/connected/metric/node.def b/templates/protocols/rip/redistribute/connected/metric/node.def
index d7ca3c34..8234167e 100644
--- a/templates/protocols/rip/redistribute/connected/metric/node.def
+++ b/templates/protocols/rip/redistribute/connected/metric/node.def
@@ -1,6 +1,6 @@
 type: u32
-help: "Metric for redistributed routes"
-syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16"
+help: Metric for redistributed routes
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
 
 
 
diff --git a/templates/protocols/rip/redistribute/connected/node.def b/templates/protocols/rip/redistribute/connected/node.def
index 46dc83f3..a7157811 100644
--- a/templates/protocols/rip/redistribute/connected/node.def
+++ b/templates/protocols/rip/redistribute/connected/node.def
@@ -1,16 +1,16 @@
-help: "Redistribute connected routes"
-delete: "touch /tmp/rip-redist-connected.\\$PPID" 
-end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+help: Redistribute connected routes
+delete:expression: "touch /tmp/rip-redist-connected.$PPID" 
+end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"no redistribute connected \"; \
-      if [ -f \"/tmp/rip-redist-connected.\\$PPID\" ]; then \
-        rm -rf /tmp/rip-redist-connected.\\$PPID; \
+      if [ -f \"/tmp/rip-redist-connected.$PPID\" ]; then \
+        rm -rf /tmp/rip-redist-connected.$PPID; \
       else \
-        if [ -n \"$(./metric/@)\" ]; then \
-          COND=\"metric $(./metric/@)\";
+        if [ -n \"$VAR(./metric/@)\" ]; then \
+          COND=\"metric $VAR(./metric/@)\";
         fi; \
-        if [ -n \"$(./route-map/@)\" ]; then \
-          COND=\"\\$COND route-map $(./route-map/@)\"; \
+        if [ -n \"$VAR(./route-map/@)\" ]; then \
+          COND=\"$COND route-map $VAR(./route-map/@)\"; \
         fi; \
-        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-          -c \"redistribute connected \\$COND\"; \
+        ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+          -c \"redistribute connected $COND\"; \
       fi; "
diff --git a/templates/protocols/rip/redistribute/connected/route-map/node.def b/templates/protocols/rip/redistribute/connected/route-map/node.def
index 5ce5f0ab..f2c6f7c2 100644
--- a/templates/protocols/rip/redistribute/connected/route-map/node.def
+++ b/templates/protocols/rip/redistribute/connected/route-map/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: "Route map reference"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist"
+help: Route map reference
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/redistribute/kernel/metric/node.def b/templates/protocols/rip/redistribute/kernel/metric/node.def
index 270a810e..549cfdf1 100644
--- a/templates/protocols/rip/redistribute/kernel/metric/node.def
+++ b/templates/protocols/rip/redistribute/kernel/metric/node.def
@@ -1,3 +1,3 @@
 type: u32
-help: "Metric for redistributed routes"
-syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16"
+help: Metric for redistributed routes
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
diff --git a/templates/protocols/rip/redistribute/kernel/node.def b/templates/protocols/rip/redistribute/kernel/node.def
index 6ac0b1ab..ca9a4412 100644
--- a/templates/protocols/rip/redistribute/kernel/node.def
+++ b/templates/protocols/rip/redistribute/kernel/node.def
@@ -1,16 +1,16 @@
-help: "Redistribute kernel routes"
-delete: "touch /tmp/rip-redist-kernel.\\$PPID" 
-end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+help: Redistribute kernel routes
+delete:expression: "touch /tmp/rip-redist-kernel.$PPID" 
+end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"no redistribute kernel \"; \
-      if [ -f \"/tmp/rip-redist-kernel.\\$PPID\" ]; then \
-        rm -rf /tmp/rip-redist-kernel.\\$PPID; \
+      if [ -f \"/tmp/rip-redist-kernel.$PPID\" ]; then \
+        rm -rf /tmp/rip-redist-kernel.$PPID; \
       else \
-        if [ -n \"$(./metric/@)\" ]; then \
-          COND=\"metric $(./metric/@)\";
+        if [ -n \"$VAR(./metric/@)\" ]; then \
+          COND=\"metric $VAR(./metric/@)\";
         fi; \
-        if [ -n \"$(./route-map/@)\" ]; then \
-          COND=\"\\$COND route-map $(./route-map/@)\"; \
+        if [ -n \"$VAR(./route-map/@)\" ]; then \
+          COND=\"$COND route-map $VAR(./route-map/@)\"; \
         fi; \
-        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-          -c \"redistribute kernel \\$COND\"; \
+        ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+          -c \"redistribute kernel $COND\"; \
       fi; "
diff --git a/templates/protocols/rip/redistribute/kernel/route-map/node.def b/templates/protocols/rip/redistribute/kernel/route-map/node.def
index 5ce5f0ab..f2c6f7c2 100644
--- a/templates/protocols/rip/redistribute/kernel/route-map/node.def
+++ b/templates/protocols/rip/redistribute/kernel/route-map/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: "Route map reference"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist"
+help: Route map reference
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/redistribute/node.def b/templates/protocols/rip/redistribute/node.def
index e46c9122..00eefa88 100644
--- a/templates/protocols/rip/redistribute/node.def
+++ b/templates/protocols/rip/redistribute/node.def
@@ -1 +1 @@
-help: "Redistribute information from another routing protocol"
+help: Redistribute information from another routing protocol
diff --git a/templates/protocols/rip/redistribute/ospf/metric/node.def b/templates/protocols/rip/redistribute/ospf/metric/node.def
index 01a2dda7..80d13b5e 100644
--- a/templates/protocols/rip/redistribute/ospf/metric/node.def
+++ b/templates/protocols/rip/redistribute/ospf/metric/node.def
@@ -1,4 +1,4 @@
 type: u32
-help: "Metric for redistributed routes"
-syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16"
+help: Metric for redistributed routes
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
 
diff --git a/templates/protocols/rip/redistribute/ospf/node.def b/templates/protocols/rip/redistribute/ospf/node.def
index cc95c6a5..04c43c83 100644
--- a/templates/protocols/rip/redistribute/ospf/node.def
+++ b/templates/protocols/rip/redistribute/ospf/node.def
@@ -1,17 +1,17 @@
-help: "Redistribute OSPF routes"
-delete: "touch /tmp/rip-redist-ospf.\\$PPID" 
-end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+help: Redistribute OSPF routes
+delete:expression: "touch /tmp/rip-redist-ospf.$PPID" 
+end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"no redistribute ospf \"; \
-      if [ -f \"/tmp/rip-redist-ospf.\\$PPID\" ]; then \
-        rm -rf /tmp/rip-redist-ospf.\\$PPID; \
+      if [ -f \"/tmp/rip-redist-ospf.$PPID\" ]; then \
+        rm -rf /tmp/rip-redist-ospf.$PPID; \
       else \
-        if [ -n \"$(./metric/@)\" ]; then \
-          COND=\"metric $(./metric/@)\";
+        if [ -n \"$VAR(./metric/@)\" ]; then \
+          COND=\"metric $VAR(./metric/@)\";
         fi; \
-        if [ -n \"$(./route-map/@)\" ]; then \
-          COND=\"\\$COND route-map $(./route-map/@)\"; \
+        if [ -n \"$VAR(./route-map/@)\" ]; then \
+          COND=\"$COND route-map $VAR(./route-map/@)\"; \
         fi; \
-        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-          -c \"redistribute ospf \\$COND\"; \
+        ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+          -c \"redistribute ospf $COND\"; \
       fi; "
 
diff --git a/templates/protocols/rip/redistribute/ospf/route-map/node.def b/templates/protocols/rip/redistribute/ospf/route-map/node.def
index 5ce5f0ab..f2c6f7c2 100644
--- a/templates/protocols/rip/redistribute/ospf/route-map/node.def
+++ b/templates/protocols/rip/redistribute/ospf/route-map/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: "Route map reference"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist"
+help: Route map reference
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/redistribute/static/metric/node.def b/templates/protocols/rip/redistribute/static/metric/node.def
index 270a810e..549cfdf1 100644
--- a/templates/protocols/rip/redistribute/static/metric/node.def
+++ b/templates/protocols/rip/redistribute/static/metric/node.def
@@ -1,3 +1,3 @@
 type: u32
-help: "Metric for redistributed routes"
-syntax: $(@) >= 1 && $(@) <= 16; "metric must be between 1 and 16"
+help: Metric for redistributed routes
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
diff --git a/templates/protocols/rip/redistribute/static/node.def b/templates/protocols/rip/redistribute/static/node.def
index a4a7cbb7..ab170994 100644
--- a/templates/protocols/rip/redistribute/static/node.def
+++ b/templates/protocols/rip/redistribute/static/node.def
@@ -1,16 +1,16 @@
-help: "Redistribute static routes"
-delete: "touch /tmp/rip-redist-static.\\$PPID" 
-end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+help: Redistribute static routes
+delete:expression: "touch /tmp/rip-redist-static.$PPID" 
+end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"no redistribute static \"; \
-      if [ -f \"/tmp/rip-redist-static.\\$PPID\" ]; then \
-        rm -rf /tmp/rip-redist-static.\\$PPID; \
+      if [ -f \"/tmp/rip-redist-static.$PPID\" ]; then \
+        rm -rf /tmp/rip-redist-static.$PPID; \
       else \
-        if [ -n \"$(./metric/@)\" ]; then \
-          COND=\"metric $(./metric/@)\";
+        if [ -n \"$VAR(./metric/@)\" ]; then \
+          COND=\"metric $VAR(./metric/@)\";
         fi; \
-        if [ -n \"$(./route-map/@)\" ]; then \
-          COND=\"\\$COND route-map $(./route-map/@)\"; \
+        if [ -n \"$VAR(./route-map/@)\" ]; then \
+          COND=\"$COND route-map $VAR(./route-map/@)\"; \
         fi; \
-        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-          -c \"redistribute static \\$COND\"; \
+        ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+          -c \"redistribute static $COND\"; \
       fi; "
diff --git a/templates/protocols/rip/redistribute/static/route-map/node.def b/templates/protocols/rip/redistribute/static/route-map/node.def
index 5ce5f0ab..f2c6f7c2 100644
--- a/templates/protocols/rip/redistribute/static/route-map/node.def
+++ b/templates/protocols/rip/redistribute/static/route-map/node.def
@@ -1,3 +1,3 @@
 type: txt
-help: "Route map reference"
-commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $(@)\" ";"route-map $(@) doesn't exist"
+help: Route map reference
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/route/node.def b/templates/protocols/rip/route/node.def
index 5983d3a8..bb2be03f 100644
--- a/templates/protocols/rip/route/node.def
+++ b/templates/protocols/rip/route/node.def
@@ -1,9 +1,9 @@
 multi:
 type: ipv4net
-help: "RIP static route configuration"
-syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)"
-create: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-         -c \"route $(@)\" "
-delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-         -c \"no route $(@)\" "
+help: RIP static route configuration
+syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
+create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+         -c \"route $VAR(@)\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+         -c \"no route $VAR(@)\" "
 
diff --git a/templates/protocols/rip/timers/garbage-collection/node.def b/templates/protocols/rip/timers/garbage-collection/node.def
index 3a70f5b6..c30b35e4 100644
--- a/templates/protocols/rip/timers/garbage-collection/node.def
+++ b/templates/protocols/rip/timers/garbage-collection/node.def
@@ -1,6 +1,6 @@
 type: u32
 default: 120
-help: "Garbage collection timer. Default is 120."
-syntax: $(@) >= 5 && $(@) <= 2147483647; "Garbage collection timer must be between 5 and 2147483647"
+help: Garbage collection timer. Default is 120.
+syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; "Garbage collection timer must be between 5 and 2147483647"
 
 
diff --git a/templates/protocols/rip/timers/node.def b/templates/protocols/rip/timers/node.def
index 08bb0234..94a46fb6 100644
--- a/templates/protocols/rip/timers/node.def
+++ b/templates/protocols/rip/timers/node.def
@@ -1,11 +1,11 @@
-help: "Set RIP timer values"
-delete: "touch /tmp/rip-timers.\\$PPID"
-end: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+help: Set RIP timer values
+delete:expression: "touch /tmp/rip-timers.$PPID"
+end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
         -c \"no timers basic\"; \
-      if [ -f \"/tmp/rip-timers.\\$PPID\" ]; then \
-        rm -rf /tmp/rip-timers.\\$PPID; \
+      if [ -f \"/tmp/rip-timers.$PPID\" ]; then \
+        rm -rf /tmp/rip-timers.$PPID; \
       else \
-        \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-          -c \"timers basic $(./update/@) $(./timeout/@) $(./garbage-collection/@)\"; \
+        ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+          -c \"timers basic $VAR(./update/@) $VAR(./timeout/@) $VAR(./garbage-collection/@)\"; \
       fi; "
 
diff --git a/templates/protocols/rip/timers/timeout/node.def b/templates/protocols/rip/timers/timeout/node.def
index 2b01255f..cc7f2fe5 100644
--- a/templates/protocols/rip/timers/timeout/node.def
+++ b/templates/protocols/rip/timers/timeout/node.def
@@ -1,4 +1,4 @@
 type: u32
 default: 180
-help: "Routing information timeout timer. Default is 180."
-syntax: $(@) >= 5 && $(@) <= 2147483647; "Timeout timer must be between 5 and 2147483647"
+help: Routing information timeout timer. Default is 180.
+syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; "Timeout timer must be between 5 and 2147483647"
diff --git a/templates/protocols/rip/timers/update/node.def b/templates/protocols/rip/timers/update/node.def
index e1aa59e7..24d6bc09 100644
--- a/templates/protocols/rip/timers/update/node.def
+++ b/templates/protocols/rip/timers/update/node.def
@@ -1,5 +1,5 @@
 type: u32
 default: 30
-help: "Routing table update timer in seconds. Default is 30."
-syntax: $(@) >= 5 && $(@) <= 2147483647; "Update timer must be between 5 and 2147483647"
+help: Routing table update timer in seconds. Default is 30.
+syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; "Update timer must be between 5 and 2147483647"