Handle group name change
Small refactors with Arbind