Get rid of vyatta-vtysh

For SELinux policy, changing vyatta-quagga to use standard path values.
This means not having to change policies.

49 files changed, 107 insertions, 111 deletions

diff --git a/templates/protocols/ospf/access-list/node.tag/export/node.def b/templates/protocols/ospf/access-list/node.tag/export/node.def
index 31806ebb..ef7c6027 100644
--- a/templates/protocols/ospf/access-list/node.tag/export/node.def
+++ b/templates/protocols/ospf/access-list/node.tag/export/node.def
@@ -2,10 +2,10 @@ multi:
 type: txt
 help: Set filter for outgoing routing updates [REQUIRED]
 syntax:expression: $VAR(@) in "bgp", "connected", "kernel", "rip", "static"; "Must be (bgp, connected, kernel, rip, or static)"
-create: vyatta-vtysh -c "configure terminal" \
+create: vtysh -c "configure terminal" \
             -c "router ospf"                                      \
             -c "distribute-list $VAR(../@) out $VAR(@)"; 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
             -c "router ospf"                                      \
             -c "no distribute-list $VAR(../@) out $VAR(@)";
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
index 251c9c30..52d5c949 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
@@ -3,7 +3,7 @@ syntax:expression: $VAR(../stub/) == "" ; "Must delete stub area type first"
 syntax:expression: $VAR(../nssa/) == "" ; "Must delete nssa area type first"
 create:expression: "                                                            \
       if [ x$VAR(../../@) != x0.0.0.0 ] && [ x$VAR(../../@) != x0 ]; then       \
-         vyatta-vtysh -c \"configure terminal\"            \
+         vtysh -c \"configure terminal\"            \
            -c \"router ospf\"                                                   \
            -c \"no area $VAR(../../@) stub\" -c \"no area $VAR(../../@) nssa\"; \
       fi; "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
index 65cff07f..ea03efdb 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
@@ -2,16 +2,16 @@ type: u32
 help: Set the summary-default cost of nssa area
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215"
 
-create: vyatta-vtysh -c "configure terminal" \
+create: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "area $VAR(../../../@) nssa"                         \
           -c "area $VAR(../../../@) default-cost $VAR(@)";
 
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "area $VAR(../../../@) default-cost $VAR(@)"; 
 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no area $VAR(../../../@) default-cost $VAR(@)";
 
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
index 6a4ad877..14c9df74 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
@@ -5,7 +5,7 @@ syntax:expression: $VAR(../stub/) == "" ; "Must delete stub area type first"
 
 delete: touch /tmp/ospf-area-nssa.$PPID
 end: if [ -f "/tmp/ospf-area-nssa.$PPID" ]; then
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "router ospf" -c "no area $VAR(../../@) nssa";
 	rm /tmp/ospf-area-nssa.$PPID;
      else
@@ -22,6 +22,6 @@ end: if [ -f "/tmp/ospf-area-nssa.$PPID" ]; then
         if [ $? -eq 0 ] ; then
            PARM="$PARM no-summary";  
         fi;
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "router ospf" -c "area $VAR(../../@) nssa $PARM";
      fi;
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
index 1929ef18..52b73d05 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
@@ -2,16 +2,16 @@ type: u32
 help: Set the summary-default cost of stub area
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215"
 
-create: vyatta-vtysh -c "configure terminal" \
+create: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "area $VAR(../../../@) stub"                         \
           -c "area $VAR(../../../@) default-cost $VAR(@)";
 
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "area $VAR(../../../@) default-cost $VAR(@)";
 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no area $VAR(../../../@) default-cost $VAR(@)";
 
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
index da351ee5..fdafe0db 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
@@ -1,11 +1,11 @@
 help: Set to not inject inter-area routes into stub
 
 create:
-	vyatta-vtysh -c "configure terminal" \
+	vtysh -c "configure terminal" \
 	    -c "router ospf" \
 	    -c "area $VAR(../../../@) stub no-summary "
 
 delete:
-	vyatta-vtysh -c "configure terminal" \
+	vtysh -c "configure terminal" \
             -c "router ospf" \
             -c "no area $VAR(../../../@) stub no-summary "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
index ecdc091a..5f5bef18 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
@@ -7,11 +7,11 @@ syntax:expression: $VAR(../nssa/) == "" ; "Must delete nssa area type first"
 syntax:expression: $VAR(../normal/) == "" ; "Must delete normal area type first"
 
 create:
