fix plural/single form of Criterion/Criteria