Finish fixing message names