more Americanization (rebased onto develop)



This is the same as gh-417 but rebased onto develop.

----

minor spelling and reformatting