File name fixes