More on renaming organization to group

[skip ci]