diff --git a/synapse/handlers/user_directory.py b/synapse/handlers/user_directory.py
index f9f7b8abd..d92f8c529 100644
--- a/synapse/handlers/user_directory.py
+++ b/synapse/handlers/user_directory.py
@@ -517,7 +517,7 @@ class UserDirectoryHandler(object):
         yield self.store.remove_user_who_share_room(user_id, room_id)
 
         # Are they still in any rooms? If not, remove them entirely.
-        rooms_user_is_in = yield self.store.get_rooms_user_is_in(user_id)
+        rooms_user_is_in = yield self.store.get_user_dir_rooms_user_is_in(user_id)
 
         if len(rooms_user_is_in) == 0:
             yield self.store.remove_from_user_dir(user_id)
diff --git a/synapse/storage/user_directory.py b/synapse/storage/user_directory.py
index 8fd4fd50d..1c00b956e 100644
--- a/synapse/storage/user_directory.py
+++ b/synapse/storage/user_directory.py
@@ -385,7 +385,7 @@ class UserDirectoryStore(SQLBaseStore):
         )
 
     @defer.inlineCallbacks
-    def get_rooms_user_is_in(self, user_id):
+    def get_user_dir_rooms_user_is_in(self, user_id):
         """
         Returns the rooms that a user is in.