MOBILE-2290: Terminology Changes (Samsung)