diff --git a/app/src/main/java/com/nextcloud/client/player/media3/session/MediaSessionBitmapLoader.kt b/app/src/main/java/com/nextcloud/client/player/media3/session/MediaSessionBitmapLoader.kt
index a211bf4d62ee..05b8c4c4a6f2 100644
--- a/app/src/main/java/com/nextcloud/client/player/media3/session/MediaSessionBitmapLoader.kt
+++ b/app/src/main/java/com/nextcloud/client/player/media3/session/MediaSessionBitmapLoader.kt
@@ -20,7 +20,7 @@ import androidx.media3.datasource.DataSourceBitmapLoader
 import com.google.common.util.concurrent.ListenableFuture
 import com.google.common.util.concurrent.ListeningExecutorService
 import com.google.common.util.concurrent.MoreExecutors
-import com.nextcloud.client.player.model.ThumbnailLoader
+import com.nextcloud.client.player.model.PlayerThumbnailLoader
 import com.nextcloud.client.player.model.file.PlaybackFile
 import com.nextcloud.client.player.util.PlayerUtil.playbackFile
 import com.owncloud.android.R
@@ -32,7 +32,7 @@ import javax.inject.Inject
 @UnstableApi
 class MediaSessionBitmapLoader @Inject constructor(
     private val context: Context,
-    private val thumbnailLoader: ThumbnailLoader
+    private val playerThumbnailLoader: PlayerThumbnailLoader
 ) : BitmapLoader by DataSourceBitmapLoader.Builder(context).build() {
 
     companion object {
@@ -82,14 +82,14 @@ class MediaSessionBitmapLoader @Inject constructor(
     private fun getBitmapFromMetadata(metadata: MediaMetadata, fileId: String?): Bitmap? {
         val model = metadata.artworkData ?: metadata.artworkUri ?: return null
         return runCatching {
-            thumbnailLoader.load(model, fileId, thumbnailSize, thumbnailSize).get()
+            playerThumbnailLoader.load(model, fileId, thumbnailSize, thumbnailSize).get()
         }.getOrElse {
             null
         }
     }
 
     private fun getBitmapForFile(file: PlaybackFile): Bitmap? = runCatching {
-        thumbnailLoader.load(file, thumbnailSize, thumbnailSize).get()
+        playerThumbnailLoader.load(file, thumbnailSize, thumbnailSize).get()
     }.getOrElse {
         null
     }
diff --git a/app/src/main/java/com/nextcloud/client/player/model/ThumbnailLoader.kt b/app/src/main/java/com/nextcloud/client/player/model/PlayerThumbnailLoader.kt
similarity index 98%
rename from app/src/main/java/com/nextcloud/client/player/model/ThumbnailLoader.kt
rename to app/src/main/java/com/nextcloud/client/player/model/PlayerThumbnailLoader.kt
index 7ae944daf5c5..f4cf34b3955e 100644
--- a/app/src/main/java/com/nextcloud/client/player/model/ThumbnailLoader.kt
+++ b/app/src/main/java/com/nextcloud/client/player/model/PlayerThumbnailLoader.kt
@@ -26,7 +26,7 @@ import java.util.concurrent.Future
 import javax.inject.Inject
 import kotlin.coroutines.resume
 
-class ThumbnailLoader @Inject constructor(
+class PlayerThumbnailLoader @Inject constructor(
     context: Context,
     clientFactory: ClientFactory,
     userAccountManager: UserAccountManager
diff --git a/app/src/main/java/com/nextcloud/client/player/ui/audio/AudioFileFragment.kt b/app/src/main/java/com/nextcloud/client/player/ui/audio/AudioFileFragment.kt
index f567a15cd494..2eaa40b2b5fe 100644
--- a/app/src/main/java/com/nextcloud/client/player/ui/audio/AudioFileFragment.kt
+++ b/app/src/main/java/com/nextcloud/client/player/ui/audio/AudioFileFragment.kt
@@ -14,7 +14,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import com.nextcloud.client.player.media3.PlaybackModel
-import com.nextcloud.client.player.model.ThumbnailLoader
+import com.nextcloud.client.player.model.PlayerThumbnailLoader
 import com.nextcloud.client.player.model.file.PlaybackFile
 import com.nextcloud.client.player.model.state.PlaybackItemMetadata
 import com.nextcloud.client.player.model.state.PlaybackState
@@ -45,7 +45,7 @@ open class AudioFileFragment :
     lateinit var playbackModel: PlaybackModel
 
     @Inject
-    lateinit var thumbnailLoader: ThumbnailLoader
+    lateinit var playerThumbnailLoader: PlayerThumbnailLoader
 
     private var _binding: PlayerAudioFileFragmentBinding? = null
     private val binding get() = checkNotNull(_binding) { "Binding accessed outside of the view lifecycle" }
@@ -120,7 +120,7 @@ open class AudioFileFragment :
     private fun loadFileThumbnail(): Job = viewLifecycleOwner.lifecycleScope.launch {
         val context = context ?: return@launch
         val thumbnailSize = context.resources.getDimensionPixelSize(R.dimen.player_album_cover_size)
-        val thumbnail = thumbnailLoader.await(file, thumbnailSize, thumbnailSize) ?: return@launch
+        val thumbnail = playerThumbnailLoader.await(file, thumbnailSize, thumbnailSize) ?: return@launch
         val albumCover = _binding?.albumCover ?: return@launch
         albumCover.setImageBitmap(thumbnail)
         isFileThumbnailLoaded = true
@@ -128,7 +128,7 @@ open class AudioFileFragment :
 
     private fun loadMetadataArtwork(metadata: PlaybackItemMetadata) {
         val source = metadata.artworkData ?: metadata.artworkUri ?: return
-        thumbnailLoader.load(binding.albumCover, source, file.id)
+        playerThumbnailLoader.load(binding.albumCover, source, file.id)
     }
 
     private fun PlaybackFile.getDetailsText(): String = listOfNotNull(
diff --git a/app/src/main/java/com/nextcloud/client/player/ui/video/VideoFileFragment.kt b/app/src/main/java/com/nextcloud/client/player/ui/video/VideoFileFragment.kt
index 0255165604f4..ee2860be96de 100644
--- a/app/src/main/java/com/nextcloud/client/player/ui/video/VideoFileFragment.kt
+++ b/app/src/main/java/com/nextcloud/client/player/ui/video/VideoFileFragment.kt
@@ -15,7 +15,7 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import com.nextcloud.client.player.media3.PlaybackModel
-import com.nextcloud.client.player.model.ThumbnailLoader
+import com.nextcloud.client.player.model.PlayerThumbnailLoader
 import com.nextcloud.client.player.model.file.PlaybackFile
 import com.nextcloud.client.player.model.state.PlaybackState
 import com.nextcloud.client.player.model.state.VideoSize
@@ -47,7 +47,7 @@ class VideoFileFragment :
     lateinit var playerModel: PlaybackModel
 
     @Inject
-    lateinit var thumbnailLoader: ThumbnailLoader
+    lateinit var playerThumbnailLoader: PlayerThumbnailLoader
 
     private var _binding: PlayerVideoFileFragmentBinding? = null
     private val binding get() = checkNotNull(_binding) { "Binding accessed outside of the view lifecycle" }
@@ -105,7 +105,7 @@ class VideoFileFragment :
     private fun loadFileThumbnail() = viewLifecycleOwner.lifecycleScope.launch {
         val context = context ?: return@launch
         val thumbnailSize = context.resources.getDimensionPixelSize(R.dimen.player_album_cover_size)
-        val thumbnail = thumbnailLoader.await(file, thumbnailSize, thumbnailSize) ?: return@launch
+        val thumbnail = playerThumbnailLoader.await(file, thumbnailSize, thumbnailSize) ?: return@launch
         _binding?.thumbnail?.setImageBitmap(thumbnail)
     }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewPlaybackFragment.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewPlaybackFragment.kt
index f0b154c4d32b..b93c01b392c7 100644
--- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewPlaybackFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewPlaybackFragment.kt
@@ -18,7 +18,7 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import com.nextcloud.client.player.media3.PlaybackModel
-import com.nextcloud.client.player.model.ThumbnailLoader
+import com.nextcloud.client.player.model.PlayerThumbnailLoader
 import com.nextcloud.client.player.model.file.PlaybackCollection
 import com.nextcloud.client.player.model.file.PlaybackFile
 import com.nextcloud.client.player.util.PlayerUtil.toPlaybackFile
@@ -79,7 +79,7 @@ class PreviewPlaybackFragment :
     lateinit var playerLauncher: PlayerLauncher
 
     @Inject
-    lateinit var thumbnailLoader: ThumbnailLoader
+    lateinit var playerThumbnailLoader: PlayerThumbnailLoader
 
     private lateinit var binding: PreviewPlaybackFragmentBinding
     private lateinit var file: OCFile
@@ -207,7 +207,7 @@ class PreviewPlaybackFragment :
         viewLifecycleOwner.lifecycleScope.launch {
             val context = context ?: return@launch
             val size = context.resources.getDimension(R.dimen.player_album_cover_size).toInt()
-            thumbnailLoader.await(playbackFile, size, size)?.let(binding.thumbnail::setImageBitmap)
+            playerThumbnailLoader.await(playbackFile, size, size)?.let(binding.thumbnail::setImageBitmap)
         }
     }