diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 7ac9b4e0b49..b7d1f9fa5e0 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <record id="view_menu" model="ir.ui.view">
             <field name="name">ir.ui.menu.tree</field>
@@ -1488,4 +1488,4 @@
             <test expr="name">Tiny sprl</test>
         </assert>
     </data>
-</terp>
+</openerp>
diff --git a/bin/addons/base/base_demo.xml b/bin/addons/base/base_demo.xml
index 7c42d89b7f5..46f9a15330d 100644
--- a/bin/addons/base/base_demo.xml
+++ b/bin/addons/base/base_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <record id="user_demo" model="res.users">
             <field name="login">demo</field>
@@ -13,4 +13,4 @@
             <field name="groups_id" eval="('base.group_user')"/> 
         </record>
     </data>
-</terp>
+</openerp>
diff --git a/bin/addons/base/base_menu.xml b/bin/addons/base/base_menu.xml
index 24d10e32b7f..1204ab5b42b 100644
--- a/bin/addons/base/base_menu.xml
+++ b/bin/addons/base/base_menu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <menuitem icon="terp-administration" id="menu_administration" name="Administration" sequence="20"/>
         <menuitem id="menu_custom" name="Custom" parent="base.menu_administration" sequence="2"/>
@@ -10,4 +10,4 @@
         <menuitem id="menu_security" name="Security" parent="base.menu_administration" sequence="8"/>
         <menuitem id="menu_management" name="Modules Management" parent="base.menu_administration" sequence="10"/>
     </data>
-</terp>
+</openerp>
diff --git a/bin/addons/base/base_security.xml b/bin/addons/base/base_security.xml
index 7e498a60256..387044d8a50 100644
--- a/bin/addons/base/base_security.xml
+++ b/bin/addons/base/base_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 <!--
@@ -157,4 +157,4 @@
 <!--Don't remove before-->
 
 </data>
-</terp>
+</openerp>
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 285e7936bf7..0cff3091f62 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <!--
     ======================
@@ -267,4 +267,4 @@ understand. You will be able to switch to the extended view later.
         </record>
 
     </data>
-</terp>
+</openerp>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 9b27c6821e9..b67f5704af8 100755
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <!-- Values -->
@@ -1188,4 +1188,4 @@
         <menuitem action="action_model_grid_security" id="menu_ir_access_grid" parent="menu_security_access"/>
 
     </data>
-</terp>
+</openerp>
diff --git a/bin/addons/base/ir/wizard/wizard_menu_view.xml b/bin/addons/base/ir/wizard/wizard_menu_view.xml
index f2c01b2dd15..b8becc8f9cd 100644
--- a/bin/addons/base/ir/wizard/wizard_menu_view.xml
+++ b/bin/addons/base/ir/wizard/wizard_menu_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="view_model_menu_create" model="ir.ui.view">
@@ -30,4 +30,4 @@
         <act_window context="{'model_id': active_id}" id="act_menu_create" name="Create Menu" res_model="wizard.ir.model.menu.create" target="new" view_mode="form"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index 5fdd7723dbf..ac1d3d4957b 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <menuitem id="menu_workflow_root" name="Workflows" parent="menu_custom"/>
         
@@ -253,4 +253,4 @@
         <menuitem action="action_workflow_workitem_form" id="menu_workflow_workitem" parent="base.menu_workflow_root"/>
         
     </data>
-</terp>
+</openerp>
diff --git a/bin/addons/base/module/module_data.xml b/bin/addons/base/module/module_data.xml
index 940dd3833c9..0bf5c5aa85d 100644
--- a/bin/addons/base/module/module_data.xml
+++ b/bin/addons/base/module/module_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="module_repository_openerp" model="ir.module.repository">
             <field name="name">OpenERP</field>
@@ -8,4 +8,4 @@
             <field eval="'href=&quot;([a-zA-Z0-9_]+)-('+version+'.(\\d+)((\\.\\d+)*)([a-z]?)((_(pre|p|beta|alpha|rc)\\d*)*)(-r(\\d+))?)(\.zip)&quot;'" name="filter"/>
         </record>
     </data>
