Resolve "Terminology"

Michelle Weidlingrequested to merge
2-terminology into master

Closes #2 (closed)

Edited by Michelle Weidling

Merge request reports