diff --git a/op-mode-definitions/container.xml.in b/op-mode-definitions/container.xml.in
index ada9a4d59..f581d39fa 100644
--- a/op-mode-definitions/container.xml.in
+++ b/op-mode-definitions/container.xml.in
@@ -1,176 +1,176 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="add">
     <children>
       <node name="container">
         <properties>
           <help>Add container image</help>
         </properties>
         <children>
           <tagNode name="image">
             <properties>
               <help>Pull a new image for container</help>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/container.py add_image --name "${4}"</command>
           </tagNode>
         </children>
       </node>
     </children>
   </node>
   <node name="connect">
     <children>
       <tagNode name="container">
         <properties>
           <help>Attach to a running container</help>
           <completionHelp>
             <path>container name</path>
           </completionHelp>
         </properties>
         <command>sudo podman exec --interactive --tty "$3" /bin/sh</command>
       </tagNode>
     </children>
   </node>
   <node name="delete">
     <children>
       <node name="container">
         <properties>
           <help>Delete container image</help>
         </properties>
         <children>
           <tagNode name="image">
             <properties>
               <help>Delete container image</help>
               <completionHelp>
                 <script>sudo podman image ls -q</script>
               </completionHelp>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/container.py delete_image --name "${4}"</command>
           </tagNode>
         </children>
       </node>
     </children>
   </node>
   <node name="generate">
     <children>
       <node name="container">
         <properties>
           <help>Generate Container Image</help>
         </properties>
         <children>
           <tagNode name="image">
             <properties>
               <help>Name of container image (tag)</help>
             </properties>
             <children>
               <tagNode name="path">
                 <properties>
                   <help>Path to Dockerfile</help>
                   <completionHelp>
                     <list>&lt;filename&gt;</list>
                   </completionHelp>
                 </properties>
                 <command>sudo podman build --net host --layers --force-rm --tag "$4" $6</command>
               </tagNode>
             </children>
           </tagNode>
         </children>
       </node>
     </children>
   </node>
   <node name="monitor">
     <children>
       <node name="log">
         <children>
           <tagNode name="container">
             <properties>
-              <help>Monitor last lines of container logs</help>
+              <help>Monitor last lines of container log</help>
               <completionHelp>
                 <path>container name</path>
               </completionHelp>
             </properties>
             <command>sudo podman logs --follow --names "$4"</command>
           </tagNode>
         </children>
       </node>
     </children>
   </node>
   <node name="show">
     <children>
       <node name="container">
         <properties>
           <help>Show containers</help>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/container.py show_container</command>
         <children>
           <leafNode name="image">
             <properties>
               <help>Show container image</help>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/container.py show_image</command>
           </leafNode>
           <tagNode name="log">
             <properties>
               <help>Show logs from a given container</help>
               <completionHelp>
                 <path>container name</path>
               </completionHelp>
             </properties>
             <command>sudo podman logs --names "$4"</command>
           </tagNode>
           <leafNode name="network">
             <properties>
               <help>Show available container networks</help>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/container.py show_network</command>
           </leafNode>
         </children>
       </node>
       <node name="log">
         <children>
           <tagNode name="container">
             <properties>
               <help>Show logs from a given container</help>
               <completionHelp>
                 <path>container name</path>
               </completionHelp>
             </properties>
             <command>sudo podman logs --names "$4"</command>
           </tagNode>
         </children>
       </node>
     </children>
   </node>
   <node name="restart">
     <children>
       <tagNode name="container">
         <properties>
           <help>Restart a given container</help>
           <completionHelp>
             <path>container name</path>
           </completionHelp>
         </properties>
         <command>sudo ${vyos_op_scripts_dir}/container.py restart --name="$3"</command>
       </tagNode>
     </children>
   </node>
   <node name="update">
     <children>
       <node name="container">
         <properties>
           <help>Update a container image</help>
         </properties>
         <children>
           <tagNode name="image">
             <properties>
               <help>Update container image</help>
               <completionHelp>
                 <path>container name</path>
               </completionHelp>
             </properties>
             <command>if cli-shell-api existsActive container name "$4"; then sudo podman pull $(cli-shell-api returnActiveValue container name "$4" image); else echo "Container $4 does not exist"; fi</command>
           </tagNode>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/dns-dynamic.xml.in b/op-mode-definitions/dns-dynamic.xml.in
