Rename the -auto files to be correctly named