Smarter file name management