Moving to more consistent zone naming scheme.