diff --git a/doc/README.urpmi b/doc/README.urpmi
index c31e558d5b5..719ac8249f3 100644
--- a/doc/README.urpmi
+++ b/doc/README.urpmi
@@ -25,7 +25,7 @@ unix user name):
     $ logout
     # logout
 
-3. Launch service daemon by "service tinyerp-server start".
+3. Launch service daemon by "service openerp-server start".
 
 The first time it is run, the server will initialise the database with all the default values.
 
diff --git a/doc/openerp-server.conf b/doc/openerp-server.conf
index 16a00b4251c..0bb48ced4b5 100644
--- a/doc/openerp-server.conf
+++ b/doc/openerp-server.conf
@@ -1,5 +1,5 @@
 [options]
-without_demo = False
+without_demo = True
 upgrade = False
 verbose = False
 xmlrpc = True
diff --git a/doc/openerp-server.init b/doc/openerp-server.init
index 0eb3d363875..fa8c6f8abb4 100644
--- a/doc/openerp-server.init
+++ b/doc/openerp-server.init
@@ -1,38 +1,38 @@
 #!/bin/bash
-# tinyerp-server        This shell script takes care of starting and stopping
-#                       TinyERP server
+# openerp-server        This shell script takes care of starting and stopping
+#                       OpenERP server
 #
 # chkconfig: 345 95 05
-# description: TinyERP server
+# description: OpenERP server
 #
-# pidfile: /var/run/tinyerp-server.pid
-# config: /etc/tinyerp-server.conf
+# pidfile: /var/run/openerp-server.pid
+# config: /etc/openerp-server.conf
 
 ### BEGIN INIT INFO
-# Provides: tinyerp-server
+# Provides: openerp-server
 # Required-Start: postgresql
 # Required-Stop: postgresql
 # Should-Start: $network harddrake
 # Default-Start: 345
-# Short-Description: Launches the TinyERP server.
-# Description: This startup script launches the TinyERP server.
+# Short-Description: Launches the OpenERP server.
+# Description: This startup script launches the OpenERP server.
 ### END INIT INFO
 
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-PIDFILE=/var/run/tinyerp/tinyerp-server.pid
-LOCKFILE=/var/lock/subsys/tinyerp-server
-LOGFILE=/var/log/tinyerp/tinyerp-server.log
+PIDFILE=/var/run/tinyerp/openerp-server.pid
+LOCKFILE=/var/lock/subsys/openerp-server
+LOGFILE=/var/log/tinyerp/openerp-server.log
 
 OPTS="--pidfile=$PIDFILE --logfile=$LOGFILE"
 
-prog="tinyerp-server"
-desc="TinyERP Server Daemon"
+prog="openerp-server"
+desc="OpenERP Server Daemon"
 
-# check if the tinyerp-server conf file is present, then use it
-if [ -f /etc/tinyerp-server.conf ]; then
-    OPTS="$OPTS -c /etc/tinyerp-server.conf"
+# check if the openerp-server conf file is present, then use it
+if [ -f /etc/openerp-server.conf ]; then
+    OPTS="$OPTS -c /etc/openerp-server.conf"
 fi
 
 # Source function library
@@ -44,16 +44,16 @@ else
  exit 0
 fi
 
-# check the existence of the tinyerp-server script
-[ -z "/usr/bin/tinyerp-server" ] && exit 0
+# check the existence of the openerp-server script
+[ -z "/usr/bin/openerp-server" ] && exit 0
 
 RETVAL=0
 
 start() {
     echo -n $"Starting $desc ($prog): "
-    daemon --user tinyerp --check tinyerp-server \
-    "/usr/bin/setsid /usr/bin/tinyerp-server \
-    -c /etc/tinyerp-server.conf \
+    daemon --user tinyerp --check openerp-server \
+    "/usr/bin/setsid /usr/bin/openerp-server \
+    -c /etc/openerp-server.conf \
     --pidfile=$PIDFILE \
     --logfile=$LOGFILE &"
 
diff --git a/doc/openerp-server.logrotate b/doc/openerp-server.logrotate
index 5d8585fe5d2..e1f7f803a7d 100644
--- a/doc/openerp-server.logrotate
+++ b/doc/openerp-server.logrotate
@@ -1,4 +1,4 @@
-/var/log/tinyerp/*.log {
+/var/log/openerp/*.log {
     copytruncate
     missingok
     notifempty