refactoring, renaming group id