core.vocabulary: refactoring