More renaming. TerminologyManager  et al to VocabularyManager et al