Removing underscores on zone name