Change some naming in the validator