Modify the format of some messages
Update all messages to match with files in server.