Fixed file upload to take an optional file name