remaned model names to singular