Changed the scheme of data file name