index 4f0399964..8f32f63f9 100644
--- a/op-mode-definitions/dns-dynamic.xml.in
+++ b/op-mode-definitions/dns-dynamic.xml.in
@@ -1,102 +1,102 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="monitor">
     <children>
       <node name="log">
         <children>
           <node name="dns">
             <properties>
-              <help>Monitor last lines of Domain Name System (DNS) related services</help>
+              <help>Monitor last lines of Domain Name System related services</help>
             </properties>
             <children>
               <node name="dynamic">
                 <properties>
                   <help>Monitor last lines of Dynamic DNS update service</help>
                 </properties>
                 <command>journalctl --no-hostname --follow --boot --unit ddclient.service</command>
               </node>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
   <node name="show">
     <children>
       <node name="log">
         <children>
           <node name="dns">
             <properties>
-              <help>Show log for Domain Name System (DNS) related services</help>
+              <help>Show log for Domain Name System related services</help>
             </properties>
             <children>
               <node name="dynamic">
                 <properties>
                   <help>Show log for Dynamic DNS update service</help>
                 </properties>
                 <command>journalctl --no-hostname --boot --unit ddclient.service</command>
               </node>
             </children>
           </node>
         </children>
       </node>
       <node name="dns">
         <properties>
-          <help>Show Domain Name System (DNS) related information</help>
+          <help>Show Domain Name System related information</help>
         </properties>
         <children>
           <node name="dynamic">
             <properties>
               <help>Show Dynamic DNS information</help>
             </properties>
             <children>
               <leafNode name="status">
                 <properties>
                   <help>Show Dynamic DNS status</help>
                 </properties>
                 <command>sudo ${vyos_op_scripts_dir}/dns_dynamic.py --status</command>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
   <node name="restart">
     <children>
       <node name="dns">
         <properties>
-          <help>Restart specific Domain Name System (DNS) related service</help>
+          <help>Restart specific Domain Name System related service</help>
         </properties>
         <children>
           <node name="dynamic">
             <properties>
               <help>Restart Dynamic DNS service</help>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/dns_dynamic.py --update</command>
           </node>
         </children>
       </node>
     </children>
   </node>
   <node name="update">
     <properties>
       <help>Update data for a service</help>
     </properties>
     <children>
       <node name="dns">
         <properties>
-          <help>Update Domain Name System (DNS) related information</help>
+          <help>Update Domain Name System related information</help>
         </properties>
         <children>
           <node name="dynamic">
             <properties>
               <help>Update Dynamic DNS information</help>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/dns_dynamic.py --update</command>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in
index a3befce26..2e5439414 100644
--- a/op-mode-definitions/monitor-log.xml.in
+++ b/op-mode-definitions/monitor-log.xml.in
@@ -1,333 +1,333 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="monitor">
     <children>
       <node name="log">
         <properties>
           <help>Monitor last lines of messages file</help>
         </properties>
         <command>SYSTEMD_LOG_COLOR=false journalctl --no-hostname --follow --boot</command>
         <children>
           <node name="color">
             <properties>
               <help>Output log in a colored fashion</help>
             </properties>
             <command>SYSTEMD_LOG_COLOR=false grc journalctl --no-hostname --follow --boot</command>
           </node>
           <node name="ids">
             <properties>
-              <help>Monitor log for Intrusion Detection System</help>
+              <help>Monitor Intrusion Detection System log</help>
             </properties>
             <children>
               <leafNode name="ddos-protection">
                 <properties>
                   <help>Monitor last lines of DDOS protection</help>
                 </properties>
                 <command>journalctl --no-hostname --follow --boot --unit fastnetmon.service</command>
               </leafNode>
             </children>
           </node>
           <node name="dhcp">
             <properties>
