Update a few messages to match the wording used in the style guide