review 1

Bert Palmrequested to merge
palmb-review into master

minor renames for better code flow

Edited by Bert Palm

Merge request reports