diff --git a/mopidy/frontends/mpd/__init__.py b/mopidy/frontends/mpd/__init__.py
index 65299e9d..8dbbf3db 100644
--- a/mopidy/frontends/mpd/__init__.py
+++ b/mopidy/frontends/mpd/__init__.py
@@ -29,7 +29,7 @@ class MpdFrontend(ThreadingActor):
         port = settings.MPD_SERVER_PORT
 
         try:
-            network.Listener(hostname, port, MpdSession)
+            network.Server(hostname, port, protocol=MpdSession)
         except IOError, e:
             logger.error(u'MPD server startup failed: %s', e)
             sys.exit(1)
diff --git a/mopidy/utils/network.py b/mopidy/utils/network.py
index f89867ba..6e8b5b44 100644
--- a/mopidy/utils/network.py
+++ b/mopidy/utils/network.py
@@ -41,7 +41,7 @@ def format_hostname(hostname):
         hostname = '::ffff:%s' % hostname
     return hostname
 
-class Listener(object):
+class Server(object):
     """Setup listener and register it with gobject loop."""
 
     def __init__(self, host, port, protocol):