-	vyatta-vtysh -c "configure terminal" \
+	vtysh -c "configure terminal" \
 	    -c "router ospf" \
 	    -c "area $VAR(../../@) stub"
 
 delete:
-	vyatta-vtysh -c "configure terminal" \
+	vtysh -c "configure terminal" \
 	    -c "router ospf" \
 	    -c "no area $VAR(../../@) stub"
diff --git a/templates/protocols/ospf/area/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/authentication/node.def
index 2146df7f..3c87b9db 100644
--- a/templates/protocols/ospf/area/node.tag/authentication/node.def
+++ b/templates/protocols/ospf/area/node.tag/authentication/node.def
@@ -5,20 +5,20 @@ syntax:expression: $VAR(@) in "plaintext-password", "md5"; \
 
 update:expression: "\
         if [ x$VAR(@) == xplaintext-password ]; then               \
-           vyatta-vtysh                       \
+           vtysh                       \
             -c \"configure terminal\"                              \
             -c \"router ospf \"                                    \
             -c \"no area $VAR(../@) authentication \"              \
             -c \"area $VAR(../@) authentication \" ;               \
          else                                                      \
-           vyatta-vtysh                       \
+           vtysh                       \
             -c \"configure terminal\"                              \
             -c \"router ospf \"                                    \
             -c \"no area $VAR(../@) authentication \"              \
             -c \"area $VAR(../@) authentication message-digest\" ; \
          fi; "
 
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
             -c \"router ospf \"                                                 \
             -c \"no area $VAR(../@) authentication \" "
 
diff --git a/templates/protocols/ospf/area/node.tag/network/node.def b/templates/protocols/ospf/area/node.tag/network/node.def
index 55b2e632..990070dd 100644
--- a/templates/protocols/ospf/area/node.tag/network/node.def
+++ b/templates/protocols/ospf/area/node.tag/network/node.def
@@ -2,7 +2,7 @@ multi:
 type: ipv4net
 help: Set OSPF network [REQUIRED]
 syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
-create:vyatta-vtysh -c "configure terminal" \
+create:vtysh -c "configure terminal" \
        -c "router ospf" -c "network $VAR(@) area $VAR(../@)"
-delete:vyatta-vtysh -c "configure terminal" \
+delete:vtysh -c "configure terminal" \
        -c "router ospf" -c "no network $VAR(@) area $VAR(../@)"
diff --git a/templates/protocols/ospf/area/node.tag/range/node.def b/templates/protocols/ospf/area/node.tag/range/node.def
index c2c74ecb..72004a5e 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.def
@@ -6,7 +6,7 @@ syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 delete: touch /tmp/ospf-range.$PPID
 
 end: if [ -f /tmp/ospf-range.$PPID ]; then
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no area $VAR(../@) range $VAR(@)";
         rm /tmp/ospf-range.$PPID;
@@ -18,26 +18,26 @@ end: if [ -f /tmp/ospf-range.$PPID ]; then
               echo "Remove 'not-advertise' before setting cost or substitue";
 	      exit 1;
            fi;
-           vyatta-vtysh --noerror -c "configure terminal" \
+           vtysh --noerror -c "configure terminal" \
              -c "router ospf"                                               \
              -c "no area $VAR(../@) range $VAR(@)";
-           vyatta-vtysh -c "configure terminal" \
+           vtysh -c "configure terminal" \
              -c "router ospf"                                        \
              -c "area $VAR(../@) range $VAR(@) not-advertise";
         else
-           vyatta-vtysh --noerror -c "configure terminal" \
+           vtysh --noerror -c "configure terminal" \
              -c "router ospf"                                               \
              -c "no area $VAR(../@) range $VAR(@)";
-           vyatta-vtysh -c "configure terminal" \
+           vtysh -c "configure terminal" \
              -c "router ospf"                                        \
              -c "area $VAR(../@) range $VAR(@)";
            if [ -n "$VAR(cost/@)" ]; then
-              vyatta-vtysh -c "configure terminal" \
+              vtysh -c "configure terminal" \
                 -c "router ospf"                                        \
                 -c "area $VAR(../@) range $VAR(@) cost $VAR(cost/@)";
            fi;
            if [ -n "$VAR(substitute/@)" ]; then
