File name fix part 2