Keep filenames as they were

Merged Erick Hitter requested to merge fix/naming into master

Merge request reports