fix to group names and IDs