Terminology update (naming)