Updates to wording and class names.