Changed names and the way the messages are printed