Added an option to control file name mapping