diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 6c5d15ff6e8..10acdc6c0b7 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <terp>
 <data>
-	<menuitem name="Administration" sequence="20" groups="admin" icon="terp-administration"/>
+	<menuitem name="Administration" sequence="20" groups="group_admin" icon="terp-administration"/>
 	<menuitem name="Administration/Configuration" sequence="1" id="menu_config"/>
 	<menuitem name="Administration/Custom" sequence="2" id="menu_custom"/>
 	<menuitem name="Administration/Translations" sequence="4" id="menu_translation"/>
diff --git a/bin/addons/base/module/module_wizard.xml b/bin/addons/base/module/module_wizard.xml
index 902b17b81b8..50f31b390d4 100644
--- a/bin/addons/base/module/module_wizard.xml
+++ b/bin/addons/base/module/module_wizard.xml
@@ -19,7 +19,7 @@
 			name="Administration/Modules Management/Update Modules List"
 			action="wizard_update"
 			type="wizard"
-			groups="admin"
+			groups="group_admin"
 			icon="STOCK_CONVERT"
 			id="menu_module_update"/>
 
diff --git a/bin/addons/base/res/bank_view.xml b/bin/addons/base/res/bank_view.xml
index 1406f6b6dc0..61144db625e 100644
--- a/bin/addons/base/res/bank_view.xml
+++ b/bin/addons/base/res/bank_view.xml
@@ -3,7 +3,7 @@
 	<data>
 		<menuitem name="Financial Management" icon="terp-account"/>
 		<menuitem name="Financial Management/Configuration"
-			groups="admin" sequence="1"/>
+			groups="group_admin" sequence="1"/>
 
 		<record model="ir.ui.view" id="view_res_bank_form">
 			<field name="name">res.bank.form</field>
diff --git a/bin/addons/base/res/country_view.xml b/bin/addons/base/res/country_view.xml
index 95668b3ef1e..ea458725e1e 100644
--- a/bin/addons/base/res/country_view.xml
+++ b/bin/addons/base/res/country_view.xml
@@ -38,7 +38,7 @@
 		</record>
 
 		<menuitem name="Partners/Configuration/Localisation/Countries"
-			groups="admin" action="action_country"
+			groups="group_admin" action="action_country"
 			id="menu_country_partner"/>
 
 		<!--
@@ -80,7 +80,7 @@
 		</record>
 
 		<menuitem name="Partners/Configuration/Localisation/States"
-			groups="admin" action="action_country_state"
+			groups="group_admin" action="action_country_state"
 			id="menu_country_state_partner"/>
 
 	</data>
diff --git a/bin/addons/base/res/partner/crm_view.xml b/bin/addons/base/res/partner/crm_view.xml
index d6155890e7d..dd4f025445a 100644
--- a/bin/addons/base/res/partner/crm_view.xml
+++ b/bin/addons/base/res/partner/crm_view.xml
@@ -18,7 +18,9 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	<menuitem name="Partners/Configuration/Partner Events/Channels" groups="admin" action="res_partner_canal-act" id="menu_res_partner_canal-act"/>
+	<menuitem name="Partners/Configuration/Partner Events/Channels"
+		groups="group_admin" action="res_partner_canal-act"
+		id="menu_res_partner_canal-act"/>
 
 	<record model="ir.ui.view" id="res_partner_event_type-view">
 		<field name="name">res.partner.event.type.form</field>
@@ -51,7 +53,9 @@
 		<field name="view_mode">tree,form</field>
 		<field name="context">{'active_test': False}</field>
 	</record>
-	<menuitem name="Partners/Configuration/Partner Events/Active Partner Events" groups="admin" action="res_partner_event_type-act" id="menu_res_partner_event_type-act"/>
+	<menuitem name="Partners/Configuration/Partner Events/Active Partner Events"
+		groups="group_admin" action="res_partner_event_type-act"
+		id="menu_res_partner_event_type-act"/>
 
 	<record model="ir.ui.view" id="res_partner_som_tree-view">
 		<field name="name">res.partner.som.tree</field>
@@ -82,7 +86,9 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	<menuitem name="Partners/Configuration/Partner Events/States of Mind" groups="admin" action="res_partner_som-act" id="menu_res_partner_som-act"/>
+	<menuitem name="Partners/Configuration/Partner Events/States of Mind"
+		groups="group_admin" action="res_partner_som-act"
+		id="menu_res_partner_som-act"/>
 
 	<record model="ir.ui.view" id="res_partner_event-wopartner-view_form">
 		<field name="name">res.partner.event.form</field>
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 6d848650309..49d07ee47c9 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -2,7 +2,7 @@
 <terp>
 <data>
 	<menuitem name="Partners" sequence="0" icon="terp-partner" id="menu_base_partner"/>
-	<menuitem name="Partners/Configuration" groups="admin" sequence="1"/>
+	<menuitem name="Partners/Configuration" groups="group_admin" sequence="1"/>
 
 	<!--
 	================================
@@ -26,7 +26,8 @@
 		<field name="res_model">res.partner.function</field>
 		<field name="view_type">form</field>
 	</record>
-	<menuitem name="Partners/Configuration/Functions" groups="admin" action="action_partner_function_form" id="menu_partner_function_form"/>
+	<menuitem name="Partners/Configuration/Functions" groups="group_admin"
+		action="action_partner_function_form" id="menu_partner_function_form"/>
 
 	<!--
 	=====================
@@ -161,7 +162,8 @@
 		<field name="res_model">res.partner.title</field>
 		<field name="view_type">form</field>
 	</record>
-	<menuitem name="Partners/Configuration/Titles" groups="admin" action="action_partner_title" id="menu_partner_title"/>
+	<menuitem name="Partners/Configuration/Titles" groups="group_admin"
+		action="action_partner_title" id="menu_partner_title"/>
 
 	<!--
 	=======================
diff --git a/bin/addons/base/res/res_currency_view.xml b/bin/addons/base/res/res_currency_view.xml
index fe50777c178..23501107d1f 100644
--- a/bin/addons/base/res/res_currency_view.xml
+++ b/bin/addons/base/res/res_currency_view.xml
@@ -3,7 +3,8 @@
 <data>
 
 	<menuitem name="Financial Management" icon="terp-account"/>
-	<menuitem name="Financial Management/Configuration" groups="admin" sequence="1"/>
+	<menuitem name="Financial Management/Configuration"
+		groups="group_admin" sequence="1"/>
 
 	<record model="ir.ui.view" id="view_currency_tree">
 		<field name="name">res.currency.tree</field>
diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index c5717aeb605..f263e96eb86 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -401,13 +401,11 @@ class xml_import(object):
 					groups_obj = self.pool.get('res.groups')
 					for group in g_names:
 						if group.startswith('-'):
-							id = groups_obj.search(cr, self.uid,
-									[('name', '=', group[1:])])[0]
-							groups_value.append((3, id))
+							group_id = self.id_get(cr, 'res.groups', group[1:])
+							groups_value.append((3, group_id))
 						else:
-							id = groups_obj.search(cr, self.uid,
-								[('name', '=', group)])[0]
-							groups_value.append((4, id))
+							group_id = self.id_get(cr, 'res.groups', group)
+							groups_value.append((4, group_id))
 					values['groups_id'] = groups_value
 				xml_id = rec.getAttribute('id').encode('utf8')
 				self._test_xml_id(xml_id)