refactor generated file names