Keep filenames as they were

Erick Hitter requested to merge fix/naming into master

Merge request reports