Fix a typo in a comment and change the wording along the way

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>