reverting some changes to index_filename, and data filename handling