diff --git a/docs/api/mpd.rst b/docs/api/mpd.rst
new file mode 100644
index 00000000..a74302dc
--- /dev/null
+++ b/docs/api/mpd.rst
@@ -0,0 +1,8 @@
+************************************************
+:mod:`mopidy.mpd` -- MPD protocol implementation
+************************************************
+
+.. automodule:: mopidy.mpd.frontend
+    :synopsis: Our implementation of the MPD protocol.
+    :members:
+    :undoc-members:
diff --git a/docs/api/mpd/handler.rst b/docs/api/mpd/handler.rst
deleted file mode 100644
index 2fcd2302..00000000
--- a/docs/api/mpd/handler.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-********************************************************
-:mod:`mopidy.mpd.handler` -- MPD protocol implementation
-********************************************************
-
-.. automodule:: mopidy.mpd.handler
-    :synopsis: Our implementation of the MPD protocol.
-    :members:
-    :undoc-members:
diff --git a/docs/development/internals.rst b/docs/development/internals.rst
index 26aeb86d..085b55ac 100644
--- a/docs/development/internals.rst
+++ b/docs/development/internals.rst
@@ -27,16 +27,16 @@ not Mopidy. The red nodes lives in the ``main`` process (running an
     "CoreProcess" [ color="blue" ]
     "DespotifyBackend" [ color="blue" ]
     "AlsaMixer" [ color="blue" ]
-    "MpdHandler" [ color="blue" ]
+    "MpdFrontend" [ color="blue" ]
     "MpdServer" [ color="red" ]
     "MpdSession" [ color="red" ]
     "__main__" -> "CoreProcess" [ label="create" ]
     "__main__" -> "MpdServer" [ label="create" ]
     "CoreProcess" -> "DespotifyBackend" [ label="create" ]
-    "CoreProcess" -> "MpdHandler" [ label="create" ]
+    "CoreProcess" -> "MpdFrontend" [ label="create" ]
     "MpdServer" -> "MpdSession" [ label="create one per client" ]
-    "MpdSession" -> "MpdHandler" [ label="pass MPD requests to" ]
-    "MpdHandler" -> "DespotifyBackend" [ label="use backend API" ]
+    "MpdSession" -> "MpdFrontend" [ label="pass MPD requests to" ]
+    "MpdFrontend" -> "DespotifyBackend" [ label="use backend API" ]
     "DespotifyBackend" -> "AlsaMixer" [ label="create and use mixer API" ]
     "DespotifyBackend" -> "spytify" [ label="use Python wrapper" ]
     "spytify" -> "despotify" [ label="use C library" ]
diff --git a/mopidy/mpd/handler.py b/mopidy/mpd/frontend.py
similarity index 99%
rename from mopidy/mpd/handler.py
rename to mopidy/mpd/frontend.py
index 25d0f2e1..cb8d109a 100644
--- a/mopidy/mpd/handler.py
+++ b/mopidy/mpd/frontend.py
@@ -17,7 +17,7 @@ import sys
 
 from mopidy.mpd import MpdAckError, MpdNotImplemented
 
-logger = logging.getLogger('mpd.handler')
+logger = logging.getLogger('mopidy.mpd.frontend')
 
 _request_handlers = {}
 
@@ -41,7 +41,7 @@ def flatten(the_list):
             result.append(element)
     return result
 
-class MpdHandler(object):
+class MpdFrontend(object):
     def __init__(self, backend=None):
         self.backend = backend
         self.command_list = False
diff --git a/mopidy/settings/default.py b/mopidy/settings/default.py
index 874c2f87..3466aef0 100644
--- a/mopidy/settings/default.py
+++ b/mopidy/settings/default.py
@@ -27,8 +27,8 @@ CONSOLE_LOG_FORMAT = u'%(levelname)-8s %(asctime)s [%(process)d:%(threadName)s]
 
 #: Protocol frontend to use. Default::
 #:
-#:     FRONTEND = u'mopidy.mpd.handler.MpdHandler'
-FRONTEND = u'mopidy.mpd.handler.MpdHandler'
+#:     FRONTEND = u'mopidy.mpd.frontend.MpdFrontend'
+FRONTEND = u'mopidy.mpd.frontend.MpdFrontend'
 
 #: Sound mixer to use. See :mod:`mopidy.mixers` for all available mixers.
 #: