Message cleanup
Change some message names