diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomCellLayoutUpdater.swift b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomCellLayoutUpdater.swift
index 37bb565a2..da6cb173d 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomCellLayoutUpdater.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomCellLayoutUpdater.swift
@@ -17,7 +17,7 @@
 import UIKit
 
 @objcMembers
-class BubbleRoomCellLayoutUpdater: RoomCellLayoutUpdaterProtocol {
+class BubbleRoomCellLayoutUpdater: RoomCellLayoutUpdater {
     
     // MARK: - Properties
     
diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineStyle.swift b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineStyle.swift
index 96e232653..5c5c6d4ac 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineStyle.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineStyle.swift
@@ -28,7 +28,7 @@ class BubbleRoomTimelineStyle: RoomTimelineStyle {
     
     let identifier: RoomTimelineStyleIdentifier
     
-    let cellLayoutUpdater: RoomCellLayoutUpdaterProtocol?
+    let cellLayoutUpdater: RoomCellLayoutUpdater?
     
     let cellProvider: RoomTimelineCellProviderProtocol
     
diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineStyle.swift b/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineStyle.swift
index cf3773003..1d4f498ec 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineStyle.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/Plain/PlainRoomTimelineStyle.swift
@@ -28,7 +28,7 @@ class PlainRoomTimelineStyle: RoomTimelineStyle {
     
     let identifier: RoomTimelineStyleIdentifier
     
-    let cellLayoutUpdater: RoomCellLayoutUpdaterProtocol?
+    let cellLayoutUpdater: RoomCellLayoutUpdater?
     
     let cellProvider: RoomTimelineCellProviderProtocol
     
diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/RoomCellLayoutUpdaterProtocol.swift b/Riot/Modules/Room/Views/BubbleCells/Styles/RoomCellLayoutUpdater.swift
similarity index 95%
rename from Riot/Modules/Room/Views/BubbleCells/Styles/RoomCellLayoutUpdaterProtocol.swift
rename to Riot/Modules/Room/Views/BubbleCells/Styles/RoomCellLayoutUpdater.swift
index 3b18df1e8..485470964 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/RoomCellLayoutUpdaterProtocol.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/RoomCellLayoutUpdater.swift
@@ -18,7 +18,7 @@ import Foundation
 
 /// Enables to setup or update a room timeline cell view
 @objc
-protocol RoomCellLayoutUpdaterProtocol: Themable {
+protocol RoomCellLayoutUpdater: Themable {
     
     func updateLayoutIfNeeded(for cell: MXKRoomBubbleTableViewCell, andCellData cellData: MXKRoomBubbleCellData)
             
diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineStyle.swift b/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineStyle.swift
index eaf483651..18c91be97 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineStyle.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/RoomTimelineStyle.swift
@@ -27,7 +27,7 @@ protocol RoomTimelineStyle: Themable {
     var identifier: RoomTimelineStyleIdentifier { get }
     
     /// Update layout if needed for cells provided by the cell provider
-    var cellLayoutUpdater: RoomCellLayoutUpdaterProtocol? { get }
+    var cellLayoutUpdater: RoomCellLayoutUpdater? { get }
     
     /// Register and provide timeline cells
     var cellProvider: RoomTimelineCellProviderProtocol { get }