complete terminology tweaks