-</terp>
+</openerp>
diff --git a/bin/addons/base/module/module_report.xml b/bin/addons/base/module/module_report.xml
index 037c3ba7a50..27094b6b98d 100644
--- a/bin/addons/base/module/module_report.xml
+++ b/bin/addons/base/module/module_report.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <report auto="False" id="ir_module_reference_print" model="ir.module.module" name="ir.module.reference" rml="base/module/report/ir_module_reference.rml" string="Technical guide"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/bin/addons/base/module/module_view.xml b/bin/addons/base/module/module_view.xml
index f3df21aa3af..54c93228e29 100644
--- a/bin/addons/base/module/module_view.xml
+++ b/bin/addons/base/module/module_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <!-- Modules Categories -->
@@ -251,4 +251,4 @@
         <menuitem action="action_config_wizard_form" id="menu_config_module" parent="base.next_id_11"/>
 
     </data>
-</terp>
+</openerp>
diff --git a/bin/addons/base/module/module_wizard.xml b/bin/addons/base/module/module_wizard.xml
index d789902606c..737a3bb60e8 100644
--- a/bin/addons/base/module/module_wizard.xml
+++ b/bin/addons/base/module/module_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="wizard_base_module_import" model="ir.actions.wizard">
             <field name="name">Import module</field>
@@ -105,4 +105,4 @@
         <menuitem action="action_wizard_update_translations" id="menu_wizard_update_translations" parent="menu_translation_app"/>
          
     </data>
-</terp>
+</openerp>
diff --git a/bin/addons/base/res/bank_view.xml b/bin/addons/base/res/bank_view.xml
index 670e086e5b0..1aec7e5c7c5 100644
--- a/bin/addons/base/res/bank_view.xml
+++ b/bin/addons/base/res/bank_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="view_res_bank_form" model="ir.ui.view">
             <field name="name">res.bank.form</field>
@@ -52,4 +52,4 @@
         <menuitem action="action_res_bank_form" groups="group_extended" id="menu_action_res_bank_form" parent="menu_base_config" sequence="12"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/bin/addons/base/res/country_view.xml b/bin/addons/base/res/country_view.xml
index 435bdef5e1e..a1852bffd62 100644
--- a/bin/addons/base/res/country_view.xml
+++ b/bin/addons/base/res/country_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <!--
@@ -81,4 +81,4 @@
         <menuitem action="action_country_state" id="menu_country_state_partner" parent="menu_localisation"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/bin/addons/base/res/ir_property_view.xml b/bin/addons/base/res/ir_property_view.xml
index bb37489ffc8..9bb00b3061b 100644
--- a/bin/addons/base/res/ir_property_view.xml
+++ b/bin/addons/base/res/ir_property_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <!-- Properties -->
         <record id="ir_property_view" model="ir.ui.view">
@@ -50,4 +50,4 @@
         <menuitem action="ir_property_form_all" id="menu_ir_property_form_all" parent="base.next_id_15"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/bin/addons/base/res/partner/crm_demo.xml b/bin/addons/base/res/partner/crm_demo.xml
index efdadcefbc1..d88fd99f33c 100644
--- a/bin/addons/base/res/partner/crm_demo.xml
+++ b/bin/addons/base/res/partner/crm_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <record model="res.partner.canal">
             <field name="name">website</field>
@@ -36,4 +36,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/bin/addons/base/res/partner/crm_view.xml b/bin/addons/base/res/partner/crm_view.xml
index c9a2c2fcf2e..ec6c5330d5a 100644
--- a/bin/addons/base/res/partner/crm_view.xml
+++ b/bin/addons/base/res/partner/crm_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="res_partner_canal-view" model="ir.ui.view">
@@ -126,4 +126,4 @@
             </field>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/bin/addons/base/res/partner/partner_data.xml b/bin/addons/base/res/partner/partner_data.xml
index 5ae31ca42b2..443f2b0ea74 100644
--- a/bin/addons/base/res/partner/partner_data.xml
+++ b/bin/addons/base/res/partner/partner_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <!-- Default bank account description -->
         <record id="bank_normal" model="res.partner.bank.type">
@@ -17,4 +17,4 @@
             <field name="bank_type_id" ref="bank_normal"/>
         </record>
     </data>
