diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 57dbaffccc5..f0c4fb33c7f 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -6,7 +6,8 @@
 	 Fiscal Year
 	-->
 
-	<menuitem name="Financial Management/Configuration" groups="admin" sequence="1"/>
+	<menuitem name="Financial Management/Configuration"
+		groups="base.group_admin" sequence="1"/>
 
 	<record model="ir.ui.view" id="view_account_fiscalyear_form">
 		<field name="name">account.fiscalyear.form</field>
diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index fbf3255e6a2..ff8128faed8 100644
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -2,7 +2,8 @@
 <terp>
 	<data>
 		<menuitem name="Financial Management/Payment" id="menu_main" />
-		<menuitem name="Financial Management/Configuration" groups="admin" sequence="1"/>
+		<menuitem name="Financial Management/Configuration"
+			groups="base.group_admin" sequence="1"/>
 
 		<record model="ir.ui.view" id="view_payment_type_form">
 			<field name="name">payment.type.form</field>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 3498f10b256..ef109b0ae8f 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -63,7 +63,9 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="crm_case_section_view_tree"/>
 	</record>
-	<menuitem name="CRM &amp; SRM/Configuration/Cases/Sections" id="menu_crm_case_section_act" action="crm_case_section_act" groups="admin"/>
+	<menuitem name="CRM &amp; SRM/Configuration/Cases/Sections"
+		id="menu_crm_case_section_act" action="crm_case_section_act"
+		groups="base.group_admin"/>
 
 	<record model="ir.actions.act_window" id="crm_case_section_act_tree">
 		<field name="name">Cases by section</field>
@@ -72,7 +74,9 @@
 		<field name="view_type">tree</field>
 		<field name="view_id" ref="crm_case_section_view_tree"/>
 	</record>
-	<menuitem name="CRM &amp; SRM/Cases/Cases by Section" id="menu_crm_case_section_act_tree" action="crm_case_section_act_tree" groups="admin"/>
+	<menuitem name="CRM &amp; SRM/Cases/Cases by Section"
+		id="menu_crm_case_section_act_tree" action="crm_case_section_act_tree"
+		groups="base.group_admin"/>
 
 
 
@@ -110,7 +114,9 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="crm_case_categ_tree-view"/>
 	</record>
-	<menuitem name="CRM &amp; SRM/Configuration/Cases/Categories" id="menu_crm_case_categ-act" action="crm_case_categ-act" groups="admin"/>
+	<menuitem name="CRM &amp; SRM/Configuration/Cases/Categories"
+		id="menu_crm_case_categ-act" action="crm_case_categ-act"
+		groups="base.group_admin"/>
 
 	# ------------------------------------------------------
 	# Case rules
@@ -202,7 +208,9 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="crm_case_rule_tree-view"/>
 	</record>
-	<menuitem name="CRM &amp; SRM/Configuration/Cases/Rules" id="menu_crm_case_rule-act" action="crm_case_rule-act" groups="admin"/>
+	<menuitem name="CRM &amp; SRM/Configuration/Cases/Rules"
+		id="menu_crm_case_rule-act" action="crm_case_rule-act"
+		groups="base.group_admin"/>
 
 
 	# ------------------------------------------------------
@@ -432,8 +440,11 @@
 		<field name="view_mode">tree,form</field>
 		<field name="view_id" ref="crm_case_history_tree-view"/>
 	</record>
-	<menuitem name="CRM &amp; SRM/Cases/Cases Histories" id="menu_crm_case_history-act_main" groups="admin"/>
-	<menuitem name="CRM &amp; SRM/Cases/Cases Histories/All Histories" id="menu_crm_case_history-act" action="crm_case_history-act" groups="admin"/>
+	<menuitem name="CRM &amp; SRM/Cases/Cases Histories"
+		id="menu_crm_case_history-act_main" groups="base.group_admin"/>
+	<menuitem name="CRM &amp; SRM/Cases/Cases Histories/All Histories"
+		id="menu_crm_case_history-act" action="crm_case_history-act"
+		groups="base.group_admin"/>
 	<record model="ir.actions.act_window" id="crm_case_history_my-act">
 		<field name="name">My Histories</field>
 		<field name="res_model">crm.case.history</field>
