Fix plural names for models