Refactor filenames