Merge pull request #195 from mikeh/1.4-Dev

Terminology updates
MOBILE-2290: Terminology Changes (Samsung)