diff --git a/bin/trytond b/bin/trytond
index b321ee84fc..1146379635 100755
--- a/bin/trytond
+++ b/bin/trytond
@@ -26,4 +26,4 @@ if 0:
     os.remove(statfile)
 
 else:
-    trytond.TrytonServer().run()
+    trytond.server.TrytonServer().run()
diff --git a/trytond/__init__.py b/trytond/__init__.py
index b331565a78..1fbeffd123 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -1,2 +1,2 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms.
-from trytond import *
+import server
diff --git a/trytond/report/report.py b/trytond/report/report.py
index 91b2155a90..e47712161c 100644
--- a/trytond/report/report.py
+++ b/trytond/report/report.py
@@ -26,7 +26,7 @@ from genshi.filters import Translator
 import traceback
 from trytond.config import CONFIG
 from trytond.sql_db import IntegrityError
-from trytond import LOCALE_SEMAPHORE
+from trytond.server import LOCALE_SEMAPHORE
 
 MODULE_LIST = []
 MODULE_CLASS_LIST = {}
diff --git a/trytond/trytond.py b/trytond/server.py
similarity index 100%
rename from trytond/trytond.py
rename to trytond/server.py