-              <help>Monitor last lines of Dynamic Host Control Protocol (DHCP)</help>
+              <help>Monitor last lines of Dynamic Host Control Protocol log</help>
             </properties>
             <children>
               <node name="server">
                 <properties>
-                  <help>Monitor last lines of DHCP server</help>
+                  <help>Monitor last lines of DHCP server log</help>
                 </properties>
                 <command>journalctl --no-hostname --follow --boot --unit isc-dhcp-server.service</command>
               </node>
               <node name="client">
                 <properties>
-                  <help>Monitor last lines of DHCP client</help>
+                  <help>Monitor last lines of DHCP client log</help>
                 </properties>
                 <command>journalctl --no-hostname --follow --boot --unit "dhclient@*.service"</command>
                 <children>
                   <tagNode name="interface">
                     <properties>
                       <help>Show DHCP client log on specific interface</help>
                       <completionHelp>
                         <script>${vyos_completion_dir}/list_interfaces --broadcast</script>
                       </completionHelp>
                     </properties>
                     <command>journalctl --no-hostname --follow --boot --unit "dhclient@$6.service"</command>
                   </tagNode>
                 </children>
               </node>
             </children>
           </node>
           <node name="dhcpv6">
             <properties>
-              <help>Monitor last lines of Dynamic Host Control Protocol IPv6 (DHCPv6)</help>
+              <help>Monitor last lines of Dynamic Host Control Protocol IPv6 log</help>
             </properties>
             <children>
               <node name="server">
                 <properties>
-                  <help>Monitor last lines of DHCPv6 server</help>
+                  <help>Monitor last lines of DHCPv6 server log</help>
                 </properties>
                 <command>journalctl --no-hostname --follow --boot --unit isc-dhcp-server6.service</command>
               </node>
               <node name="client">
                 <properties>
-                  <help>Monitor last lines of DHCPv6 client</help>
+                  <help>Monitor last lines of DHCPv6 client log</help>
                 </properties>
                 <command>journalctl --no-hostname --follow --boot --unit "dhcp6c@*.service"</command>
                 <children>
                   <tagNode name="interface">
                     <properties>
                       <help>Show DHCPv6 client log on specific interface</help>
                       <completionHelp>
                         <script>${vyos_completion_dir}/list_interfaces</script>
                       </completionHelp>
                     </properties>
                     <command>journalctl --no-hostname --follow --boot --unit "dhcp6c@$6.service"</command>
                   </tagNode>
                 </children>
               </node>
             </children>
           </node>
           <leafNode name="flow-accounting">
             <properties>
               <help>Monitor last lines of flow-accounting log</help>
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit uacctd.service</command>
           </leafNode>
           <leafNode name="ipoe-server">
             <properties>
-              <help>Monitor last lines of IPoE server log</help>
+              <help>Monitor last lines of IP over Ethernet server log</help>
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit accel-ppp@ipoe.service</command>
           </leafNode>
           <leafNode name="kernel">
             <properties>
               <help>Monitor last lines of Linux Kernel log</help>
             </properties>
             <command>journalctl --no-hostname --boot --follow --dmesg</command>
           </leafNode>
           <leafNode name="nhrp">
             <properties>
-              <help>Monitor last lines of Next Hop Resolution Protocol (NHRP) log</help>
+              <help>Monitor last lines of Next Hop Resolution Protocol log</help>
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit opennhrp.service</command>
           </leafNode>
           <leafNode name="ntp">
             <properties>
