Rename helper structs to match groupBy's new name.