fixed message names