Better wording

Excuse-me for the 3 commits...