Change userId to senderId, add senderDisplayName