Minor refactoring of message names