Changed models field names