diff --git a/addons/account/account.py b/addons/account/account.py
index 4e239d12cc9..5908fa737e0 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -448,7 +448,7 @@ class account_journal(osv.osv):
         'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
 
         'active': fields.boolean('Active'),
-        'view_id': fields.many2one('account.journal.view', 'View', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tell Tiny ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
+        'view_id': fields.many2one('account.journal.view', 'View', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tell Open ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
         'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account'),
         'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account'),
         'centralisation': fields.boolean('Centralised counterpart', help="Check this box if you want that each entry doesn't create a counterpart but share the same counterpart for each entry of this journal."),
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index 65433812843..338d243e2e7 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -222,7 +222,7 @@ class account_analytic_journal(osv.osv):
         'name' : fields.char('Journal name', size=64, required=True),
         'code' : fields.char('Journal code', size=8),
         'active' : fields.boolean('Active'),
-        'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', size=32, required=True, help="Gives the type of the analytic journal. When a document (eg: an invoice) needs to create analytic entries, Tiny ERP will look for a matching journal of the same type."),
+        'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', size=32, required=True, help="Gives the type of the analytic journal. When a document (eg: an invoice) needs to create analytic entries, Open ERP will look for a matching journal of the same type."),
         'line_ids' : fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
     }
     _defaults = {
diff --git a/addons/auction/report/artists.xsl b/addons/auction/report/artists.xsl
index 98e3bde4b01..3349fc2d0bc 100644
--- a/addons/auction/report/artists.xsl
+++ b/addons/auction/report/artists.xsl
@@ -10,7 +10,7 @@
 <xsl:template match="artists">
 
 	<document>
-		<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Bids report" author="Generated by Tiny ERP, Fabien Pinckaers">
+		<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Bids report" author="Generated by Open ERP, Fabien Pinckaers">
 
 
 			<pageTemplate id="all">
diff --git a/addons/auction/report/buyer_list.xsl b/addons/auction/report/buyer_list.xsl
index 38d739ebf31..7ee19643971 100644
--- a/addons/auction/report/buyer_list.xsl
+++ b/addons/auction/report/buyer_list.xsl
@@ -7,7 +7,7 @@
 
 	<xsl:template match="achat-listing">
 		<document filename="example.pdf">
-			<template pageSize="21cm,29.7cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Bordereau acheteur" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+			<template pageSize="21cm,29.7cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Bordereau acheteur" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
 				<pageTemplate id="first">
 					<pageGraphics>
 						<drawRightString x="19.0cm" y="26.0cm"><xsl:value-of select="date"/></drawRightString>
diff --git a/addons/auction/report/huissier.xsl b/addons/auction/report/huissier.xsl
index 5113fd91f44..50d7203b607 100644
--- a/addons/auction/report/huissier.xsl
+++ b/addons/auction/report/huissier.xsl
@@ -7,7 +7,7 @@
 
 <xsl:template match="report">
 	<document filename="example_5.pdf">
-	<template pageSize="21cm,29.7cm" leftMargin="1.5cm" rightMargin="1.5cm" topMargin="1.5cm" bottomMargin="1.5cm" title="Bordereau acheteur" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+	<template pageSize="21cm,29.7cm" leftMargin="1.5cm" rightMargin="1.5cm" topMargin="1.5cm" bottomMargin="1.5cm" title="Bordereau acheteur" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
 		<pageTemplate id="main">
 			<pageGraphics>
 				<fill color="(0.4,0.4,0.4)"/>
diff --git a/addons/auction/report/lots_bids_phone2.xsl b/addons/auction/report/lots_bids_phone2.xsl
index abceb460670..b8445998caf 100644
--- a/addons/auction/report/lots_bids_phone2.xsl
+++ b/addons/auction/report/lots_bids_phone2.xsl
@@ -8,7 +8,7 @@
 
 	<xsl:template match="/">
 		<document xmlns:fo="http://www.w3.org/1999/XSL/Format">
-			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Releve de compte" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20" pageSize="(21cm,29.7cm)">
+			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Releve de compte" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20" pageSize="(21cm,29.7cm)">
 
 				<pageTemplate id="all">
 					<frame id="list" x1="1.0cm" y1="1.0cm" height="22.7cm" width="19cm"/>
diff --git a/addons/auction/report/lots_list_inv.xsl b/addons/auction/report/lots_list_inv.xsl
index 35fc5c80471..edd779fb0da 100644
--- a/addons/auction/report/lots_list_inv.xsl
+++ b/addons/auction/report/lots_list_inv.xsl
@@ -8,7 +8,7 @@
 
 	<xsl:template match="lots">
 		<document xmlns:fo="http://www.w3.org/1999/XSL/Format">
-			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Releve de compte" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Releve de compte" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
 				<pageTemplate id="all">
 					<pageGraphics/>
 					<frame id="list" x1="1.0cm" y1="2.0cm" width="19.0cm" height="27cm"/>
diff --git a/addons/auction/report/lots_list_landscape.xsl b/addons/auction/report/lots_list_landscape.xsl
index b3ed6ce5a4d..55838eaf27c 100644
--- a/addons/auction/report/lots_list_landscape.xsl
+++ b/addons/auction/report/lots_list_landscape.xsl
@@ -6,7 +6,7 @@
 
 	<xsl:template match="lots">
 		<document xmlns:fo="http://www.w3.org/1999/XSL/Format">
-			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="" author="Generated by Tiny ERP" allowSplitting="20" pageSize="29.7cm,21cm">
+			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="" author="Generated by Open ERP" allowSplitting="20" pageSize="29.7cm,21cm">
 
 				<pageTemplate id="all">
 					<pageGraphics/>
diff --git a/addons/auction/report/results.xsl b/addons/auction/report/results.xsl
index abe867e75b8..2e575941650 100644
--- a/addons/auction/report/results.xsl
+++ b/addons/auction/report/results.xsl
@@ -19,7 +19,7 @@
 
 <xsl:template match="results">
 	<document filename="example_5.pdf">
-	<template pageSize="21cm,29.7cm" leftMargin="1.5cm" rightMargin="1.5cm" topMargin="1.5cm" bottomMargin="1.5cm" title="Bordereau acheteur" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+	<template pageSize="21cm,29.7cm" leftMargin="1.5cm" rightMargin="1.5cm" topMargin="1.5cm" bottomMargin="1.5cm" title="Bordereau acheteur" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
 		<pageTemplate id="main">
 			<pageGraphics>
 				<fill color="(0.4,0.4,0.4)"/>
diff --git a/addons/auction/report/results_buyer.xsl b/addons/auction/report/results_buyer.xsl
index 8c3648b6799..320a8a2e4f3 100644
--- a/addons/auction/report/results_buyer.xsl
+++ b/addons/auction/report/results_buyer.xsl
@@ -20,7 +20,7 @@
 
 <xsl:template match="results">
 	<document filename="example_5.pdf">
-	<template pageSize="21cm,29.7cm" leftMargin="1.5cm" rightMargin="1.5cm" topMargin="1.5cm" bottomMargin="1.5cm" title="Bordereau acheteur" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+	<template pageSize="21cm,29.7cm" leftMargin="1.5cm" rightMargin="1.5cm" topMargin="1.5cm" bottomMargin="1.5cm" title="Bordereau acheteur" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
 		<pageTemplate id="main">
 			<pageGraphics>
 				<fill color="(0.4,0.4,0.4)"/>
diff --git a/addons/auction/report/seller_list.xsl b/addons/auction/report/seller_list.xsl
index b81e23b299f..1c414c72482 100644
--- a/addons/auction/report/seller_list.xsl
+++ b/addons/auction/report/seller_list.xsl
@@ -7,9 +7,9 @@
 
 	<xsl:template match="seller-list">
 		<document filename="example.pdf">
-			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
 <!--
-			<template pageSize="21m,29.7cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+			<template pageSize="21m,29.7cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
 -->
 				<pageTemplate id="first">
 					<pageGraphics>
diff --git a/addons/base_module_publish/wizard/base_module_publish.py b/addons/base_module_publish/wizard/base_module_publish.py
index a2e36b60147..74addefd82c 100644
--- a/addons/base_module_publish/wizard/base_module_publish.py
+++ b/addons/base_module_publish/wizard/base_module_publish.py
@@ -40,7 +40,7 @@ intro_fields = {
     'text': {'string':'Introduction', 'type':'text', 'readonly':True,
         'default': lambda *args: """
 This system will automatically publish the selected module to the
-Tiny ERP official website. You can use it to quickly publish a new
+Open ERP official website. You can use it to quickly publish a new
 module or update an existing one (new version).
 
 Make sure you read the publication manual and modules guidelines
@@ -123,7 +123,7 @@ check_fields = {
 upload_info_form = '''<?xml version="1.0"?>
 <form string="Module publication">
     <separator string="User information" colspan="4"/>
-    <label string="Please provide here your login on the Tiny ERP website."
+    <label string="Please provide here your login on the Open ERP website."
     align="0.0" colspan="4"/>
     <label string="If you don't have an access, you can create one http://www.openerp.com/"
     align="0.0" colspan="4"/>
@@ -174,7 +174,7 @@ end_fields = {
 Thank you for contributing !
 
 Your module has been successfully uploaded to the official website.
-You must wait a few hours/days so that the Tiny ERP core team review
+You must wait a few hours/days so that the Open ERP core team review
 your module for approval on the website.
 """},
     'result': {'string':'Result page', 'type':'text', 'readonly':True}
diff --git a/addons/base_module_publish/wizard/base_module_publish_all.py b/addons/base_module_publish/wizard/base_module_publish_all.py
index 214559daf96..c404d31ef43 100644
--- a/addons/base_module_publish/wizard/base_module_publish_all.py
+++ b/addons/base_module_publish/wizard/base_module_publish_all.py
@@ -36,7 +36,7 @@ intro_fields = {
     'text': {'string': 'Introduction', 'type': 'text', 'readonly': True,
         'default': lambda *a: """
 This system will automatically publish and upload the selected modules to the
-Tiny ERP official website. You can use it to quickly update a set of
+Open ERP official website. You can use it to quickly update a set of
 module (new version).
 
 Make sure you read the publication manual and modules guidlines
@@ -50,7 +50,7 @@ Thanks you for contributing!
 login_form = '''<?xml version="1.0"?>
 <form string="Module publication">
     <separator string="User information" colspan="4"/>
-    <label string="Please provide here your login on the Tiny ERP website."
+    <label string="Please provide here your login on the Open ERP website."
     align="0.0" colspan="4"/>
     <label string="If you don't have an access, you can create one http://www.openerp.com/"
     align="0.0" colspan="4"/>
diff --git a/addons/base_module_record/__terp__.py b/addons/base_module_record/__terp__.py
index a30d774b970..dadfa472873 100644
--- a/addons/base_module_record/__terp__.py
+++ b/addons/base_module_record/__terp__.py
@@ -29,7 +29,7 @@
 This module allows you to create a new module without any development.
 It records all operations on objects during the recording session and
 produce a .ZIP module. So you can create your own module directly from
-the Tiny ERP client.
+the Open ERP client.
 
 This version works for creating and updating existing records. It recomputes
 dependencies and links for all types of widgets (many2one, many2many, ...).
@@ -40,7 +40,7 @@ for custom configurations and demo/testing data.
 
 How to use it:
 1. Start the recording
-2. Do stuff in your Tiny ERP client
+2. Do stuff in your Open ERP client
 3. Stop the recording session
 4. Export to a reusable module
     """,
diff --git a/addons/base_module_record/wizard/base_module_record.py b/addons/base_module_record/wizard/base_module_record.py
index 60c94cddfaf..79f98ff01c7 100644
--- a/addons/base_module_record/wizard/base_module_record.py
+++ b/addons/base_module_record/wizard/base_module_record.py
@@ -27,14 +27,14 @@ import pooler
 intro_stop_form = '''<?xml version="1.0"?>
 <form string="Module Recording">
     <separator string="Recording Information" colspan="4"/>
-    <label string="Tiny ERP recording is stopped. Don't forget to save the recorded module." colspan="4" align="0.0"/>
+    <label string="Open ERP recording is stopped. Don't forget to save the recorded module." colspan="4" align="0.0"/>
     <label string="You can continue the recording session by relauching the 'start recording' wizard." colspan="4" align="0.0"/>
 </form>'''
 
 intro_start_form = '''<?xml version="1.0"?>
 <form string="Recording Stopped">
     <separator string="Recording information" colspan="4"/>
-    <label string="The module recorder allows you to record every operation made in the Tiny ERP client and save them as a module. You will be able to install this module on any database to reuse and/or publish it." colspan="4" align="0.0"/>
+    <label string="The module recorder allows you to record every operation made in the Open ERP client and save them as a module. You will be able to install this module on any database to reuse and/or publish it." colspan="4" align="0.0"/>
     <field name="continue"/>
 </form>'''
 
diff --git a/addons/base_module_record/wizard/base_module_save.py b/addons/base_module_record/wizard/base_module_save.py
index da1da2a7895..826c5f5f5f5 100644
--- a/addons/base_module_record/wizard/base_module_save.py
+++ b/addons/base_module_record/wizard/base_module_save.py
@@ -136,7 +136,7 @@ def _create_module(self, cr, uid, data, context):
         "installable": True
 } """ % data['form']
     filewrite = {
-        '__init__.py':'#\n# Generated by the Tiny ERP module recorder !\n#\n',
+        '__init__.py':'#\n# Generated by the Open ERP module recorder !\n#\n',
         '__terp__.py':_terp,
         dname+'_data.xml': res_xml
     }
diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py
index 91c068d9672..04fd6141744 100644
--- a/addons/base_report_designer/wizard/base_report_designer_modify.py
+++ b/addons/base_report_designer/wizard/base_report_designer_modify.py
@@ -45,7 +45,7 @@ did not installed yet, you can find this package on:
 
 This wizard will provide you the .SXW report that you can modify
 in OpenOffice. After having modified it, you will be able to reupload
-it to the Tiny ERP server.
+it to the Open ERP server.
 """},
     'operation': {
         'string': 'Operation',
@@ -83,7 +83,7 @@ get_form_result = '''<?xml version="1.0"?>
     <newline/>
     <field name="file_sxw"/>
     <newline/>
-    <label colspan="4" string="This is the template of your requested report.\nSave it as a .SXW file and open it with OpenOffice.\nDon't forget to install the Tiny OpenOffice package to modify it.\nOnce it is modified, re-upload it in Tiny ERP using this wizard." align="0.0"/>
+    <label colspan="4" string="This is the template of your requested report.\nSave it as a .SXW file and open it with OpenOffice.\nDon't forget to install the Tiny OpenOffice package to modify it.\nOnce it is modified, re-upload it in Open ERP using this wizard." align="0.0"/>
 </form>'''
 
 get_form_fields = {
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
index 6c550ae9404..9bc62ac02c8 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
@@ -31,7 +31,7 @@
 ##############################################################################
 
 """
-Tiny SXW2RML - The Tiny ERP's report engine
+Tiny SXW2RML - The Open ERP's report engine
 
 Tiny SXW2RMLis part of the Tiny report project.
 Tiny Report is a module that allows you to render high quality PDF document
diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 38196f6aed2..aa5ef205bb6 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -25,23 +25,23 @@
     "author" : "Tiny",
     "website" : "http://tinyerp.com/module_crm.html",
     "category" : "Generic Modules/CRM & SRM",
-    "description": """The Tiny ERP case and request tracker enables a group of
+    "description": """The Open ERP case and request tracker enables a group of
 people to intelligently and efficiently manage tasks, issues, and requests.
 It manages key tasks such as communication, identification, prioritization,
 assignment, resolution and notification.
 
-Tiny ERP ensures that all cases are successfly tracked by users, customers and
+Open ERP ensures that all cases are successfly tracked by users, customers and
 suppliers. It can automatically send reminders, escalate the request, trigger
 specific methods and lots of others actions based on your enterprise own rules.
 
 The greatest thing about this system is that users don't need to do anything
-special. They can just send email to the request tracker. Tiny ERP will take
+special. They can just send email to the request tracker. Open ERP will take
 care of thanking them for their message, automatically routing it to the
 appropriate staff, and making sure all future correspondence gets to the right
 place.
 
 The CRM module has a email gateway for the synchronisation interface
-between mails and Tiny ERP.""",
+between mails and Open ERP.""",
     "depends" : ["base"],
     "init_xml" : ["crm_data.xml"],
     "demo_xml" : ["crm_demo.xml"],
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 85cab98107f..7ba7c6d0337 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -60,7 +60,7 @@ class crm_case_section(osv.osv):
         'active': fields.boolean('Active'),
         'sequence': fields.integer('Sequence'),
         'user_id': fields.many2one('res.users', 'Responsible'),
-        'reply_to': fields.char('Reply-To', size=64, help="The email address wich is the 'Reply-To' of all email sent by Tiny ERP for cases in this section"),
+        'reply_to': fields.char('Reply-To', size=64, help="The email address wich is the 'Reply-To' of all email sent by Open ERP for cases in this section"),
         'parent_id': fields.many2one('crm.case.section', 'Parent Section'),
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Childs Sections'),
     }
diff --git a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
index c2667fdb74d..af0f8ae5fcb 100644
--- a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
+++ b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
@@ -296,11 +296,11 @@ if __name__ == '__main__':
 
     group = optparse.OptionGroup(parser, "Note",
         "This program parse a mail from standard input and communicate "
-        "with the Tiny ERP server for case management in the CRM module.")
+        "with the Open ERP server for case management in the CRM module.")
     parser.add_option_group(group)
 
-    parser.add_option("-u", "--user", dest="userid", help="ID of the user in Tiny ERP", default=3, type='int')
-    parser.add_option("-p", "--password", dest="password", help="Password of the user in Tiny ERP", default='admin')
+    parser.add_option("-u", "--user", dest="userid", help="ID of the user in Open ERP", default=3, type='int')
+    parser.add_option("-p", "--password", dest="password", help="Password of the user in Open ERP", default='admin')
     parser.add_option("-e", "--email", dest="email", help="Email address used in the From field of outgoing messages")
     parser.add_option("-s", "--section", dest="section", help="ID or code of the case section", default="support")
     parser.add_option("-m", "--default", dest="default", help="Default eMail in case of any trouble.", default=None)
diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py
index 881b7595162..3606a49e2b9 100644
--- a/addons/crm_configuration/__terp__.py
+++ b/addons/crm_configuration/__terp__.py
@@ -26,7 +26,7 @@
     "website" : "http://tinyerp.com/module_crm.html",
     "category" : "Generic Modules/CRM & SRM",
     "description": """
-The Tiny ERP case and request tracker enables a group of
+The Open ERP case and request tracker enables a group of
 people to intelligently and efficiently manage tasks, issues,
 and requests. It manages key tasks such as communication, 
 identification, prioritization, assignment, resolution and notification.
diff --git a/addons/crm_profiling/crm_profiling_demo.xml b/addons/crm_profiling/crm_profiling_demo.xml
index 102a8ee28e0..9295f009dcc 100644
--- a/addons/crm_profiling/crm_profiling_demo.xml
+++ b/addons/crm_profiling/crm_profiling_demo.xml
@@ -17,7 +17,7 @@
 		<field name="name">Partner level?</field>
 	</record>
 	<record model="crm_profiling.question" id="partner_tiny">
-		<field name="name">TinyERP partner?</field>
+		<field name="name">OpenERP partner?</field>
 	</record>
 
 	<!--
@@ -103,7 +103,7 @@
 	-->
 
 	<record model="crm.segmentation" id="crm_segmentation0">
-		<field name="name">TinyERP partners</field>
+		<field name="name">OpenERP partners</field>
 		<field name="answer_yes" eval="[(6,0,[partner_tiny1])]" />
 		<field name="categ_id" ref="base.res_partner_category_2"/>
 		<field name="profiling_active">True</field>
diff --git a/addons/custom/corporate_defaults.xsl b/addons/custom/corporate_defaults.xsl
index 71d940ca520..de2ef8ee2e1 100644
--- a/addons/custom/corporate_defaults.xsl
+++ b/addons/custom/corporate_defaults.xsl
@@ -2,7 +2,7 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 	<xsl:variable name="signature" select="//corporate-header/user/signature"/>
-	<xsl:variable name="title">Tiny ERP Report</xsl:variable>
+	<xsl:variable name="title">Open ERP Report</xsl:variable>
 	<xsl:variable name="leftMargin">1cm</xsl:variable>
 	<xsl:variable name="rightMargin">1cm</xsl:variable>
 	<xsl:variable name="topMargin">1cm</xsl:variable>
diff --git a/addons/delivery/__terp__.py b/addons/delivery/__terp__.py
index 8a7597d3aef..63e134482af 100644
--- a/addons/delivery/__terp__.py
+++ b/addons/delivery/__terp__.py
@@ -24,7 +24,7 @@
     "version" : "1.0",
     "author" : "Tiny",
     "category" : "Generic Modules/Sales & Purchases",
-    "description": "Allows to add delivery methods in sales order and packings. You can define your own carrier and delivery grids for prices. When creating invoices from pickings, Tiny ERP is able to add and compute the shipping line.",
+    "description": "Allows to add delivery methods in sales order and packings. You can define your own carrier and delivery grids for prices. When creating invoices from pickings, Open ERP is able to add and compute the shipping line.",
     "depends" : ["sale","purchase", "stock",],
     "init_xml" : ["delivery_data.xml"],
     "demo_xml" : ["delivery_demo.xml"],
diff --git a/addons/hr/report/bymonth.xsl b/addons/hr/report/bymonth.xsl
index 0b79152bf97..8d5ae74f8cc 100644
--- a/addons/hr/report/bymonth.xsl
+++ b/addons/hr/report/bymonth.xsl
@@ -10,7 +10,7 @@
 
     <xsl:template name="rml">
 		<document filename="example.pdf">
-			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Timesheets" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Timesheets" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
 				<pageTemplate id="first">
 					<pageGraphics>
 						<drawRightString x="19.0cm" y="26.0cm"><xsl:value-of select="date"/></drawRightString>
diff --git a/addons/hr_holidays/report/holidays_summary.xsl b/addons/hr_holidays/report/holidays_summary.xsl
index ebe00a83911..793c557c262 100644
--- a/addons/hr_holidays/report/holidays_summary.xsl
+++ b/addons/hr_holidays/report/holidays_summary.xsl
@@ -9,7 +9,7 @@
 
 	<xsl:template name="rml">
 		<document filename="example.pdf">
-			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Timesheets" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Timesheets" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
 				<pageTemplate id="first">
 					<frame id="col1" x1="0.8cm" y1="2.0cm" width="28.0cm" height="17cm"/>
 				</pageTemplate>
@@ -273,4 +273,4 @@
             </xsl:for-each>
 		</blockTable>
 	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/addons/hr_timesheet/report/user_timesheet.xsl b/addons/hr_timesheet/report/user_timesheet.xsl
index 07bbd778ded..88faa6dafef 100644
--- a/addons/hr_timesheet/report/user_timesheet.xsl
+++ b/addons/hr_timesheet/report/user_timesheet.xsl
@@ -10,7 +10,7 @@
 
     <xsl:template name="rml">
 		<document filename="example.pdf">
-			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Timesheets" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Timesheets" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
 				<pageTemplate id="first">
 					<frame id="col1" x1="2.0cm" y1="2.5cm" width="24.7cm" height="17cm"/>
 				</pageTemplate>
diff --git a/addons/hr_timesheet/report/users_timesheet.xsl b/addons/hr_timesheet/report/users_timesheet.xsl
index 7a06e04b409..7f4110b7c90 100644
--- a/addons/hr_timesheet/report/users_timesheet.xsl
+++ b/addons/hr_timesheet/report/users_timesheet.xsl
@@ -10,7 +10,7 @@
 
 	<xsl:template name="rml">
 		<document filename="example.pdf">
-			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Timesheets" author="Generated by Tiny ERP, Fabien Pinckaers" allowSplitting="20">
+			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Timesheets" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
 				<pageTemplate id="first">
 					<frame id="col1" x1="2.0cm" y1="2.5cm" width="24.7cm" height="17cm"/>
 				</pageTemplate>
diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__terp__.py
index 83b9ef0d80d..608ee2c1b68 100644
--- a/addons/l10n_be/__terp__.py
+++ b/addons/l10n_be/__terp__.py
@@ -28,7 +28,7 @@
         "account_chart"],
     "init_xml" : [],
     "description": """
-    This is the base module to manage the accounting chart for Belgium in Tiny ERP.
+    This is the base module to manage the accounting chart for Belgium in Open ERP.
 
     After Installing this module,The Configuration wizard for accounting is launched.
     * We have the account templates which can be helpful to generate Charts of Accounts.
diff --git a/addons/l10n_chart_uk_minimal/__terp__.py b/addons/l10n_chart_uk_minimal/__terp__.py
index 742af32f6c8..610d9f7b408 100644
--- a/addons/l10n_chart_uk_minimal/__terp__.py
+++ b/addons/l10n_chart_uk_minimal/__terp__.py
@@ -22,7 +22,7 @@
 
 #
 # This module provides a minimal UK chart of accounts for building upon further
-# Tiny ERP's default currency and accounts are remapped to this chart
+# Open ERP's default currency and accounts are remapped to this chart
 #
 # This module works for TinyERP 4.1.0 (and, assumed, onwards).
 # This module does not work for TinyERP 4.0.2 and before.
diff --git a/addons/l10n_fr/__terp__.py b/addons/l10n_fr/__terp__.py
index 742d5d37e11..cbd0d92e4da 100644
--- a/addons/l10n_fr/__terp__.py
+++ b/addons/l10n_fr/__terp__.py
@@ -35,7 +35,7 @@
     "website": "http://erp-libre.info",
     "depends" : ["base", "account", "account_chart", 'base_vat'],
      "description": """
-    This is the base module to manage the accounting chart for France in Tiny ERP.
+    This is the base module to manage the accounting chart for France in Open ERP.
 
     After Installing this module,The Configuration wizard for accounting is launched.
     * We have the account templates which can be helpful to generate Charts of Accounts.
diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 9dcaa397b14..e988c2d09c4 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -27,7 +27,7 @@
     "category" : "Generic Modules/Production",
     "depends" : ["stock", "hr", "purchase", "product","process"],
     "description": """
-    This is the base module to manage the manufacturing process in Tiny ERP.
+    This is the base module to manage the manufacturing process in Open ERP.
 
     Features:
     * Make to Stock / Make to Order (by line)
diff --git a/addons/mrp/report/custom_default.xsl b/addons/mrp/report/custom_default.xsl
index 7082392aed6..ce9ea180613 100644
--- a/addons/mrp/report/custom_default.xsl
+++ b/addons/mrp/report/custom_default.xsl
@@ -2,7 +2,7 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 	<xsl:variable name="signature">Axair</xsl:variable>
-	<xsl:variable name="title">Tiny ERP Report</xsl:variable>
+	<xsl:variable name="title">Open ERP Report</xsl:variable>
 	<xsl:variable name="leftMargin">1cm</xsl:variable>
 	<xsl:variable name="rightMargin">1cm</xsl:variable>
 	<xsl:variable name="topMargin">1cm</xsl:variable>
diff --git a/addons/mrp/report/custom_rml.xsl b/addons/mrp/report/custom_rml.xsl
index afc8c3d9a92..96d4f003f0c 100644
--- a/addons/mrp/report/custom_rml.xsl
+++ b/addons/mrp/report/custom_rml.xsl
@@ -7,7 +7,7 @@
 	
 	<xsl:template name="rml">
 		<document>
-			<template author="Generated by Tiny ERP, Fabien Pinckaers">
+			<template author="Generated by Open ERP, Fabien Pinckaers">
 				<xsl:attribute name="pageSize">
 					<xsl:value-of select="$pageSize"/>
 				</xsl:attribute>
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 5342e5b9e87..1d93704d71d 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -113,7 +113,7 @@ class report_custom(report_rml):
             <tableSize>60.00mm,60.00mm, 20.00mm, 20.00mm, 20.00mm, 20.00mm</tableSize>
             """
         config_stop = """
-            <report-footer>Generated by Tiny ERP</report-footer>
+            <report-footer>Generated by Open ERP</report-footer>
         </config>
         """
         header = """
diff --git a/addons/product/__terp__.py b/addons/product/__terp__.py
index f345a77ede4..bbc4d667b75 100644
--- a/addons/product/__terp__.py
+++ b/addons/product/__terp__.py
@@ -28,7 +28,7 @@
     "init_xml" : [],
     "demo_xml" : ["product_demo.xml"],
     "description": """
-    This is the base module to manage products and pricelists in Tiny ERP.
+    This is the base module to manage products and pricelists in Open ERP.
 
     Products support variants, different pricing methods, suppliers
     information, make to stock/order, different unit of measures,
diff --git a/addons/product/report/product_label.xsl b/addons/product/report/product_label.xsl
index 5c52e21227f..2df7e8d3e2c 100644
--- a/addons/product/report/product_label.xsl
+++ b/addons/product/report/product_label.xsl
@@ -15,7 +15,7 @@
 
 	<xsl:template match="lots">
 		<document>
-			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Address list" author="Generated by Tiny ERP">
+			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Address list" author="Generated by Open ERP">
 				<pageTemplate id="all">
 					<pageGraphics/>
 					<xsl:apply-templates select="lot-line" mode="frames"/>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index ea6803bf302..84ed9925148 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -21,7 +21,7 @@
 
         <record id="project_project_9" model="project.project">
             <field name="warn_manager">1</field>
-            <field name="name">Tiny ERP Integration</field>
+            <field name="name">Open ERP Integration</field>
             <field name="manager" ref="base.user_root"/>
         </record>
         <record id="project_project_21" model="project.project">
diff --git a/addons/project/report/gantt.py b/addons/project/report/gantt.py
index fb426a098a3..8fc83070adb 100644
--- a/addons/project/report/gantt.py
+++ b/addons/project/report/gantt.py
@@ -31,7 +31,7 @@ class GanttCanvas(object):
     def __init__(self, io, convertors=(lambda x:x,lambda x:x)):
         self._datas = {}
         self._canvas = canvas.init(fname=io, format='pdf')
-        self._canvas.set_author("Tiny ERP")
+        self._canvas.set_author("Open ERP")
         self._names = {}
         self._conv = convertors
         self._min = 0
diff --git a/addons/scrum/report/sprint_burndown.py b/addons/scrum/report/sprint_burndown.py
index 5c2d7f91de1..9b07960ac7e 100644
--- a/addons/scrum/report/sprint_burndown.py
+++ b/addons/scrum/report/sprint_burndown.py
@@ -47,7 +47,7 @@ class report_tasks(report_int):
         io = StringIO.StringIO()
 
         canv = canvas.init(fname=io, format='pdf')
-        canv.set_author("Tiny ERP")
+        canv.set_author("Open ERP")
 
         cr.execute('select id,date_start,date_stop from scrum_sprint where id=%s', (datas['id'],))
         for (id,date_start,date_stop) in cr.fetchall():
diff --git a/addons/scrum/report/task_burndown.py b/addons/scrum/report/task_burndown.py
index 12ad09c7ea3..0730352f9bf 100644
--- a/addons/scrum/report/task_burndown.py
+++ b/addons/scrum/report/task_burndown.py
@@ -91,7 +91,7 @@ class report_tasks(report_int):
         datas = _burndown.compute_burndown(cr, uid, ids, datas['date_start'], datas['date_stop'])
 
         canv = canvas.init(fname=io, format='pdf')
-        canv.set_author("Tiny ERP")
+        canv.set_author("Open ERP")
 
         max_hour = reduce(lambda x,y: max(y[1],x), datas, 0)
 
diff --git a/addons/scrum/scrum_demo.xml b/addons/scrum/scrum_demo.xml
index c3b6d392cf2..f58bfbe4a34 100644
--- a/addons/scrum/scrum_demo.xml
+++ b/addons/scrum/scrum_demo.xml
@@ -9,7 +9,7 @@
             <field name="tasks">[24, 25, 28, 26, 27, 29, 30, 31, 32, 33, 34, 35, 37, 36, 38]</field>
             <field model="res.users" name="manager" search="[('login','=','demo')]"/>
             <field name="planned_hours">156.0</field>
-            <field name="name">Tiny ERP - dev branch</field>
+            <field name="name">Open ERP - dev branch</field>
             <field model="res.users" name="product_owner_id" search="[('login','=','demo')]"/>
         </record>
         
@@ -32,21 +32,21 @@
         <record id="scrum_product_backlog_0" model="scrum.product.backlog">
             <field name="priority">3</field>
             <field name="name">Automatic migration system</field>
-            <field name="note">This new system will enable you to migrate automatically from an old version of Tiny ERP to a new one. This system will migrate not only the Tiny ERP system but also the customers particularities. This happens without any kind of script or programming. It has been possible to carry out such a system thanks to the descriptive approach of Tiny ERP components. </field>
+            <field name="note">This new system will enable you to migrate automatically from an old version of Open ERP to a new one. This system will migrate not only the Open ERP system but also the customers particularities. This happens without any kind of script or programming. It has been possible to carry out such a system thanks to the descriptive approach of Open ERP components. </field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
         <record id="scrum_product_backlog_1" model="scrum.product.backlog">
             <field name="priority">3</field>
             <field name="name">New accounting module</field>
-            <field name="note">The accounting module of Tiny ERP (financial accounting and management accounting) is being reshaped. New functionnalities will be added: intangible assets, a new way of presenting ledgers and bookings, new stock valuation calculation, and lots of predefined reports. </field>
+            <field name="note">The accounting module of Open ERP (financial accounting and management accounting) is being reshaped. New functionnalities will be added: intangible assets, a new way of presenting ledgers and bookings, new stock valuation calculation, and lots of predefined reports. </field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
         <record id="scrum_product_backlog_2" model="scrum.product.backlog">
             <field name="priority">3</field>
             <field name="name">Automated Plugin System to install/uninstall modules</field>
-            <field name="note">We have to develop a plug-in system which will enable to install/remove modules. The basic version of Tiny ERP will include only the required minimum, and you will select the modules thanks to the plug-in manager. This allows you to limit your system to your real needs: quality management, localisations, project and service management, marketing campaigns, and so on... </field>
+            <field name="note">We have to develop a plug-in system which will enable to install/remove modules. The basic version of Open ERP will include only the required minimum, and you will select the modules thanks to the plug-in manager. This allows you to limit your system to your real needs: quality management, localisations, project and service management, marketing campaigns, and so on... </field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
@@ -62,13 +62,13 @@
         </record>
         <record id="scrum_product_backlog_5" model="scrum.product.backlog">
             <field name="name">Test for 3.2.0 Publishing</field>
-            <field name="note">Test Tiny ERP to release stable 3.2.0 version. (may be 3.2.0-pre1 ?)</field>
+            <field name="note">Test Open ERP to release stable 3.2.0 version. (may be 3.2.0-pre1 ?)</field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
         <record id="scrum_product_backlog_6" model="scrum.product.backlog">
             <field name="name">Reshape the complete menu</field>
-            <field name="note">Restrucutre the Tiny ERP menu to be more like others ERP.</field>
+            <field name="note">Restrucutre the Open ERP menu to be more like others ERP.</field>
             <field name="sprint_id" ref="scrum_sprint_0"/>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
diff --git a/addons/stock/report/lot_move_label.xsl b/addons/stock/report/lot_move_label.xsl
index 1a6c65b8b0f..57b29e69405 100644
--- a/addons/stock/report/lot_move_label.xsl
+++ b/addons/stock/report/lot_move_label.xsl
@@ -15,7 +15,7 @@
 
 	<xsl:template match="lots">
 		<document>
-			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Address list" author="Generated by Tiny ERP">
+			<template leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Address list" author="Generated by Open ERP">
 				<pageTemplate id="all">
 					<pageGraphics/>
 					<xsl:apply-templates select="lot-line" mode="frames"/>
diff --git a/addons/stock/report/stock_by_location.py b/addons/stock/report/stock_by_location.py
index 75c70400613..ccd048261b8 100644
--- a/addons/stock/report/stock_by_location.py
+++ b/addons/stock/report/stock_by_location.py
@@ -36,7 +36,7 @@ class report_custom(report_rml):
             <PageHeight>841.88</PageHeight>
             <tableSize>60.00mm,60.00mm,60.00mm</tableSize>
             <report-header>Stock by location</report-header>
-            <report-footer>Generated by Tiny ERP</report-footer>
+            <report-footer>Generated by Open ERP</report-footer>
         </config>
         """
         header = """
diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py
index ac5ae5f2718..ee8ab243260 100644
--- a/addons/stock/report/stock_graph.py
+++ b/addons/stock/report/stock_graph.py
@@ -32,7 +32,7 @@ class stock_graph(object):
     def __init__(self, io):
         self._datas = {}
         self._canvas = canvas.init(fname=io, format='pdf')
-        self._canvas.set_author("Tiny ERP")
+        self._canvas.set_author("Open ERP")
         self._names = {}
         self.val_min = ''
         self.val_max = ''