diff --git a/syncapi/routing/messages.go b/syncapi/routing/messages.go
index 8442dea4d..8f3ed3f5b 100644
--- a/syncapi/routing/messages.go
+++ b/syncapi/routing/messages.go
@@ -72,6 +72,9 @@ func OnIncomingMessagesRequest(
 ) util.JSONResponse {
 	var err error
 
+	// NewDatabaseTransaction is used here instead of NewDatabaseSnapshot as we
+	// expect to be able to write to the database in response to a /messages
+	// request that requires backfilling from the roomserver or federation.
 	snapshot, err := db.NewDatabaseTransaction(req.Context())
 	if err != nil {
 		return jsonerror.InternalServerError()
diff --git a/syncapi/storage/shared/syncserver.go b/syncapi/storage/shared/storage_consumer.go
similarity index 100%
rename from syncapi/storage/shared/syncserver.go
rename to syncapi/storage/shared/storage_consumer.go
diff --git a/syncapi/storage/shared/transaction.go b/syncapi/storage/shared/storage_sync.go
similarity index 100%
rename from syncapi/storage/shared/transaction.go
rename to syncapi/storage/shared/storage_sync.go