Fix inconsistencies and a misspelling in user-visible strings.