diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index b2dc9123..6bc08d83 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -8,7 +8,7 @@ sys.path.insert(0,
     os.path.abspath(os.path.join(os.path.dirname(__file__), '../')))
 
 from mopidy import settings, SettingsError
-from mopidy.core import CoreProcess
+from mopidy.process import CoreProcess
 from mopidy.utils import get_class
 
 logger = logging.getLogger('mopidy.main')
@@ -18,7 +18,7 @@ def main():
     core_queue = multiprocessing.Queue()
     core = CoreProcess(core_queue)
     core.start()
-    get_class(settings.SERVER)(core_queue=core_queue)
+    get_class(settings.SERVER)(core_queue)
     asyncore.loop()
 
 def _setup_logging(verbosity_level):
diff --git a/mopidy/core.py b/mopidy/process.py
similarity index 95%
rename from mopidy/core.py
rename to mopidy/process.py
index 4eb65fbb..673b542d 100644
--- a/mopidy/core.py
+++ b/mopidy/process.py
@@ -4,7 +4,7 @@ import multiprocessing
 from mopidy import settings
 from mopidy.utils import get_class, unpickle_connection
 
-logger = logging.getLogger('mopidy.core')
+logger = logging.getLogger('mopidy.process')
 
 class CoreProcess(multiprocessing.Process):
     def __init__(self, core_queue):