Terminology and minor fix