Continue to change message label name convention