Index: sources/gui/GuiView.cpp
===================================================================
diff -u -r32dc194cb261763cd4e9d5409921d4c8523fc84d -rc088fe92da340747ae49a082ecf3e8e2a4b0467c
--- sources/gui/GuiView.cpp	(.../GuiView.cpp)	(revision 32dc194cb261763cd4e9d5409921d4c8523fc84d)
+++ sources/gui/GuiView.cpp	(.../GuiView.cpp)	(revision c088fe92da340747ae49a082ecf3e8e2a4b0467c)
@@ -251,7 +251,7 @@
 void GuiView::doExportListInsert(quint32 vIndex, const QString &vFilename, bool isPendingFolder)
 {
     // File indicated in the pending folder, append "pending" to filename
-    QString filename = isPendingFolder ? QString("%1%2").arg(Storage::Log_Folder_Pending).arg(vFilename) : vFilename;
+    QString filename = isPendingFolder ? QString("%1%2").arg(Storage::Log_Folder_Pending_Suffix).arg(vFilename) : vFilename;
 
     _exportList             [vIndex] = filename      ;
     _exportListPercent      [vIndex] = 100           ;
Index: sources/storage/Logger.cpp
===================================================================
diff -u -r32dc194cb261763cd4e9d5409921d4c8523fc84d -rc088fe92da340747ae49a082ecf3e8e2a4b0467c
--- sources/storage/Logger.cpp	(.../Logger.cpp)	(revision 32dc194cb261763cd4e9d5409921d4c8523fc84d)
+++ sources/storage/Logger.cpp	(.../Logger.cpp)	(revision c088fe92da340747ae49a082ecf3e8e2a4b0467c)
@@ -617,10 +617,10 @@
             auto filename = it.value();
 
             // TODO : When a logging-file model is added, the following condition might not be needed
-            bool isPendingFolder = filename.contains(Storage::Log_Folder_Pending);
+            bool isPendingFolder = filename.contains(Storage::Log_Folder_Pending_Suffix);
             if(isPendingFolder) {
-                mSource  = mSource .append ( Storage::Log_Folder_Pending    );
-                filename = filename.replace( Storage::Log_Folder_Pending, "");
+                mSource  = mSource .append ( Storage::Log_Folder_Pending_Suffix    );
+                filename = filename.replace( Storage::Log_Folder_Pending_Suffix, "");
             }
 
             result = FileHandler::copyFile(mSource, mDestination + _logBasePathNames[vLogType], filename, &notifier, index);
Index: sources/storage/StorageGlobals.cpp
===================================================================
diff -u -r32dc194cb261763cd4e9d5409921d4c8523fc84d -rc088fe92da340747ae49a082ecf3e8e2a4b0467c
--- sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision 32dc194cb261763cd4e9d5409921d4c8523fc84d)
+++ sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision c088fe92da340747ae49a082ecf3e8e2a4b0467c)
@@ -112,7 +112,8 @@
     const char *Log_Folder_Application  = "log/"               ; // Event/Data  Log
     const char *Log_Folder_Service      = "service/"           ; // Service     Log
     const char *Log_Folder_Treatment    = "treatment/"         ; // Treatment   Log
-    const char *Log_Folder_Pending      = "/pending/"          ; // *           Log Pending, have not been saved on cloud yet.
+    const char *Log_Folder_Pending      = "treatment/pending/" ; // Treatment   Log Pending, have not been saved on cloud yet.
+    const char *Log_Folder_Pending_Suffix = "/pending/"        ; // The name of the pending log subfolder
 
 
     // FIXME : Not sure having global settings object is a good idea.
Index: sources/storage/StorageGlobals.h
===================================================================
diff -u -r32dc194cb261763cd4e9d5409921d4c8523fc84d -rc088fe92da340747ae49a082ecf3e8e2a4b0467c
--- sources/storage/StorageGlobals.h	(.../StorageGlobals.h)	(revision 32dc194cb261763cd4e9d5409921d4c8523fc84d)
+++ sources/storage/StorageGlobals.h	(.../StorageGlobals.h)	(revision c088fe92da340747ae49a082ecf3e8e2a4b0467c)
@@ -72,6 +72,7 @@
     extern const char *Log_Folder_Service;      // Service     Log
     extern const char *Log_Folder_Treatment;    // Treatment   Log
     extern const char *Log_Folder_Pending;      // *           Log Pending, have not been saved on cloud yet.
+    extern const char *Log_Folder_Pending_Suffix;
 
     // Date and Time
     extern const char *Date_Time_Set_Sh;
Index: sources/storage/TreatmentLog.cpp
===================================================================
diff -u -r6d76149dca70e879f33bf6ed44203d0d06bc523a -rc088fe92da340747ae49a082ecf3e8e2a4b0467c
--- sources/storage/TreatmentLog.cpp	(.../TreatmentLog.cpp)	(revision 6d76149dca70e879f33bf6ed44203d0d06bc523a)
+++ sources/storage/TreatmentLog.cpp	(.../TreatmentLog.cpp)	(revision c088fe92da340747ae49a082ecf3e8e2a4b0467c)
@@ -188,7 +188,7 @@
         }
         _treatmentLogPath_Pending = QString("%1%2")
                                 .arg(Storage::SDCard_Base_Path_Name)
-                                .arg(Storage::Log_Folder_Pending );
+                                .arg(Storage::Log_Folder_Pending_Suffix );
 
         LOG_DEBUG(QString("Treatment log folder has been set to %1"         ).arg(_treatmentLogPath          ));
         LOG_DEBUG(QString("Treatment log pending folder has been set to %1" ).arg(_treatmentLogPath_Pending  ));