diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 21f9df30ec1fcb3b55848c82a9ab558b0a3ddfa4..081030dbb842615fb8f95c0ea911abfa27b3a1a9 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -295,7 +295,7 @@ class MessageHandler(BaseHandler):
         defer.returnValue(ret)
 
     @defer.inlineCallbacks
-    def snapshot_room(self, user_id, room_id, pagin_config=None,
+    def room_initial_sync(self, user_id, room_id, pagin_config=None,
                       feedback=False):
         yield self.auth.check_joined_room(room_id, user_id)
 
diff --git a/synapse/rest/room.py b/synapse/rest/room.py
index 393d6284f56b2b83017ef4005cd730c01c016165..e656dd3f3583b2f62592b90fc76cb63e3dec53a8 100644
--- a/synapse/rest/room.py
+++ b/synapse/rest/room.py
@@ -362,7 +362,7 @@ class RoomInitialSyncRestServlet(RestServlet):
     @defer.inlineCallbacks
     def on_GET(self, request, room_id):
         user = yield self.auth.get_user_by_req(request)
-        events = yield self.handlers.message_handler.snapshot_room(
+        events = yield self.handlers.message_handler.room_initial_sync(
             room_id=room_id,
             user_id=user.to_string(),
         )