some fixes on bundle name