diff --git a/addons/account/account_assert_test.xml b/addons/account/account_assert_test.xml
index 4abcd07fb2f..a7ff8e236ae 100644
--- a/addons/account/account_assert_test.xml
+++ b/addons/account/account_assert_test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <assert model="account.move" search="[]" string="For all account moves, the state is valid implies that the sum of credits equals the sum of debits">
             <test expr="not len(line_id) or line_id[0].state != 'valid' or (sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001)"/>
@@ -25,4 +25,4 @@
 
 -->
     </data>
-</terp>
+</openerp>
diff --git a/addons/account/account_demo.xml b/addons/account/account_demo.xml
index 63ff26351f6..5b6f996b92e 100644
--- a/addons/account/account_demo.xml
+++ b/addons/account/account_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <!--
@@ -91,4 +91,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml
index 4860384ec11..8ac41eadd6d 100644
--- a/addons/account/account_end_fy.xml
+++ b/addons/account/account_end_fy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="action_account_period_tree" model="ir.actions.act_window">
@@ -12,4 +12,4 @@
         <menuitem action="action_account_period_tree" id="menu_action_account_period_close_tree" parent="account.menu_account_end_year_treatments"/>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 36b0f97f31b..7df291dc117 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
 
         <!--
@@ -585,4 +585,4 @@
         <act_window domain="[('account_analytic_id', '=', active_id)]" id="act_account_analytic_account_2_account_invoice_line" name="Invoice lines" res_model="account.invoice.line" src_model="account.analytic.account"/>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/account/account_invoice_workflow.xml b/addons/account/account_invoice_workflow.xml
index 89a62ac3a0d..0a60b309777 100644
--- a/addons/account/account_invoice_workflow.xml
+++ b/addons/account/account_invoice_workflow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="wkf" model="workflow">
             <field name="name">account.invoice.basic</field>
@@ -115,4 +115,4 @@ write({'state':'cancel'})</field>
 	    	<field name="signal">invoice_cancel</field>
 	    </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index ccbc4a1ce37..9ed14c06c40 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
 
         <menuitem icon="terp-account" id="menu_finance" name="Financial Management"/>
@@ -16,4 +16,4 @@
         <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance" sequence="3"/>
         <menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance_periodical_processing" sequence="20"/>
     </data>
-</terp>
+</openerp>
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 536b53ded64..f3cb4ea4a94 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <report auto="False" id="account_general_ledger" menu="False" model="account.account" name="account.general.ledger" rml="account/report/general_ledger.rml" string="General Ledger"/>
         <report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/third_party_ledger.rml" string="Partner ledger"/>
@@ -60,4 +60,4 @@
 			auto="False" />
 		-->
     </data>
-</terp>
+</openerp>
diff --git a/addons/account/account_unit_test.xml b/addons/account/account_unit_test.xml
index 0a3ebc10d7d..6da81e996d9 100644
--- a/addons/account/account_unit_test.xml
+++ b/addons/account/account_unit_test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <!-- This file must be loaded  _after_  account_demo.xml ! --> 
         <record id="test_invoice_1" model="account.invoice">
@@ -75,4 +75,4 @@
             <test expr="state">paid</test>
         </assert>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 320c51984f6..460a46d5756 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
 
         <!--
@@ -1679,4 +1679,4 @@
 
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index de7e7f450cb..70ec040e354 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
 
         <wizard id="wizard_invoice_refund" model="account.invoice" name="account.invoice.refund" string="Refund invoice"/>
@@ -82,4 +82,4 @@
 		<!-- account.invoice -->
 	    <wizard string="Open State" model="account.invoice" name="account.wizard_paid_open" menu="False" id="wizard_paid_open"/>
     </data>
-</terp>
+</openerp>
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index 4de634f1479..2ec4ef8a7d5 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
 
         <!--
@@ -329,4 +329,4 @@
         </record>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/account/data/account_invoice.xml b/addons/account/data/account_invoice.xml
index 498398357f5..de2fff507f5 100644
--- a/addons/account/data/account_invoice.xml
+++ b/addons/account/data/account_invoice.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <record id="req_link_invoice" model="res.request.link">
             <field name="name">Invoice</field>
@@ -72,4 +72,4 @@
             <field eval="2708" name="number_next"/>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 5fb1410aee4..0138cd5e668 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="True">
 
 
@@ -233,4 +233,4 @@ your own chart of account.
         </record>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 4a05314daca..ad5a6284292 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <!--
         Partners Extension
@@ -66,4 +66,4 @@
         </record>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 3ca95e625b8..431bdd9e35a 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
@@ -61,4 +61,4 @@
         </record>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index bc7bda80144..8c4a5f1d62e 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <record id="analytic_absences" model="account.analytic.account">
             <field name="name">Absences</field>
@@ -224,4 +224,4 @@
             <field name="parent_id" ref="analytic_absences"/>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/project/project_demo.xml b/addons/account/project/project_demo.xml
index c9bb7187c6a..a26d2e338c9 100644
--- a/addons/account/project/project_demo.xml
+++ b/addons/account/project/project_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <record id="cose_journal_sale" model="account.analytic.journal">
             <field name="code">SAL</field>
@@ -17,4 +17,4 @@
             <field name="type">situation</field>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/project/project_report.xml b/addons/account/project/project_report.xml
index 99e79ca0474..ea282adb875 100644
--- a/addons/account/project/project_report.xml
+++ b/addons/account/project/project_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <report auto="False" id="analytic_journal_print" menu="False" model="account.analytic.journal" name="account.analytic.account.journal" rml="account/project/report/analytic_journal.rml" string="Analytic Journal"/>
         
@@ -41,4 +41,4 @@
 			menu="False"/>-->
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 02476766045..e62eeb7d3d7 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
 
         <record id="view_account_analytic_account_list" model="ir.ui.view">
@@ -354,4 +354,4 @@
         </record>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index 6b56e75957c..3860447ff9d 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><terp><data noupdate="1">
+<?xml version="1.0" encoding="utf-8"?><openerp><data noupdate="1">
 
     <record id="group_account_invoice" model="res.groups">
         <field name="name">Finance / Invoice</field>
@@ -11,4 +11,4 @@
     <record id="group_account_manager" model="res.groups">
         <field name="name">Finance / Manager</field>
     </record>
-</data></terp>
+</data></openerp>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 6ebab7aa0a8..c57a0cdba70 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <menuitem icon="terp-project" id="menu_main" name="Project Management"/>
@@ -101,4 +101,4 @@
         <menuitem action="action_account_analytic_all_simplified" id="menu_action_account_analytic_all_simplified" parent="account_analytic_analysis.next_id_72"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index d6e9e958077..fb4a3d774d2 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
 
         <!--
@@ -117,4 +117,4 @@
         </record>
 
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index fb5eb636f01..1dbfa87d853 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="view_account_analytic_default_tree" model="ir.ui.view">
             <field name="name">account.analytic.default.tree</field>
@@ -69,4 +69,4 @@
             domain="[('product_id','=',active_id)]"/>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/account_analytic_plans/account_analytic_plans_report.xml b/addons/account_analytic_plans/account_analytic_plans_report.xml
index d68ec3bd6ab..8bed6104b00 100644
--- a/addons/account_analytic_plans/account_analytic_plans_report.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 		<report
@@ -19,5 +19,5 @@
 			keyword="client_print_multi"/>
 
 	</data>
-</terp>
+</openerp>
 
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index ad5f89f907e..2078a9d6e94 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 
 <!-- Add plan_id after user_id in account.journal many2one with account.analytic.plan -->
@@ -245,4 +245,4 @@
         </record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/account_analytic_plans/model_wizard.xml b/addons/account_analytic_plans/model_wizard.xml
index ac67a765147..9dc545b90a5 100644
--- a/addons/account_analytic_plans/model_wizard.xml
+++ b/addons/account_analytic_plans/model_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 		<wizard
 			string="Create Model"
@@ -7,5 +7,5 @@
 			name="create.model" id="create_model"
 			menu="False"/>
 	</data>
-</terp>
+</openerp>
 
diff --git a/addons/account_balance/account_report.xml b/addons/account_balance/account_report.xml
index 5eae7b94e23..1c3701ccba7 100644
--- a/addons/account_balance/account_report.xml
+++ b/addons/account_balance/account_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 		<report id="account_account_balance"
 			string="Account balance"
@@ -17,4 +17,4 @@
 			menu="False"/>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/account_balance/account_wizard.xml b/addons/account_balance/account_wizard.xml
index 1fc7f52ed0f..5d90d97161f 100644
--- a/addons/account_balance/account_wizard.xml
+++ b/addons/account_balance/account_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 		<menuitem parent="account.menu_finance" icon="terp-account"/>
 
@@ -11,4 +11,4 @@
 			id="wizard_account_balance_report"/>
 
 		</data>
-</terp>
+</openerp>
diff --git a/addons/account_budget_crossover/crossovered_budget_report.xml b/addons/account_budget_crossover/crossovered_budget_report.xml
index 42f59110be4..5fd907d03b1 100644
--- a/addons/account_budget_crossover/crossovered_budget_report.xml
+++ b/addons/account_budget_crossover/crossovered_budget_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 	<!-- Reports on crossovered.budget -->
@@ -41,4 +41,4 @@
 			auto="False"
 			menu="False"/>
 	</data>
-</terp>
+</openerp>
diff --git a/addons/account_budget_crossover/crossovered_budget_view.xml b/addons/account_budget_crossover/crossovered_budget_view.xml
index 9959f41b558..613d9edf960 100644
--- a/addons/account_budget_crossover/crossovered_budget_view.xml
+++ b/addons/account_budget_crossover/crossovered_budget_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 		<record model="ir.ui.view" id="crossovered_budget_view_form">
 			<field name="name">crossovered.budget.view.form</field>
@@ -251,6 +251,6 @@
 		</record>
 
 	</data>
-</terp>
+</openerp>
 
 
diff --git a/addons/account_budget_crossover/crossovered_budget_workflow.xml b/addons/account_budget_crossover/crossovered_budget_workflow.xml
index e271d131448..a14cfd2cced 100644
--- a/addons/account_budget_crossover/crossovered_budget_workflow.xml
+++ b/addons/account_budget_crossover/crossovered_budget_workflow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 <data>
 
 	<record model="res.roles" id="crossovered_budget_role">
@@ -101,4 +101,4 @@
 		<field name="role_id" ref="crossovered_budget_role"/>
 	</record>-->
 </data>
-</terp>
+</openerp>
diff --git a/addons/account_chart/account_chart.xml b/addons/account_chart/account_chart.xml
index 2b6e6fe7825..0a887345ea9 100644
--- a/addons/account_chart/account_chart.xml
+++ b/addons/account_chart/account_chart.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="True">
         
         <!-- deactivate minimal account -->
@@ -23,4 +23,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_date_check/account_date_check_view.xml b/addons/account_date_check/account_date_check_view.xml
index c14a85a0f31..e411cbd53aa 100644
--- a/addons/account_date_check/account_date_check_view.xml
+++ b/addons/account_date_check/account_date_check_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 
 	<record model="ir.ui.view" id="view_account_journal_form_inherit2">
@@ -15,4 +15,4 @@
 	</record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/account_followup/followup_demo.xml b/addons/account_followup/followup_demo.xml
index a75de0b1be9..7f25af3b1d0 100644
--- a/addons/account_followup/followup_demo.xml
+++ b/addons/account_followup/followup_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <record id="demo_followup1" model="account_followup.followup">
@@ -30,4 +30,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_followup/followup_report_view.xml b/addons/account_followup/followup_report_view.xml
index 7ee9a34fb2b..53fec56b46c 100644
--- a/addons/account_followup/followup_report_view.xml
+++ b/addons/account_followup/followup_report_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="view_account_followup_stat_form" model="ir.ui.view">
@@ -50,4 +50,4 @@
         
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_followup/followup_view.xml b/addons/account_followup/followup_view.xml
index 3d3cb73b720..8739a94372a 100644
--- a/addons/account_followup/followup_view.xml
+++ b/addons/account_followup/followup_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="view_account_followup_followup_line_form" model="ir.ui.view">
@@ -109,4 +109,4 @@
         
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/account_invoice_layout/account_invoice_layout_report.xml b/addons/account_invoice_layout/account_invoice_layout_report.xml
index 13ff08146b8..dcc5c5ed1a4 100644
--- a/addons/account_invoice_layout/account_invoice_layout_report.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 	<wizard	string="Formatted Inv. + Message"
 			model="account.invoice"
@@ -15,4 +15,4 @@
 			rml="account_invoice_layout/report/report_account_invoice_layout.rml"
 			auto="False"/>
 	</data>
-</terp>
+</openerp>
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index c9061926488..04fc554b05a 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 		<record model="ir.ui.view" id="view_invoice_line_form_inherit_1">
@@ -87,4 +87,4 @@
 
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/account_payment/account_invoice_view.xml b/addons/account_payment/account_invoice_view.xml
index dde7462af74..99a4fe0a2ba 100644
--- a/addons/account_payment/account_invoice_view.xml
+++ b/addons/account_payment/account_invoice_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="invoice_supplier_form" model="ir.ui.view">
             <field name="name">account.invoice.supplier.form.inherit</field>
