diff --git a/Vector/ViewController/RoomParticipantsViewController.m b/Vector/ViewController/RoomParticipantsViewController.m
index 45f45ab5e..1a20a32f9 100644
--- a/Vector/ViewController/RoomParticipantsViewController.m
+++ b/Vector/ViewController/RoomParticipantsViewController.m
@@ -134,7 +134,7 @@
     
     if (membersListener)
     {
-        [self.mxRoom.liveTimeLine removeListener:membersListener];
+        [self.mxRoom.liveTimeline removeListener:membersListener];
         membersListener = nil;
     }
     
@@ -194,7 +194,7 @@
     }
     if (membersListener)
     {
-        [self.mxRoom.liveTimeLine removeListener:membersListener];
+        [self.mxRoom.liveTimeline removeListener:membersListener];
     }
     
     _mxRoom = mxRoom;
@@ -221,7 +221,7 @@
         
         // Register a listener for events that concern room members
         NSArray *mxMembersEvents = @[kMXEventTypeStringRoomMember, kMXEventTypeStringRoomThirdPartyInvite, kMXEventTypeStringRoomPowerLevels];
-        membersListener = [self.mxRoom.liveTimeLine listenToEventsOfTypes:mxMembersEvents onEvent:^(MXEvent *event, MXEventDirection direction, id customObject) {
+        membersListener = [self.mxRoom.liveTimeline listenToEventsOfTypes:mxMembersEvents onEvent:^(MXEvent *event, MXEventDirection direction, id customObject) {
             
             // Consider only live event
             if (direction == MXEventDirectionForwards)
diff --git a/Vector/ViewController/RoomViewController.m b/Vector/ViewController/RoomViewController.m
index 7406713c8..8d3f5a587 100644
--- a/Vector/ViewController/RoomViewController.m
+++ b/Vector/ViewController/RoomViewController.m
@@ -1074,7 +1074,7 @@
         // Remove the previous live listener
         if (typingNotifListener)
         {
-            [self.roomDataSource.room.liveTimeLine removeListener:typingNotifListener];
+            [self.roomDataSource.room.liveTimeline removeListener:typingNotifListener];
             currentTypingUsers = nil;
         }
     }
@@ -1085,7 +1085,7 @@
     if (self.roomDataSource)
     {
         // Add typing notification listener
-        typingNotifListener = [self.roomDataSource.room.liveTimeLine listenToEventsOfTypes:@[kMXEventTypeStringTypingNotification] onEvent:^(MXEvent *event, MXEventDirection direction, MXRoomState *roomState) {
+        typingNotifListener = [self.roomDataSource.room.liveTimeline listenToEventsOfTypes:@[kMXEventTypeStringTypingNotification] onEvent:^(MXEvent *event, MXEventDirection direction, MXRoomState *roomState) {
             
             // Handle only live events
             if (direction == MXEventDirectionForwards)