diff --git a/bin/tinyerp-server.py b/bin/openerp-server.py
similarity index 100%
rename from bin/tinyerp-server.py
rename to bin/openerp-server.py
diff --git a/man/tinyerp-server.1 b/man/openerp-server.1
similarity index 83%
rename from man/tinyerp-server.1
rename to man/openerp-server.1
index 1bb935953f9..0d0275b31d6 100644
--- a/man/tinyerp-server.1
+++ b/man/openerp-server.1
@@ -1,20 +1,20 @@
-.TH tinyerp_server 1
+.TH openerp_server 1
 
 .SH NAME
-tinyerp_server \- Server for Tiny ERP 
+openerp_server \- Server for OpenERP 
 
 .SH SYNOPSIS
-.B tinyerp_server.py [options]
+.B openerp_server.py [options]
 
 .SH DESCRIPTION
-TinyERP is an Enterprise Resource Planning and Customer Relationship
+OpenERP is an Enterprise Resource Planning and Customer Relationship
 Management software package. It is developed to meet changing needs. 
 The main functional features are: CRM and SRM, analytic and financial 
 accounting, double-entry stock management, sales and purchases management, 
 tasks automation, a help desk, marketing campaigns, and vertical modules 
 for very specific businesses. Technical features include a distributed 
 server, flexible workflows, an object database, a dynamic GUI, customizable 
-reports, and a SOAP and XML-RPC interface.
+reports, and a NET-RPC and XML-RPC interface.
 
 .SH OPTIONS
 
@@ -28,7 +28,7 @@ Print the program's version number and exit.
 
 .TP
 .B \-c \fIFILE\fB, \-\-config=\fIFILE\fB
-Specify an alternate config file. By default, tinyerp server uses ~/.terp_serverrc
+Specify an alternate config file. By default, openerp server uses ~/.terp_serverrc
 
 .TP
 .B \-s, \-\-save
@@ -87,14 +87,12 @@ Import the CSV file at \fIFILEPATH\fR. It should contain the translations for th
 
 .SH AUTHORS
 
-Tiny ERP is a product of \fBTiny.be\fR (\fIhttp://www.tiny.be\fR)
+OpenERP is a product of \fBTiny.be\fR (\fIhttp://www.tiny.be\fR)
 
 .SH SEE ALSO
-terp_serverrc(5)
-tinyerp(1)
+openerp_serverrc(5)
+openerp(1)
 .br
-\fIhttp://www.tinyerp.com\fR : Tiny ERP functional description
-.br
-\fIhttp://www.tinyerp.org\fR : Tiny ERP developer zone
+\fIhttp://www.openerp.com\fR : Tiny ERP functional description
 
 
diff --git a/man/terp_serverrc.5 b/man/openerp_serverrc.5
similarity index 85%
rename from man/terp_serverrc.5
rename to man/openerp_serverrc.5
index 9959509f4d0..9337bc370a1 100644
--- a/man/terp_serverrc.5
+++ b/man/openerp_serverrc.5
@@ -1,7 +1,7 @@
-.TH terp_serverrc 5
+.TH openerp_serverrc 5
 
 .SH NAME
-terp_serverrc \- configuration file for Tiny ERP
+openerp_serverrc \- configuration file for OpenERP
 
 .SH SYNOPSIS
 [options]
@@ -71,8 +71,6 @@ Specify the SMTP password for sending email.
 .TP
 .IR db_name
 Specify the database name.
-.br
-(default terp)
 .TP
 .IR db_user
 Specify the database user name.
@@ -105,11 +103,9 @@ Specify the price accuracy.
 
 .SH AUTHORS
 
-Tiny ERP is a product of \fBTiny.be\fR (\fIhttp://www.tiny.be\fR)
+OpenERP is a product of \fBTiny.be\fR (\fIhttp://www.tiny.be\fR)
 
 .SH SEE ALSO
 tinyerp-server(1)
 .br
-\fIhttp://www.tinyerp.com\fR : Tiny ERP functional description
-.br
-\fIhttp://www.tinyerp.org\fR : Tiny ERP developer zone
+\fIhttp://www.openerp.com\fR : OpenERP functional description
diff --git a/pixmaps/tinyerp-header.bmp b/pixmaps/openerp-header.bmp
similarity index 100%
rename from pixmaps/tinyerp-header.bmp
rename to pixmaps/openerp-header.bmp
diff --git a/pixmaps/tinyerp-icon.png b/pixmaps/openerp-icon.png
similarity index 100%
rename from pixmaps/tinyerp-icon.png
rename to pixmaps/openerp-icon.png
diff --git a/pixmaps/tinyerp-intro.bmp b/pixmaps/openerp-intro.bmp
similarity index 100%
rename from pixmaps/tinyerp-intro.bmp
rename to pixmaps/openerp-intro.bmp
diff --git a/pixmaps/tinyerp.ico b/pixmaps/openerp.ico
similarity index 100%
rename from pixmaps/tinyerp.ico
rename to pixmaps/openerp.ico
diff --git a/win32/TinyERPServerService.py b/win32/OpenERPServerService.py
similarity index 100%
rename from win32/TinyERPServerService.py
rename to win32/OpenERPServerService.py