@@ -14,4 +14,4 @@
             </field>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_payment/payment_report.xml b/addons/account_payment/payment_report.xml
index 733d71c9a19..16e1185355e 100644
--- a/addons/account_payment/payment_report.xml
+++ b/addons/account_payment/payment_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <report auto="True" id="payment_order" model="payment.order" name="payement.order" rml="account_payment/report/order.rml" string="Payment Order"/>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_payment/payment_sequence.xml b/addons/account_payment/payment_sequence.xml
index 67f118a1852..45fd4f8c885 100644
--- a/addons/account_payment/payment_sequence.xml
+++ b/addons/account_payment/payment_sequence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <record forcecreate="1" id="seq_type_payment_order" model="ir.sequence.type">
             <field name="name">Payment order</field>
@@ -26,4 +26,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index b001aaa9bdb..ef6773c480a 100644
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
 
         <!-- View used in the wizard -->
@@ -310,4 +310,4 @@
         <act_window domain="[('move_line_id.move_id.id', '=', move_id)]" id="act_account_invoice_2_payment_line" name="Payment Lines" res_model="payment.line" src_model="account.invoice"/>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/account_payment/payment_wizard.xml b/addons/account_payment/payment_wizard.xml
index dc1c0b2d2df..0cc5759b318 100644
--- a/addons/account_payment/payment_wizard.xml
+++ b/addons/account_payment/payment_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <wizard id="wizard_populate_payment" menu="False" model="payment.order" name="populate_payment" string="Populate payment"/>
         
@@ -8,4 +8,4 @@
         <wizard id="wizard_populate_statement" menu="False" model="account.bank.statement" name="populate_statement" string="Populate Statement with Payment lines"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_payment/payment_workflow.xml b/addons/account_payment/payment_workflow.xml
index e7d441c3109..dd7aa2d4933 100644
--- a/addons/account_payment/payment_workflow.xml
+++ b/addons/account_payment/payment_workflow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="wkf_payment_order" model="workflow">
             <field name="name">Payment Order Workflow</field>
@@ -58,4 +58,4 @@ write({'state':'open'})</field>
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml
index 58242d28e1d..9705473a33a 100644
--- a/addons/account_payment/security/account_payment_security.xml
+++ b/addons/account_payment/security/account_payment_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
     <record id="group_account_payment" model="res.groups">
@@ -7,4 +7,4 @@
     </record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/account_report/account_report.xml b/addons/account_report/account_report.xml
index d7ba6cb2489..50464753f8b 100755
--- a/addons/account_report/account_report.xml
+++ b/addons/account_report/account_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <report auto="False" id="fiscal_statements" model="account.report.report" name="accounting.report" rml="account_report/report/accounting_report.rml" string="Fiscal Statements"/>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_report/account_view.xml b/addons/account_report/account_view.xml
index 052fcafe6e3..f0f357f93ae 100644
--- a/addons/account_report/account_view.xml
+++ b/addons/account_report/account_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="view_account_report_form" model="ir.ui.view">
@@ -141,4 +141,4 @@
         
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/account_reporting/account_data.xml b/addons/account_reporting/account_data.xml
index 4fcb11a9768..c4e2dac819b 100644
--- a/addons/account_reporting/account_data.xml
+++ b/addons/account_reporting/account_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 
 	<record model="color.rml" id="c1">
@@ -488,4 +488,4 @@
 	</record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/account_reporting/account_report.xml b/addons/account_reporting/account_report.xml
index cd1ca195f20..7385f009f31 100644
--- a/addons/account_reporting/account_report.xml
+++ b/addons/account_reporting/account_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 <!--		<report id="balancesheet_report"
 			string="BalanceSheet Report"
@@ -15,4 +15,4 @@
 			id="wizard_balance_report"/>
 
 	</data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_reporting/account_view.xml b/addons/account_reporting/account_view.xml
index bbbb2a9c70b..8e12951ee84 100644
--- a/addons/account_reporting/account_view.xml
+++ b/addons/account_reporting/account_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 
 	<record model="ir.ui.view" id="view_account_report_bs_form">
@@ -62,4 +62,4 @@
 
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/account_tax_include/invoice_tax_incl.xml b/addons/account_tax_include/invoice_tax_incl.xml
index 9dc8efadcfb..d3762f0bb94 100644
--- a/addons/account_tax_include/invoice_tax_incl.xml
+++ b/addons/account_tax_include/invoice_tax_incl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="account_tax_view_price" model="ir.ui.view">
@@ -76,4 +76,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/association_vertical/aso_data.xml b/addons/association_vertical/aso_data.xml
index 14561e36db5..b240e19d26a 100644
--- a/addons/association_vertical/aso_data.xml
+++ b/addons/association_vertical/aso_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data><!-- NoOne doesn't exist anymore
 		<record id="hr.menu_hr_root" model="ir.ui.menu">
 			<field eval="[(6,0,[ref('base.noone')])]" name="groups_id"/>
@@ -24,4 +24,4 @@
 		</record>
 -->
 	</data>
-</terp>
+</openerp>
diff --git a/addons/association_vertical/aso_vertical_view.xml b/addons/association_vertical/aso_vertical_view.xml
index 01fd9b39655..76c8535262a 100644
--- a/addons/association_vertical/aso_vertical_view.xml
+++ b/addons/association_vertical/aso_vertical_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 		<record id="crm_configuration.menu_crm_case_category_act_meetings" model="ir.ui.menu">
 			<field eval="&quot;Calendar of Meetings&quot;" name="name"/>
@@ -46,4 +46,4 @@
 		</record>
 
 	</data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/association_vertical/crm_fund_data.xml b/addons/association_vertical/crm_fund_data.xml
index 051de401ba7..c6965852c6e 100644
--- a/addons/association_vertical/crm_fund_data.xml
+++ b/addons/association_vertical/crm_fund_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data noupdate="1">
 		<record id="crm_case_helpingstreetchildren0" model="crm.case">
 			<field eval="0.5" name="probability"/>
@@ -143,4 +143,4 @@
 			<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
 		</record>
 	</data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/association_vertical/crm_fund_demo.xml b/addons/association_vertical/crm_fund_demo.xml
index 43e1b8704d8..b8df8c882d0 100644
--- a/addons/association_vertical/crm_fund_demo.xml
+++ b/addons/association_vertical/crm_fund_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 	<record model="crm.case.section" id="section_support4">
@@ -239,4 +239,4 @@
 	<menuitem name="CRM &amp; SRM/Fund Raising/All Funds/All Funds To Be Processed" id="menu_crm_case_categ0_act_fund_all3" action="crm_case_category_act_fund_all3"/>
 
 </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/auction/auction_data.xml b/addons/auction/auction_data.xml
index 2c3eb37148f..436392f140e 100644
--- a/addons/auction/auction_data.xml
+++ b/addons/auction/auction_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 	<record model="account.account" id="auction_income_view">
 		<field name="name">Auction Adjudications</field>
@@ -95,4 +95,4 @@
 	</record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index 1d12fcef062..91185306bf9 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 
@@ -881,4 +881,4 @@
         </record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/auction/auction_report.xml b/addons/auction/auction_report.xml
index 16deddfa1ad..17e7e07e968 100644
--- a/addons/auction/auction_report.xml
+++ b/addons/auction/auction_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 		<!--<delete model="ir.actions.report.xml" search="[('model','like','auction.')]"/>-->
 
@@ -232,5 +232,5 @@
 
 
 		</data>
-</terp>
+</openerp>
 
diff --git a/addons/auction/auction_sequence.xml b/addons/auction/auction_sequence.xml
index 293afccebb0..a25bbfe8c1a 100644
--- a/addons/auction/auction_sequence.xml
+++ b/addons/auction/auction_sequence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 	#
@@ -28,4 +28,4 @@
 	</record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index 02400f4062b..ea8d8cbc4e0 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 	<menuitem name="Auction Management" id="menu_root" icon="terp-purchase"/>
 	<menuitem name="Auction Management/Configuration"/>
@@ -1597,4 +1597,4 @@ Object encoded
 		id="act_auction_lot_open_deposit"/>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/auction/auction_wizard.xml b/addons/auction/auction_wizard.xml
index 28ed52b4563..daefea82d88 100644
--- a/addons/auction/auction_wizard.xml
+++ b/addons/auction/auction_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 	    <!--<delete model="ir.actions.wizard" search="[('wiz_name','like','auction.lots.')]"/>-->
 
@@ -117,5 +117,5 @@
 
 
 	</data>
-</terp>
+</openerp>
 
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index d88f2c84832..4c2682ac854 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 <data>
 
     <!-- Views for Contacts -->
@@ -299,4 +299,4 @@
             view_mode='tree,form'
             id="act_res_partner_jobs"/>
 </data>
-</terp>
+</openerp>
diff --git a/addons/base_iban/base_iban_data.xml b/addons/base_iban/base_iban_data.xml
index daf199166d9..678b798c82f 100644
--- a/addons/base_iban/base_iban_data.xml
+++ b/addons/base_iban/base_iban_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
 
         <!--
@@ -40,4 +40,4 @@
             <field eval="True" name="readonly"/>
         </record>
     </data>
-</terp>
+</openerp>
diff --git a/addons/base_iban/base_iban_view.xml b/addons/base_iban/base_iban_view.xml
index b9f52580c0a..d93e9ffb086 100644
--- a/addons/base_iban/base_iban_view.xml
+++ b/addons/base_iban/base_iban_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
 
         <record id="view_partner_bank_iban_form" model="ir.ui.view">
@@ -44,4 +44,4 @@
         </record>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/base_module_publish/base_module_publish_wizard.xml b/addons/base_module_publish/base_module_publish_wizard.xml
index 1b293d395a0..7f52e957fc4 100644
--- a/addons/base_module_publish/base_module_publish_wizard.xml
+++ b/addons/base_module_publish/base_module_publish_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <wizard id="wizard_base_module_publish" model="ir.module.module" name="base_module_publish.module_publish" string="Publish module"/>
         
@@ -8,4 +8,4 @@
         <wizard id="wizard_base_module_export" model="ir.module.module" name="base_module_publish.module_export" string="Export module"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/base_module_record/base_module_record_wizard.xml b/addons/base_module_record/base_module_record_wizard.xml
index b98d4f0479e..76b902382b1 100644
--- a/addons/base_module_record/base_module_record_wizard.xml
+++ b/addons/base_module_record/base_module_record_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 		<wizard
 			id="wizard_base_module_record"
@@ -42,4 +42,4 @@
 			id="menu_wizard_base_module_save"/>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/base_report_creator/base_report_creator_demo.xml b/addons/base_report_creator/base_report_creator_demo.xml
index b5339e3b843..da44979f26d 100644
--- a/addons/base_report_creator/base_report_creator_demo.xml
+++ b/addons/base_report_creator/base_report_creator_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 		<record id="base_report_creator_report_salesanalysis0" model="base_report_creator.report">
 			<field model="ir.model" search="[('model','in',('sale.order','sale.order.line','res.partner'))]" name="model_ids"/>
@@ -41,4 +41,4 @@
 			<field name="graph_mode">y</field>
 		</record>
 	</data>
-</terp>
+</openerp>
diff --git a/addons/base_report_creator/base_report_creator_view.xml b/addons/base_report_creator/base_report_creator_view.xml
index 87a49180e3b..6240fa25b05 100644
--- a/addons/base_report_creator/base_report_creator_view.xml
+++ b/addons/base_report_creator/base_report_creator_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 
 	<record model="ir.ui.view" id="base.view_model_fields_tree">
@@ -149,4 +149,4 @@
 
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/base_report_creator/base_report_creator_wizard.xml b/addons/base_report_creator/base_report_creator_wizard.xml
index 031ea8bc05b..eb956e89c6d 100644
--- a/addons/base_report_creator/base_report_creator_wizard.xml
+++ b/addons/base_report_creator/base_report_creator_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 	<wizard
 			id="wizard_set_filter_fields"
@@ -10,4 +10,4 @@
 			string="Create Menu for Report"
 			name="base_report_creator.report.menu.create"/>
 </data>
-</terp>
+</openerp>
diff --git a/addons/base_report_designer/base_report_designer_wizard.xml b/addons/base_report_designer/base_report_designer_wizard.xml
index c0b83fc9f50..d320df74baa 100644
--- a/addons/base_report_designer/base_report_designer_wizard.xml
+++ b/addons/base_report_designer/base_report_designer_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 		<wizard
@@ -18,6 +18,6 @@
 
 
 	</data>
