diff --git a/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/TimelineVoiceBroadcastProvider.swift b/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/TimelineVoiceBroadcastProvider.swift
index 327da466d..5a8b4e268 100644
--- a/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/TimelineVoiceBroadcastProvider.swift
+++ b/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/TimelineVoiceBroadcastProvider.swift
@@ -20,7 +20,7 @@ class TimelineVoiceBroadcastProvider {
     static let shared = TimelineVoiceBroadcastProvider()
     
     var session: MXSession?
-    var coordinatorsForEventIdentifiers = [String: TimelineVoiceBroadcastCoordinator]()
+    var coordinatorsForEventIdentifiers = [String: VoiceBroadcastPlaybackController]()
     
     private init() { }
     
@@ -35,8 +35,8 @@ class TimelineVoiceBroadcastProvider {
             return coordinator.toPresentable().view
         }
         
-        let parameters = TimelineVoiceBroadcastCoordinatorParameters(session: session, room: room, voiceBroadcastStartEvent: event)
-        guard let coordinator = try? TimelineVoiceBroadcastCoordinator(parameters: parameters) else {
+        let parameters = VoiceBroadcastPlaybackControllerParameters(session: session, room: room, voiceBroadcastStartEvent: event)
+        guard let coordinator = try? VoiceBroadcastPlaybackController(parameters: parameters) else {
             return nil
         }
         
@@ -46,7 +46,7 @@ class TimelineVoiceBroadcastProvider {
     }
     
     /// Retrieve the voiceBroadcast timeline coordinator for the given event or nil if it hasn't been created yet
-    func timelineVoiceBroadcastCoordinatorForEventIdentifier(_ eventIdentifier: String) -> TimelineVoiceBroadcastCoordinator? {
+    func voiceBroadcastPlaybackControllerForEventIdentifier(_ eventIdentifier: String) -> VoiceBroadcastPlaybackController? {
         coordinatorsForEventIdentifiers[eventIdentifier]
     }
 }
diff --git a/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/TimelineVoiceBroadcastCoordinator.swift b/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/VoiceBroadcastPlaybackController.swift
similarity index 92%
rename from RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/TimelineVoiceBroadcastCoordinator.swift
rename to RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/VoiceBroadcastPlaybackController.swift
index bb3e4457f..4650530cc 100644
--- a/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/TimelineVoiceBroadcastCoordinator.swift
+++ b/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Coordinator/VoiceBroadcastPlaybackController.swift
@@ -18,18 +18,18 @@ import Combine
 import MatrixSDK
 import SwiftUI
 
-struct TimelineVoiceBroadcastCoordinatorParameters {
+struct VoiceBroadcastPlaybackControllerParameters {
     let session: MXSession
     let room: MXRoom
     let voiceBroadcastStartEvent: MXEvent
 }
 
-final class TimelineVoiceBroadcastCoordinator: Coordinator, Presentable, VoiceBroadcastAggregatorDelegate {
+final class VoiceBroadcastPlaybackController: Coordinator, Presentable, VoiceBroadcastAggregatorDelegate {
     // MARK: - Properties
     
     // MARK: Private
     
-    private let parameters: TimelineVoiceBroadcastCoordinatorParameters
+    private let parameters: VoiceBroadcastPlaybackControllerParameters
     private let selectedAnswerIdentifiersSubject = PassthroughSubject<[String], Never>()
     
     private var voiceBroadcastAggregator: VoiceBroadcastAggregator
@@ -43,7 +43,7 @@ final class TimelineVoiceBroadcastCoordinator: Coordinator, Presentable, VoiceBr
     
     // MARK: - Setup
     
-    init(parameters: TimelineVoiceBroadcastCoordinatorParameters) throws {
+    init(parameters: VoiceBroadcastPlaybackControllerParameters) throws {
         self.parameters = parameters
         
         try voiceBroadcastAggregator = VoiceBroadcastAggregator(session: parameters.session, room: parameters.room, voiceBroadcastStartEventId: parameters.voiceBroadcastStartEvent.eventId)
diff --git a/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Service/VoiceBroadcastChunk.swift b/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Service/VoiceBroadcastChunk.swift
deleted file mode 100644
index ea45ac303..000000000
--- a/RiotSwiftUI/Modules/Room/TimelineVoiceBroadcast/Service/VoiceBroadcastChunk.swift
+++ /dev/null
@@ -1,27 +0,0 @@
-// 
-// Copyright 2022 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-//TODO: VB remove duplicated class or struct
-/// Represents user live location
-struct VoiceBroadcastChunk {
-    /// Chunk sequence number
-    let sequence: UInt
-
-    /// Chunk file url
-    let url: URL
-}