diff --git a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
index 3dc3472d..3a0f7c80 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/MusicService.java
@@ -46,6 +46,7 @@ import com.dkanada.gramophone.service.notifications.PlayingNotificationMarshmall
 import com.dkanada.gramophone.service.notifications.PlayingNotificationNougat;
 import com.dkanada.gramophone.service.playback.LocalPlayer;
 import com.dkanada.gramophone.service.playback.Playback;
+import com.dkanada.gramophone.service.playback.PlaybackListener;
 import com.dkanada.gramophone.service.receivers.MediaButtonIntentReceiver;
 import com.dkanada.gramophone.util.PreferenceUtil;
 import com.dkanada.gramophone.util.Util;
@@ -152,7 +153,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
         }
     };
 
-    private final Playback.PlaybackCallbacks playbackCallbacks = new Playback.PlaybackCallbacks() {
+    private final PlaybackListener playbackCallbacks = new PlaybackListener() {
         @Override
         public void onStateChanged(int state) {
             notifyChange(STATE_CHANGED);
@@ -236,7 +237,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
         wakeLock.setReferenceCounted(false);
 
         playback = new LocalPlayer(this);
-        playback.setCallbacks(playbackCallbacks);
+        playback.setListener(playbackCallbacks);
 
         queueManager = new QueueManager(this, queueCallbacks);
 
diff --git a/app/src/main/java/com/dkanada/gramophone/service/playback/LocalPlayer.java b/app/src/main/java/com/dkanada/gramophone/service/playback/LocalPlayer.java
index 9202d02c..ebb7c1bf 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/playback/LocalPlayer.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/playback/LocalPlayer.java
@@ -42,7 +42,7 @@ public class LocalPlayer implements Playback {
     private final SimpleExoPlayer exoPlayer;
     private final SimpleCache simpleCache;
 
-    private PlaybackCallbacks callbacks;
+    private PlaybackListener listener;
 
     private final ExecutorService executorService = Executors.newSingleThreadExecutor();
 
@@ -51,25 +51,25 @@ public class LocalPlayer implements Playback {
         @Override
         public void onPlayWhenReadyChanged(boolean playWhenReady, int reason) {
             Log.i(TAG, String.format("onPlayWhenReadyChanged: %b %d", playWhenReady, reason));
-            if (callbacks != null) callbacks.onReadyChanged(playWhenReady, reason);
+            if (listener != null) listener.onReadyChanged(playWhenReady, reason);
         }
 
         @Override
         public void onPlaybackStateChanged(int state) {
             Log.i(TAG, String.format("onPlaybackStateChanged: %d", state));
-            if (callbacks != null) callbacks.onStateChanged(state);
+            if (listener != null) listener.onStateChanged(state);
         }
 
         @Override
         public void onPlaybackSuppressionReasonChanged(@Player.PlaybackSuppressionReason int playbackSuppressionReason) {
             Log.i(TAG, String.format("onPlaybackSuppressionReasonChanged: %d", playbackSuppressionReason));
-            if (callbacks != null) callbacks.onStateChanged(Player.STATE_READY);
+            if (listener != null) listener.onStateChanged(Player.STATE_READY);
         }
 
         @Override
         public void onMediaItemTransition(MediaItem mediaItem, int reason) {
             Log.i(TAG, String.format("onMediaItemTransition: %s %d", mediaItem, reason));
-            if (callbacks != null) callbacks.onTrackChanged(reason);
+            if (listener != null) listener.onTrackChanged(reason);
         }
 
         @Override
@@ -194,8 +194,8 @@ public class LocalPlayer implements Playback {
     }
 
     @Override
-    public void setCallbacks(Playback.PlaybackCallbacks callbacks) {
-        this.callbacks = callbacks;
+    public void setListener(PlaybackListener listener) {
+        this.listener = listener;
     }
 
     @Override
diff --git a/app/src/main/java/com/dkanada/gramophone/service/playback/Playback.java b/app/src/main/java/com/dkanada/gramophone/service/playback/Playback.java
index 6570e6e3..91536c03 100644
--- a/app/src/main/java/com/dkanada/gramophone/service/playback/Playback.java
+++ b/app/src/main/java/com/dkanada/gramophone/service/playback/Playback.java
@@ -10,7 +10,7 @@ public interface Playback {
 
     void playSongAt(int position);
 
-    void setCallbacks(PlaybackCallbacks callbacks);
+    void setListener(PlaybackListener listener);
 
     boolean isReady();
 
@@ -39,12 +39,4 @@ public interface Playback {
     void setVolume(int volume);
 
     int getVolume();
-
-    interface PlaybackCallbacks {
-        void onStateChanged(int state);
-
-        void onReadyChanged(boolean ready, int reason);
-
-        void onTrackChanged(int reason);
-    }
 }
diff --git a/app/src/main/java/com/dkanada/gramophone/service/playback/PlaybackListener.java b/app/src/main/java/com/dkanada/gramophone/service/playback/PlaybackListener.java
new file mode 100644
index 00000000..692c945f
--- /dev/null
+++ b/app/src/main/java/com/dkanada/gramophone/service/playback/PlaybackListener.java
@@ -0,0 +1,9 @@
+package com.dkanada.gramophone.service.playback;
+
+public interface PlaybackListener {
+    void onStateChanged(int state);
+
+    void onReadyChanged(boolean ready, int reason);
+
+    void onTrackChanged(int reason);
+}