fixing message names