diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index 2b6c2117f9..99e8413092 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -106,7 +106,7 @@ class DeviceWorkerHandler(BaseHandler):
         users_who_share_room = yield self.store.get_users_who_share_room_with_user(
             user_id
         )
-        changed = yield self.store.get_user_whose_devices_changed(
+        changed = yield self.store.get_users_whose_devices_changed(
             from_token.device_list_key, users_who_share_room
         )
 
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 8249e75ecd..f70ebfdee7 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -1080,7 +1080,7 @@ class SyncHandler(object):
             # weren't in the previous sync *or* they left and rejoined.
             changed = users_who_share_room & set(newly_joined_or_invited_users)
 
-            changed_users = yield self.store.get_user_whose_devices_changed(
+            changed_users = yield self.store.get_users_whose_devices_changed(
                 since_token.device_list_key, users_who_share_room
             )
 
diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py
index 3af0171f75..97f6cd2754 100644
--- a/synapse/storage/devices.py
+++ b/synapse/storage/devices.py
@@ -391,7 +391,7 @@ class DeviceWorkerStore(SQLBaseStore):
 
         return now_stream_id, []
 
-    def get_user_whose_devices_changed(self, from_key, user_ids):
+    def get_users_whose_devices_changed(self, from_key, user_ids):
         """Get set of users whose devices have changed since `from_key` that
         are in the given list of user_ids.
 
@@ -426,7 +426,7 @@ class DeviceWorkerStore(SQLBaseStore):
             AND user_id IN (%s)
         """
 
-        def _get_user_whose_devices_changed_txn(txn):
+        def _get_users_whose_devices_changed_txn(txn):
             changes = set()
 
             for chunk in chunks:
@@ -436,7 +436,7 @@ class DeviceWorkerStore(SQLBaseStore):
             return changes
 
         return self.runInteraction(
-            "get_user_whose_devices_changed", _get_user_whose_devices_changed_txn
+            "get_users_whose_devices_changed", _get_users_whose_devices_changed_txn
         )
 
     def get_all_device_list_changes_for_remotes(self, from_key, to_key):