Fix pluralization in RESTMapper when kind ends with 'y'