Refactor bundle names