@@ -441,7 +452,9 @@
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('user_id','=',uid)]</field>
 	</record>
-	<menuitem name="CRM &amp; SRM/Cases/Cases Histories/" id="menu_crm_case_history_my-act" action="crm_case_history_my-act" groups="admin"/>
+	<menuitem name="CRM &amp; SRM/Cases/Cases Histories/"
+		id="menu_crm_case_history_my-act" action="crm_case_history_my-act"
+		groups="base.group_admin"/>
 
 	<record model="ir.ui.view" id="crm_segmentation_line_tree-view">
 		<field name="name">crm.segmentation.line.tree</field>
@@ -536,7 +549,7 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	<menuitem name="CRM &amp; SRM/Configuration" groups="admin"/>
+	<menuitem name="CRM &amp; SRM/Configuration" groups="base.group_admin"/>
 	<menuitem name="CRM &amp; SRM/Configuration/Segmentations/Segmentation Rules" id="menu_crm_segmentation-act" action="crm_segmentation_tree-act"/>
 	<menuitem name="CRM &amp; SRM/Automatic Segmentations" id="menu_crm_segmentation_tree-act" action="crm_segmentation_tree-act"/>
 
diff --git a/addons/custom/custom_view.xml b/addons/custom/custom_view.xml
index 4909336c498..2631ccb9621 100644
--- a/addons/custom/custom_view.xml
+++ b/addons/custom/custom_view.xml
@@ -1,12 +1,12 @@
 <terp>
 <data>
 	<record model="res.groups" id="group_compta_user">
- 		<field name="name">grcompta</field>
+		<field name="name">grcompta</field>
 	</record>
 	<record model="res.groups" id="group_compta_admin">
 		<field name="name">grcomptaadmin</field>
 	</record>
-	<menuitem name="Administration" groups="admin,grcomptaadmin" icon="terp-stock" id="menu_admin_compta"/>
+	<menuitem groups="group_compta_admin" id="menu_admin_compta"/>
 </data>
 </terp>
 
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index cb28e8c54fc..ab618b82d06 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -3,7 +3,7 @@
 	<data>
 		<menuitem name="Human Resources" id="menu_hr_root" icon="terp-hr"/>
 		<menuitem name="Human Resources/Reporting" id="menu_hr_reporting" sequence="40"/>
-		<menuitem name="Human Resources/Configuration" groups="admin"/>
+		<menuitem name="Human Resources/Configuration" groups="base.group_admin"/>
 
 		<!--
 		==========
@@ -69,7 +69,9 @@
 			<field name="view_id" ref="view_employee_tree"/>
 			<field name="domain">[('parent_id','=',False)]</field>
 		</record>
-		<menuitem name="Human Resources/Employees" id="menu_open_view_employee_tree" action="open_view_employee_tree" groups="admin"/>
+		<menuitem name="Human Resources/Employees"
+			id="menu_open_view_employee_tree" action="open_view_employee_tree"
+			groups="base.group_admin"/>
 
 		<record model="ir.ui.view" id="view_employee_list">
 			<field name="name">hr.employee.tree</field>
@@ -91,14 +93,18 @@
 			<field name="view_mode">tree,form</field>
 			<field name="view_id" ref="view_employee_list"/>
 		</record>
-		<menuitem name="Human Resources/Employees/Employees" id="menu_open_view_employee_list" action="open_view_employee_list" groups="admin"/>
+		<menuitem name="Human Resources/Employees/Employees"
+			id="menu_open_view_employee_list" action="open_view_employee_list"
+			groups="base.group_admin"/>
 
 		<record model="ir.actions.act_window" id="open_view_employee_new">
 			<field name="res_model">hr.employee</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">form,tree</field>
 		</record>
-		<menuitem name="Human Resources/Employees/New Employee" id="menu_open_view_employee_new" action="open_view_employee_new" groups="admin"/>
+		<menuitem name="Human Resources/Employees/New Employee"
+			id="menu_open_view_employee_new" action="open_view_employee_new"
+			groups="base.group_admin"/>
 
 
 		<!--
