Renaming files to make them more consistent