Fix bug wrt changing field names.