Continue to change message label names; fix messages