diff --git a/README.md b/README.md
index 90c3c86deeb..2521793ec58 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ from the documentation.
 
 If you are a developer you may type the following command at your terminal:
 
-    wget -O- https://raw.githubusercontent.com/odoo/odoo/9.0/odoo.py | python
+    wget -O- https://raw.githubusercontent.com/odoo/odoo/10.0/setup/setup_dev.py | python
 
 Then follow <a href="https://www.odoo.com/documentation/9.0/tutorials.html">the developer tutorials</a>
 
diff --git a/odoo/cli/shell.py b/odoo/cli/shell.py
index cf7b5ffbce2..6d0b0d5bd01 100644
--- a/odoo/cli/shell.py
+++ b/odoo/cli/shell.py
@@ -46,7 +46,7 @@ class Shell(Command):
             exec sys.stdin in local_vars
         else:
             if 'env' not in local_vars:
-                print 'No environment set, use `odoo.py shell -d dbname` to get one.'
+                print 'No environment set, use `%s shell -d dbname` to get one.' % sys.argv[0]
             for i in sorted(local_vars):
                 print '%s: %s' % (i, local_vars[i])
 
diff --git a/odoo/tools/config.py b/odoo/tools/config.py
index eddc34b5b78..20105c775ed 100644
--- a/odoo/tools/config.py
+++ b/odoo/tools/config.py
@@ -45,7 +45,7 @@ def _get_default_datadir():
 def _deduplicate_loggers(loggers):
     """ Avoid saving multiple logging levels for the same loggers to a save
     file, that just takes space and the list can potentially grow unbounded
-    if for some odd reason people use :option`odoo.py --save`` all the time.
+    if for some odd reason people use :option`--save`` all the time.
     """
     # dict(iterable) -> the last item of iterable for any given key wins,
     # which is what we want and expect. Output order should not matter as
diff --git a/setup.py b/setup.py
index 41175072b1c..c226b1631e3 100644
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,6 @@ def py2exe_options():
         import py2exe
         return {
             'console': [
-                {'script': 'odoo.py'},
                 {'script': 'openerp-server', 'icon_resources': [
                     (1, join('setup', 'win32', 'static', 'pixmaps', 'openerp-icon.ico'))
                 ]},
@@ -129,7 +128,7 @@ setup(
     author_email=author_email,
     classifiers=filter(None, classifiers.split('\n')),
     license=license,
-    scripts=['openerp-server', 'odoo.py'],
+    scripts=['openerp-server'],
     packages=find_packages(),
     package_dir={'%s' % lib_name: 'odoo'},
     include_package_data=True,
diff --git a/odoo.py b/setup/setup_dev.py
similarity index 100%
rename from odoo.py
rename to setup/setup_dev.py