Use only singular form for model names