Re-implement the changes from pascal's PR: non-mergable due to big commit in the middle

- fix strings that are identical except for capitalization
- use var tag for computer variables inside a sentence

@pascalchevrel: r?