Renamed Indivudal validator and cleaned up Validator Multi handling