(BlackBerry) Match up the names with internal naming.