Fix group naming