Improved on the file name suggestions.