Tidy up file names and underscores.