Update zone names to fix extra spaces