Change the return file name to correct things