Validator names fix