Cleanup group by abstraction part 2 of 2
Modify spillable config property names