Cleanup and contrib names