terminology updates (still WIP)

Merged Rieks Joosten requested to merge terminology-rieks into master

Merge request reports