Updated messages to use usernames