Merge pull request #192 from mchf/master

Straightening terminology