Fixed file name generation.