Rename the files to have consistent naming