-</terp>
+</openerp>
 
 
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index 02eff787ca9..c715dbb6992 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <record id="action_wizard_setup" model="ir.actions.wizard">
@@ -14,4 +14,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/base_setup/base_setup_demo.xml b/addons/base_setup/base_setup_demo.xml
index 5e821d7d471..4255606e3f1 100644
--- a/addons/base_setup/base_setup_demo.xml
+++ b/addons/base_setup/base_setup_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <record id="base.user_demo" model="res.users">
@@ -7,4 +7,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/base_setup/base_setup_wizard.xml b/addons/base_setup/base_setup_wizard.xml
index 1fb380757f3..9a48bf41f6c 100644
--- a/addons/base_setup/base_setup_wizard.xml
+++ b/addons/base_setup/base_setup_wizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <wizard id="wizard_base_setup" model="base_setup.base_setup" name="base_setup.base_setup" string="Setup"/>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/base_vat/base_vat_data.xml b/addons/base_vat/base_vat_data.xml
index a813d24f6b1..d61201f93d8 100644
--- a/addons/base_vat/base_vat_data.xml
+++ b/addons/base_vat/base_vat_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="view_partner_form" model="ir.ui.view">
@@ -18,4 +18,4 @@
         </record>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 3df58f36c20..36c9b128b3a 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <menuitem icon="terp-graph" id="dashboard_menu" name="Dashboards"/>
         
@@ -89,4 +89,4 @@
         <act_window context="{'view': active_id}" id="dashboard_open" multi="True" name="Open Dashboard" res_model="board.board" src_model="board.board"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/board_account/board_account_demo.xml b/addons/board_account/board_account_demo.xml
index 690a07f633f..9870338e9ee 100644
--- a/addons/board_account/board_account_demo.xml
+++ b/addons/board_account/board_account_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <!--
@@ -18,4 +18,4 @@
         </record>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/board_account/board_account_view.xml b/addons/board_account/board_account_view.xml
index bbf927364b9..a90b2da13fe 100644
--- a/addons/board_account/board_account_view.xml
+++ b/addons/board_account/board_account_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="note_account_type" model="board.note.type">
@@ -74,4 +74,4 @@
         
         <menuitem id="next_id_68" name="Accounting" parent="board.dashboard_menu"/><menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="next_id_68" sequence="1"/>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/board_association/board_association_demo.xml b/addons/board_association/board_association_demo.xml
index 91c51ac40f4..959f2c1f5a8 100644
--- a/addons/board_association/board_association_demo.xml
+++ b/addons/board_association/board_association_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data noupdate="1">
 
 		<!--
@@ -17,5 +17,5 @@
 			<field name="action_id" ref="open_board_associations_manager"/>
 		</record>
 	</data>
-</terp>
+</openerp>
 
diff --git a/addons/board_association/board_association_view.xml b/addons/board_association/board_association_view.xml
index 1d91a72f6f6..ae637cfe54c 100644
--- a/addons/board_association/board_association_view.xml
+++ b/addons/board_association/board_association_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 		<record model="board.note.type" id="note_association_type">
 			<field name="name">associations</field>
@@ -60,4 +60,4 @@
 			icon="terp-graph"/>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/board_auction/board_auction_demo.xml b/addons/board_auction/board_auction_demo.xml
index eb525bacc99..f44e2e6d723 100644
--- a/addons/board_auction/board_auction_demo.xml
+++ b/addons/board_auction/board_auction_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<terp>
+<openerp>
 	<data noupdate="1">
 	<record model="ir.ui.view_sc" id="sc_auction_dash">
 			<field name="name">Auction dashboard</field>
@@ -14,4 +14,4 @@
 		</record>
 
 	</data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/board_auction/board_auction_manager_view.xml b/addons/board_auction/board_auction_manager_view.xml
index 21d3e39e755..b4d863c1c41 100644
--- a/addons/board_auction/board_auction_manager_view.xml
+++ b/addons/board_auction/board_auction_manager_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 		<record model="board.note.type" id="note_auction_type1">
 			<field name="name">Auction manager</field>
@@ -77,4 +77,4 @@
 			id="menu_board_auction_manager"/>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/board_auction/board_auction_view.xml b/addons/board_auction/board_auction_view.xml
index afb1b3826a1..6e1c49965b5 100644
--- a/addons/board_auction/board_auction_view.xml
+++ b/addons/board_auction/board_auction_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 		<record model="board.note.type" id="note_auction_type">
 			<field name="name">Auction</field>
@@ -64,5 +64,5 @@
 			id="menu_board_auction"/>
 
 </data>
-</terp>
+</openerp>
 
diff --git a/addons/board_crm_configuration/board_crm_demo.xml b/addons/board_crm_configuration/board_crm_demo.xml
index f05393aff0c..76caab9208c 100644
--- a/addons/board_crm_configuration/board_crm_demo.xml
+++ b/addons/board_crm_configuration/board_crm_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data noupdate="1">
 
 		<!--
@@ -18,4 +18,4 @@
 		</record>
 
 	</data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/board_crm_configuration/board_crm_statistical_view.xml b/addons/board_crm_configuration/board_crm_statistical_view.xml
index 7bcb440cb98..51585130bfe 100644
--- a/addons/board_crm_configuration/board_crm_statistical_view.xml
+++ b/addons/board_crm_configuration/board_crm_statistical_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 		<!--
 		 Board for statistical view of the sections
@@ -121,4 +121,4 @@
 			icon="terp-graph"/>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/board_crm_configuration/board_crm_view.xml b/addons/board_crm_configuration/board_crm_view.xml
index 86e10c17274..6672e13b2b1 100644
--- a/addons/board_crm_configuration/board_crm_view.xml
+++ b/addons/board_crm_configuration/board_crm_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 		<record model="board.note.type" id="note_crm_type">
 			<field name="name">CRM Configuration</field>
@@ -133,4 +133,4 @@
 
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/board_document/board_document_demo.xml b/addons/board_document/board_document_demo.xml
index dc059263b4c..07d6ed92f38 100644
--- a/addons/board_document/board_document_demo.xml
+++ b/addons/board_document/board_document_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data noupdate="1">
 
 		<!--
@@ -17,4 +17,4 @@
 			<field name="action_id" ref="open_board_document_manager"/>
  		</record>
  	</data>
- </terp>
\ No newline at end of file
+ </openerp>
diff --git a/addons/board_document/board_document_view.xml b/addons/board_document/board_document_view.xml
index 6d0cbfc645b..794b79590f4 100644
--- a/addons/board_document/board_document_view.xml
+++ b/addons/board_document/board_document_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
- <terp>
+ <openerp>
  	<data>
 		<record model="board.note.type" id="note_document_type">
 			<field name="name">Document</field>
@@ -103,4 +103,4 @@
 			id="menu_board_document_manager1"
  			icon="terp-graph"/>
  	</data>
- </terp>
+ </openerp>
diff --git a/addons/board_manufacturing/board_manufacturing_demo.xml b/addons/board_manufacturing/board_manufacturing_demo.xml
index 20d09124782..82bffd3178c 100644
--- a/addons/board_manufacturing/board_manufacturing_demo.xml
+++ b/addons/board_manufacturing/board_manufacturing_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <record id="sc_manufacturing_dash" model="ir.ui.view_sc">
             <field name="name">Production dashboard</field>
@@ -16,4 +16,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml
index 45ac6e61cfa..9befd988f84 100644
--- a/addons/board_manufacturing/board_manufacturing_view.xml
+++ b/addons/board_manufacturing/board_manufacturing_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="note_sale_type" model="board.note.type">
             <field name="name">Production</field>
@@ -40,4 +40,4 @@
         <menuitem id="next_id_87" name="Production" parent="board.dashboard_menu"/><menuitem action="open_board_manufacturing" icon="terp-graph" id="menu_board_manufacturing" parent="next_id_87" sequence="1"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/board_project/board_project_demo.xml b/addons/board_project/board_project_demo.xml
index 3a2ad768105..fa92e92f092 100644
--- a/addons/board_project/board_project_demo.xml
+++ b/addons/board_project/board_project_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         
@@ -25,4 +25,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/board_project/board_project_manager_view.xml b/addons/board_project/board_project_manager_view.xml
index 2f3741d5274..01e934e38d3 100644
--- a/addons/board_project/board_project_manager_view.xml
+++ b/addons/board_project/board_project_manager_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="note_project_type" model="board.note.type">
@@ -89,4 +89,4 @@
         
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index 81871bf84ca..5d1c8151964 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="note_project_manager_type" model="board.note.type">
@@ -80,4 +80,4 @@
         <menuitem id="next_id_86" name="Project" parent="board.dashboard_menu"/><menuitem action="open_board_project" icon="terp-graph" id="menu_board_project" parent="next_id_86" sequence="1"/>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/board_sale/board_sale_demo.xml b/addons/board_sale/board_sale_demo.xml
index 3499b2fabb8..0630a1db3bd 100644
--- a/addons/board_sale/board_sale_demo.xml
+++ b/addons/board_sale/board_sale_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <!--
@@ -17,4 +17,4 @@
             <field name="action_id" ref="open_board_sales_manager"/>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/board_sale/board_sale_view.xml b/addons/board_sale/board_sale_view.xml
index c18d0e2dd81..6770638c1cd 100644
--- a/addons/board_sale/board_sale_view.xml
+++ b/addons/board_sale/board_sale_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="note_sale_type" model="board.note.type">
             <field name="name">Sales</field>
@@ -38,4 +38,4 @@
         <menuitem id="next_id_88" name="Sales" parent="board.dashboard_menu"/><menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="next_id_88" sequence="1"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index b356af526a7..7ba270d268f 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="req_link_case" model="res.request.link">
@@ -68,4 +68,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 649e67ee661..d8f11683c5b 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
 
         <!--
@@ -481,4 +481,4 @@
         </function>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/crm/crm_report.xml b/addons/crm/crm_report.xml
index 1e4116aad28..abfdb7e065b 100644
--- a/addons/crm/crm_report.xml
+++ b/addons/crm/crm_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <report auto="False" id="crm_business_opportunities_report" keyword="client_print_multi" menu="True" model="crm.case" multi="True" name="crm.case" string="Business Opportunities"/>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index e355719ef11..1d4cfc21d24 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <menuitem icon="terp-crm" id="menu_crm" name="CRM &amp; SRM"/>
         <menuitem id="menu_crm_configuration" name="Configuration" parent="crm.menu_crm"/>
@@ -555,4 +555,4 @@
         
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/crm/crm_wizard.xml b/addons/crm/crm_wizard.xml
index d5c3ae1672d..079dd3191c1 100644
--- a/addons/crm/crm_wizard.xml
+++ b/addons/crm/crm_wizard.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <wizard id="wizard_case_section_menu" model="crm.case.section" name="crm.case.section.menu" string="Create menus for a case section"/>
         <menuitem action="wizard_case_section_menu" id="menu_wizard_case_section_menu" parent="crm.menu_crm_configuration" type="wizard"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 1cd685af371..9e73b1a0e84 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
     <record id="group_crm_manager" model="res.groups">
@@ -11,4 +11,4 @@
     </record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/crm_configuration/crm_bugs_data.xml b/addons/crm_configuration/crm_bugs_data.xml
index 69608dafbe0..c618447703a 100644
--- a/addons/crm_configuration/crm_bugs_data.xml
+++ b/addons/crm_configuration/crm_bugs_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 	<!-- 
 		((((((((((( Demo Cases ))))))))))) 
@@ -273,4 +273,4 @@
 	</record>
 	
 </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm_configuration/crm_bugs_demo.xml b/addons/crm_configuration/crm_bugs_demo.xml
index 99e5fc274dd..66467393e66 100644
--- a/addons/crm_configuration/crm_bugs_demo.xml
+++ b/addons/crm_configuration/crm_bugs_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 	<!--
@@ -691,4 +691,4 @@
 	<menuitem parent="menu_crm_case_category_act_f0" id="menu_crm_case_categ0_act_f7" action="crm_case_category_act_f7"/>
 	
 </data>
-</terp>
+</openerp>
diff --git a/addons/crm_configuration/crm_bugs_view.xml b/addons/crm_configuration/crm_bugs_view.xml
index cb8408e71c5..14e57133bad 100644
--- a/addons/crm_configuration/crm_bugs_view.xml
+++ b/addons/crm_configuration/crm_bugs_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 <!--	<menuitem name="CRM &amp; SRM" icon="terp-crm" id="menu_crm1"/>	-->
 
@@ -140,4 +140,4 @@
 		</field>
 	</record>
 	</data>
-</terp>
+</openerp>
diff --git a/addons/crm_configuration/crm_fund_view.xml b/addons/crm_configuration/crm_fund_view.xml
index 46ad404a327..86048399e06 100644
--- a/addons/crm_configuration/crm_fund_view.xml
+++ b/addons/crm_configuration/crm_fund_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 	# ------------------------------------------------------ 
@@ -147,4 +147,4 @@
 		</field>
 	</record>
 </data>
-</terp>
+</openerp>
diff --git a/addons/crm_configuration/crm_jobs_data.xml b/addons/crm_configuration/crm_jobs_data.xml
index aa1e508b4cb..9366486e483 100644
--- a/addons/crm_configuration/crm_jobs_data.xml
+++ b/addons/crm_configuration/crm_jobs_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 	<!-- 
 		((((((((((( Demo Cases ))))))))))) 
@@ -146,4 +146,4 @@
 	</record>
 	
 </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm_configuration/crm_jobs_demo.xml b/addons/crm_configuration/crm_jobs_demo.xml
index fc1421a64ab..af9818ed571 100644
--- a/addons/crm_configuration/crm_jobs_demo.xml
+++ b/addons/crm_configuration/crm_jobs_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 	<record model="crm.case.section" id="section_support0">
@@ -401,4 +401,4 @@
 	</record>
 	<menuitem parent="menu_crm_case_categ0_act111" id="menu_crm_case_categ0_act_myjobs_alljobs" action="crm_case_categ0_act_alljobs"/>	
 </data>
-</terp>
+</openerp>
diff --git a/addons/crm_configuration/crm_jobs_view.xml b/addons/crm_configuration/crm_jobs_view.xml
index 00aa271b7af..b2d8fb1efd4 100644
--- a/addons/crm_configuration/crm_jobs_view.xml
+++ b/addons/crm_configuration/crm_jobs_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 	# ------------------------------------------------------ 
 	# Jobs
@@ -146,4 +146,4 @@
 		</field>
 	</record>
 	</data>
-</terp>
+</openerp>
diff --git a/addons/crm_configuration/crm_lead_data.xml b/addons/crm_configuration/crm_lead_data.xml
index 3b6ae85f3dd..c53098b6518 100644
--- a/addons/crm_configuration/crm_lead_data.xml
+++ b/addons/crm_configuration/crm_lead_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 	<!-- 
 		((((((((((( Demo Cases ))))))))))) 
@@ -140,4 +140,4 @@
 			<field eval="&quot;(282) 603-7489&quot;" name="partner_phone"/>
 		</record>
 	</data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm_configuration/crm_lead_demo.xml b/addons/crm_configuration/crm_lead_demo.xml
index b53ec379400..5716d19be19 100644
--- a/addons/crm_configuration/crm_lead_demo.xml
+++ b/addons/crm_configuration/crm_lead_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 <!--		CASE SECTION		-->
 	<record model="crm.case.section" id="section_support2">
@@ -552,4 +552,4 @@
 	<menuitem name="Cases by Section, Category and Category2" parent="menu_action_report_crm_case_lead" action="action_report_crm_case_lead_categ_categ2" id="menu_action_report_crm_case_lead_categ_categ2"/>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/crm_configuration/crm_lead_view.xml b/addons/crm_configuration/crm_lead_view.xml
index 66f9666bce5..3c35f82629c 100644
--- a/addons/crm_configuration/crm_lead_view.xml
+++ b/addons/crm_configuration/crm_lead_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 	# ------------------------------------------------------ 
@@ -142,4 +142,4 @@
 		</field>
 	</record>
 </data>
-</terp>
+</openerp>
diff --git a/addons/crm_configuration/crm_meeting_data.xml b/addons/crm_configuration/crm_meeting_data.xml
index a6654007c5b..4444573e9b7 100644
--- a/addons/crm_configuration/crm_meeting_data.xml
+++ b/addons/crm_configuration/crm_meeting_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 	<!-- 
 		((((((((((( Demo Cases ))))))))))) 
@@ -111,4 +111,4 @@
 			<field eval="time.strftime('%Y-%m-28')" name="date_deadline"/>
 		</record>
 	</data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm_configuration/crm_meeting_demo.xml b/addons/crm_configuration/crm_meeting_demo.xml
index cccfb96e6a0..7ff8978c160 100644
--- a/addons/crm_configuration/crm_meeting_demo.xml
+++ b/addons/crm_configuration/crm_meeting_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 	<record model="crm.case.section" id="section_support1">
@@ -277,4 +277,4 @@
 	</record>
 	<menuitem name="Next Deadlines" parent="menu_crm_case_categ_meet" id="menu_crm_case_categ0_act_meetall3" action="crm_case_category_act_meetall3"/>
 </data>
-</terp>
+</openerp>
diff --git a/addons/crm_configuration/crm_meeting_view.xml b/addons/crm_configuration/crm_meeting_view.xml
index 65db5944731..b0d186e2b97 100644
--- a/addons/crm_configuration/crm_meeting_view.xml
+++ b/addons/crm_configuration/crm_meeting_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 	# ------------------------------------------------------ 
 	# Meetings
@@ -141,4 +141,4 @@
 		</field>
 	</record>
 	</data>
-</terp>
+</openerp>
diff --git a/addons/crm_configuration/crm_opportunity_data.xml b/addons/crm_configuration/crm_opportunity_data.xml
index 7294a8e21dc..c20cb450468 100644
--- a/addons/crm_configuration/crm_opportunity_data.xml
+++ b/addons/crm_configuration/crm_opportunity_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 	<!-- 
 		((((((((((( Demo Cases ))))))))))) 
@@ -95,4 +95,4 @@
 			<field eval="&quot;Dirt Mining Ltd 271742 - 1000 units&quot;" name="name"/>
 		</record>
 	</data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/crm_configuration/crm_opportunity_demo.xml b/addons/crm_configuration/crm_opportunity_demo.xml
index 63f38f849c8..2adb0e96ab2 100644
--- a/addons/crm_configuration/crm_opportunity_demo.xml
+++ b/addons/crm_configuration/crm_opportunity_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 	<record model="crm.case.section" id="section_support3">
 		<field name="name">Opportunities</field>
@@ -315,4 +315,4 @@
 	<menuitem name="Cases by Section, Category and Category2" parent="menu_action_report_crm_case_oppor" action="action_report_crm_case_oppor_categ_categ2" id="menu_action_report_crm_case_oppor_categ_categ2"/>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/crm_configuration/crm_opportunity_view.xml b/addons/crm_configuration/crm_opportunity_view.xml
index e294d8b1c64..05658f6374b 100644
--- a/addons/crm_configuration/crm_opportunity_view.xml
+++ b/addons/crm_configuration/crm_opportunity_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 	# ------------------------------------------------------ 
@@ -139,4 +139,4 @@
 		</field>
 	</record>
 </data>
-</terp>
+</openerp>
diff --git a/addons/crm_configuration/crm_report_view.xml b/addons/crm_configuration/crm_report_view.xml
index 3dc21239916..1f71e321279 100644
--- a/addons/crm_configuration/crm_report_view.xml
+++ b/addons/crm_configuration/crm_report_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 	#
 	# Cases by section and category2 of case
@@ -239,4 +239,4 @@
 	</record>
 	<menuitem parent="report_crm.next_id_66" name="Cases by Section, Category and Category2" action="action_report_crm_case_section_categ_categ2_tree" id="menu_crm_case_section_categ_categ2_tree"/>
 </data>
-</terp>
+</openerp>
diff --git a/addons/crm_profiling/crm_profiling_demo.xml b/addons/crm_profiling/crm_profiling_demo.xml
index 1f5a662886d..102a8ee28e0 100644
--- a/addons/crm_profiling/crm_profiling_demo.xml
+++ b/addons/crm_profiling/crm_profiling_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 
@@ -266,5 +266,5 @@
 	</record>	
 
 </data>
-</terp>
+</openerp>
 
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index d890535956a..16489e209f6 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 <!--		<wizard
 			string="Select partners"
@@ -240,4 +240,4 @@
 	</record>
 -->
 	</data>
-</terp>
+</openerp>
diff --git a/addons/crm_profiling/crm_profiling_wizard.xml b/addons/crm_profiling/crm_profiling_wizard.xml
index 389a9d29cd5..089e3604d35 100644
--- a/addons/crm_profiling/crm_profiling_wizard.xml
+++ b/addons/crm_profiling/crm_profiling_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 <!--		<wizard
@@ -9,4 +9,4 @@
 			id="wizard_open_partner"/>
 -->
 		</data>
-</terp>
+</openerp>
diff --git a/addons/crm_vertical/crm_vertical_shortcuts.xml b/addons/crm_vertical/crm_vertical_shortcuts.xml
index 3c120f011e5..bbbe96c4751 100644
--- a/addons/crm_vertical/crm_vertical_shortcuts.xml
+++ b/addons/crm_vertical/crm_vertical_shortcuts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data noupdate="1">
 		<record id="ir_ui_view_sc_mymeetings0" model="ir.ui.view_sc">
 			<field ref="crm_configuration.menu_crm_case_categ_meet_my" name="res_id"/>
@@ -32,4 +32,4 @@
 			<field name="user_id" ref="base.user_root"/>
 		</record>
 	</data>
-</terp>
+</openerp>
diff --git a/addons/crm_vertical/crm_vertical_view.xml b/addons/crm_vertical/crm_vertical_view.xml
index 32a47904ff6..57d4c1eeb69 100644
--- a/addons/crm_vertical/crm_vertical_view.xml
+++ b/addons/crm_vertical/crm_vertical_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 		<record id="crm_configuration.menu_crm_case_category_act_meetings" model="ir.ui.menu">
 			<field eval="&quot;Calendar of Meetings&quot;" name="name"/>
@@ -27,4 +27,4 @@
 			<field ref="base.menu_base_config" name="parent_id"/>
 		</record>
 	</data>
-</terp>
+</openerp>
diff --git a/addons/custom/custom_report.xml b/addons/custom/custom_report.xml
index 76dc3973a52..c7c4cedbb33 100644
--- a/addons/custom/custom_report.xml
+++ b/addons/custom/custom_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
     <data>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/custom/custom_view.xml b/addons/custom/custom_view.xml
index 0931ca23fb7..ebc084668b7 100644
--- a/addons/custom/custom_view.xml
+++ b/addons/custom/custom_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
     </data>
-</terp>
+</openerp>
diff --git a/addons/delivery/delivery_data.xml b/addons/delivery/delivery_data.xml
index 67c050de499..97e841ead45 100644
--- a/addons/delivery/delivery_data.xml
+++ b/addons/delivery/delivery_data.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="True">
         <record forcecreate="True" id="property_delivery_carrier" model="ir.property">
             <field name="name">property_delivery_carrier</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_delivery_carrier')]"/>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml
index cd1a18c3403..e9c584868f4 100644
--- a/addons/delivery/delivery_demo.xml
+++ b/addons/delivery/delivery_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <!-- Create a transporter -->
         
@@ -61,4 +61,4 @@
         </record>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index d643f44feb7..282c33b8921 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <!-- Delivery Carriers -->
         <menuitem id="menu_delivery" name="Delivery" parent="stock.menu_stock_configuration" sequence="4"/>
@@ -194,4 +194,4 @@
         
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/delivery/delivery_wizard.xml b/addons/delivery/delivery_wizard.xml
index b7b366e5c06..b497e6144d9 100644
--- a/addons/delivery/delivery_wizard.xml
+++ b/addons/delivery/delivery_wizard.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <wizard id="wizard_deliver_line_add" keyword="client_action_multi" model="sale.order" name="delivery.sale.order" string="Delivery Costs"/>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/delivery/partner_view.xml b/addons/delivery/partner_view.xml
index a6dffcb008d..9911cb1ff42 100644
--- a/addons/delivery/partner_view.xml
+++ b/addons/delivery/partner_view.xml
@@ -1,4 +1,4 @@
-<terp>
+<openerp>
     <data>
 
         <record id="view_partner_property_form" model="ir.ui.view">
@@ -17,4 +17,4 @@
         </record>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/event/event_data.xml b/addons/event/event_data.xml
index bc8d77bb541..37da989e12d 100644
--- a/addons/event/event_data.xml
+++ b/addons/event/event_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 <!-- The base section for all events -->
@@ -10,4 +10,4 @@
 
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 58a301326a4..94be31ea93d 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 <!-- Demo Data for Product -->
@@ -141,4 +141,4 @@
 	</record>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/event/event_sequence.xml b/addons/event/event_sequence.xml
index 55124ec6462..52a41c11688 100644
--- a/addons/event/event_sequence.xml
+++ b/addons/event/event_sequence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 
 	#
@@ -18,4 +18,4 @@
 	</record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 5564a2ab244..081462b2675 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 	<!-- EVENTS  -->
@@ -396,4 +396,4 @@
 
 	<!-- end...  -->
 	</data>
-</terp>
+</openerp>
diff --git a/addons/event/event_wizard.xml b/addons/event/event_wizard.xml
index a84731752e4..555d8d8d30e 100644
--- a/addons/event/event_wizard.xml
+++ b/addons/event/event_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 		<wizard string="Project"
 			model="event.event"
@@ -49,4 +49,4 @@
 		</record>
 		-->
 	</data>
-</terp>
+</openerp>
diff --git a/addons/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
index c1f94452a5c..453a6b0c556 100644
--- a/addons/google_map/google_map_view.xml
+++ b/addons/google_map/google_map_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 		<record model="ir.ui.view" id="view_partner_address_form1_inheritg">
@@ -54,4 +54,4 @@
 		</record>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/google_map/google_map_wizard.xml b/addons/google_map/google_map_wizard.xml
