Move file name trick from DefaultCore to DefaultWebClient