diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index 16276b1ff..2b4569fba 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -348,7 +348,7 @@ const CGFloat kTypingCellHeight = 24;
 {
     if (indexPath.row == self.typingCellIndex)
     {
-        RoomTypingBubbleCell *cell = [tableView dequeueReusableCellWithIdentifier:RoomTypingBubbleCell.defaultReuseIdentifier forIndexPath:indexPath];
+        MessageTypingCell *cell = [tableView dequeueReusableCellWithIdentifier:MessageTypingCell.defaultReuseIdentifier forIndexPath:indexPath];
         [cell updateWithTheme:ThemeService.shared.theme];
         [cell updateTypingUsers:_currentTypingUsers mediaManager:self.mxSession.mediaManager];
         return cell;
diff --git a/Riot/Modules/Room/TimelineCells/MessageTyping/RoomTypingBubbleCell.swift b/Riot/Modules/Room/TimelineCells/MessageTyping/MessageTypingCell.swift
similarity index 98%
rename from Riot/Modules/Room/TimelineCells/MessageTyping/RoomTypingBubbleCell.swift
rename to Riot/Modules/Room/TimelineCells/MessageTyping/MessageTypingCell.swift
index f0eba07b2..dfe6fc7b0 100644
--- a/Riot/Modules/Room/TimelineCells/MessageTyping/RoomTypingBubbleCell.swift
+++ b/Riot/Modules/Room/TimelineCells/MessageTyping/MessageTypingCell.swift
@@ -17,7 +17,7 @@
 import UIKit
 
 @objcMembers
-class RoomTypingBubbleCell: MXKTableViewCell, Themable {
+class MessageTypingCell: MXKTableViewCell, Themable {
     // MARK: - Constants
     
     private enum Constants {
diff --git a/Riot/Modules/Room/TimelineCells/MessageTyping/RoomTypingBubbleCell.xib b/Riot/Modules/Room/TimelineCells/MessageTyping/MessageTypingCell.xib
similarity index 94%
rename from Riot/Modules/Room/TimelineCells/MessageTyping/RoomTypingBubbleCell.xib
rename to Riot/Modules/Room/TimelineCells/MessageTyping/MessageTypingCell.xib
index 5cd15a92d..b326a955f 100644
--- a/Riot/Modules/Room/TimelineCells/MessageTyping/RoomTypingBubbleCell.xib
+++ b/Riot/Modules/Room/TimelineCells/MessageTyping/MessageTypingCell.xib
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="nQB-23-kip" customClass="RoomTypingBubbleCell" customModule="Riot" customModuleProvider="target">
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" id="nQB-23-kip" customClass="MessageTypingCell" customModule="Riot" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="nQB-23-kip" id="vRo-3W-dC9">
diff --git a/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m b/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
index 3d5a4636e..7fc94a75e 100644
--- a/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
+++ b/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
@@ -119,7 +119,7 @@
     
     [tableView registerClass:RoomCreationIntroCell.class forCellReuseIdentifier:RoomCreationIntroCell.defaultReuseIdentifier];
     
-    [tableView registerNib:RoomTypingBubbleCell.nib forCellReuseIdentifier:RoomTypingBubbleCell.defaultReuseIdentifier];
+    [tableView registerNib:MessageTypingCell.nib forCellReuseIdentifier:MessageTypingCell.defaultReuseIdentifier];
 }
 
 - (Class<MXKCellRendering>)cellViewClassForCellIdentifier:(RoomTimelineCellIdentifier)identifier
@@ -324,7 +324,7 @@
         @(RoomTimelineCellIdentifierSelectedSticker) : RoomSelectedStickerBubbleCell.class,
         @(RoomTimelineCellIdentifierRoomPredecessor) : RoomPredecessorBubbleCell.class,
         @(RoomTimelineCellIdentifierRoomCreationIntro) : RoomCreationIntroCell.class,
-        @(RoomTimelineCellIdentifierTyping) : RoomTypingBubbleCell.class,
+        @(RoomTimelineCellIdentifierTyping) : MessageTypingCell.class,
     };
     [cellClasses addEntriesFromDictionary:othersCells];