Resolve "Make wording in the application consistent"

Note: this is based on !799 (merged) so that I can update those strings as well.

Closes #455 (closed)