Improve naming slightly

Jørgen Lind requested to merge ImproveNaming into master

Merge request reports