Fix the bundle naming