diff --git a/docs/changes.rst b/docs/changes.rst
index b6e827f2..01b3c5bc 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -102,6 +102,9 @@ greatly improved MPD client support.
     :meth:`mopidy.backends.base.BasePlaybackController.new_playlist_loaded_callback()`
     to
     :meth:`mopidy.backends.base.BasePlaybackController.on_current_playlist_change()`.
+  - Rename
+    :meth:`mopidy.backends.base.BasePlaybackController.end_of_track_callback()`
+    to :meth:`mopidy.backends.base.BasePlaybackController.on_end_of_track()`.
 
 
 0.1.0a3 (2010-08-03)
diff --git a/mopidy/backends/base/playback.py b/mopidy/backends/base/playback.py
index b86678a2..f484bf89 100644
--- a/mopidy/backends/base/playback.py
+++ b/mopidy/backends/base/playback.py
@@ -300,7 +300,7 @@ class BasePlaybackController(object):
     def _current_wall_time(self):
         return int(time.time() * 1000)
 
-    def end_of_track_callback(self):
+    def on_end_of_track(self):
         """
         Tell the playback controller that end of track is reached.
 
diff --git a/mopidy/process.py b/mopidy/process.py
index 53b6fbb5..01ac8ed4 100644
--- a/mopidy/process.py
+++ b/mopidy/process.py
@@ -68,7 +68,7 @@ class CoreProcess(BaseProcess):
             connection = unpickle_connection(message['reply_to'])
             connection.send(response)
         elif message['command'] == 'end_of_track':
-            self.backend.playback.end_of_track_callback()
+            self.backend.playback.on_end_of_track()
         elif message['command'] == 'stop_playback':
             self.backend.playback.stop()
         elif message['command'] == 'set_stored_playlists':