index 9d19185aa86..2f3b3b2a178 100644
--- a/addons/google_map/google_map_wizard.xml
+++ b/addons/google_map/google_map_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 
 		<wizard
@@ -9,4 +9,4 @@
 			id="wizard_google_map"
 			keyword="client_action_multi"/>
 	</data>
-</terp>
+</openerp>
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 9192f5666ca..c83c20d5a9b 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record model="hr.action.reason">
@@ -212,4 +212,4 @@
             <field name="employee_id" ref="employee1"/>
         </record>
     </data>
-</terp>
+</openerp>
diff --git a/addons/hr/hr_department_demo.xml b/addons/hr/hr_department_demo.xml
index 6e5a38d4a7f..c7ea68f1dc3 100644
--- a/addons/hr/hr_department_demo.xml
+++ b/addons/hr/hr_department_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <record id="dep_management" model="hr.department">
@@ -60,4 +60,4 @@
         
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 199a072cc4a..d6c9c245acc 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <!--
@@ -58,4 +58,4 @@
         <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr/hr_report.xml b/addons/hr/hr_report.xml
index 60de2e0b3c1..a0d3497c9aa 100644
--- a/addons/hr/hr_report.xml
+++ b/addons/hr/hr_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <report auto="False" id="attendance_error_report" keyword="client_print_multi" menu="False" model="hr.employee" multi="True" name="hr.timesheet.attendance.error" rml="hr/report/attendance_errors.rml" string="Attendance Error Report"/>
     </data>
-</terp>
+</openerp>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 81bcc401dc8..879f4328db6 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources"/>
         <menuitem id="menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="40"/>
@@ -354,4 +354,4 @@
         <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_hr_configuration"/>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/hr/hr_wizard.xml b/addons/hr/hr_wizard.xml
index c0b24a2fb84..74a047ffb5c 100644
--- a/addons/hr/hr_wizard.xml
+++ b/addons/hr/hr_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
 
         <wizard id="si_so" model="hr.employee" name="hr.si_so" string="Sign in / Sign out"/>
@@ -13,4 +13,4 @@
         <wizard id="wizard_attendance_error" keyword="client_print_multi" model="hr.employee" name="hr.timesheet.attendance.report" string="Print Attendance Error Report"/>
 
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index d1c4018da12..3001ac6895d 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
 <data noupdate="1">
     <record id="group_hr_manager" model="res.groups">
         <field name="name">Human Resources / Manager</field>
@@ -9,4 +9,4 @@
         <field name="name">Human Resources / User</field>
     </record>
 </data>
-</terp>
+</openerp>
diff --git a/addons/hr_contract/hr_contract_data.xml b/addons/hr_contract/hr_contract_data.xml
index 903529cd080..821e4bdac4f 100644
--- a/addons/hr_contract/hr_contract_data.xml
+++ b/addons/hr_contract/hr_contract_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <!-- Contract Period Names -->
@@ -39,4 +39,4 @@
             <field name="name">Widower</field>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 266cbdc0372..01a9f8e20ed 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
@@ -210,4 +210,4 @@
         <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_root"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_contract/security/hr_contract_security.xml b/addons/hr_contract/security/hr_contract_security.xml
index 8dd7c65644c..b8fbf3b54ea 100644
--- a/addons/hr_contract/security/hr_contract_security.xml
+++ b/addons/hr_contract/security/hr_contract_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
     <record id="group_hr_contract" model="res.groups">
@@ -7,4 +7,4 @@
     </record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index 4ec63b343e9..1168fd29679 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_expense/hr_expense_report.xml b/addons/hr_expense/hr_expense_report.xml
index a8c96ad2b79..bad8e790801 100644
--- a/addons/hr_expense/hr_expense_report.xml
+++ b/addons/hr_expense/hr_expense_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <report auto="False" id="hr_expenses" model="hr.expense.expense" name="hr.expense" rml="hr_expense/report/expense.rml" string="Print HR expenses"/>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_expense/hr_expense_sequence.xml b/addons/hr_expense/hr_expense_sequence.xml
index fdb11e04b7e..4350faecb47 100644
--- a/addons/hr_expense/hr_expense_sequence.xml
+++ b/addons/hr_expense/hr_expense_sequence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <record id="seq_type_hr_expense_invoice" model="ir.sequence.type">
             <field name="name">Expense invoice</field>
@@ -12,4 +12,4 @@
             <field name="padding">3</field>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index eda15334250..a2b0ef91dd0 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <!-- Expenses -->
         <record id="view_expenses_line_tree" model="ir.ui.view">
@@ -158,4 +158,4 @@
         <menuitem action="expense_my_confirm" id="menu_expense_my_confirm" parent="hr_expense.menu_expense_my"/>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index f4687aca7de..cbd33ba94aa 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <!-- Roles definition -->
@@ -120,4 +120,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_holidays/hr_bel_holidays_2008.xml b/addons/hr_holidays/hr_bel_holidays_2008.xml
index 7ab92c0e6dd..4cc3322f6b7 100644
--- a/addons/hr_holidays/hr_bel_holidays_2008.xml
+++ b/addons/hr_holidays/hr_bel_holidays_2008.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data noupdate="1">
 
 		<record model="hr.holidays">
@@ -63,4 +63,4 @@
 			<field name="holiday_status" ref="hr.jf" />
 		</record>
 	</data>
-</terp>
+</openerp>
diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/hr_holidays_report.xml
index 4f5c72cc848..85c4f69649e 100644
--- a/addons/hr_holidays/hr_holidays_report.xml
+++ b/addons/hr_holidays/hr_holidays_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 		<report id="report_holidays_summary"
 				string="Summary Of Holidays"
@@ -22,4 +22,4 @@
 			id="menu_wizard_hr_holidays_summary"/>-->
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index 4d99b0fb488..325768afbef 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 	<wizard string="Print Summary of Holidays"
 		  name="hr.holidays.summary"
@@ -14,4 +14,4 @@
 		model="hr.employee" name="hr.holidays.summary.employee"
 		keyword="client_print_multi" id="wizard_holidays_summary" />
  	</data>
-</terp>
+</openerp>
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index 21d49da0462..9825337d32c 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 
 		<!-- Holidays -->
@@ -248,4 +248,4 @@
 			id="act_hr_employee_holiday_request"/>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/hr_holidays/hr_workflow.xml b/addons/hr_holidays/hr_workflow.xml
index 3e2549486a4..668e84022c1 100644
--- a/addons/hr_holidays/hr_workflow.xml
+++ b/addons/hr_holidays/hr_workflow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 <data>
 
 	<!-- Roles definition -->
@@ -93,4 +93,4 @@
 		<field name="act_to" ref="act_draft" />
 	</record>
 </data>
-</terp>
+</openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_data.xml b/addons/hr_timesheet/hr_timesheet_data.xml
index 1ace31ecffa..08a769d7ee6 100644
--- a/addons/hr_timesheet/hr_timesheet_data.xml
+++ b/addons/hr_timesheet/hr_timesheet_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="analytic_journal" model="account.analytic.journal">
             <field name="code">TS</field>
@@ -7,4 +7,4 @@
             <field name="type">general</field>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index 31060ddca4a..a4578e9217b 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <record id="uom_categ_wtime" model="product.uom.categ">
@@ -158,4 +158,4 @@
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index dfaac9c8f23..f1798cba4ce 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
         
@@ -15,4 +15,4 @@
         <menuitem action="wizard_hr_timesheet_users" id="menu_wizard_hr_timesheet_users" parent="hr_timesheet.next_id_48" type="wizard"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 5285c115577..73d6e26e1d5 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="hr_timesheet_line_tree" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.tree</field>
@@ -104,4 +104,4 @@
             </field>
         </record>
     </data>
-</terp>
+</openerp>
diff --git a/addons/hr_timesheet/hr_timesheet_wizard.xml b/addons/hr_timesheet/hr_timesheet_wizard.xml
index f3c197a5ef2..e0364f0204b 100644
--- a/addons/hr_timesheet/hr_timesheet_wizard.xml
+++ b/addons/hr_timesheet/hr_timesheet_wizard.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <wizard id="si_so" model="hr.employee" name="hr_timesheet.si_so" string="Sign in / Sign out by project"/>
         <menuitem action="si_so"  id="menu_si_so" parent="hr.menu_hr_attendance" type="wizard"/>
 
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
index 1c2543c2c1b..adc9e47b033 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <record id="timesheet_invoice_factor1" model="hr_timesheet_invoice.factor">
@@ -33,4 +33,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index ff353bff60d..2ae672635a5 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
@@ -12,4 +12,4 @@
         <menuitem action="account_analytic_profit" id="print_account_analytic_profit" parent="hr.menu_hr_reporting" type="wizard"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index bc6b0883df7..d2bd328cb55 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form</field>
@@ -206,4 +206,4 @@
         <menuitem action="action_hr_timesheet_invoice_factor_form" id="hr_timesheet_invoice_factor_view" parent="account.account_analytic_def_account"/>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml
index 56065686dce..70d24306229 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_wizard.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <wizard id="hr_timesheet_invoice_create" model="account.analytic.line" name="hr.timesheet.invoice.create" string="Invoice analytic lines"/>
         <wizard id="hr_timesheet_final_invoice_create" model="account.analytic.account" name="hr.timesheet.final.invoice.create" string="Final invoices"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_timesheet_project/hr_timesheet_project_view.xml b/addons/hr_timesheet_project/hr_timesheet_project_view.xml
index c1493a20a9e..53d43ebf499 100644
--- a/addons/hr_timesheet_project/hr_timesheet_project_view.xml
+++ b/addons/hr_timesheet_project/hr_timesheet_project_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <wizard id="encode_hour" model="hr.employee" name="hr_timesheet_project.encode.hour" string="Hours From Tasks"/>
@@ -8,4 +8,4 @@
         <wizard id="encode_hour_tss" model="hr_timesheet_sheet.sheet" name="hr_timesheet_project.encode.hour.noopen" string="Import Hours From Tasks"/>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index 435e94c9efb..4b707196d37 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <record id="sheet0" model="hr_timesheet_sheet.sheet">
             <field name="name">Sheet 0</field>
@@ -108,4 +108,4 @@
             <field name="sheet_id" ref="sheet1"/>
         </record>
     </data>
-</terp>
+</openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 5e9c83a4b6c..ab654cad9b7 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="hr_timesheet_sheet_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.tree</field>
@@ -333,4 +333,4 @@
         
         <menuitem action="act_hr_timesheet_sheet_unvalidate" id="menu_hr_timesheet_sheet_unvalidate" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
     </data>
-</terp>
+</openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
index 25dd954834a..11af4574a4a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <!-- Roles definition -->
@@ -65,4 +65,4 @@
             <field name="role_id" ref="HR"/>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 11d8c722fb9..cdf606c3444 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 	<menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES" />
 		<record model="ir.ui.view" id="view_idea_category_form">
@@ -285,4 +285,4 @@
 	<menuitem name="All Votes" parent="menu_ideas" id="menu_idea_vote" action="action_idea_vote"/>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/idea/idea_workflow.xml b/addons/idea/idea_workflow.xml
index eed32adf105..230f36f61e1 100644
--- a/addons/idea/idea_workflow.xml
+++ b/addons/idea/idea_workflow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
     <data>
         <record model="workflow" id="wkf_idea">
             <field name="name">idea.wkf</field>
@@ -69,4 +69,4 @@
         </record>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/invoice_payment_tab/invoice_payment_tab_view.xml b/addons/invoice_payment_tab/invoice_payment_tab_view.xml
index ad14122c152..5514600899d 100644
--- a/addons/invoice_payment_tab/invoice_payment_tab_view.xml
+++ b/addons/invoice_payment_tab/invoice_payment_tab_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 
 <!-- add payments tab on account.invoice -->
@@ -69,4 +69,4 @@
 		</record>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/l10n_be/account_demo.xml b/addons/l10n_be/account_demo.xml
index bfa9141343a..697d3c3cfef 100644
--- a/addons/l10n_be/account_demo.xml
+++ b/addons/l10n_be/account_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <!-- Invoices -->
@@ -114,4 +114,4 @@
         <workflow action="invoice_open" model="account.invoice" ref="invoice_4"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index 1bf01ec893d..2104baf6670 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="True">
 
         <!-- account.account.type -->
@@ -6816,4 +6816,4 @@
         </record>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/l10n_be/l10n_be_sequence.xml b/addons/l10n_be/l10n_be_sequence.xml
index 6e2ea26cbe6..b3e92e868cb 100644
--- a/addons/l10n_be/l10n_be_sequence.xml
+++ b/addons/l10n_be/l10n_be_sequence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 	#
@@ -29,4 +29,4 @@
 	</record>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml
index ea3f65a9b10..296cdfefa65 100644
--- a/addons/l10n_be/l10n_be_wizard.xml
+++ b/addons/l10n_be/l10n_be_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 	<wizard
 			string="Enlist Vat Details"
