Fix consistency of i18n message names