Merge "Revise Terminology section"