Support for zones with longer names