[REPORTING] Simplifying group_by names