Rename deprecated filenames

Merged Jan Möbius requested to merge rename_deprecated_filenames into master

Merge request reports