Rename some groupIds