-</terp>
+</openerp>
diff --git a/bin/addons/base/res/partner/partner_demo.xml b/bin/addons/base/res/partner/partner_demo.xml
index 86c5f65b4f1..d14d5705e7b 100644
--- a/bin/addons/base/res/partner/partner_demo.xml
+++ b/bin/addons/base/res/partner/partner_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <!--
@@ -357,4 +357,4 @@
         </record>
         
     </data>
-</terp>
+</openerp>
diff --git a/bin/addons/base/res/partner/partner_report.xml b/bin/addons/base/res/partner/partner_report.xml
index 2c938448c2b..b4057414f56 100644
--- a/bin/addons/base/res/partner/partner_report.xml
+++ b/bin/addons/base/res/partner/partner_report.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <report id="res_partner_address_report" model="res.partner" name="res.partner.address" string="Labels" xml="base/res/partner/report/partner_address.xml" xsl="base/res/partner/report/partner_address.xsl"/>
         <!-- 
 		<report string="Business Cards" model="res.partner" name="res.partner.businesscard" xml="base/res/partner/report/business_card.xml" xsl="base/res/partner/report/business_card.xsl"/>
 		-->
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index b36133d8a2e..aad15578511 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <menuitem icon="terp-partner" id="menu_base_partner" name="Partners" sequence="0"/>
         
@@ -509,4 +509,4 @@
         <menuitem action="action_partner_category_form" id="menu_partner_category_form" parent="base.menu_base_config"/>
 
     </data>
-</terp>
+</openerp>
diff --git a/bin/addons/base/res/partner/partner_wizard.xml b/bin/addons/base/res/partner/partner_wizard.xml
index b6d0159d38f..c064644bcf3 100644
--- a/bin/addons/base/res/partner/partner_wizard.xml
+++ b/bin/addons/base/res/partner/partner_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <wizard id="res_partner_send_sms_wizard" model="res.partner" name="res.partner.sms_send" string="Send SMS"/>
         <wizard id="res_partner_mass_mailing_wizard" model="res.partner" name="res.partner.spam_send" string="Mass Mailing"/>
@@ -8,4 +8,4 @@
 		<wizard string="Clear IDs" model="res.partner" name="res.partner.clear_ids"/>
 		-->
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/bin/addons/base/res/res_currency_view.xml b/bin/addons/base/res/res_currency_view.xml
index ccd75eabf7f..476d797e98e 100644
--- a/bin/addons/base/res/res_currency_view.xml
+++ b/bin/addons/base/res/res_currency_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="view_currency_tree" model="ir.ui.view">
@@ -52,4 +52,4 @@
         <menuitem action="action_currency_form" id="menu_action_currency_form" parent="menu_localisation" sequence="11"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/bin/addons/base/res/res_lang_view.xml b/bin/addons/base/res/res_lang_view.xml
index 0e85140c0c4..3c6f45f0ad4 100644
--- a/bin/addons/base/res/res_lang_view.xml
+++ b/bin/addons/base/res/res_lang_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="res_lang_tree" model="ir.ui.view">
             <field name="name">res.lang.tree</field>
@@ -23,4 +23,4 @@
         </record>
         <menuitem action="res_lang_act_window" id="menu_res_lang_act_window" parent="base.menu_translation_app"/>
     </data>
-</terp>
+</openerp>
diff --git a/bin/addons/base/res/res_request_view.xml b/bin/addons/base/res/res_request_view.xml
index a3d8809fdae..f7fc34013d4 100644
--- a/bin/addons/base/res/res_request_view.xml
+++ b/bin/addons/base/res/res_request_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="res_request_tree-view" model="ir.ui.view">
             <field name="name">res.request.tree</field>
@@ -127,4 +127,4 @@
             </field>
         </record>
     </data>
-</terp>
+</openerp>
diff --git a/bin/addons/base/res/res_security.xml b/bin/addons/base/res/res_security.xml
index d2d0bdbb7a3..85d00551521 100644
--- a/bin/addons/base/res/res_security.xml
+++ b/bin/addons/base/res/res_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
     <record model="res.groups" id="group_partner_manager">
@@ -7,4 +7,4 @@
     </record>
 
 </data>
-</terp>
+</openerp>