diff --git a/Riot/Modules/Room/TimelineCells/Styles/Bubble/Cells/Poll/PollBaseBubbleCell.swift b/Riot/Modules/Room/TimelineCells/Styles/Bubble/Cells/Poll/PollBaseBubbleCell.swift
index 769eb82e5..b69abdcd4 100644
--- a/Riot/Modules/Room/TimelineCells/Styles/Bubble/Cells/Poll/PollBaseBubbleCell.swift
+++ b/Riot/Modules/Room/TimelineCells/Styles/Bubble/Cells/Poll/PollBaseBubbleCell.swift
@@ -16,7 +16,7 @@
 
 import UIKit
 
-class PollBaseBubbleCell: PollBubbleCell {
+class PollBaseBubbleCell: PollPlainCell {
     
     // MARK: - Properties
     
diff --git a/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollBubbleCell.swift b/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollPlainCell.swift
similarity index 92%
rename from Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollBubbleCell.swift
rename to Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollPlainCell.swift
index 51dd798d8..65a356f9d 100644
--- a/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollBubbleCell.swift
+++ b/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollPlainCell.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-class PollBubbleCell: SizableBaseRoomCell, RoomCellReactionsDisplayable, RoomCellReadMarkerDisplayable {
+class PollPlainCell: SizableBaseRoomCell, RoomCellReactionsDisplayable, RoomCellReadMarkerDisplayable {
     
     private var pollView: UIView?
     private var event: MXEvent?
@@ -62,4 +62,4 @@ class PollBubbleCell: SizableBaseRoomCell, RoomCellReactionsDisplayable, RoomCel
     }
 }
 
-extension PollBubbleCell: RoomCellThreadSummaryDisplayable {}
+extension PollPlainCell: RoomCellThreadSummaryDisplayable {}
diff --git a/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollWithPaginationTitleBubbleCell.swift b/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollWithPaginationTitlePlainCell.swift
similarity index 92%
rename from Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollWithPaginationTitleBubbleCell.swift
rename to Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollWithPaginationTitlePlainCell.swift
index 969c7864d..8862ef42b 100644
--- a/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollWithPaginationTitleBubbleCell.swift
+++ b/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollWithPaginationTitlePlainCell.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-class PollWithPaginationTitleBubbleCell: PollBubbleCell {
+class PollWithPaginationTitlePlainCell: PollPlainCell {
     
     override func setupViews() {
         super.setupViews()
diff --git a/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollWithoutSenderInfoBubbleCell.swift b/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollWithoutSenderInfoPlainCell.swift
similarity index 93%
rename from Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollWithoutSenderInfoBubbleCell.swift
rename to Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollWithoutSenderInfoPlainCell.swift
index 2663996a8..a7b4db95c 100644
--- a/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollWithoutSenderInfoBubbleCell.swift
+++ b/Riot/Modules/Room/TimelineCells/Styles/Plain/Cells/Poll/PollWithoutSenderInfoPlainCell.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 
-class PollWithoutSenderInfoBubbleCell: PollBubbleCell {
+class PollWithoutSenderInfoPlainCell: PollPlainCell {
     
     override func setupViews() {
         super.setupViews()
diff --git a/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m b/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
index 17afd0297..e8b253a88 100644
--- a/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
+++ b/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
@@ -249,9 +249,9 @@
 
 - (void)registerPollCellsForTableView:(UITableView*)tableView
 {
-    [tableView registerClass:PollBubbleCell.class forCellReuseIdentifier:PollBubbleCell.defaultReuseIdentifier];
-    [tableView registerClass:PollWithoutSenderInfoBubbleCell.class forCellReuseIdentifier:PollWithoutSenderInfoBubbleCell.defaultReuseIdentifier];
-    [tableView registerClass:PollWithPaginationTitleBubbleCell.class forCellReuseIdentifier:PollWithPaginationTitleBubbleCell.defaultReuseIdentifier];
+    [tableView registerClass:PollPlainCell.class forCellReuseIdentifier:PollPlainCell.defaultReuseIdentifier];
+    [tableView registerClass:PollWithoutSenderInfoPlainCell.class forCellReuseIdentifier:PollWithoutSenderInfoPlainCell.defaultReuseIdentifier];
+    [tableView registerClass:PollWithPaginationTitlePlainCell.class forCellReuseIdentifier:PollWithPaginationTitlePlainCell.defaultReuseIdentifier];
 }
 
 - (void)registerLocationCellsForTableView:(UITableView*)tableView
@@ -517,13 +517,13 @@
 {
     return @{
         // Incoming
-        @(RoomTimelineCellIdentifierIncomingPoll) : PollBubbleCell.class,
-        @(RoomTimelineCellIdentifierIncomingPollWithoutSenderInfo) : PollWithoutSenderInfoBubbleCell.class,
-        @(RoomTimelineCellIdentifierIncomingPollWithPaginationTitle) : PollWithPaginationTitleBubbleCell.class,
+        @(RoomTimelineCellIdentifierIncomingPoll) : PollPlainCell.class,
+        @(RoomTimelineCellIdentifierIncomingPollWithoutSenderInfo) : PollWithoutSenderInfoPlainCell.class,
+        @(RoomTimelineCellIdentifierIncomingPollWithPaginationTitle) : PollWithPaginationTitlePlainCell.class,
         // Outoing
-        @(RoomTimelineCellIdentifierOutgoingPoll) : PollBubbleCell.class,
-        @(RoomTimelineCellIdentifierOutgoingPollWithoutSenderInfo) : PollWithoutSenderInfoBubbleCell.class,
-        @(RoomTimelineCellIdentifierOutgoingPollWithPaginationTitle) : PollWithPaginationTitleBubbleCell.class
+        @(RoomTimelineCellIdentifierOutgoingPoll) : PollPlainCell.class,
+        @(RoomTimelineCellIdentifierOutgoingPollWithoutSenderInfo) : PollWithoutSenderInfoPlainCell.class,
+        @(RoomTimelineCellIdentifierOutgoingPollWithPaginationTitle) : PollWithPaginationTitlePlainCell.class
     };
 }