Index: sources/device/DeviceController.cpp
===================================================================
diff -u -r3965beb5e2516db06c7a00e11e6270ffee75ca51 -r0b477f941afaf62fa6625dc32a070bc213481111
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 3965beb5e2516db06c7a00e11e6270ffee75ca51)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 0b477f941afaf62fa6625dc32a070bc213481111)
@@ -1043,16 +1043,20 @@
     QString   fileBase(fileInfo.baseName());
     QString   regstr = "u\\d*.";
     QRegExp   reg(regstr);
+    QString   uploadExt;
+    QString   pendingExt;
+    QString   fileSufx;
+    QString   fileDest;
+    Logger::LogType logType;
 
-    const QString   pendingExt;
     if (reg.indexIn(fileInfo.completeSuffix()) != -1) { pendingExt = reg.cap(0);} else {ok = false; goto lOut;}
 
-    const QString   uploadExt  = _Logger.logFileNameUploadedSubExt();
-    const QString   fileSufx(fileInfo.completeSuffix().replace(pendingExt, uploadExt));
+    uploadExt  = _Logger.logFileNameUploadedSubExt();
+    fileSufx = fileInfo.completeSuffix().replace(pendingExt, uploadExt);
 
-    QString   fileDest = QString("%1.%2").arg(fileBase, fileSufx);
+    fileDest = QString("%1.%2").arg(fileBase, fileSufx);
 
-    Logger::LogType logType = _Logger.logFileLogType(vFileName, filePath);
+    logType = _Logger.logFileLogType(vFileName, filePath);
     ok = logType != Logger::eLogNone;
     if ( ! ok ) { LOG_APPED_UI(QString("CS Incorrect log upload type [%1]").arg(fileSufx)); goto lOut; }
     // DEBUG qDebug() << __FUNCTION__ << "\n" << vFileName << "\n" << fileDest;
@@ -1076,7 +1080,7 @@
     } while (QFile::exists(vFilePath + tFileDest));
 
     vFileDest = tFileDest;
-    qDebug() << __FUNCTION__ << "\n" << vFileName << "\n" << vFileDest;
+    qDebug() << __FUNCTION__ << "\n" << vFilePath << "\n" << vFileDest;
 
     return tally;
 }
@@ -1153,7 +1157,7 @@
 
     QFileInfoList pendingFiles;
     QString logLoc = Log_Folder_Base;
-    QString logExt = QString("*.%1*").arg(_Logger.logFileNamePendingSubExt('*')); // "*.u*.*";
+    QString logExt = QString("*.%1*").arg(_Logger.logFileNamePendingSubExt("*")); // "*.u*.*";
     for( auto logFolder : { Log_Folder_Application, Log_Folder_Service/*, Log_Folder_CloudSync*/ } ) {
         pendingFiles = Storage::FileHandler::find( logLoc + logFolder, { logExt } );
         // look into the list.
Index: sources/storage/Logger.h
===================================================================
diff -u -r3965beb5e2516db06c7a00e11e6270ffee75ca51 -r0b477f941afaf62fa6625dc32a070bc213481111
--- sources/storage/Logger.h	(.../Logger.h)	(revision 3965beb5e2516db06c7a00e11e6270ffee75ca51)
+++ sources/storage/Logger.h	(.../Logger.h)	(revision 0b477f941afaf62fa6625dc32a070bc213481111)
@@ -146,8 +146,8 @@
         { LogType::eLogTrtmt,  "Treatment"  },
     };
 
-    const char *        _logFileNamePendingSubExt   = "u%1.";
-    const char *        _logFileNameUploadedSubExt  = "c%1.";
+    QString         _logFileNamePendingSubExt   = "u%1.";
+    QString         _logFileNameUploadedSubExt  = "c%1.";
     const char *        _logFileNameCompressExt     = Storage::gzipExt;
     const TLogData      _logFileNameExt {
         { LogType::eLogAppED,  ".log" }, // Application log