Refactor bundle name
Refactor bundle names