Index: branches/5.1.x/core/admin_templates/js/uploader/uploader.js
===================================================================
diff -u -N -r13658 -r13659
--- branches/5.1.x/core/admin_templates/js/uploader/uploader.js	(.../uploader.js)	(revision 13658)
+++ branches/5.1.x/core/admin_templates/js/uploader/uploader.js	(.../uploader.js)	(revision 13659)
@@ -134,7 +134,7 @@
 	SWFUpload.instances[this.flash_id].uploadStart = UploadsManager.onUploadStart;
 	SWFUpload.instances[this.flash_id].uploadProgress = UploadsManager.onUploadProgress;
 	SWFUpload.instances[this.flash_id].uploadError = UploadsManager.onUploadError;
-	SWFUpload.instances[this.flash_id].uploadSuccess = UploadsManager.onHandleEverything;
+	SWFUpload.instances[this.flash_id].uploadSuccess = UploadsManager.onUploadSuccess;
 	SWFUpload.instances[this.flash_id].uploadComplete = UploadsManager.onUploadComplete;
 	SWFUpload.instances[this.flash_id].debug = UploadsManager.onDebug;
 
@@ -461,7 +461,21 @@
 	this.updateProgressOnly($file_index);
 }
 
+Uploader.prototype.UploadSuccess = function(file, serverData, receivedResponse) {
+	if (!receivedResponse) {
+		return ;
+	}
+
+	for (var f = 0; f < this.files.length; f++) {
+		if (this.files[f].id == file.id) {
+			// new uploaded file name returned by OnUploadFile event
+			this.files[f].name = serverData;
+		}
+	}
+}
+
 Uploader.prototype.UploadFileComplete = function(file) {
+	// file was uploaded OR file upload was cancelled
 	var $file_index = this.getFileIndex(file);
 
 	if ($file_index !== false) {