rename handling of grouped data. #640