Terminology updates - follow-up