Renaming files for consistency