first stab at consistency and terminology

Open Henk Birkholz requested to merge 1st-review-batch into master

Merge request reports