Renamed discussion to collaboration evaluation

And some fixes!