diff --git a/Vector/Model/Room/RoomPreviewData.m b/Vector/Model/Room/RoomPreviewData.m
index 07650c17c..49af34e8b 100644
--- a/Vector/Model/Room/RoomPreviewData.m
+++ b/Vector/Model/Room/RoomPreviewData.m
@@ -16,6 +16,8 @@
 
 #import "RoomPreviewData.h"
 
+#import "MXRoom+Vector.h"
+
 @implementation RoomPreviewData
 
 - (instancetype)initWithRoomId:(NSString *)roomId andSession:(MXSession *)mxSession
@@ -78,7 +80,7 @@
         _roomDataSource = [[RoomDataSource alloc] initWithPeekingRoom:peekingRoom andInitialEventId:_eventId];
         [_roomDataSource finalizeInitialization];
 
-        _roomName = peekingRoom.state.displayname;
+        _roomName = peekingRoom.vectorDisplayname;
         _roomAvatarUrl = peekingRoom.state.avatar;
         
         _roomTopic = [MXTools stripNewlineCharacters:peekingRoom.state.topic];;
diff --git a/Vector/Model/RoomList/RecentsDataSource.m b/Vector/Model/RoomList/RecentsDataSource.m
index db99e4944..875e0a9ed 100644
--- a/Vector/Model/RoomList/RecentsDataSource.m
+++ b/Vector/Model/RoomList/RecentsDataSource.m
@@ -858,7 +858,7 @@
         
         NSString* tagOrder = [room.mxSession tagOrderToBeAtIndex:newPath.row from:oldPos withTag:dstRoomTag];
         
-        NSLog(@"[RecentsDataSource] Update the room %@ [%@] tag from %@ to %@ with tag order %@", room.state.roomId, room.state.displayname, oldRoomTag, dstRoomTag, tagOrder);
+        NSLog(@"[RecentsDataSource] Update the room %@ [%@] tag from %@ to %@ with tag order %@", room.state.roomId, room.vectorDisplayname, oldRoomTag, dstRoomTag, tagOrder);
         
         [room replaceTag:oldRoomTag
                    byTag:dstRoomTag
diff --git a/Vector/Views/RoomList/RoomTableViewCell.m b/Vector/Views/RoomList/RoomTableViewCell.m
index 4c24d8855..4af6970fe 100644
--- a/Vector/Views/RoomList/RoomTableViewCell.m
+++ b/Vector/Views/RoomList/RoomTableViewCell.m
@@ -44,7 +44,7 @@
     [room setRoomAvatarImageIn:self.avatarImageView];
     self.avatarImageView.backgroundColor = [UIColor clearColor];
     
-    self.titleLabel.text = room.state.displayname;
+    self.titleLabel.text = room.vectorDisplayname;
 }
 
 + (CGFloat)cellHeight