diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 123e48ef205..d73b5776653 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -70,16 +70,21 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem
-            action="mrp_property_action"
-            id="menu_mrp_property_action"
+        <menuitem name="Properties"
+            id="menu_mrp_property"
             parent="menu_mrp_configuration"
             groups="base.group_extended"
             sequence="10" />
+        <menuitem
+            action="mrp_property_action"
+            id="menu_mrp_property_action"
+            parent="menu_mrp_property"
+            groups="base.group_extended" />
         <menuitem
             action="mrp_property_group_action"
             id="menu_mrp_property_group_action"
-            parent="menu_mrp_property_action"/>
+            parent="menu_mrp_property"/>
+
         <!--
         Work Centers
         -->
@@ -215,7 +220,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_routing_tree_view"/>
         </record>
-        <menuitem name="Routings &amp; Work Centers" id="menu_mrp_routing_and_workcenters" parent="menu_mrp_configuration" groups="base.group_extended"
+        <menuitem name="Routings" id="menu_mrp_routing_and_workcenters" parent="menu_mrp_configuration" groups="base.group_extended"
                   sequence="100" />
         <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="menu_mrp_routing_and_workcenters" groups="base.group_extended" />
         <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="menu_mrp_routing_and_workcenters" groups="base.group_extended"/>
@@ -288,24 +293,34 @@
             </field>
         </record>
         <record id="mrp_bom_form_action" model="ir.actions.act_window">
-            <field name="name">Bill of Materials</field>
+            <field name="name">Master Bill of Materials</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.bom</field>
             <field name="view_type">form</field>
             <field name="domain">[('bom_id','=',False)]</field>
             <field name="view_id" ref="mrp_bom_tree_view"/>
         </record>
-        <menuitem action="mrp_bom_form_action" id="menu_mrp_bom_form_action" parent="menu_mrp_configuration"
-                  sequence="50" />
-
         <record id="mrp_bom_form_action2" model="ir.actions.act_window">
-            <field name="name">Bill of Materials Components</field>
+            <field name="name">Bill of Material Components</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.bom</field>
             <field name="view_type">form</field>
             <field name="domain">[('bom_id','!=',False)]</field>
         </record>
-        <menuitem action="mrp_bom_form_action2" id="menu_mrp_bom_form_action2" parent="menu_mrp_bom_form_action"/>
+
+        <!-- BOM menus -->
+        <menuitem name="Bill of Materials"
+                  id="menu_mrp_bom"
+                  parent="menu_mrp_configuration"
+                  sequence="50" />
+        <menuitem action="mrp_bom_form_action"
+                  id="menu_mrp_bom_form_action"
+                  parent="menu_mrp_bom"
+                  sequence="10"/>
+        <menuitem action="mrp_bom_form_action2"
+                  id="menu_mrp_bom_form_action2"
+                  parent="menu_mrp_bom"
+                  sequence="20"/>
 
         <record id="action2" model="ir.actions.act_window">
             <field name="name">Bill of Materials Structure</field>