consistify file names and formats