Rename :group_by_field to :group_by