Changed method names/parameters count_valid, count_invalid, validation_handler
Fixed names in remaining places validation_handler, count_valid