Refactoring of file names