3 files changed, 10 insertions, 10 deletions
diff --git a/templates/service/telnet/allow-root/node.def b/templates/service/telnet/allow-root/node.def
index 9c3ff97d..d1a25f4e 100644
--- a/templates/service/telnet/allow-root/node.def
+++ b/templates/service/telnet/allow-root/node.def
@@ -1,19 +1,19 @@
 type: bool
 default: false
-help: "Enable/disable root login"
-update: " \
+help: Enable/disable root login
+update:expression: " \
   if ! env | grep -q SSH_TTY=; then \
     if [[ \"`tty`\" == /dev/pts/* ]]; then \
       echo \"Please configure telnet settings via ssh or console.\"; \
       exit 1; \
     fi; \
   fi; \
-  if [ \"$(@)\" == \"true\" ]; then \
+  if [ \"$VAR(@)\" == \"true\" ]; then \
     sudo mv -f /etc/securetty /etc/securetty.allow-root >&/dev/null; \
   else
     sudo mv -f /etc/securetty.allow-root /etc/securetty >&/dev/null; \
   fi ; /bin/true"
-delete: " \
+delete:expression: " \
   if ! env | grep -q SSH_TTY=; then \
     if [[ \"`tty`\" == /dev/pts/* ]]; then \
       echo \"Please configure telnet settings via ssh or console.\"; \
diff --git a/templates/service/telnet/node.def b/templates/service/telnet/node.def
index 844aec98..a1cc9680 100644
--- a/templates/service/telnet/node.def
+++ b/templates/service/telnet/node.def
@@ -1,5 +1,5 @@
-help: "Enable/disable telnet protocol"
-delete: " \
+help: Enable/disable telnet protocol
+delete:expression: " \
   if ! env | grep -q SSH_TTY=; then \
     if [[ \"`tty`\" == /dev/pts/* ]]; then \
       echo \"Please configure telnet settings via ssh or console.\"; \
@@ -7,12 +7,12 @@ delete: " \
     fi; \
   fi; \
   sudo /opt/vyatta/sbin/telnetd.init stop"
-end: " \
+end:expression: " \
   if ! env | grep -q SSH_TTY=; then \
     if [[ \"`tty`\" == /dev/pts/* ]]; then \
       echo \"Please configure telnet settings via ssh or console.\"; \
       exit 1; \
     fi; \
   fi; \
-  if [ -z \"$(port/@)\" ]; then exit 0; fi; \
-  sudo /opt/vyatta/sbin/telnetd.init restart $(port/@)"
+  if [ -z \"$VAR(port/@)\" ]; then exit 0; fi; \
+  sudo /opt/vyatta/sbin/telnetd.init restart $VAR(port/@)"
diff --git a/templates/service/telnet/port/node.def b/templates/service/telnet/port/node.def
index d9bbce6c..81b2ff91 100644
--- a/templates/service/telnet/port/node.def
+++ b/templates/service/telnet/port/node.def
@@ -1,3 +1,3 @@
 type:  u32
 default:  23
-help: "Port for telnet service"
+help: Port for telnet service