Merge: Term updates according to issue #48

This pull request implement the changes agreed upon during the [NIDASH call of May 12th](https://docs.google.com/document/d/1c4TLR14HsLtHUlmKeXHoAh4IVMR2aqgLDH2trjwT0t0/edit?usp=sharing), as stated in issue #48.