validator renaming & add validation for target