Fix name and messages.