Adjust to the new vocabulary.