@@ -33,4 +33,4 @@ This is the same wizard that runs from Financial Managament/Configuration/Financ
     </record>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/l10n_chart_uk_minimal/account_chart.xml b/addons/l10n_chart_uk_minimal/account_chart.xml
index 30bfe04b362..683252462f3 100755
--- a/addons/l10n_chart_uk_minimal/account_chart.xml
+++ b/addons/l10n_chart_uk_minimal/account_chart.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
 
 
 
@@ -342,4 +342,4 @@
 
 
 
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_chart_uk_minimal/account_tax.xml b/addons/l10n_chart_uk_minimal/account_tax.xml
index eb1902929ea..c1b254865c7 100755
--- a/addons/l10n_chart_uk_minimal/account_tax.xml
+++ b/addons/l10n_chart_uk_minimal/account_tax.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     
     
     
@@ -441,4 +441,4 @@
     
     
     
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_fr/fr_wizard.xml b/addons/l10n_fr/fr_wizard.xml
index d0b77ee7ce1..086e366dd6f 100755
--- a/addons/l10n_fr/fr_wizard.xml
+++ b/addons/l10n_fr/fr_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
 
         <wizard id="wizard_chart_report" menu="False" model="account.account" name="account.chart.report" string="Account Report"/>
@@ -8,4 +8,4 @@
 
 
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_fr/plan-99-03_societe.xml b/addons/l10n_fr/plan-99-03_societe.xml
index bd2c3c6eefa..9c60f248f1f 100644
--- a/addons/l10n_fr/plan-99-03_societe.xml
+++ b/addons/l10n_fr/plan-99-03_societe.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <!--
 		testé avec la version de développement 4.1.x
@@ -7064,4 +7064,4 @@
         </record>
         <!-- la taxe nulle n'est pas acceptee -->
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_fr/taxes.xml b/addons/l10n_fr/taxes.xml
index ad307a21453..0068f4c503a 100644
--- a/addons/l10n_fr/taxes.xml
+++ b/addons/l10n_fr/taxes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="True">
         <!--
 
@@ -572,4 +572,4 @@
             <field eval="[(6,0,[ref('tva_normale')])]" name="tax_ids"/>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_fr/types.xml b/addons/l10n_fr/types.xml
index f52cf3fc91d..db8dd754c8a 100644
--- a/addons/l10n_fr/types.xml
+++ b/addons/l10n_fr/types.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="True">
         <!--
 #
@@ -61,4 +61,4 @@
         </record>
 
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/membership/demo_data.xml b/addons/membership/demo_data.xml
index 8c01d860c9b..6689ced1eb4 100755
--- a/addons/membership/demo_data.xml
+++ b/addons/membership/demo_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data noupdate="1">
 		<record id="account_tax_testingtax0" model="account.tax">
 			<field eval="1" name="sequence"/>
@@ -178,4 +178,4 @@ result = price_unit * 0.10&quot;" name="python_compute"/>
 		<workflow action="invoice_open" model="account.invoice" ref="account_invoice_0"/>
 	</data>
 -->
-</terp>
+</openerp>
diff --git a/addons/membership/membership_data.xml b/addons/membership/membership_data.xml
index 9c36d8de5d5..d0b9beceebd 100644
--- a/addons/membership/membership_data.xml
+++ b/addons/membership/membership_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data noupdate="1">
 
 	<!--
@@ -28,4 +28,4 @@
 	</record>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml
index 4e7750ccfb7..10ac053397f 100644
--- a/addons/membership/membership_demo.xml
+++ b/addons/membership/membership_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 <!-- Demo Data for Membership Product -->
@@ -194,4 +194,4 @@
 	</record>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 16ac3e910cc..5f488738e1a 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 
@@ -571,4 +571,4 @@
 		</record>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/membership/membership_wizard.xml b/addons/membership/membership_wizard.xml
index 54a14f83c3c..e4400393de6 100644
--- a/addons/membership/membership_wizard.xml
+++ b/addons/membership/membership_wizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml
index 0f8989e174f..1975bf5bb72 100644
--- a/addons/mrp/company_view.xml
+++ b/addons/mrp/company_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
     <data>
 
         <record id="mrp_company" model="ir.ui.view">
@@ -20,4 +20,4 @@
         </record>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
index 8cca7f01d7d..32bf65ac883 100644
--- a/addons/mrp/mrp_data.xml
+++ b/addons/mrp/mrp_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <record id="sequence_mrp_prod_type" model="ir.sequence.type">
@@ -45,4 +45,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index 1a8e1f4b270..0201572e122 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <!--
@@ -510,4 +510,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mrp/mrp_order_point.xml b/addons/mrp/mrp_order_point.xml
index 2569e3ce268..2e3d12c027f 100644
--- a/addons/mrp/mrp_order_point.xml
+++ b/addons/mrp/mrp_order_point.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <!-- Resource: stock.warehouse.orderpoint -->
@@ -47,4 +47,4 @@
             <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mrp/mrp_report.xml b/addons/mrp/mrp_report.xml
index 3a6f5bec561..f6eca4722e8 100644
--- a/addons/mrp/mrp_report.xml
+++ b/addons/mrp/mrp_report.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <report auto="True" header="False" id="report_bom_structure" model="mrp.bom" name="bom.structure" rml="mrp/report/bom_structure.rml" string="BOM Structure"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 3a5d2f39916..55986cd260c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing"/>
@@ -789,4 +789,4 @@
 
         <act_window domain="[('product_id', '=', active_id),('bom_id','=',False)]" id="act_product_product_2_mrp_bom" name="Bill of Material" res_model="mrp.bom" src_model="product.product"/>
     </data>
-</terp>
+</openerp>
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index 6e02dbc55e6..be3eca8eed2 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="wiz_mrp_proc0" model="ir.actions.wizard">
             <field name="name">Compute All Schedulers</field>
@@ -31,4 +31,4 @@
         </record>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 1b675703a0c..f64e241e76e 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <!-- Production -->
         
@@ -351,4 +351,4 @@
             <field name="condition">not action_check_finnished()</field>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 5d20f9c5b7d..9118fe051ae 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
     <record id="group_mrp_manager" model="res.groups">
@@ -10,4 +10,4 @@
     </record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/mrp_jit/mrp_jit.xml b/addons/mrp_jit/mrp_jit.xml
index dd35e0c7afe..9db4c930930 100644
--- a/addons/mrp_jit/mrp_jit.xml
+++ b/addons/mrp_jit/mrp_jit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 
 	# -----------------------------------------------------------
@@ -11,4 +11,4 @@
 		</record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/mrp_operations/mrp_operation_data.xml b/addons/mrp_operations/mrp_operation_data.xml
index 19ee1b8feca..0d5899c6014 100644
--- a/addons/mrp_operations/mrp_operation_data.xml
+++ b/addons/mrp_operations/mrp_operation_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 	<record model="mrp_operations.operation.code" id="mrp_op_1">
@@ -21,4 +21,4 @@
 	</record>
 
 </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mrp_operations/mrp_operations_report.xml b/addons/mrp_operations/mrp_operations_report.xml
index a6c546cbd31..d386386cb6e 100644
--- a/addons/mrp_operations/mrp_operations_report.xml
+++ b/addons/mrp_operations/mrp_operations_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 		<report
@@ -19,4 +19,4 @@
 			header="False"/>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 83e78b5803d..20648cb7dca 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 
 	<record model="ir.ui.view" id="mrp_production_workcenter_tree_view_inherit">
@@ -174,4 +174,4 @@
 
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/mrp_operations/mrp_operations_workflow.xml b/addons/mrp_operations/mrp_operations_workflow.xml
index 045427b2f07..5510d3b0ab0 100644
--- a/addons/mrp_operations/mrp_operations_workflow.xml
+++ b/addons/mrp_operations/mrp_operations_workflow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 	# -----------------------------------------------------------
 	# Activities
@@ -67,4 +67,4 @@
 			<field name="signal">button_cancel</field>
 		</record>
 </data>
-</terp>
+</openerp>
diff --git a/addons/point_of_sale/pos_data.xml b/addons/point_of_sale/pos_data.xml
index 51be9126600..abde72796b5 100644
--- a/addons/point_of_sale/pos_data.xml
+++ b/addons/point_of_sale/pos_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 
 <!-- FIXME : -->
@@ -16,4 +16,4 @@
 <!-- 	</record> -->
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/pos_report.xml
index b477abc912e..b1b2f286c52 100644
--- a/addons/point_of_sale/pos_report.xml
+++ b/addons/point_of_sale/pos_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<terp>
+<openerp>
 	<data>
 		<report
 			id="pos_receipt"
@@ -48,4 +48,4 @@
 			 />
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/point_of_sale/pos_sequence.xml b/addons/point_of_sale/pos_sequence.xml
index 3faf09aa20d..42bc4334b89 100644
--- a/addons/point_of_sale/pos_sequence.xml
+++ b/addons/point_of_sale/pos_sequence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 	#
@@ -40,4 +40,4 @@
 	</record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 7f1e26a6677..fe2f3f09aee 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 
 	<record model="ir.ui.view" id="view_pos_pos_form">
@@ -334,4 +334,4 @@
 
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 0d4bc890a0b..67ff7069ae0 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 		<wizard string="Refund Orders" model="pos.order"
@@ -27,4 +27,4 @@
 				name="pos.sale.get" id="pos_sale_get"/>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/point_of_sale/pos_workflow.xml b/addons/point_of_sale/pos_workflow.xml
index da5916597fb..9b43b1fb659 100644
--- a/addons/point_of_sale/pos_workflow.xml
+++ b/addons/point_of_sale/pos_workflow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
   <data>
 	<record model="workflow" id="wkf_pos">
 	  <field name="name">Pos workflow</field>
@@ -85,4 +85,4 @@
 
 
   </data>
-</terp>
+</openerp>
diff --git a/addons/point_of_sale/sale_wizard.xml b/addons/point_of_sale/sale_wizard.xml
index 2a5311313a2..ca741e2c808 100644
--- a/addons/point_of_sale/sale_wizard.xml
+++ b/addons/point_of_sale/sale_wizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 		<wizard string="Pos payment" model="sale.order" name="sale.pos_payment" id="pos_payment" />
 	</data>
-</terp>
+</openerp>
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 30b3cfbee7c..d70fd1caa85 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
     <record id="group_pos_manager" model="res.groups">
@@ -10,4 +10,4 @@
     </record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/process/process_data.xml b/addons/process/process_data.xml
index 23b62c803e2..9e87801c767 100644
--- a/addons/process/process_data.xml
+++ b/addons/process/process_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 		<record id="process_process_salesworkflow0" model="process.process">
 			<field eval="1" name="active"/>
@@ -89,4 +89,4 @@
 			<field name="node_to_id" ref="process_node_invoice0"/>
 		</record>
 	</data>
-</terp>
+</openerp>
diff --git a/addons/process/process_report.xml b/addons/process/process_report.xml
index f2c085573ff..51a231c2550 100644
--- a/addons/process/process_report.xml
+++ b/addons/process/process_report.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <report id="report_process"
             model="process.process"
             name="process.process.print"
             string="Print Process"/>
     </data>
-</terp>
+</openerp>
 
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 64809baab3a..dfafcf1c90e 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 <data>
 
 	<menuitem
@@ -184,4 +184,4 @@
 		id="menu_action_transition_open"/>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index c13194c47e6..938478efa68 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -1,4 +1,4 @@
-<terp>
+<openerp>
     <data>
 
         <record id="view_partner_property_form" model="ir.ui.view">
@@ -18,4 +18,4 @@
         </record>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 80c59479996..896623a47f9 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="product.menu_main_product" sequence="2"/>
@@ -185,4 +185,4 @@
         <menuitem action="product_pricelist_type_action" groups="base.group_extended" id="menu_product_pricelist_type_action" parent="product.menu_config_product"/>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 6ed181e05e1..4460711ed7a 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         
@@ -91,4 +91,4 @@ parameter) will see those record just disappear.
         
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 6d43c3fe419..57d7cda2f06 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <!-- 
 	Resource: product.category 
@@ -468,4 +468,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/product/product_report.xml b/addons/product/product_report.xml
index 62b872f8166..aec7212993a 100644
--- a/addons/product/product_report.xml
+++ b/addons/product/product_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <report id="report_product_label" model="product.product" name="product.product.label" string="Products Labels" xml="product/report/product_label.xml" xsl="product/report/product_label.xsl"/>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index c941bb0f34c..e394f521e56 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <menuitem icon="terp-product" id="menu_main_product" name="Products"/>
@@ -492,4 +492,4 @@
         
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index f4e92cc6f38..89530976a32 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
     <record id="group_uos" model="res.groups">
@@ -10,4 +10,4 @@
     </record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/profile_accounting/profile_accounting.xml b/addons/profile_accounting/profile_accounting.xml
index a1a38921192..62350fa0d78 100644
--- a/addons/profile_accounting/profile_accounting.xml
+++ b/addons/profile_accounting/profile_accounting.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="view_confirm_install_module_form" model="ir.ui.view">
             <field name="name">Accounting Profile : Install extra modules</field>
