Freeflow/renaming

Merged Thomas Fetzer requested to merge freeflow/renaming into master

Merge request reports