Clean up terminology

The problem

!63 (closed) got too big. This is an overview issue for tracking the clean up of our terminology.

Definition of "done"

• Close all the related issues

Additional context

!63 (closed)