@@ -43,4 +43,4 @@
             <field name="state">open</field>
         </record>
     </data>
-</terp>
+</openerp>
diff --git a/addons/profile_association/profile_association.xml b/addons/profile_association/profile_association.xml
index d2b2d26cadc..03b8f441803 100644
--- a/addons/profile_association/profile_association.xml
+++ b/addons/profile_association/profile_association.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="view_confirm_install_module_form" model="ir.ui.view">
             <field name="name">Association Profile : Install extra modules</field>
@@ -42,4 +42,4 @@
             <field name="state">open</field>
         </record>
     </data>
-</terp>
+</openerp>
diff --git a/addons/profile_manufacturing/profile_manufacturing.xml b/addons/profile_manufacturing/profile_manufacturing.xml
index 9ddf4866215..1abe782d8b0 100644
--- a/addons/profile_manufacturing/profile_manufacturing.xml
+++ b/addons/profile_manufacturing/profile_manufacturing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="view_confirm_install_module_form" model="ir.ui.view">
             <field name="name">Manufacturing Profile : Install extra modules</field>
@@ -44,4 +44,4 @@
             <field name="state">open</field>
         </record>
     </data>
-</terp>
+</openerp>
diff --git a/addons/profile_service/profile_service.xml b/addons/profile_service/profile_service.xml
index 1010ef236a4..ba4039d678c 100644
--- a/addons/profile_service/profile_service.xml
+++ b/addons/profile_service/profile_service.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="view_confirm_install_module_form" model="ir.ui.view">
             <field name="name">Service Profile : Install extra modules</field>
@@ -51,4 +51,4 @@
 
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 1957b50572a..2addd68fa19 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <!--
 		Requests Links
@@ -13,4 +13,4 @@
             <field name="object">project.task</field>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 7e46e0428d4..903da6cdf0b 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <!--
@@ -203,4 +203,4 @@
             <field name="name">Latest in house tests</field>
         </record>
     </data>
-</terp>
+</openerp>
diff --git a/addons/project/project_report.xml b/addons/project/project_report.xml
index e10be805a55..5aa92c011fd 100644
--- a/addons/project/project_report.xml
+++ b/addons/project/project_report.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <report auto="False" id="report_project_task_gantt" model="project.task" name="project.tasks.gantt" string="Gantt Representation"/>
         <report auto="False" id="report_project_project_gantt" model="project.project" name="project.project.gantt" string="Gantt Representation"/>
         <report auto="True" id="report_project_desc" model="project.project" name="project.report" string="Project Description" xml="project/report/project_report.xml" xsl="project/report/project_report.xsl"/>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 299e6a99075..5383e5e4873 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <menuitem icon="terp-project" id="menu_main" name="Project Management"/>
         <menuitem id="menu_definitions" name="Configuration" parent="project.menu_main" sequence="1"/>
@@ -486,4 +486,4 @@
         <act_window domain="[('user_id', '=', active_id),('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/project/project_wizard.xml b/addons/project/project_wizard.xml
index fa0fc6bf37a..3e441e3f8f0 100644
--- a/addons/project/project_wizard.xml
+++ b/addons/project/project_wizard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <wizard id="wizard_close_task" menu="False" model="project.task" name="project.task.close" string="Close Task"/>
         <wizard id="wizard_delegate_task" menu="False" model="project.task" name="project.task.delegate" string="Delegate Task"/>
     </data>
-</terp>
+</openerp>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 0c79a79ebf9..2fee59e9ad0 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
     <record id="group_project_finance" model="res.groups">
@@ -13,4 +13,4 @@
     </record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/project_gtd/project_gtd_demo.xml b/addons/project_gtd/project_gtd_demo.xml
index 8fc668ed283..08a9d3cc2f2 100644
--- a/addons/project_gtd/project_gtd_demo.xml
+++ b/addons/project_gtd/project_gtd_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 
 	<record model="project.gtd.context" id="context_office">
@@ -73,4 +73,4 @@
 	</record>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 48be75ef4c5..f34b4a4889c 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 
 
@@ -207,4 +207,4 @@
 
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/project_gtd/project_gtd_wizard.xml b/addons/project_gtd/project_gtd_wizard.xml
index 8d3338c52ca..03503303311 100644
--- a/addons/project_gtd/project_gtd_wizard.xml
+++ b/addons/project_gtd/project_gtd_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 
 		<wizard string="My Daily Timebox"
@@ -25,4 +25,4 @@
 
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/project_mrp/project_workflow.xml b/addons/project_mrp/project_workflow.xml
index 944f6e9c518..d91c365f869 100644
--- a/addons/project_mrp/project_workflow.xml
+++ b/addons/project_mrp/project_workflow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 	<record model="workflow.transition" id="mrp.trans_produce_service_make_done">
 		<field name="act_from" ref="mrp.act_produce_service"/>
@@ -7,5 +7,5 @@
 		<field name="signal">subflow.done</field>
 	</record>
 </data>
-</terp>
+</openerp>
 
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index aa0857021b0..53ea07eb9de 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -1,4 +1,4 @@
-<terp>
+<openerp>
     <data>
 
         <record id="view_partner_property_form" model="ir.ui.view">
@@ -17,4 +17,4 @@
         </record>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index 207c2c338d7..e90dc0bec1c 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
 
         <record id="req_link_purchase_order" model="res.request.link">
@@ -40,4 +40,4 @@
         <function eval="('default',False,'warehouse_id', [('purchase.order', False)], ref('stock.warehouse0'), True, False, False, False, True)" id="purchase_default_set" model="ir.values" name="set"/>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index 4ec63b343e9..1168fd29679 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/purchase/purchase_report.xml b/addons/purchase/purchase_report.xml
index a6a236ce390..e13ca9911b0 100644
--- a/addons/purchase/purchase_report.xml
+++ b/addons/purchase/purchase_report.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <report auto="False" id="report_purchase_quotation" model="purchase.order" name="purchase.quotation" rml="purchase/report/request_quotation.rml" string="Request for Quotation"/>
         <report auto="False" id="report_purchase_order" model="purchase.order" name="purchase.order" rml="purchase/report/order.rml" string="Purchase Order"/>
     </data>
-</terp>
+</openerp>
diff --git a/addons/purchase/purchase_sequence.xml b/addons/purchase/purchase_sequence.xml
index f3721d234b9..bad7672e142 100644
--- a/addons/purchase/purchase_sequence.xml
+++ b/addons/purchase/purchase_sequence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <!-- Sequences for purchase.order --> 
         <record id="seq_type_purchase_order" model="ir.sequence.type">
@@ -13,4 +13,4 @@
             <field name="padding">3</field>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/purchase/purchase_unit_test.xml b/addons/purchase/purchase_unit_test.xml
index 6eb611aacf3..ef4ade4724f 100644
--- a/addons/purchase/purchase_unit_test.xml
+++ b/addons/purchase/purchase_unit_test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
     <data>
         <!-- Resource: purchase.order -->
         <!--
@@ -137,5 +137,5 @@
             <test expr="state">done</test>
         </assert>
     </data>
-</terp>
+</openerp>
  
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 049c68e2b91..0d509aa5370 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management"/>
 
@@ -206,4 +206,4 @@
 
         <act_window context="{'partner_id': active_id}" domain="[('partner_id', '=', active_id)]" id="act_res_partner_2_purchase_order" name="Purchase orders" res_model="purchase.order" src_model="res.partner"/>
     </data>
-</terp>
+</openerp>
diff --git a/addons/purchase/purchase_wizard.xml b/addons/purchase/purchase_wizard.xml
index b86e74d0f3f..886846ca48e 100644
--- a/addons/purchase/purchase_wizard.xml
+++ b/addons/purchase/purchase_wizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <wizard id="purchase_order_merge" model="purchase.order" multi="True" name="purchase.order.merge" string="Merge purchases"/>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 68ad644168f..ee6c36f2c40 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="purchase_order" model="workflow">
@@ -179,4 +179,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 3b65143718c..4cf0414b27d 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
     <record id="group_purchase_manager" model="res.groups">
@@ -10,4 +10,4 @@
     </record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index b05c2030363..24412239929 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="stock_picking_inherit_purchase" model="ir.ui.view">
@@ -17,4 +17,4 @@
         <act_window domain="[('purchase_id', '=', active_id)]" id="act_purchase_order_2_stock_picking" name="Packings" res_model="stock.picking" src_model="purchase.order"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
index d924dee431b..9d0ac4c06cf 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 
 	<record model="ir.ui.view" id="purchase_order_line_form_inherit">
@@ -15,4 +15,4 @@
 	</record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/report_account/report_receivable_view.xml b/addons/report_account/report_receivable_view.xml
index ab5aef643de..dd6c93f3492 100644
--- a/addons/report_account/report_receivable_view.xml
+++ b/addons/report_account/report_receivable_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <!-- Balance by account type -->
@@ -50,4 +50,4 @@
         <menuitem action="action_account_receivable_graph" id="menu_account_receivable_graph" parent="account.menu_finance_reporting"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/report_analytic/report_analytic_view.xml b/addons/report_analytic/report_analytic_view.xml
index 91f4576d402..87aa0c3b858 100644
--- a/addons/report_analytic/report_analytic_view.xml
+++ b/addons/report_analytic/report_analytic_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <!-- Analytic accounts to close -->
         <record id="view_analytic_account_close_form" model="ir.ui.view">
@@ -60,4 +60,4 @@
         <menuitem action="action_analytic_account_tree" id="menu_action_analytic_account_tree" parent="account.next_id_42"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/report_analytic_line/report_analytic_line_view.xml b/addons/report_analytic_line/report_analytic_line_view.xml
index ea310c5147d..90e31c99d93 100644
--- a/addons/report_analytic_line/report_analytic_line_view.xml
+++ b/addons/report_analytic_line/report_analytic_line_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="account_analytic_line_to_invoice_view_form" model="ir.ui.view">
@@ -63,4 +63,4 @@
         <act_window domain="[('account_id', '=', active_id),('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" name="Lines to Invoice" res_model="account.analytic.line" src_model="account.analytic.account"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/report_analytic_planning/report_analytic_planning_report.xml b/addons/report_analytic_planning/report_analytic_planning_report.xml
index c2b9815874f..2b158e50341 100644
--- a/addons/report_analytic_planning/report_analytic_planning_report.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <report id="report_planning" model="report_account_analytic.planning" name="report_account_analytic.planning.print" rml="report_analytic_planning/report/report_planning.rml" string="Planning"/>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml
index aeebc175595..2676b3abb5f 100644
--- a/addons/report_analytic_planning/report_analytic_planning_view.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="account_analytic_planning_view_tree" model="ir.ui.view">
             <field name="name">report.account.analytic.planning.tree</field>
@@ -201,4 +201,4 @@
         
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml
index 1e3b5a15e90..e1d81f7212c 100644
--- a/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <!--
@@ -152,4 +152,4 @@
         <act_window domain="[('section_id', '=', active_id)]" id="act_crm_case_section_2_report_crm_case_categ" name="Monthly cases by section" res_model="report.crm.case.categ" src_model="crm.case.section"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/report_intrastat/report_intrastat_data.xml b/addons/report_intrastat/report_intrastat_data.xml
index ea0f6b56526..f3c465c1549 100644
--- a/addons/report_intrastat/report_intrastat_data.xml
+++ b/addons/report_intrastat/report_intrastat_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <record id="base.de" model="res.country">
             <field eval="True" name="intrastat"/>
@@ -74,4 +74,4 @@
             <field eval="True" name="intrastat"/>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index dee6972d1a8..50349d32d87 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <!-- Country -->
         <record id="view_country_tree" model="ir.ui.view">
@@ -108,4 +108,4 @@
         
         <menuitem id="next_id_90" name="All Months" parent="report_stock.next_id_61"/><menuitem action="action_report_intrastat_tree_all" id="menu_report_intrastat_all" parent="next_id_90"/>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/report_mrp/report_mrp_view.xml b/addons/report_mrp/report_mrp_view.xml
index acff24d5c2d..6ef87a2ca1c 100644
--- a/addons/report_mrp/report_mrp_view.xml
+++ b/addons/report_mrp/report_mrp_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="view_workcenter_load_tree" model="ir.ui.view">
@@ -102,4 +102,4 @@
         
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/report_project/report_project_view.xml b/addons/report_project/report_project_view.xml
index 6963ec75fe6..674fca07646 100644
--- a/addons/report_project/report_project_view.xml
+++ b/addons/report_project/report_project_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <!-- Tasks by projects and users -->
@@ -108,4 +108,4 @@
         <menuitem action="action_project_task_tree" id="menu_project_task_tree" parent="report_task.next_id_58"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/report_purchase/report_purchase_view.xml b/addons/report_purchase/report_purchase_view.xml