-              vyatta-vtysh -c "configure terminal" \
+              vtysh -c "configure terminal" \
                 -c "router ospf"                                        \
                 -c "area $VAR(../@) range $VAR(@) substitute $VAR(substitute/@)";
            fi;
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
index e5387351..4728b0f3 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
@@ -1,7 +1,7 @@
 help: Set to not advertise this range
-create:expression: "vyatta-vtysh -c \"configure terminal\" \
+create:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"area $VAR(../../@) range $VAR(../@) not-advertise\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no area $VAR(../../@) range $VAR(../@) not-advertise\"; "
diff --git a/templates/protocols/ospf/area/node.tag/shortcut/node.def b/templates/protocols/ospf/area/node.tag/shortcut/node.def
index 15046236..85b7df93 100644
--- a/templates/protocols/ospf/area/node.tag/shortcut/node.def
+++ b/templates/protocols/ospf/area/node.tag/shortcut/node.def
@@ -1,10 +1,10 @@
 type: txt
 help: Set area's shortcut mode
 syntax:expression: $VAR(@) in "default", "disable", "enable"; "Must be (default, disable, enable)"
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
+update:expression: "vtysh -c \"configure terminal\" \
           -c \"router ospf\" \
           -c \"area $VAR(../@) shortcut $VAR(@)\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
           -c \"router ospf\" \
           -c \"no area $VAR(../@) shortcut $VAR(@)\"; "
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.def
index 614a50cd..4f8e71f0 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.def
@@ -2,9 +2,9 @@ tag:
 type: ipv4
 help: Set a virtual link
 syntax:expression: ! $VAR(../@) in "0", "0.0.0.0"; "Can't configure VL over area $VAR(../@)"
