diff --git a/op-mode-definitions/force-ipv6-nd.xml b/op-mode-definitions/force-ipv6-nd.xml
index 64c8347ea..49de097f6 100644
--- a/op-mode-definitions/force-ipv6-nd.xml
+++ b/op-mode-definitions/force-ipv6-nd.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="force">
     <children>
       <node name="ipv6-nd">
         <properties>
-          <help>ICMPv6 Neighbor Discovery tool</help>
+          <help>IPv6 Neighbor Discovery</help>
         </properties>
         <children>
           <tagNode name="interface">
             <properties>
-              <help>IPv6 Neighbor Discovery on a specific interface</help>
+              <help>IPv6 Neighbor Discovery on specified interface</help>
               <completionHelp>
                 <script>${vyos_completion_dir}/list_interfaces.py</script>
               </completionHelp>
             </properties>
             <children>
               <tagNode name="address">
                 <properties>
-                  <help>The IP address of the target</help>
+                  <help>IPv6 address of node to lookup</help>
                   <completionHelp>
                     <list>&lt;h:h:h:h:h:h:h:h&gt;</list>
                   </completionHelp>
                 </properties>
-                <command>ndisc6 $6 $4 -m</command>
+                <command>/usr/bin/ndisc6 -m "$6" "$4"</command>
               </tagNode>
             </children>
           </tagNode>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/force-ipv6-rd.xml b/op-mode-definitions/force-ipv6-rd.xml
index 722cb67bf..8c901af25 100644
--- a/op-mode-definitions/force-ipv6-rd.xml
+++ b/op-mode-definitions/force-ipv6-rd.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="force">
     <children>
       <node name="ipv6-rd">
         <properties>
-          <help>IPv6 Router Discovery tool</help>
+          <help>IPv6 Router Discovery</help>
         </properties>
         <children>
           <tagNode name="interface">
             <properties>
-              <help>IPv6 Router Discovery tool on a specific interface</help>
+              <help>IPv6 Router Discovery on specified interface</help>
               <completionHelp>
                 <script>${vyos_completion_dir}/list_interfaces.py</script>
               </completionHelp>
             </properties>
-            <command>rdisc6 $4</command>
+            <command>/usr/bin/rdisc6 "$4"</command>
             <children>
               <tagNode name="address">
                 <properties>
-                  <help>The IP address of the target</help>
+                  <help>IPv6 address of target</help>
                   <completionHelp>
                     <list>&lt;h:h:h:h:h:h:h:h&gt;</list>
                   </completionHelp>
                 </properties>
-                <command>rdisc6 $6 $4 -m</command>
+                <command>/usr/bin/rdisc6 -m "$6" "$4"</command>
               </tagNode>
             </children>
           </tagNode>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>