Minor fixes to file names