MOBILE-2290: Terminology Changes (Samsung)
Merge pull request #196 from mikeh/1.4-Dev

MOBILE-2290: Terminology Changes (Samsung)