Simplified the names of the constraints and their validator.