Fix groupname convention, consist style