Fixing wording issues for #1594