@@ -164,7 +170,9 @@
 			<field name="view_type">form</field>
 			<field name="view_id" ref="create_group" />
 		</record>
-		<menuitem name="Human Resources/Configuration/Timesheet Categories" id="menu_edit_workgroup" action="edit_workgroup" groups="admin"/>
+		<menuitem name="Human Resources/Configuration/Timesheet Categories"
+			id="menu_edit_workgroup" action="edit_workgroup"
+			groups="base.group_admin"/>
 
 		<record model="ir.ui.view" id="view_timesheet_tree">
 			<field name="name">hr.timesheet.tree</field>
@@ -260,7 +268,9 @@
 			<field name="view_type">form</field>
 			<field name="view_mode">form,tree</field>
 		</record>
-		<menuitem name="Human Resources/Configuration/Categories of Employee" id="menu_view_employee_category_form" action="open_view_categ_form" groups="admin"/>
+		<menuitem name="Human Resources/Configuration/Categories of Employee"
+			id="menu_view_employee_category_form" action="open_view_categ_form"
+			groups="base.group_admin"/>
 
 		<record model="ir.actions.act_window" id="open_view_categ_tree">
 			<field name="name">Categories structure</field>
@@ -269,7 +279,9 @@
 			<field name="view_id" ref="view_employee_category_tree"/>
 			<field name="domain">[('parent_id','=',False)]</field>
 		</record>
-		<menuitem name="Human Resources/Configuration/Categories of Employee/Categories Structure" id="menu_view_employee_category_tree" action="open_view_categ_tree" groups="admin"/>
+		<menuitem name="Human Resources/Configuration/Categories of Employee/Categories Structure"
+			id="menu_view_employee_category_tree" action="open_view_categ_tree"
+			groups="base.group_admin"/>
 
 		<record model="ir.ui.view" id="view_attendance_who">
 			<field name="name">hr.attendance.tree</field>
@@ -291,7 +303,9 @@
 			<field name="view_mode">tree,form</field>
 		</record>
 		<menuitem name="Human Resources/Attendances" id="menu_hr_attendance"/>
-		<menuitem name="Human Resources/Attendances/Attendances" id="menu_open_view_attendance" action="open_view_attendance" groups="admin"/>
+		<menuitem name="Human Resources/Attendances/Attendances"
+			id="menu_open_view_attendance" action="open_view_attendance"
+			groups="base.group_admin"/>
 
 
 		<!-- Holidays -->
@@ -344,7 +358,8 @@
 			<field name="view_id" ref="view_holiday" />
 		</record>
 		<menuitem name="Human Resources/Attendances/Vacation Request"
-			id="menu_open_ask_holidays" action="open_ask_holidays" groups="admin"/>
+			id="menu_open_ask_holidays" action="open_ask_holidays"
+			groups="base.group_admin"/>
 
 		<!-- Some Configuration (holiday type, attendance reasons) -->
 
@@ -376,7 +391,8 @@
 			<field name="view_id" ref="view_holiday_status" />
 		</record>
 		<menuitem name="Human Resources/Configuration/Holiday Status"
-			id="menu_open_view_holiday_status" action="open_view_holiday_status" groups="admin"/>
+			id="menu_open_view_holiday_status" action="open_view_holiday_status"
+			groups="base.group_admin"/>
 
 		<record model="ir.ui.view" id="edit_attendance_reason">
 			<field name="name">hr.action.reason.form</field>
@@ -408,7 +424,8 @@
 			<field name="view_id" ref="view_attendance_reason" />
 		</record>
 		<menuitem name="Human Resources/Configuration/Attendance Reasons"
-			id="menu_open_view_attendance_reason" action="open_view_attendance_reason" groups="admin"/>
+			id="menu_open_view_attendance_reason" action="open_view_attendance_reason"
+			groups="base.group_admin"/>
 
 	</data>
 </terp>
