Terminology updates
Terminology updates - follow-up
Merge pull request #195 from mikeh/1.4-Dev

Terminology updates