Use uploader filename instead of file path basename