Update and rename Vocabulary to Descriptor/Vocabulary