Add destination name checking