diff --git a/app/src/main/java/com/cappielloantonio/play/service/DownloaderTracker.java b/app/src/main/java/com/cappielloantonio/play/service/DownloaderManager.java
similarity index 98%
rename from app/src/main/java/com/cappielloantonio/play/service/DownloaderTracker.java
rename to app/src/main/java/com/cappielloantonio/play/service/DownloaderManager.java
index 3b599929..77eea8c5 100644
--- a/app/src/main/java/com/cappielloantonio/play/service/DownloaderTracker.java
+++ b/app/src/main/java/com/cappielloantonio/play/service/DownloaderManager.java
@@ -28,7 +28,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-public class DownloaderTracker {
+public class DownloaderManager {
     private static final String TAG = "DownloadTracker";
 
     private final Context context;
@@ -41,7 +41,7 @@ public class DownloaderTracker {
     }
 
     @SuppressLint("UnsafeOptInUsageError")
-    public DownloaderTracker(Context context, DownloadManager downloadManager) {
+    public DownloaderManager(Context context, DownloadManager downloadManager) {
         this.context = context.getApplicationContext();
 
         listeners = new CopyOnWriteArraySet<>();
diff --git a/app/src/main/java/com/cappielloantonio/play/service/MediaService.java b/app/src/main/java/com/cappielloantonio/play/service/MediaService.java
index 3b8530d1..df91fef9 100644
--- a/app/src/main/java/com/cappielloantonio/play/service/MediaService.java
+++ b/app/src/main/java/com/cappielloantonio/play/service/MediaService.java
@@ -18,6 +18,7 @@ import androidx.media3.session.MediaSession;
 
 import com.cappielloantonio.play.ui.activity.MainActivity;
 import com.cappielloantonio.play.util.DownloadUtil;
+import com.google.android.gms.cast.framework.CastContext;
 
 public class MediaService extends MediaLibraryService {
     private static final String TAG = "MediaService";
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java b/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java
index f185c713..34155468 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java
@@ -16,16 +16,16 @@ import androidx.media3.session.SessionToken;
 
 import com.cappielloantonio.play.R;
 import com.cappielloantonio.play.service.DownloaderService;
-import com.cappielloantonio.play.service.DownloaderTracker;
+import com.cappielloantonio.play.service.DownloaderManager;
 import com.cappielloantonio.play.service.MediaService;
 import com.cappielloantonio.play.util.DownloadUtil;
 import com.google.common.util.concurrent.ListenableFuture;
 
-public class BaseActivity extends AppCompatActivity implements DownloaderTracker.Listener {
+public class BaseActivity extends AppCompatActivity implements DownloaderManager.Listener {
     private static final String TAG = "BaseActivity";
 
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
-    private DownloaderTracker downloaderTracker;
+    private DownloaderManager downloaderManager;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -102,7 +102,7 @@ public class BaseActivity extends AppCompatActivity implements DownloaderTracker
 
     @SuppressLint("UnsafeOptInUsageError")
     private void initializeDownloader() {
-        downloaderTracker = DownloadUtil.getDownloadTracker(this);
+        downloaderManager = DownloadUtil.getDownloadTracker(this);
 
         try {
             DownloadService.start(this, DownloaderService.class);
@@ -112,10 +112,10 @@ public class BaseActivity extends AppCompatActivity implements DownloaderTracker
     }
 
     private void addDownloadListener() {
-        downloaderTracker.addListener(this);
+        downloaderManager.addListener(this);
     }
 
     private void removeDownloadListener() {
-        downloaderTracker.removeListener(this);
+        downloaderManager.removeListener(this);
     }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/util/DownloadUtil.java b/app/src/main/java/com/cappielloantonio/play/util/DownloadUtil.java
index f779a13d..13b276ad 100644
--- a/app/src/main/java/com/cappielloantonio/play/util/DownloadUtil.java
+++ b/app/src/main/java/com/cappielloantonio/play/util/DownloadUtil.java
@@ -19,7 +19,7 @@ import androidx.media3.exoplayer.offline.DefaultDownloadIndex;
 import androidx.media3.exoplayer.offline.DownloadManager;
 import androidx.media3.exoplayer.offline.DownloadNotificationHelper;
 
-import com.cappielloantonio.play.service.DownloaderTracker;
+import com.cappielloantonio.play.service.DownloaderManager;
 
 import java.io.File;
 import java.io.IOException;
@@ -43,7 +43,7 @@ public final class DownloadUtil {
     private static File downloadDirectory;
     private static Cache downloadCache;
     private static DownloadManager downloadManager;
-    private static DownloaderTracker downloaderTracker;
+    private static DownloaderManager downloaderManager;
     private static DownloadNotificationHelper downloadNotificationHelper;
 
     public static synchronized HttpDataSource.Factory getHttpDataSourceFactory() {
@@ -81,9 +81,9 @@ public final class DownloadUtil {
         return downloadManager;
     }
 
-    public static synchronized DownloaderTracker getDownloadTracker(Context context) {
+    public static synchronized DownloaderManager getDownloadTracker(Context context) {
         ensureDownloadManagerInitialized(context);
-        return downloaderTracker;
+        return downloaderManager;
     }
 
     @SuppressLint("UnsafeOptInUsageError")
@@ -103,7 +103,7 @@ public final class DownloadUtil {
             upgradeActionFile(context, DOWNLOAD_ACTION_FILE, downloadIndex, false);
             upgradeActionFile(context, DOWNLOAD_TRACKER_ACTION_FILE, downloadIndex, true);
             downloadManager = new DownloadManager(context, getDatabaseProvider(context), getDownloadCache(context), getHttpDataSourceFactory(), Executors.newFixedThreadPool(6));
-            downloaderTracker = new DownloaderTracker(context, downloadManager);
+            downloaderManager = new DownloaderManager(context, downloadManager);
         }
     }