Fix group names