diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index 1116dfd27..ed077c9a7 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -259,7 +259,9 @@ class DeviceHandler(BaseHandler):
             # to resync the users device list, otherwise we do.
             resync = True
             if len(prev_ids) == 1:
-                extremity = yield self.store.get_device_list_remote_extremity(user_id)
+                extremity = yield self.store.get_device_list_last_stream_id_for_remote(
+                    user_id
+                )
                 logger.info("Extrem: %r, prev_ids: %r", extremity, prev_ids)
                 if str(extremity) == str(prev_ids[0]):
                     resync = False
diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py
index b99de2f1b..d46203dd3 100644
--- a/synapse/storage/devices.py
+++ b/synapse/storage/devices.py
@@ -137,7 +137,7 @@ class DeviceStore(SQLBaseStore):
 
         defer.returnValue({d["device_id"]: d for d in devices})
 
-    def get_device_list_remote_extremity(self, user_id):
+    def get_device_list_last_stream_id_for_remote(self, user_id):
         """Get the last stream_id we got for a user. May be None if we haven't
         got any information for them.
         """