modify model names to singular form