diff --git a/addons/hr_timesheet/hr_timesheet_wizard.xml b/addons/hr_timesheet/hr_timesheet_wizard.xml
index 1e9b4fcc050..fccb3f3172a 100644
--- a/addons/hr_timesheet/hr_timesheet_wizard.xml
+++ b/addons/hr_timesheet/hr_timesheet_wizard.xml
@@ -2,7 +2,9 @@
 <terp>
 	<data>
 		<wizard string="Sign in / Sign out by project" model="hr.employee" name="hr_timesheet.si_so" id="si_so"/>
-		<menuitem name="Human Resources/Attendances/Sign in\/Out by Project" action="si_so" type="wizard" groups="admin" id="menu_si_so"/>
+		<menuitem name="Human Resources/Attendances/Sign in\/Out by Project"
+			action="si_so" type="wizard" groups="base.group_admin"
+			id="menu_si_so"/>
 
 	</data>
 </terp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index f46dee8a7b1..fe819bb82c9 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -26,7 +26,8 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	<menuitem name="Production Management/Configuration" groups="admin"/>
+	<menuitem name="Production Management/Configuration"
+		groups="base.group_admin"/>
 	<menuitem name="Production Management/Configuration/Properties/Property Categories" id="menu_mrp_property_group_action" action="mrp_property_group_action"/>
 
 	<record model="ir.ui.view" id="mrp_property_tree_view">
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 53ea3d8844c..3e0810a2e9a 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -3,7 +3,8 @@
 	<data>
 
 		<menuitem name="Products" icon="terp-product" id="menu_main_product"/>
-		<menuitem name="Products/Configuration" groups="admin" sequence="1" id="menu_config_product"/>
+		<menuitem name="Products/Configuration" groups="base.group_admin"
+			sequence="1" id="menu_config_product"/>
 
 		<record model="ir.ui.view" id="product_product_tree_view">
 			<field name="name">product.product.tree</field>
@@ -234,7 +235,7 @@
 			<field name="view_id" ref="product_template_form_view"/>
 			<field name="act_window_id" ref="product_template_action"/>
 		</record>
-		<menuitem name="Products/Products/Templates" id="menu_product_template_action" action="product_template_action" groups="admin"/>
+		<menuitem name="Products/Products/Templates" id="menu_product_template_action" action="product_template_action" groups="base.group_admin"/>
 
 		<record model="ir.ui.view" id="product_category_form_view">
 			<field name="name">product.category.form</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8ff654adcb5..6dbabfeedc1 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -2,7 +2,8 @@
 <terp>
 	<data>
 		<menuitem name="Project Management" id="menu_main" icon="terp-project"/>
-		<menuitem name="Project Management/Configuration" groups="admin" sequence="1" id="menu_definitions"/>
+		<menuitem name="Project Management/Configuration"
+			groups="base.group_admin" sequence="1" id="menu_definitions"/>
 
 		<!-- Project -->
 		<record model="ir.ui.view" id="edit_project">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 517afae76dd..cd623c1b10a 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -40,7 +40,8 @@
 		<field name="view_type">form</field>
 		<field name="view_id" ref="view_shop_tree"/>
 	</record>
-	<menuitem name="Sales Management/Configuration" groups="admin" sequence="1"/>
+	<menuitem name="Sales Management/Configuration" groups="base.group_admin"
+		sequence="1"/>
 	<menuitem name="Sales Management/Configuration/Shop" id="menu_action_shop_form" action="action_shop_form"/>
 
 	<record model="ir.ui.view" id="view_order_tree">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ccab2803176..ae539c255e4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -2,7 +2,8 @@
 <terp>
 <data>
 	<menuitem name="Inventory Control" id="menu_stock_root" icon="terp-stock"/>
-	<menuitem name="Inventory Control/Configuration" groups="admin" sequence="1"/>
+	<menuitem name="Inventory Control/Configuration" groups="base.group_admin"
+		sequence="1"/>
 
 	=============================
 	Inventory Line
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 6b4aafe59aa..e5dd22847a6 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -3,7 +3,8 @@
 <data>
 
 	<menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>
-	<menuitem name="Tools/Subscriptions/Configuration" groups="admin" id="menu_subscription_config"/>
+	<menuitem name="Tools/Subscriptions/Configuration"
+		groups="base.group_admin" id="menu_subscription_config"/>
 	<!--
 	=======================================================
 	Subscription Views