Simplify more contest names in preparation for having URLs printed on the right