Follow up commit for the changing field names.