Fixed naming of messages.