Rename filenames for consistency