diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml
index 6efa01a7267..00104813896 100644
--- a/addons/base_contact/base_contact_demo.xml
+++ b/addons/base_contact/base_contact_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<terp>
+<openerp>
 	<data>
         <!-- Create the functions -->
 		<record id="res_partner_function_privateaddress0" model="res.partner.function">
@@ -323,4 +323,4 @@
             <field name="sequence_contact">1</field>
 		</record>
 	</data>
-</terp>
+</openerp>
diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index 1a623b2dbb5..17ff37645f6 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -172,7 +172,7 @@ class base_module_record(osv.osv):
         # Create the minidom document
         self.ids = {}
         doc = minidom.Document()
-        terp = doc.createElement("terp")
+        terp = doc.createElement("openerp")
         doc.appendChild(terp)
         for rec in self.recording_data:
             if rec[0]=='workflow':
diff --git a/addons/document/custom_report.xml b/addons/document/custom_report.xml
index 02cf10e6a4a..ebfe70e4c50 100644
--- a/addons/document/custom_report.xml
+++ b/addons/document/custom_report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 	<data>
 
 	</data>
-</terp>
+</openerp>
diff --git a/addons/document/custom_view.xml b/addons/document/custom_view.xml
index 4909336c498..61d95f9aa27 100644
--- a/addons/document/custom_view.xml
+++ b/addons/document/custom_view.xml
@@ -1,4 +1,4 @@
-<terp>
+<openerp>
 <data>
 	<record model="res.groups" id="group_compta_user">
  		<field name="name">grcompta</field>
@@ -8,5 +8,5 @@
 	</record>
 	<menuitem name="Administration" groups="admin,grcomptaadmin" icon="terp-stock" id="menu_admin_compta"/>
 </data>
-</terp>
+</openerp>
 
diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml
index 98793851804..9953d07dd92 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/document/document_demo.xml b/addons/document/document_demo.xml
index 3de248ffa28..94c52923556 100644
--- a/addons/document/document_demo.xml
+++ b/addons/document/document_demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<terp>
+<openerp>
 <data noupdate="1">
 
 	<record model="document.directory" id="dir_root">
@@ -90,4 +90,4 @@
 	</record>
 
 </data>
-</terp>
+</openerp>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 5ae50b2f539..4e5a0b717ba 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -1,4 +1,4 @@
-<terp>
+<openerp>
 <data>
     <menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
 
@@ -237,5 +237,5 @@
         </record>
 
 </data>
-</terp>
+</openerp>