Clean up naming of messages