diff --git a/op-mode-definitions/monitor-bandwidth-test.xml.in b/op-mode-definitions/execute-bandwidth-test.xml.in
similarity index 93%
rename from op-mode-definitions/monitor-bandwidth-test.xml.in
rename to op-mode-definitions/execute-bandwidth-test.xml.in
index 9655912800..1581d5c256 100644
--- a/op-mode-definitions/monitor-bandwidth-test.xml.in
+++ b/op-mode-definitions/execute-bandwidth-test.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
-  <node name="monitor">
+  <node name="execute">
     <children>
       <node name="bandwidth-test">
         <properties>
@@ -39,7 +39,7 @@
                     <list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
                   </completionHelp>
                 </properties>
-                <command>${vyos_op_scripts_dir}/monitor_bandwidth_test.sh "$5"</command>
+                <command>${vyos_op_scripts_dir}/execute_bandwidth_test.sh "$5"</command>
               </tagNode>
               <tagNode name="udp">
                 <properties>
@@ -48,7 +48,7 @@
                     <list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
                   </completionHelp>
                 </properties>
-                <command>${vyos_op_scripts_dir}/monitor_bandwidth_test.sh "$5" "-u"</command>
+                <command>${vyos_op_scripts_dir}/execute_bandwidth_test.sh "$5" "-u"</command>
               </tagNode>
             </children>
           </node>
diff --git a/op-mode-definitions/execute-shell.xml.in b/op-mode-definitions/execute-shell.xml.in
new file mode 100644
index 0000000000..dfdc1e3716
--- /dev/null
+++ b/op-mode-definitions/execute-shell.xml.in
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="execute">
+    <children>
+      <node name="shell">
+        <properties>
+          <help>Execute shell</help>
+        </properties>
+        <children>
+          <tagNode name="netns">
+            <properties>
+              <help>Execute shell in given Network Namespace</help>
+              <completionHelp>
+                <path>netns name</path>
+              </completionHelp>
+            </properties>
+            <command>sudo ip netns exec $4 su - $(whoami)</command>
+          </tagNode>
+          <tagNode name="vrf">
+            <properties>
+              <help>Execute shell in given VRF instance</help>
+              <completionHelp>
+                <path>vrf name</path>
+              </completionHelp>
+            </properties>
+            <command>sudo ip vrf exec $4 su - $(whoami)</command>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/op-mode-definitions/force-wamp.xml.in b/op-mode-definitions/execute-wamp.xml.in
similarity index 96%
rename from op-mode-definitions/force-wamp.xml.in
rename to op-mode-definitions/execute-wamp.xml.in
index dbb205c6b9..bcceedc53b 100644
--- a/op-mode-definitions/force-wamp.xml.in
+++ b/op-mode-definitions/execute-wamp.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
-  <node name="force">
+  <node name="execute">
     <children>
       <tagNode name="owping">
         <properties>
diff --git a/op-mode-definitions/force-netns.xml.in b/op-mode-definitions/force-netns.xml.in
deleted file mode 100644
index b9dc2c1e82..0000000000
--- a/op-mode-definitions/force-netns.xml.in
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="force">
-    <children>
-      <tagNode name="netns">
-        <properties>
-          <help>Execute shell in given Network Namespace</help>
-          <completionHelp>
-            <path>netns name</path>
-          </completionHelp>
-        </properties>
-        <command>sudo ip netns exec $3 su - $(whoami)</command>
-      </tagNode>
-    </children>
-  </node>
-</interfaceDefinition>
diff --git a/op-mode-definitions/force-vrf.xml.in b/op-mode-definitions/force-vrf.xml.in
deleted file mode 100644
index 71f50b0d28..0000000000
--- a/op-mode-definitions/force-vrf.xml.in
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="force">
-    <children>
-      <tagNode name="vrf">
-        <properties>
-          <help>Execute shell in given VRF instance</help>
-          <completionHelp>
-            <path>vrf name</path>
-          </completionHelp>
-        </properties>
-        <command>sudo ip vrf exec $3 su - $(whoami)</command>
-      </tagNode>
-    </children>
-  </node>
-</interfaceDefinition>
diff --git a/op-mode-definitions/telnet.xml.in b/op-mode-definitions/telnet.xml.in
index c5bb6d2837..2cacc6a261 100644
--- a/op-mode-definitions/telnet.xml.in
+++ b/op-mode-definitions/telnet.xml.in
@@ -1,30 +1,35 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
-  <node name="telnet">
-    <properties>
-      <help>Telnet to a node</help>
-    </properties>
+  <node name="execute">
     <children>
-      <tagNode name="to">
+      <node name="telnet">
         <properties>
-          <help>Telnet to a host</help>
-          <completionHelp>
-            <list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
-          </completionHelp>
+          <help>Telnet to a node</help>
         </properties>
-        <command>/usr/bin/telnet $3</command>
         <children>
-          <tagNode name="port">
+          <tagNode name="to">
             <properties>
-              <help>Telnet to a host:port</help>
+              <help>Telnet to a host</help>
               <completionHelp>
-                <list>&lt;0-65535&gt;</list>
+                <list>&lt;hostname&gt; &lt;x.x.x.x&gt; &lt;h:h:h:h:h:h:h:h&gt;</list>
               </completionHelp>
             </properties>
-            <command>/usr/bin/telnet $3 $5</command>
+            <command>/usr/bin/telnet $4</command>
+            <children>
+              <tagNode name="port">
+                <properties>
+                  <help>Telnet to a host:port</help>
+                  <completionHelp>
+                    <list>&lt;0-65535&gt;</list>
+                  </completionHelp>
+                </properties>
+                <command>/usr/bin/telnet $4 $6</command>
+              </tagNode>
+            </children>
           </tagNode>
         </children>
-      </tagNode>
+      </node>
     </children>
   </node>
 </interfaceDefinition>
+
diff --git a/op-mode-definitions/wake-on-lan.xml.in b/op-mode-definitions/wake-on-lan.xml.in
index 625cf40564..d4589c868d 100644
--- a/op-mode-definitions/wake-on-lan.xml.in
+++ b/op-mode-definitions/wake-on-lan.xml.in
@@ -19,7 +19,7 @@
                 <properties>
                   <help>Station (MAC) address to wake up</help>
                 </properties>
-                <command>sudo /usr/sbin/etherwake -i "$3" "$5"</command>
+                <command>sudo /usr/sbin/etherwake -i "$4" "$6"</command>
               </tagNode>
             </children>
             </tagNode>
diff --git a/src/op_mode/monitor_bandwidth_test.sh b/src/op_mode/execute_bandwidth_test.sh
similarity index 100%
rename from src/op_mode/monitor_bandwidth_test.sh
rename to src/op_mode/execute_bandwidth_test.sh