Changed models from plural names to singular names, as they should be.