fixes naming of messages