Minor tweaks to file names