Fix `ensure_same_availability_zone` to access zone name