Fix a few more Type → Name renames missed by 71fcde3
CreateRoleGroup should be back-compat with Name/Type as well
Merge branch '4.2/further-group-type-name-renames'