Index: sources/device/DeviceController.cpp
===================================================================
diff -u -r6e9dccd1109d9c8d4ee4b6a21260618969a1706b -r2a45c77ca8205bfdd0b03f9702d0e1e15f0ee044
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 6e9dccd1109d9c8d4ee4b6a21260618969a1706b)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 2a45c77ca8205bfdd0b03f9702d0e1e15f0ee044)
@@ -1038,8 +1038,9 @@
     QFileInfo fileInfo(vFileName);
     QString   filePath;
     QString   fileBase(fileInfo.baseName());
-    QString   ext = _Logger.logFileNamePendingSubExt();
-    QString   fileSufx(fileInfo.completeSuffix().remove(ext));
+    QString   pendingExt = _Logger.logFileNamePendingSubExt();
+    QString   uploadExt  = _Logger.logFileNameUploadedSubExt();
+    QString   fileSufx(fileInfo.completeSuffix().replace(pendingExt, uploadExt));
     QString   fileDest = QString("%1.%2").arg(fileBase, fileSufx);
 
     Logger::LogType logType = _Logger.logFileLogType(vFileName, filePath);
@@ -1116,7 +1117,7 @@
 
     QFileInfoList pendingFiles;
     QString logLoc = Log_Folder_Base;
-    QString logExt = QString("*.%1*").arg(_Logger.logFileNamePendingSubExt()); // "*.u.*";
+    QString logExt = QString("*.%1*").arg(_Logger.logFileNamePendingSubExt()); // "*.p.*";
     for( auto logFolder : { Log_Folder_Application, Log_Folder_Service/*, Log_Folder_CloudSync*/ } ) {
         pendingFiles = Storage::FileHandler::find( logLoc + logFolder, { logExt } );
         // look into the list.