Fix thesaurus names