Make the filename a bit smarter.