save the system assigned name for uploaded file and use it for the rest
Merge pull request #1761 from simod/issue-1758

save the system assigned name for uploaded file and use it for the rest