Fix various minor mistakes

core/upload.js

@@ -387,13 +387,11 @@ exports.getModule = class UploadModule extends MenuModule {
                     self.client.log.error(
                         'Failed moving physical upload file', { error : err.message, fileName : newEntry.fileName, source : src, dest : dst }
                     );
-
-                    if(!err && dst !== finalPath) {
-                        //  name changed; ajust before persist
-                        newEntry.fileName = paths.basename(finalPath);
-                    }
-
                     return nextEntry(null); //  still try next file
+                } else if(dst !== finalPath)
+                {
+                    //  name changed; adjust before persist
+                    newEntry.fileName = paths.basename(finalPath);
                 }
 
                 self.client.log.debug('Moved upload to area', { path : finalPath } );