-              <help>Monitor last lines of Network Time Protocol (NTP) log</help>
+              <help>Monitor last lines of Network Time Protocol log</help>
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit chrony.service</command>
           </leafNode>
           <node name="pppoe">
             <properties>
               <help>Monitor last lines of PPPoE interface log</help>
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit "ppp@pppoe*.service"</command>
             <children>
               <tagNode name="interface">
                 <properties>
                   <help>Monitor last lines of PPPoE log for specific interface</help>
                   <completionHelp>
                     <path>interfaces pppoe</path>
                   </completionHelp>
                 </properties>
                 <command>journalctl --no-hostname --boot --follow --unit "ppp@$5.service"</command>
               </tagNode>
             </children>
           </node>
           <leafNode name="pppoe-server">
             <properties>
               <help>Monitor last lines of PPPoE server log</help>
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit accel-ppp@pppoe.service</command>
           </leafNode>
           <node name="protocol">
             <properties>
-              <help>Monitor log for Routing Protocol</help>
+              <help>Monitor routing protocol logs</help>
             </properties>
             <children>
               <leafNode name="ospf">
                 <properties>
                   <help>Monitor log for OSPF</help>
                 </properties>
                 <command>journalctl --follow --no-hostname --boot /usr/lib/frr/ospfd</command>
               </leafNode>
               <leafNode name="ospfv3">
                 <properties>
                   <help>Monitor log for OSPF for IPv6</help>
                 </properties>
                 <command>journalctl --follow --no-hostname --boot /usr/lib/frr/ospf6d</command>
               </leafNode>
               <leafNode name="bgp">
                 <properties>
                   <help>Monitor log for BGP</help>
                 </properties>
                 <command>journalctl --follow --no-hostname --boot /usr/lib/frr/bgpd</command>
               </leafNode>
               <leafNode name="rip">
                 <properties>
                   <help>Monitor log for RIP</help>
                 </properties>
                 <command>journalctl --follow --no-hostname --boot /usr/lib/frr/ripd</command>
               </leafNode>
               <leafNode name="ripng">
                 <properties>
                   <help>Monitor log for RIPng</help>
                 </properties>
                 <command>journalctl --follow --no-hostname --boot /usr/lib/frr/ripngd</command>
               </leafNode>
               <leafNode name="static">
                 <properties>
                   <help>Monitor log for static route</help>
                 </properties>
                 <command>journalctl --follow --no-hostname --boot /usr/lib/frr/staticd</command>
               </leafNode>
               <leafNode name="multicast">
                 <properties>
                   <help>Monitor log for Multicast protocol</help>
                 </properties>
                 <command>journalctl --follow --no-hostname --boot /usr/lib/frr/pimd</command>
               </leafNode>
               <leafNode name="isis">
                 <properties>
                   <help>Monitor log for ISIS</help>
                 </properties>
                 <command>journalctl --follow --no-hostname --boot /usr/lib/frr/isisd</command>
               </leafNode>
               <leafNode name="nhrp">
                 <properties>
                   <help>Monitor log for NHRP</help>
                 </properties>
                 <command>journalctl --follow --no-hostname --boot /usr/lib/frr/nhrpd</command>
               </leafNode>
               <leafNode name="bfd">
                 <properties>
                   <help>Monitor log for BFD</help>
                 </properties>
                 <command>journalctl --follow --no-hostname --boot /usr/lib/frr/bfdd</command>
               </leafNode>
               <leafNode name="mpls">
                 <properties>
                   <help>Monitor log for MPLS</help>
                 </properties>
                 <command>journalctl --follow --no-hostname --boot /usr/lib/frr/ldpd</command>
               </leafNode>
             </children>
           </node>
           <node name="macsec">
             <properties>
               <help>Monitor last lines of MACsec</help>
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit "wpa_supplicant-macsec@*.service"</command>
             <children>
               <tagNode name="interface">
                 <properties>
                   <help>Monitor last lines of specific MACsec interface</help>
                   <completionHelp>
                     <path>interfaces macsec</path>
                   </completionHelp>
                 </properties>
                 <command>SRC=$(cli-shell-api returnValue interfaces macsec "$5" source-interface); journalctl --no-hostname --boot --follow --unit "wpa_supplicant-macsec@$SRC.service"</command>
               </tagNode>
             </children>
           </node>
           <leafNode name="router-advert">
             <properties>