-create:expression: "vyatta-vtysh -c \"configure terminal\" \
+create:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"area $VAR(../@) virtual-link $VAR(@)\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no area $VAR(../@) virtual-link $VAR(@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
index 0806a5c7..f906e58f 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
@@ -6,13 +6,13 @@ 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-vtysh -c \"configure terminal\"   \
+         vtysh -c \"configure terminal\"   \
            -c \"router ospf\"                                          \
            -c \"no area $VAR(../../../../@)                            \
            virtual-link $VAR(../../../@) message-digest-key $VAR(@)\"; \
          rm /tmp/ospf-md5.$PPID;                                       \
       else                                                             \
-         vyatta-vtysh -c \"configure terminal\"   \
+         vtysh -c \"configure terminal\"   \
            -c \"router ospf\"                                          \
            -c \"area $VAR(../../../../@) virtual-link $VAR(../../../@) \
            message-digest-key $VAR(@) md5 $VAR(md5-key/@)\";           \
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
index dfb75d71..2fd13feb 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
@@ -1,16 +1,14 @@
 help: Set MD5 key id
 commit:expression: $VAR(../plaintext-password/) == "" ; "plaintext-password already set"
 
-create: vyatta-vtysh                          \
-          -c "configure terminal"                                  \
+create: vtysh -c "configure terminal"                              \
           -c "router ospf"                                         \
           -c "no area $VAR(../../../@) virtual-link $VAR(../../@)  \
             authentication-key"                                    \
           -c "area $VAR(../../../@) virtual-link $VAR(../../@)     \
             authentication message-digest";
 
-delete: vyatta-vtysh                          \
-          -c "configure terminal"                                  \
+delete: vtysh -c "configure terminal"                              \
           -c "router ospf"                                         \
           -c "area $VAR(../../../@) virtual-link $VAR(../../@)     \
             authentication null";
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def
index ee36125b..9a7292eb 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def
@@ -8,13 +8,11 @@ syntax:expression: exec "                              \
 
 commit:expression: $VAR(../md5/) == "" ; "md5 password already set"
 
-update: vyatta-vtysh                      \
-          -c "configure terminal" -c "router ospf"             \
+update: vtysh -c "configure terminal" -c "router ospf"         \
           -c "area $VAR(../../../@) virtual-link $VAR(../../@) \
             authentication authentication-key $VAR(@) "
 
-delete: vyatta-vtysh                         \
-          -c "configure terminal" -c "router ospf"                \
+delete: vtysh  -c "configure terminal" -c "router ospf"           \
           -c "no area $VAR(../../../@) virtual-link $VAR(../../@) \
             authentication authentication-key";
 
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
index f61b8e2d..8ce008a3 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
@@ -1,10 +1,10 @@
 type: u32
 help: Set interval after which a neighbor is declared dead
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
+update:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"area $VAR(../../@) virtual-link $VAR(../@) dead-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no area $VAR(../../@) virtual-link $VAR(../@) dead-interval \"; "
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
index a2922c43..2d378bd7 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
@@ -1,10 +1,10 @@
 type: u32
 help: Set interval between hello packets
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
+update:expression: "vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"area $VAR(../../@) virtual-link $VAR(../@) hello-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"no area $VAR(../../@) virtual-link $VAR(../@) hello-interval \"; "
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
index e2c6a17f..faa4ba8d 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
@@ -1,11 +1,11 @@
 type: u32
 help: Set interval between retransmitting lost link state advertisements
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
+update:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"area $VAR(../../@) virtual-link $VAR(../@) \
        retransmit-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no area $VAR(../../@) virtual-link $VAR(../@) \
        retransmit-interval \"; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
index 4caab873..13a58564 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
@@ -1,10 +1,10 @@
 type: u32
 help: Set link state transmit delay
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
+update:expression: "vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"area $VAR(../../@) virtual-link $VAR(../@) transmit-delay $VAR(@)\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"no area $VAR(../../@) virtual-link $VAR(../@) transmit-delay \"; "
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
index 9d1b9b1c..0bcafe6d 100644
--- a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
+++ b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
@@ -4,14 +4,14 @@ default: 100
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967; \
        "Must be between 1-4294967"
 
-update:expression: "vyatta-vtysh --noerror \
+update:expression: "vtysh --noerror \
        -c \"configure terminal\"                       \
        -c \"router ospf\"                              \
        -c \"auto-cost reference-bandwidth $VAR(@) \";  \
        echo 'OSPF: Reference bandwidth is changed.';   \
        echo '      Please ensure reference bandwidth is consistent across all routers'; "
 
-delete:expression: "vyatta-vtysh --noerror \
+delete:expression: "vtysh --noerror \
        -c \"configure terminal\"                       \
        -c \"router ospf\"                              \
        -c \"no auto-cost reference-bandwidth \";       \
diff --git a/templates/protocols/ospf/default-information/originate/node.def b/templates/protocols/ospf/default-information/originate/node.def
index 5e6e79cc..c1646b9d 100644
--- a/templates/protocols/ospf/default-information/originate/node.def
+++ b/templates/protocols/ospf/default-information/originate/node.def
@@ -1,7 +1,7 @@
 help: Set to distribute a default route
 delete: touch /tmp/ospf-default-info.$PPID
 end: if [ -f "/tmp/ospf-default-info.$PPID" ]; then
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no default-information originate";
      else
@@ -24,7 +24,7 @@ end: if [ -f "/tmp/ospf-default-info.$PPID" ]; then
         if [ -n "$VAR(./route-map/@)" ]; then
            PARM="$PARM route-map $VAR(./route-map/@)";
         fi;
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "default-information originate $PARM";
      fi;
diff --git a/templates/protocols/ospf/default-metric/node.def b/templates/protocols/ospf/default-metric/node.def
index c2bcef57..e6f0dd3a 100644
--- a/templates/protocols/ospf/default-metric/node.def
+++ b/templates/protocols/ospf/default-metric/node.def
@@ -1,10 +1,10 @@
 type: u32
 help: Set metric of redistributed routes
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "Must be between 0-16777214"
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
+update:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"default-metric $VAR(@) \"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no default-metric $VAR(@) \"; "
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/distance/global/node.def b/templates/protocols/ospf/distance/global/node.def
index 8eb8f75a..31025a39 100644
--- a/templates/protocols/ospf/distance/global/node.def
+++ b/templates/protocols/ospf/distance/global/node.def
@@ -1,10 +1,10 @@
 type: u32
 help: Set OSPF administrative distance
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255"
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
+update:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"distance $VAR(@) \"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no distance $VAR(@) \"; "
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/distance/ospf/node.def b/templates/protocols/ospf/distance/ospf/node.def
index 8a5bc13f..85329600 100644
--- a/templates/protocols/ospf/distance/ospf/node.def
+++ b/templates/protocols/ospf/distance/ospf/node.def
@@ -2,7 +2,7 @@ help: Set OSPF administrative distance
 delete:expression: "touch /tmp/ospf-distance.$PPID"
 end:expression: "\
       if [ -f \"/tmp/ospf-distance.$PPID\" ]; then                   \
-         vyatta-vtysh -c \"configure terminal\" \
+         vtysh -c \"configure terminal\" \
            -c \"router ospf\"                                        \
            -c \"no distance ospf\";                                  \
 	 rm /tmp/ospf-distance.$PPID;                                \
@@ -16,7 +16,7 @@ end:expression: "\
          if [ -n \"$VAR(./external/@)\" ]; then                      \
            PARM=\"$PARM external $VAR(./external/@)\";               \
          fi;                                                         \
-         vyatta-vtysh -c \"configure terminal\" \
+         vtysh -c \"configure terminal\" \
            -c \"router ospf\"                                        \
            -c \"no distance ospf\" -c \"distance ospf $PARM\";       \
       fi; "
diff --git a/templates/protocols/ospf/log-adjacency-changes/detail/node.def b/templates/protocols/ospf/log-adjacency-changes/detail/node.def
index 92e992fd..49c8c0de 100644
--- a/templates/protocols/ospf/log-adjacency-changes/detail/node.def
+++ b/templates/protocols/ospf/log-adjacency-changes/detail/node.def
@@ -1,6 +1,6 @@
 help: Set to log all state changes
-create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \
+create:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
          -c \"log-adjacency-changes detail\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
          -c \"no log-adjacency-changes detail\"; "
 
diff --git a/templates/protocols/ospf/log-adjacency-changes/node.def b/templates/protocols/ospf/log-adjacency-changes/node.def
index 7b56f74b..d8789d98 100644
--- a/templates/protocols/ospf/log-adjacency-changes/node.def
+++ b/templates/protocols/ospf/log-adjacency-changes/node.def
@@ -1,7 +1,7 @@
 help: Set to log changes in adjacency state
-create:expression: "vyatta-vtysh -c \"configure terminal\" \
+create:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"log-adjacency-changes\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no log-adjacency-changes\"; "
diff --git a/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def b/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def
index d6f7b8ac..96b17e75 100644
--- a/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def
+++ b/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def
@@ -1,7 +1,7 @@
 help: Set to administratively apply, for an indefinite period
-create:expression: "vyatta-vtysh -c \"configure terminal\" \
+create:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"max-metric router-lsa administrative\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no max-metric router-lsa administrative \"; "
diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
index ebd9dd25..2369b7be 100644
--- a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
+++ b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
@@ -1,10 +1,10 @@
 type: u32
 help: Set to advertise stub-router prior to full shutdown of OSPF
 syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds"
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
+update:expression: "vtysh -c \"configure terminal\" \
         -c \"router ospf\" \
         -c \"max-metric router-lsa on-shutdown $VAR(@)\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
         -c \"router ospf\" \
         -c \"no max-metric router-lsa on-shutdown \"; "
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
index 514a3075..e859f0fd 100644
--- a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
+++ b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
@@ -1,10 +1,10 @@
 type: u32
 help: Set to automatically advertise stub Router-LSA on startup of OSPF
 syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds"
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
+update:expression: "vtysh -c \"configure terminal\" \
         -c \"router ospf\" \
         -c \"max-metric router-lsa on-startup $VAR(@)\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
         -c \"router ospf\" \
         -c \"no max-metric router-lsa on-startup \"; "
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/mpls-te/enable/node.def b/templates/protocols/ospf/mpls-te/enable/node.def
index 188d0d04..4a24bf6e 100644
--- a/templates/protocols/ospf/mpls-te/enable/node.def
+++ b/templates/protocols/ospf/mpls-te/enable/node.def
@@ -1,7 +1,7 @@
 help: Enable MPLS-TE functionality
-create:expression: "vyatta-vtysh -c \"configure terminal\" \
+create:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"mpls-te on\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no mpls-te\"; "
diff --git a/templates/protocols/ospf/mpls-te/router-address/node.def b/templates/protocols/ospf/mpls-te/router-address/node.def
index fe414340..e849f8b3 100644
--- a/templates/protocols/ospf/mpls-te/router-address/node.def
+++ b/templates/protocols/ospf/mpls-te/router-address/node.def
@@ -1,8 +1,8 @@
 type: ipv4
 help: Set stable IP address of the advertising router
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
+update:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"mpls-te router-address $VAR(@)\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no mpls-te\"; "
diff --git a/templates/protocols/ospf/neighbor/node.def b/templates/protocols/ospf/neighbor/node.def
index e1c9e9e9..84491993 100644
--- a/templates/protocols/ospf/neighbor/node.def
+++ b/templates/protocols/ospf/neighbor/node.def
@@ -1,9 +1,9 @@
 tag:
 type: ipv4
 help: Set neighbor IP address
-create:expression: "vyatta-vtysh -c \"configure terminal\" \
+create:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"neighbor $VAR(@)\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no neighbor $VAR(@)\"; "
diff --git a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def b/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
index cd8babb2..b5e39099 100644
--- a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
+++ b/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
@@ -2,10 +2,10 @@ type: u32
 help: Set dead neighbor polling interval
 default: 60
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535 seconds"
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "neighbor $VAR(../@) poll-interval $VAR(@)";
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "neighbor $VAR(../@) poll-interval 60";
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/neighbor/node.tag/priority/node.def b/templates/protocols/ospf/neighbor/node.tag/priority/node.def
index ae89ff6f..6772e988 100644
--- a/templates/protocols/ospf/neighbor/node.tag/priority/node.def
+++ b/templates/protocols/ospf/neighbor/node.tag/priority/node.def
@@ -2,10 +2,10 @@ type: u32
 help: Set neighbor priority in seconds
 default: 0
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Priority must be between 0-255"
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "neighbor $VAR(../@) priority $VAR(@)"; 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "neighbor $VAR(../@) priority 0";
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def
index a51c86d8..a2262b24 100644
--- a/templates/protocols/ospf/node.def
+++ b/templates/protocols/ospf/node.def
@@ -1,4 +1,4 @@
 priority: 620
 help: Configure Open Shortest Path First protocol (OSPF) parameters
-create: vyatta-vtysh -c "configure terminal" -c "router ospf"
-delete: vyatta-vtysh -c "configure terminal" -c "no router ospf"
+create: vtysh -c "configure terminal" -c "router ospf"
+delete: vtysh -c "configure terminal" -c "no router ospf"
diff --git a/templates/protocols/ospf/parameters/abr-type/node.def b/templates/protocols/ospf/parameters/abr-type/node.def
index 2b80f14a..cb1b588c 100644
--- a/templates/protocols/ospf/parameters/abr-type/node.def
+++ b/templates/protocols/ospf/parameters/abr-type/node.def
@@ -2,10 +2,10 @@ type: txt
 help: Set OSPF ABR type
 default: "cisco"
 syntax:expression: $VAR(@) in "cisco", "ibm", "shortcut", "standard"; "Must be (cisco, ibm, shortcut, standard)"
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "ospf abr-type $VAR(@)";
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "ospf abr-type cisco"; 
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/parameters/opaque-lsa/node.def b/templates/protocols/ospf/parameters/opaque-lsa/node.def
index 7faf64b6..be999e27 100644
--- a/templates/protocols/ospf/parameters/opaque-lsa/node.def
+++ b/templates/protocols/ospf/parameters/opaque-lsa/node.def
@@ -1,6 +1,6 @@
 help: Enable the Opaque-LSA capability (rfc2370)
-create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \
+create:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
           -c \"ospf opaque-lsa \"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
           -c \"no ospf opaque-lsa \"; "
 
diff --git a/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def b/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def
index dfef025d..9de29ecf 100644
--- a/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def
+++ b/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def
@@ -1,5 +1,5 @@
 help: Enable rfc1583 criteria for handling AS external routes
-create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \
+create:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
           -c \"ospf rfc1583compatibility \"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
           -c \"no ospf rfc1583compatibility \"; "
diff --git a/templates/protocols/ospf/parameters/router-id/node.def b/templates/protocols/ospf/parameters/router-id/node.def
index 8b1011ec..abd4211d 100644
--- a/templates/protocols/ospf/parameters/router-id/node.def
+++ b/templates/protocols/ospf/parameters/router-id/node.def
@@ -1,8 +1,8 @@
 type: ipv4
 help: Set to override the default router identifier
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
+update:expression: "vtysh -c \"configure terminal\" \
            -c \"router ospf\" \
            -c \"ospf router-id $VAR(@)\" "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
+delete:expression: "vtysh -c \"configure terminal\" \
            -c \"router ospf\" \
            -c \"no ospf router-id \" "
diff --git a/templates/protocols/ospf/passive-interface-exclude/node.def b/templates/protocols/ospf/passive-interface-exclude/node.def
index 98820945..b69cc8b0 100644
--- a/templates/protocols/ospf/passive-interface-exclude/node.def
+++ b/templates/protocols/ospf/passive-interface-exclude/node.def
@@ -13,11 +13,11 @@ create: if [ -z $VAR(@) ] ; then
           echo "Error: must include interface";
           exit 1;
      	else  
-          vyatta-vtysh -c "configure terminal" -c "router ospf" \
+          vtysh -c "configure terminal" -c "router ospf" \
              -c "no passive-interface $VAR(@)"
 	fi;
 
-delete: vyatta-vtysh -c "configure terminal" -c "router ospf" \
+delete: vtysh -c "configure terminal" -c "router ospf" \
           -c "passive-interface $VAR(@)";
 
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def
index 09321d9f..2ee24c93 100644
--- a/templates/protocols/ospf/passive-interface/node.def
+++ b/templates/protocols/ospf/passive-interface/node.def
@@ -3,15 +3,15 @@ type: txt
 help: Set to suppress routing updates on an interface
 allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all && echo default
 create: if [ -z $VAR(@) ]
-        then  vyatta-vtysh -c "configure terminal" -c "router ospf" \
+        then  vtysh -c "configure terminal" -c "router ospf" \
           -c "passive-interface default";
-     	else  vyatta-vtysh -c "configure terminal" -c "router ospf" \
+     	else  vtysh -c "configure terminal" -c "router ospf" \
           -c "passive-interface $VAR(@)"
 	fi
 delete: if [ -z $VAR(@) ]
-	then vyatta-vtysh -c "configure terminal" -c "router ospf" \
+	then vtysh -c "configure terminal" -c "router ospf" \
           -c "no passive-interface default"
-	else vyatta-vtysh -c "configure terminal" -c "router ospf" \
+	else vtysh -c "configure terminal" -c "router ospf" \
           -c "no passive-interface $VAR(@)"
  	fi
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/redistribute/bgp/node.def b/templates/protocols/ospf/redistribute/bgp/node.def
index a3e04d6d..573b0e82 100644
--- a/templates/protocols/ospf/redistribute/bgp/node.def
+++ b/templates/protocols/ospf/redistribute/bgp/node.def
@@ -1,6 +1,6 @@
 help: Set to redistribute BGP routes
 delete:expression: "touch /tmp/ospf-redist-bgp.$PPID" 
-end: vyatta-vtysh -c "configure terminal"      \
+end: vtysh -c "configure terminal"      \
         -c "router ospf"                                             \
         -c "no redistribute bgp";
      if [ -f "/tmp/ospf-redist-bgp.$PPID" ]; then
@@ -15,7 +15,7 @@ end: vyatta-vtysh -c "configure terminal"      \
         if [ -n "$VAR(./route-map/@)" ]; then
            COND="$COND route-map $VAR(./route-map/@)";
         fi;
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
            -c "router ospf"                                       \
            -c "redistribute bgp $COND";
      fi; 
diff --git a/templates/protocols/ospf/redistribute/connected/node.def b/templates/protocols/ospf/redistribute/connected/node.def
index be4f6d0e..98b864fd 100644
--- a/templates/protocols/ospf/redistribute/connected/node.def
+++ b/templates/protocols/ospf/redistribute/connected/node.def
@@ -1,6 +1,6 @@
 help: Set to redistribute connected routes
 delete:expression: "touch /tmp/ospf-redist-connected.$PPID" 
-end: vyatta-vtysh -c "configure terminal"    \
+end: vtysh -c "configure terminal"    \
         -c "router ospf"                                          \
         -c "no redistribute connected";
      if [ -f "/tmp/ospf-redist-connected.$PPID" ]; then
@@ -15,7 +15,7 @@ end: vyatta-vtysh -c "configure terminal"    \
         if [ -n "$VAR(./route-map/@)" ]; then
            COND="$COND route-map $VAR(./route-map/@)";
         fi;
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
            -c "router ospf"                                       \
            -c "redistribute connected $COND";
      fi;
diff --git a/templates/protocols/ospf/redistribute/kernel/node.def b/templates/protocols/ospf/redistribute/kernel/node.def
index 605e72a8..5e2fc586 100644
--- a/templates/protocols/ospf/redistribute/kernel/node.def
+++ b/templates/protocols/ospf/redistribute/kernel/node.def
@@ -1,6 +1,6 @@
 help: Set to redistribute kernel routes
 delete:expression: "touch /tmp/ospf-redist-kernel.$PPID" 
-end: vyatta-vtysh -c "configure terminal" \
+end: vtysh -c "configure terminal" \
                   -c "router ospf"        \
                   -c "no redistribute kernel";
      if [ -f "/tmp/ospf-redist-kernel.$PPID" ]; then
@@ -15,7 +15,7 @@ end: vyatta-vtysh -c "configure terminal" \
         if [ -n "$VAR(./route-map/@)" ]; then
            COND="$COND route-map $VAR(./route-map/@)";
         fi;
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
                      -c "router ospf"        \
                      -c "redistribute kernel $COND";
      fi;
diff --git a/templates/protocols/ospf/redistribute/rip/node.def b/templates/protocols/ospf/redistribute/rip/node.def
index 6d29347b..48552329 100644
--- a/templates/protocols/ospf/redistribute/rip/node.def
+++ b/templates/protocols/ospf/redistribute/rip/node.def
@@ -1,6 +1,6 @@
 help: Set to redistribute RIP routes
 delete:expression: "touch /tmp/ospf-redist-rip.$PPID" 
-end: vyatta-vtysh -c "configure terminal"    \
+end: vtysh -c "configure terminal"    \
         -c "router ospf"                                          \
         -c "no redistribute rip";
      if [ -f "/tmp/ospf-redist-rip.$PPID" ]; then
@@ -15,7 +15,7 @@ end: vyatta-vtysh -c "configure terminal"    \
         if [ -n "$VAR(./route-map/@)" ]; then
            COND="$COND route-map $VAR(./route-map/@)";
         fi;
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "redistribute rip $COND";
      fi;
diff --git a/templates/protocols/ospf/redistribute/static/node.def b/templates/protocols/ospf/redistribute/static/node.def
index 4e748859..a9fc42d1 100644
--- a/templates/protocols/ospf/redistribute/static/node.def
+++ b/templates/protocols/ospf/redistribute/static/node.def
@@ -1,6 +1,6 @@
 help: Set to redistribute static routes
 delete:expression: "touch /tmp/ospf-redist-static.$PPID" 
-end: vyatta-vtysh -c "configure terminal"    \
+end: vtysh -c "configure terminal"    \
         -c "router ospf"                                          \
         -c "no redistribute static";
      if [ -f "/tmp/ospf-redist-static.$PPID" ]; then
@@ -15,7 +15,7 @@ end: vyatta-vtysh -c "configure terminal"    \
         if [ -n "$VAR(./route-map/@)" ]; then
            COND="$COND route-map $VAR(./route-map/@)";
         fi;
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
            -c "router ospf"                                       \
            -c "redistribute static $COND";
      fi;
diff --git a/templates/protocols/ospf/refresh/timers/node.def b/templates/protocols/ospf/refresh/timers/node.def
index 241ee3b6..055d9f26 100644
--- a/templates/protocols/ospf/refresh/timers/node.def
+++ b/templates/protocols/ospf/refresh/timers/node.def
@@ -1,10 +1,10 @@
 type: u32
 help: Set refresh timer
 syntax:expression: $VAR(@) >= 10 && $VAR(@) <= 1800; "must be between 10-1800"
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no refresh timer" -c "refresh timer $VAR(@)"; 
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no refresh timer $VAR(@)";
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/timers/throttle/spf/node.def b/templates/protocols/ospf/timers/throttle/spf/node.def
index 44d74492..1600d41c 100644
--- a/templates/protocols/ospf/timers/throttle/spf/node.def
+++ b/templates/protocols/ospf/timers/throttle/spf/node.def
@@ -1,12 +1,12 @@
 help: Set OSPF SPF timers
 delete: touch /tmp/ospf-timer.$PPID
 end: if [ -f "/tmp/ospf-timer.$PPID" ]; then
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no timers throttle spf";
         rm /tmp/ospf-timer.$PPID;
      else
-        vyatta-vtysh -c "configure terminal" \
+        vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "timers throttle spf $VAR(delay/@) $VAR(initial-holdtime/@) $VAR(max-holdtime/@)";
      fi;