More file name fixes