change the terminology in the group_ function too. Clean up the doc strings as well