Fix pluralization.. i think?