improved handling of cpt names