Rename of Validator
Review followup