Changed logic for uploaded file name generating