Terminology tweaks