Refactored withinGroupOrderBy naming