Replacing 'row' with 'group' where appropriate.