index 0744f4705b0..bfbdacc5db0 100644
--- a/addons/report_purchase/report_purchase_view.xml
+++ b/addons/report_purchase/report_purchase_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <!-- Purchases by products by month -->       
@@ -110,4 +110,4 @@
         <act_window domain="[('category_id', '=', active_id)]" id="act_product_category_2_report_purchase_order_category" name="Monthly purchases" res_model="report.purchase.order.category" src_model="product.category"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/report_sale/report_sale_graph.xml b/addons/report_sale/report_sale_graph.xml
index fa33c5f8b7e..d0e337ed75d 100644
--- a/addons/report_sale/report_sale_graph.xml
+++ b/addons/report_sale/report_sale_graph.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <menuitem id="next_id_83" name="Graphs" parent="report_sale.next_id_82"/><menuitem icon="STOCK_PRINT" id="ir_ui_menu1" name="Monthly Sales Turnover Over One Year" parent="next_id_83"/>
@@ -93,4 +93,4 @@
         <function eval="[[ir_report_custom_6]]" model="ir.report.custom" name="subscribe"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml
index 52e50f95027..eba8fe71223 100644
--- a/addons/report_sale/report_sale_view.xml
+++ b/addons/report_sale/report_sale_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <!--  Sales by products by month -->
@@ -154,4 +154,4 @@
         
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/report_stock/report_stock_view.xml b/addons/report_stock/report_stock_view.xml
index 8e3d11b4313..2ae68273e5b 100644
--- a/addons/report_stock/report_stock_view.xml
+++ b/addons/report_stock/report_stock_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <record id="report_stock_prodlots_tree" model="ir.ui.view">
@@ -33,4 +33,4 @@
         <act_window domain="[('prodlot_id', '=', active_id)]" id="act_stock_production_lot_2_report_stock_prodlots" name="Stock" res_model="report.stock.prodlots" src_model="stock.production.lot"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml
index 8f2083cbe35..496af9ce7f3 100644
--- a/addons/report_task/report_task_view.xml
+++ b/addons/report_task/report_task_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <!-- Tasks by projects and users -->
@@ -56,4 +56,4 @@
         <menuitem id="next_id_57" name="Reporting" parent="project.menu_main"/><menuitem id="next_id_58" name="All Months" parent="next_id_57"/><menuitem action="action_project_task" id="menu_project_task_user_tree" parent="next_id_58"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index 6863d44ee88..659be98b8f2 100644
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <!-- Statistics report on timesheet by user -->
@@ -279,4 +279,4 @@
         <act_window domain="[('manager_id', '=', active_id)]" id="act_res_users_2_report_timesheet_invoice" name="Costs to invoice" res_model="report_timesheet.invoice" src_model="res.users"/>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index b6e4c670b7c..e1a8998e1d3 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <!--
 	Requests Links
@@ -31,4 +31,4 @@
         <function eval="('default',False,'shop_id', [('sale.order', False)], shop, True, False, False, False, True)" id="sale_default_set" model="ir.values" name="set"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 53796da223f..d7ee9c2dd93 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <!--
@@ -198,4 +198,4 @@
         <!-- Run all schedulers -->
         <function model="mrp.procurement" name="run_scheduler"/>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/sale/sale_report.xml b/addons/sale/sale_report.xml
index a647e924890..8ced0a1c0dc 100644
--- a/addons/sale/sale_report.xml
+++ b/addons/sale/sale_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <!-- 
 	this report is defined here instead of in the stock module because it uses the
@@ -26,4 +26,4 @@
         <report auto="False" id="report_sale_order" model="sale.order" name="sale.order" rml="sale/report/order.rml" string="Print Order"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/sale/sale_sequence.xml b/addons/sale/sale_sequence.xml
index 6425cb9e97c..5e5005d3b1b 100644
--- a/addons/sale/sale_sequence.xml
+++ b/addons/sale/sale_sequence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <!-- Sequences for sale.order -->
         <record id="seq_type_sale_order" model="ir.sequence.type">
@@ -13,4 +13,4 @@
             <field name="padding">3</field>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml
index 2e0e77ec3c8..6f2b9327319 100644
--- a/addons/sale/sale_unit_test.xml
+++ b/addons/sale/sale_unit_test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <!-- Resource: sale.order -->
         <record id="test_order_1" model="sale.order">
@@ -118,4 +118,4 @@
             <test expr="state">done</test>
         </assert>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d5cfcb25ca7..28b07d8e118 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <menuitem icon="terp-sale" id="menu_sale_root" name="Sales Management"/>
 
@@ -484,4 +484,4 @@
 
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/sale/sale_wizard.xml b/addons/sale/sale_wizard.xml
index ece746bfa12..46e42ffff37 100644
--- a/addons/sale/sale_wizard.xml
+++ b/addons/sale/sale_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <wizard
@@ -19,4 +19,4 @@
 			string="Make invoices"/>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/sale/sale_workflow.xml b/addons/sale/sale_workflow.xml
index bab64fa038f..15b6f359175 100644
--- a/addons/sale/sale_workflow.xml
+++ b/addons/sale/sale_workflow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="wkf_sale" model="workflow">
             <field name="name">sale.order.basic</field>
@@ -249,4 +249,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index a1a0d74bbad..765c151a47e 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
     <record id="group_sale_manager" model="res.groups">
@@ -10,4 +10,4 @@
     </record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/sale/stock_view.xml b/addons/sale/stock_view.xml
index 46c21107532..db273c38b60 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale/stock_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="stock_picking_inherit_sale" model="ir.ui.view">
             <field name="name">stock.picking.form</field>
@@ -14,4 +14,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index 3a7fbd3e697..fdab5de1399 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data>
 
 	<record model="ir.ui.view" id="view_order_form_inherit">
@@ -40,4 +40,4 @@
 	</record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/sale_crm/sale_crm_wizard.xml b/addons/sale_crm/sale_crm_wizard.xml
index 0af64870428..ea93b9b94d3 100644
--- a/addons/sale_crm/sale_crm_wizard.xml
+++ b/addons/sale_crm/sale_crm_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
 
 		<wizard
@@ -16,4 +16,4 @@
 			keyword="client_action_multi"
 			id="sale_crm_make_case_wizard"/>
 	</data>
-</terp>
+</openerp>
diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
index 60b38200c6d..4bc9493e6bd 100644
--- a/addons/sale_journal/picking_journal_view.xml
+++ b/addons/sale_journal/picking_journal_view.xml
@@ -1,4 +1,4 @@
-<terp>
+<openerp>
 <data>
 
 	<record model="ir.ui.view" id="view_picking_journal_form">
@@ -119,4 +119,4 @@
 	</record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/sale_journal/picking_journal_view_report.xml b/addons/sale_journal/picking_journal_view_report.xml
index dae1fb7a6af..7f956736fc0 100644
--- a/addons/sale_journal/picking_journal_view_report.xml
+++ b/addons/sale_journal/picking_journal_view_report.xml
@@ -1,4 +1,4 @@
-<terp>
+<openerp>
 <data>
 
 	#
@@ -131,4 +131,4 @@
 	<menuitem name="Packings by Journal" id="menu_picking_picking_stats_open_all" parent="menu_definition_journal_reporting_all" action="action_picking_picking_stats_open_menu_all"/>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/sale_journal/sale_journal_data.xml b/addons/sale_journal/sale_journal_data.xml
index 2eef0a0f1bd..3639f945c83 100644
--- a/addons/sale_journal/sale_journal_data.xml
+++ b/addons/sale_journal/sale_journal_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 	<record model="ir.property" id="property_invoice_type_def">
@@ -9,4 +9,4 @@
 	</record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/sale_journal/sale_journal_demo.xml b/addons/sale_journal/sale_journal_demo.xml
index 268000d880c..30606e25145 100644
--- a/addons/sale_journal/sale_journal_demo.xml
+++ b/addons/sale_journal/sale_journal_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 	<record model="sale_journal.invoice.type" id="daily">
@@ -15,4 +15,4 @@
 	</record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 2a80d4befd3..be96302c583 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -1,4 +1,4 @@
-<terp>
+<openerp>
 <data>
 	<record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
 		<field name="name">sale_journal.invoice.type.form</field>
@@ -281,4 +281,4 @@
 
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/scrum/scrum_demo.xml b/addons/scrum/scrum_demo.xml
index 0da89078df8..c3b6d392cf2 100644
--- a/addons/scrum/scrum_demo.xml
+++ b/addons/scrum/scrum_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <!-- Resource: scrum.project -->
@@ -190,4 +190,4 @@
         </record>
         
     </data>
-</terp>
+</openerp>
diff --git a/addons/scrum/scrum_report.xml b/addons/scrum/scrum_report.xml
index 0735a4bcbb0..a5b3a672986 100644
--- a/addons/scrum/scrum_report.xml
+++ b/addons/scrum/scrum_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <report auto="False" model="project.task" name="project.tasks.burndown" string="Burndown Chart"/>
@@ -7,4 +7,4 @@
         <report auto="False" model="scrum.sprint" name="scrum.sprint.burndown" string="Burndown Chart"/>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index a8752e4d32e..2b7c16a66bd 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         
@@ -429,4 +429,4 @@
         </record>
         <menuitem action="action_view_task6" id="menu_action_view_task6" parent="project.menu_action_view_task"/>
     </data>
-</terp>
+</openerp>
diff --git a/addons/scrum/scrum_wizard.xml b/addons/scrum/scrum_wizard.xml
index b744543dbc9..5c8020d15a3 100644
--- a/addons/scrum/scrum_wizard.xml
+++ b/addons/scrum/scrum_wizard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <wizard id="wizard_scrum_backlog_task" model="scrum.product.backlog" name="scrum.product.backlog.task.create" string="Created tasks"/>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 0fce0ccf7e0..7c329d98e71 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <!--
         Partners Extension
@@ -22,4 +22,4 @@
         </record>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/stock/product_data.xml b/addons/stock/product_data.xml
index 636a42178aa..1a60ca0781b 100644
--- a/addons/stock/product_data.xml
+++ b/addons/stock/product_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <record id="property_stock_journal" model="ir.property">
@@ -34,4 +34,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index ab397a47a87..4359f2360e4 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
 
         <record id="view_category_property_form" model="ir.ui.view">
@@ -91,4 +91,4 @@
 
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index c4f68b304fc..6bd063ed388 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
     <record id="group_stock_manager" model="res.groups">
@@ -10,4 +10,4 @@
     </record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index d9332a643f1..5a752f612bb 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         <!--
 	Request link
@@ -106,4 +106,4 @@
             <field name="lot_output_id" ref="stock_location_output"/>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 7b31c99db89..f876815b690 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data noupdate="1">
         
         <!--
@@ -185,4 +185,4 @@
         </function>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/stock_incoterms.xml b/addons/stock/stock_incoterms.xml
index 09db0b06255..371b61055ba 100644
--- a/addons/stock/stock_incoterms.xml
+++ b/addons/stock/stock_incoterms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="incoterm_EXW" model="stock.incoterms">
             <field name="code">EXW</field>
@@ -50,4 +50,4 @@
             <field name="name">DELIVERED DUTY UNPAID</field>
         </record>
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 0d786c9a4da..2a35a89513f 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future stock forecast"/>
@@ -18,4 +18,4 @@
         <report id="report_location_overview_all" model="stock.location" name="stock.location.overview.all" string="Location Content (With childs)" xml="stock/report/lot_overview_all.xml" xsl="stock/report/lot_overview_all.xsl"/>
     
     </data>
-</terp>
+</openerp>
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index 6c0871e8e6c..8346ce28342 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <!--
     Sequences for packings
@@ -47,4 +47,4 @@
             <field name="number_increment">1</field>
         </record>
     </data>
-</terp>
+</openerp>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2b92d1ed430..85f296647d6 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <menuitem icon="terp-stock" id="menu_stock_root" name="Stock Management"/>
         <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="1"/>
@@ -1252,4 +1252,4 @@
         </record>     
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index 5f80ea7437e..10e0859295e 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <!--
@@ -20,4 +20,4 @@
         
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/stock_workflow.xml b/addons/stock/stock_workflow.xml
index 588e8bd6566..74d185ca8c1 100644
--- a/addons/stock/stock_workflow.xml
+++ b/addons/stock/stock_workflow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         <record id="wkf_picking" model="workflow">
             <field name="name">stock.picking.basic</field>
@@ -96,4 +96,4 @@
         </record>
         
     </data>
-</terp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock_location/stock_view.xml b/addons/stock_location/stock_view.xml
index cd53a6ff1c5..bdb62963c09 100644
--- a/addons/stock_location/stock_view.xml
+++ b/addons/stock_location/stock_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
     <data>
 
        <record id="stock_location_path_tree" model="ir.ui.view">
@@ -55,4 +55,4 @@
        </record>
 
     </data>
-</terp>
+</openerp>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 9951eaa8514..7e1d86575dd 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<terp>
+<openerp>
     <data>
         
         <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>
@@ -152,4 +152,4 @@
         </record>
         <menuitem action="action_document_form" id="menu_action_document_form" parent="subscription.menu_subscription_config"/>
     </data>
-</terp>
\ No newline at end of file
+</openerp>