Fixed vocabulary names