Fixed typos (2.2)

This PR affects some new files, so I can't base my changes on 2.0/2.1 branches.