diff --git a/obmenu-generator b/obmenu-generator
index 592e7dd..71776ce 100644
--- a/obmenu-generator
+++ b/obmenu-generator
@@ -24,7 +24,7 @@
 # Program: obmenu-generator
 # License: GPLv3
 # Created on: 25 March 2011
-# Latest edit on: 20 June 2015
+# Latest edit on: 22 October 2015
 # Website: https://github.com/trizen/obmenu-generator
 
 #use 5.014;
@@ -514,10 +514,10 @@ foreach my $schema (@$SCHEMA) {
 
                  $icons
                    ? <<"ITEM_WITH_ICON"
-    <item label="$name" icon="${\check_icon($_->{Icon})}"><action name="Execute"><execute><![CDATA[$exec]]></execute></action></item>
+    <item label="$name" icon="${\check_icon($_->{Icon})}"><action name="Execute"><command><![CDATA[$exec]]></command></action></item>
 ITEM_WITH_ICON
                    : <<"ITEM";
-    <item label="$name"><action name="Execute"><execute><![CDATA[$exec]]></execute></action></item>
+    <item label="$name"><action name="Execute"><command><![CDATA[$exec]]></command></action></item>
 ITEM
 
                } @{$categories{$category}}
@@ -529,10 +529,10 @@ ITEM
         my ($command, $label, $icon) = @{$schema->{item}};
         $generated_menu .= $icons
           ? <<"ITEM_WITH_ICON"
-    <item label="$label" icon="${\check_icon($icon)}"><action name="Execute"><execute><![CDATA[$command]]></execute></action></item>
+    <item label="$label" icon="${\check_icon($icon)}"><action name="Execute"><command><![CDATA[$command]]></command></action></item>
 ITEM_WITH_ICON
           : <<"ITEM";
-    <item label="$label"><action name="Execute"><execute><![CDATA[$command]]></execute></action></item>
+    <item label="$label"><action name="Execute"><command><![CDATA[$command]]></command></action></item>
 ITEM
     }
     elsif (exists $schema->{sep}) {
@@ -581,23 +581,23 @@ CONFIG_MENU
 RECONFIGURE
 
         -e '/usr/bin/obconf' && ($generated_menu .= <<'EOL');
-    <item label="Openbox Configuration Manager"><action name="Execute"><execute>obconf</execute></action></item>
+    <item label="Openbox Configuration Manager"><action name="Execute"><command>obconf</command></action></item>
 EOL
 
         $generated_menu .= <<"CONFIG_MENU";
-    <item label="Configure autostarted apps"><action name="Execute"><execute><![CDATA[$CONFIG{editor} $openbox_conf/autostart]]></execute></action></item>
-    <item label="Edit rc.xml"><action name="Execute"><execute><![CDATA[$CONFIG{editor} $openbox_conf/rc.xml]]></execute></action></item>
+    <item label="Configure autostarted apps"><action name="Execute"><command><![CDATA[$CONFIG{editor} $openbox_conf/autostart]]></command></action></item>
+    <item label="Edit rc.xml"><action name="Execute"><command><![CDATA[$CONFIG{editor} $openbox_conf/rc.xml]]></command></action></item>
     <separator />
-    <item label="Generate a pipe menu"><action name="Execute"><execute><![CDATA[$0 -p]]></execute></action></item>
-    <item label="Generate a static menu"><action name="Execute"><execute><![CDATA[$0 -s]]></execute></action></item>
-    <item label="Generate a pipe menu with icons"><action name="Execute"><execute><![CDATA[$0 -p -i]]></execute></action></item>
-    <item label="Generate a static menu with icons"><action name="Execute"><execute><![CDATA[$0 -s -i]]></execute></action></item>
+    <item label="Generate a pipe menu"><action name="Execute"><command><![CDATA[$0 -p]]></command></action></item>
+    <item label="Generate a static menu"><action name="Execute"><command><![CDATA[$0 -s]]></command></action></item>
+    <item label="Generate a pipe menu with icons"><action name="Execute"><command><![CDATA[$0 -p -i]]></command></action></item>
+    <item label="Generate a static menu with icons"><action name="Execute"><command><![CDATA[$0 -s -i]]></command></action></item>
     <separator />
-    <item label="Edit menu.xml"><action name="Execute"><execute><![CDATA[$CONFIG{editor} $menufile]]></execute></action></item>
-    <item label="Edit the schema file"><action name="Execute"><execute><![CDATA[$CONFIG{editor} $schema_file]]></execute></action></item>
-    <item label="Edit the configuration file"><action name="Execute"><execute><![CDATA[$CONFIG{editor} $config_file]]></execute></action></item>
+    <item label="Edit menu.xml"><action name="Execute"><command><![CDATA[$CONFIG{editor} $menufile]]></command></action></item>
+    <item label="Edit the schema file"><action name="Execute"><command><![CDATA[$CONFIG{editor} $schema_file]]></command></action></item>
+    <item label="Edit the configuration file"><action name="Execute"><command><![CDATA[$CONFIG{editor} $config_file]]></command></action></item>
     <separator />
-    <item label="Regenerate configuration file"><action name="Execute"><execute><![CDATA[$0 -r]]></execute></action></item>
+    <item label="Regenerate configuration file"><action name="Execute"><command><![CDATA[$0 -r]]></command></action></item>
   </menu>
 CONFIG_MENU
     }