diff --git a/client/components/app/StreamContainer.vue b/client/components/app/MediaPlayerContainer.vue
similarity index 96%
rename from client/components/app/StreamContainer.vue
rename to client/components/app/MediaPlayerContainer.vue
index 0cae1421..2e0afc55 100644
--- a/client/components/app/StreamContainer.vue
+++ b/client/components/app/MediaPlayerContainer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="streamLibraryItem" id="streamContainer" class="w-full fixed bottom-0 left-0 right-0 h-48 md:h-40 z-50 bg-primary px-2 md:px-4 pb-1 md:pb-4 pt-2">
+  <div v-if="streamLibraryItem" id="mediaPlayerContainer" class="w-full fixed bottom-0 left-0 right-0 h-48 md:h-40 z-50 bg-primary px-2 md:px-4 pb-1 md:pb-4 pt-2">
     <div id="videoDock" />
     <div class="absolute left-2 top-2 md:left-4 cursor-pointer">
       <covers-book-cover expand-on-click :library-item="streamLibraryItem" :width="bookCoverWidth" :book-cover-aspect-ratio="coverAspectRatio" />
@@ -380,7 +380,7 @@ export default {
       if (this.playerHandler.isPlayingLocalItem && this.playerHandler.currentStreamId === data.stream) {
         if (!data.numSegments) return
         var chunks = data.chunks
-        console.log(`[StreamContainer] Stream Progress ${data.percent}`)
+        console.log(`[MediaPlayerContainer] Stream Progress ${data.percent}`)
         if (this.$refs.audioPlayer) {
           this.$refs.audioPlayer.setChunksReady(chunks, data.numSegments)
         } else {
@@ -397,17 +397,17 @@ export default {
       this.playerHandler.prepareOpenSession(session, this.currentPlaybackRate)
     },
     streamOpen(session) {
-      console.log(`[StreamContainer] Stream session open`, session)
+      console.log(`[MediaPlayerContainer] Stream session open`, session)
     },
     streamClosed(streamId) {
       // Stream was closed from the server
       if (this.playerHandler.isPlayingLocalItem && this.playerHandler.currentStreamId === streamId) {
-        console.warn('[StreamContainer] Closing stream due to request from server')
+        console.warn('[MediaPlayerContainer] Closing stream due to request from server')
         this.playerHandler.closePlayer()
       }
     },
     streamReady() {
-      console.log(`[StreamContainer] Stream Ready`)
+      console.log(`[MediaPlayerContainer] Stream Ready`)
       if (this.$refs.audioPlayer) {
         this.$refs.audioPlayer.setStreamReady()
       } else {
@@ -417,7 +417,7 @@ export default {
     streamError(streamId) {
       // Stream had critical error from the server
       if (this.playerHandler.isPlayingLocalItem && this.playerHandler.currentStreamId === streamId) {
-        console.warn('[StreamContainer] Closing stream due to stream error from server')
+        console.warn('[MediaPlayerContainer] Closing stream due to stream error from server')
         this.playerHandler.closePlayer()
       }
     },
@@ -496,7 +496,7 @@ export default {
 </script>
 
 <style>
-#streamContainer {
+#mediaPlayerContainer {
   box-shadow: 0px -6px 8px #1111113f;
 }
 </style>
diff --git a/client/layouts/default.vue b/client/layouts/default.vue
index 41d4943a..6d5e0230 100644
--- a/client/layouts/default.vue
+++ b/client/layouts/default.vue
@@ -7,7 +7,7 @@
       <Nuxt :key="currentLang" />
     </div>
 
-    <app-stream-container ref="streamContainer" />
+    <app-media-player-container ref="mediaPlayerContainer" />
 
     <modals-item-edit-modal />
     <modals-collections-add-create-modal />
@@ -129,23 +129,23 @@ export default {
       this.$eventBus.$emit('socket_init')
     },
     streamOpen(stream) {
-      if (this.$refs.streamContainer) this.$refs.streamContainer.streamOpen(stream)
+      if (this.$refs.mediaPlayerContainer) this.$refs.mediaPlayerContainer.streamOpen(stream)
     },
     streamClosed(streamId) {
-      if (this.$refs.streamContainer) this.$refs.streamContainer.streamClosed(streamId)
+      if (this.$refs.mediaPlayerContainer) this.$refs.mediaPlayerContainer.streamClosed(streamId)
     },
     streamProgress(data) {
-      if (this.$refs.streamContainer) this.$refs.streamContainer.streamProgress(data)
+      if (this.$refs.mediaPlayerContainer) this.$refs.mediaPlayerContainer.streamProgress(data)
     },
     streamReady() {
-      if (this.$refs.streamContainer) this.$refs.streamContainer.streamReady()
+      if (this.$refs.mediaPlayerContainer) this.$refs.mediaPlayerContainer.streamReady()
     },
     streamReset(payload) {
-      if (this.$refs.streamContainer) this.$refs.streamContainer.streamReset(payload)
+      if (this.$refs.mediaPlayerContainer) this.$refs.mediaPlayerContainer.streamReset(payload)
     },
     streamError({ id, errorMessage }) {
       this.$toast.error(`Stream Failed: ${errorMessage}`)
-      if (this.$refs.streamContainer) this.$refs.streamContainer.streamError(id)
+      if (this.$refs.mediaPlayerContainer) this.$refs.mediaPlayerContainer.streamError(id)
     },
     libraryAdded(library) {
       this.$store.commit('libraries/addUpdate', library)
@@ -247,7 +247,7 @@ export default {
         this.multiSessionCurrentSessionId = null
         this.$toast.dismiss('multiple-sessions')
       }
-      if (this.$refs.streamContainer) this.$refs.streamContainer.sessionClosedEvent(sessionId)
+      if (this.$refs.mediaPlayerContainer) this.$refs.mediaPlayerContainer.sessionClosedEvent(sessionId)
     },
     userMediaProgressUpdate(payload) {
       this.$store.commit('user/updateMediaProgress', payload)