Updated provider and bundle names