5 files changed, 10 insertions, 10 deletions
diff --git a/setup/package.py b/setup/package.py
index 0020fe04072..a5525276a3c 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -21,7 +21,7 @@ from tempfile import NamedTemporaryFile
 #----------------------------------------------------------
 # Utils
 #----------------------------------------------------------
-execfile(join(dirname(__file__), '..', 'openerp', 'release.py'))
+execfile(join(dirname(__file__), '..', 'odoo', 'release.py'))
 version = version.split('-')[0]
 timestamp = time.strftime("%Y%m%d", time.gmtime())
 GPGPASSPHRASE = os.getenv('GPGPASSPHRASE')
@@ -231,9 +231,9 @@ def _prepare_build_dir(o, win32=False):
     try:
         for addon_path in glob(join(o.build_dir, 'addons/*')):
             if addon_path.split(os.path.sep)[-1] not in ADDONS_NOT_TO_PUBLISH:
-                shutil.move(addon_path, join(o.build_dir, 'openerp/addons'))
+                shutil.move(addon_path, join(o.build_dir, 'odoo/addons'))
     except shutil.Error:
-        # Thrown when the add-on is already in openerp/addons (if _prepare_build_dir
+        # Thrown when the add-on is already in odoo/addons (if _prepare_build_dir
         # has already been called once)
         pass
 
@@ -306,8 +306,8 @@ def test_tgz(o):
         wheezy.system('su postgres -s /bin/bash -c "createdb mycompany"')
         wheezy.system('mkdir /var/lib/odoo')
         wheezy.system('chown odoo:odoo /var/lib/odoo')
-        wheezy.system('su odoo -s /bin/bash -c "odoo.py --addons-path=/usr/local/lib/python2.7/dist-packages/openerp/addons -d mycompany -i base --stop-after-init"')
-        wheezy.system('su odoo -s /bin/bash -c "odoo.py --addons-path=/usr/local/lib/python2.7/dist-packages/openerp/addons -d mycompany &"')
+        wheezy.system('su odoo -s /bin/bash -c "odoo.py --addons-path=/usr/local/lib/python2.7/dist-packages/odoo/addons -d mycompany -i base --stop-after-init"')
+        wheezy.system('su odoo -s /bin/bash -c "odoo.py --addons-path=/usr/local/lib/python2.7/dist-packages/odoo/addons -d mycompany &"')
 
 def test_deb(o):
     with docker('odoo-%s-debian-nightly-tests' % version, o.build_dir, o.pub) as wheezy:
@@ -420,7 +420,7 @@ def options():
     o.pkg = join(o.build_dir, 'pkg')
     o.version_full = '%s-%s' % (o.version, timestamp)
     o.work = join(o.build_dir, 'openerp-%s' % o.version_full)
-    o.work_addons = join(o.work, 'openerp', 'addons')
+    o.work_addons = join(o.work, 'odoo', 'addons')
 
     return o
 
diff --git a/setup/redhat/postinstall.sh b/setup/redhat/postinstall.sh
index 19ea5292739..e8ada164318 100644
--- a/setup/redhat/postinstall.sh
+++ b/setup/redhat/postinstall.sh
@@ -27,7 +27,7 @@ db_host = False
 db_port = False
 db_user = $ODOO_USER
 db_password = False
-addons_path = /usr/lib/python2.7/site-packages/openerp/addons
+addons_path = /usr/lib/python2.7/site-packages/odoo/addons
 " > $ODOO_CONFIGURATION_FILE
     chown $ODOO_USER:$ODOO_GROUP $ODOO_CONFIGURATION_FILE
     chmod 0640 $ODOO_CONFIGURATION_FILE
diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi
index 67b1551ff9c..398fc9b265e 100755
--- a/setup/win32/setup.nsi
+++ b/setup/win32/setup.nsi
@@ -224,7 +224,7 @@ Section $(TITLE_OpenERP_Server) SectionOpenERP_Server
     WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_password" $TextPostgreSQLPassword
     WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort
     # Fix the addons path
-    WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "addons_path" "$INSTDIR\server\openerp\addons"
+    WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "addons_path" "$INSTDIR\server\odoo\addons"
     WriteIniStr "$INSTDIR\server\openerp-server.conf" "options" "bin_path" "$INSTDIR\thirdparty"
 
     # if we're going to install postgresql force it's path,
diff --git a/setup/win32/win32_service.py b/setup/win32/win32_service.py
index fcc6b897059..5da2083323a 100644
--- a/setup/win32/win32_service.py
+++ b/setup/win32/win32_service.py
@@ -11,7 +11,7 @@ import sys
 from os.path import dirname, join, split
 
 
-execfile(join(dirname(__file__), '..', 'server', 'openerp', 'release.py'))
+execfile(join(dirname(__file__), '..', 'server', 'odoo', 'release.py'))
 
 
 class OdooService(win32serviceutil.ServiceFramework):
diff --git a/setup/win32/win32_setup.py b/setup/win32/win32_setup.py
index dcebaf3630f..d973f90674a 100644
--- a/setup/win32/win32_setup.py
+++ b/setup/win32/win32_setup.py
@@ -6,7 +6,7 @@ import py2exe
 from distutils.core import setup
 
 
-execfile(os.path.join(os.path.dirname(__file__), '..', '..', 'openerp', 'release.py'))
+execfile(os.path.join(os.path.dirname(__file__), '..', '..', 'odoo', 'release.py'))
 
 
 def generate_files():