-              <help>Monitor last lines of Router Advertisement Daemon (radvd) log</help>
+              <help>Monitor last lines of Router Advertisement Daemon log</help>
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit radvd.service</command>
           </leafNode>
           <leafNode name="snmp">
             <properties>
-              <help>Monitor last lines of Simple Network Monitoring Protocol (SNMP) log</help>
+              <help>Monitor last lines of Simple Network Monitoring Protocol log</help>
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit snmpd.service</command>
           </leafNode>
           <leafNode name="ssh">
             <properties>
-              <help>Monitor last lines of Secure Shell (SSH) log</help>
+              <help>Monitor last lines of Secure Shell log</help>
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit ssh.service</command>
           </leafNode>
           <node name="sstpc">
             <properties>
-              <help>Monitor last lines of SSTP client log</help>
+              <help>Monitor last lines of Secure Socket Tunneling Protocol log</help>
             </properties>
             <command>journalctl --no-hostname --boot --follow --unit "ppp@sstpc*.service"</command>
             <children>
               <tagNode name="interface">
                 <properties>
                   <help>Monitor last lines of SSTP client log for specific interface</help>
                   <completionHelp>
                     <path>interfaces sstpc</path>
                   </completionHelp>
                 </properties>
                 <command>journalctl --no-hostname --boot --follow --unit "ppp@$5.service"</command>
               </tagNode>
             </children>
           </node>
           <node name="vpn">
             <properties>
-              <help>Monitor Virtual Private Network (VPN) services</help>
+              <help>Monitor Virtual Private Network services</help>
             </properties>
             <children>
               <leafNode name="all">
                 <properties>
                   <help>Monitor last lines of ALL VPNs</help>
                 </properties>
                 <command>journalctl --no-hostname --boot --follow --unit strongswan.service --unit accel-ppp@*.service --unit ocserv.service</command>
               </leafNode>
               <leafNode name="ipsec">
                 <properties>
                   <help>Monitor last lines of IPsec log</help>
                 </properties>
                 <command>journalctl --no-hostname --boot --follow --unit strongswan.service</command>
               </leafNode>
               <leafNode name="l2tp">
                 <properties>
                   <help>Monitor last lines of L2TP log</help>
                 </properties>
                 <command>journalctl --no-hostname --boot --follow --unit accel-ppp@l2tp.service</command>
               </leafNode>
               <leafNode name="openconnect">
                 <properties>
                   <help>Monitor last lines of OpenConnect log</help>
                 </properties>
                 <command>journalctl --no-hostname --boot --follow --unit ocserv.service</command>
               </leafNode>
               <leafNode name="pptp">
                 <properties>
                   <help>Monitor last lines of PPTP log</help>
                 </properties>
                 <command>journalctl --no-hostname --boot --follow --unit accel-ppp@pptp.service</command>
               </leafNode>
               <leafNode name="sstp">
                 <properties>
                   <help>Monitor last lines of SSTP log</help>
                 </properties>
                 <command>journalctl --no-hostname --boot --follow --unit accel-ppp@sstp.service</command>
               </leafNode>
             </children>
           </node>
           <leafNode name="vpp">
             <properties>
-              <help>Monitor last lines of Vector Packet Processor (VPP) log</help>
+              <help>Monitor last lines of Vector Packet Processor log</help>
             </properties>
             <command>journalctl --no-hostname --boot --unit vpp.service</command>
           </leafNode>
           <leafNode name="vrrp">
             <properties>
-              <help>Monitor last lines of Virtual Router Redundancy Protocol (VRRP) log</help>
+              <help>Monitor last lines of Virtual Router Redundancy Protocol log</help>
             </properties>
             <command>journalctl --no-hostname --boot --unit keepalived.service</command>
           </leafNode>
           <leafNode name="webproxy">
             <properties>
               <help>Monitor last lines of Webproxy log</help>
             </properties>
             <command>journalctl --no-hostname --boot --unit squid.service</command>
           </leafNode>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>