Fix up some file names