diff --git a/synapse/storage/deviceinbox.py b/synapse/storage/deviceinbox.py
index 1951de0ce..bde3b5cbb 100644
--- a/synapse/storage/deviceinbox.py
+++ b/synapse/storage/deviceinbox.py
@@ -31,10 +31,10 @@ class DeviceInboxStore(BackgroundUpdateStore):
         super(DeviceInboxStore, self).__init__(hs)
 
         self.register_background_index_update(
-            "device_lists_stream_idx",
-            index_name="device_lists_stream_user_id",
-            table="device_lists_stream",
-            columns=["user_id", "device_id"],
+            "device_inbox_stream_index",
+            index_name="device_inbox_stream_id_user_id",
+            table="device_inbox",
+            columns=["stream_id", "user_id"],
         )
 
         self.register_background_update_handler(
diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py
index ed659b700..81c43d31f 100644
--- a/synapse/storage/devices.py
+++ b/synapse/storage/devices.py
@@ -34,10 +34,10 @@ class DeviceStore(SQLBaseStore):
         )
 
         self.register_background_index_update(
-            "device_inbox_stream_index",
-            index_name="device_inbox_stream_id_user_id",
-            table="device_inbox",
-            columns=["stream_id", "user_id"],
+            "device_lists_stream_idx",
+            index_name="device_lists_stream_user_id",
+            table="device_lists_stream",
+            columns=["user_id", "device_id"],
         )
 
     @defer.inlineCallbacks