Changing group id to follow conventions