Terminology streamlined and refactored