Add proper plural form for model names