rename bundle name and packages to comply with standard