Switch to naming suggested by native speakers.

Authored by hein on Apr 19 2016, 9:40 AM.