Fix bundle name collision