Refactor the filenames