4 files changed, 12 insertions, 12 deletions
diff --git a/op-mode-definitions/show-arp.xml b/op-mode-definitions/show-arp.xml
index 00b68a331..3d40db728 100644
--- a/op-mode-definitions/show-arp.xml
+++ b/op-mode-definitions/show-arp.xml
@@ -2,12 +2,12 @@
 <interfaceDefinition>
   <node name="show">
     <children>
-    <node name="arp">
+    <leafNode name="arp">
       <properties>
         <help>Show Address Resolution Protocol (ARP) information</help>
       </properties>
       <command>/usr/sbin/arp -e -n</command>
-    </node>
+    </leafNode>
     <tagNode name="arp">
       <properties>
         <help>Show Address Resolution Protocol (ARP) cache for specified interface</help>
diff --git a/op-mode-definitions/show-bridge.xml b/op-mode-definitions/show-bridge.xml
index 53fe9175d..0d80de86e 100644
--- a/op-mode-definitions/show-bridge.xml
+++ b/op-mode-definitions/show-bridge.xml
@@ -2,12 +2,12 @@
 <interfaceDefinition>
   <node name="show">
     <children>
-      <node name="bridge">
+      <leafNode name="bridge">
         <properties>
           <help>Show bridging information</help>
         </properties>
         <command>/sbin/brctl show</command>
-      </node>
+      </leafNode>
       <tagNode name="bridge">
         <properties>
           <help>Show bridge information for a given bridge interface</help>
@@ -17,18 +17,18 @@
         </properties>
         <command>/sbin/brctl show '$3'</command>
         <children>
-          <node name="macs">
+          <leafNode name="macs">
             <properties>
               <help>Show bridge Media Access Control (MAC) address table</help>
             </properties>
             <command>/sbin/brctl showmacs '$3'</command>
-          </node>
-          <node name="spanning-tree">
+          </leafNode>
+          <leafNode name="spanning-tree">
             <properties>
               <help>Show bridge spanning tree information</help>
             </properties>
             <command>/sbin/brctl showstp '$3'</command>
-          </node>
+          </leafNode>
         </children>
     </tagNode>
 
diff --git a/op-mode-definitions/show-date.xml b/op-mode-definitions/show-date.xml
index 0edb4b1ff..dddecd2fb 100644
--- a/op-mode-definitions/show-date.xml
+++ b/op-mode-definitions/show-date.xml
@@ -14,12 +14,12 @@
         </properties>
         <command>/bin/date -u</command>
         <children>
-          <node name="maya">
+          <leafNode name="maya">
             <properties>
               <help>Show UTC date in Maya calendar format</help>
             </properties>
             <command>${vyatta_bindir}/maya-date.py $(date +%s)</command>
-          </node>
+          </leafNode>
         </children>
       </node>
       </children>
diff --git a/op-mode-definitions/show-disk.xml b/op-mode-definitions/show-disk.xml
index 243a3656a..db473959a 100644
--- a/op-mode-definitions/show-disk.xml
+++ b/op-mode-definitions/show-disk.xml
@@ -10,12 +10,12 @@
         </completionHelp>
       </properties>
       <children>
-        <node name="format">
+        <leafNode name="format">
           <properties>
             <help>Show disk drive formatting</help>
           </properties>
           <command>${vyos_op_scripts_dir}/show-disk-format.sh $3</command>
-        </node>
+        </leafNode>
       </children>
     </tagNode>