MOBILE-2290: Terminology Changes
Merge pull request #79 from mikeh/1.4-Dev

MOBILE-2290: Terminology Changes