Draft: Resolve "Renaming"

Open Johannes requested to merge 61-renaming into master

Closes #61

Merge request reports