Remove old bundle package, rename bundle2 to bundle