Rename group -> aggregate for consistency.