diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 6b273a030..822806927 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -154,7 +154,7 @@ class DataStore(RoomMemberStore, RoomStore,
     @log_function
     def _persist_event_txn(self, txn, event, backfilled, stream_ordering=None):
         if event.type == RoomMemberEvent.TYPE:
-            self._store_room_member_txn(txn, event)
+            self._store_room_member_from_event_txn(txn, event)
         elif event.type == FeedbackEvent.TYPE:
             self._store_feedback_txn(txn, event)
         elif event.type == RoomNameEvent.TYPE:
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 9a393e256..437ff03a7 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -26,7 +26,7 @@ logger = logging.getLogger(__name__)
 
 class RoomMemberStore(SQLBaseStore):
 
-    def _store_room_member_txn(self, txn, event):
+    def _store_room_member_from_event_txn(self, txn, event):
         """Store a room member in the database.
         """
         target_user_id = event.state_key