File name generation fix