diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index d2e270b39c42add651d546e5c081c4c8ebafc87b..2a276c31e37603078c9f239b536a263b9a9c2325 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -126,7 +126,7 @@ void ProjectDocument::saveProjectFileWithData(const QString& projectPullPath)
     writeProject(&file);
     file.close();
 
-    m_jobs->writeDatafiles(GUI::Util::Project::projectDir(projectPullPath));
+    m_jobs->saveAllDatafields(GUI::Util::Project::projectDir(projectPullPath));
     m_datafiles->writeDatafiles(GUI::Util::Project::projectDir(projectPullPath));
 
     const bool autoSave = GUI::Util::Project::isAutosave(projectPullPath);
@@ -155,7 +155,7 @@ ProjectDocument::ReadResult ProjectDocument::loadProjectFileWithData(const QStri
         if (result == ReadResult::error)
             return result;
 
-        m_jobs->readDatafiles(GUI::Util::Project::projectDir(projectPullPath), &messageService);
+        m_jobs->loadAllDatafields(GUI::Util::Project::projectDir(projectPullPath), &messageService);
         m_datafiles->readDatafiles(GUI::Util::Project::projectDir(projectPullPath),
                                    &messageService);
 
diff --git a/GUI/Model/Tune/JobsSet.cpp b/GUI/Model/Tune/JobsSet.cpp
index fbe973b7c55e4a17370b5750190f765159888f2d..2603849a7fabb8cef59aa6bb831b04077bec84f7 100644
--- a/GUI/Model/Tune/JobsSet.cpp
+++ b/GUI/Model/Tune/JobsSet.cpp
@@ -84,7 +84,7 @@ void JobsSet::readFrom(QXmlStreamReader* r)
         throw std::runtime_error(r->errorString().toLatin1());
 }
 
-void JobsSet::writeDatafiles(const QString& projectDir)
+void JobsSet::saveAllDatafields(const QString& projectDir) const
 {
     for (const auto* job : m_job_items)
         job->saveDatafields(projectDir);
@@ -92,7 +92,7 @@ void JobsSet::writeDatafiles(const QString& projectDir)
     dataFilesCleaner.cleanOldFiles(projectDir, dataItems());
 }
 
-void JobsSet::readDatafiles(const QString& projectDir, MessageService* messageService)
+void JobsSet::loadAllDatafields(const QString& projectDir, MessageService* messageService)
 {
     for (auto* job : m_job_items)
         job->loadDatafields(projectDir, messageService);
diff --git a/GUI/Model/Tune/JobsSet.h b/GUI/Model/Tune/JobsSet.h
index f14deec715ebbdef5b0c3a22b7f3042eb73add81..7e7c6add852ddaccb6aea4fae9add7e8c66bc872 100644
--- a/GUI/Model/Tune/JobsSet.h
+++ b/GUI/Model/Tune/JobsSet.h
@@ -41,8 +41,8 @@ public:
     void writeTo(QXmlStreamWriter* w) const;
     void readFrom(QXmlStreamReader* r);
 
-    void writeDatafiles(const QString& projectDir);
-    void readDatafiles(const QString& projectDir, MessageService* messageService);
+    void saveAllDatafields(const QString& projectDir) const;
+    void loadAllDatafields(const QString& projectDir, MessageService* messageService);
 
     JobItem* createJobItem();
     void addJobItem(JobItem* job_item);
@@ -76,7 +76,7 @@ private slots:
 private:
     QString generateJobName() const;
 
-    DatafilesCleaner dataFilesCleaner;
+    mutable DatafilesCleaner dataFilesCleaner;
     OwningVector<JobItem> m_job_items;
     int m_current_index = -1;
 };
diff --git a/Tests/Unit/GUI/TestJobModel.cpp b/Tests/Unit/GUI/TestJobModel.cpp
index e0a76a9ca5ffd8150776e421dc790f2e0f9de1e7..9fd1395fff140702d3fab5f1a70f7f01b73ef6e2 100644
--- a/Tests/Unit/GUI/TestJobModel.cpp
+++ b/Tests/Unit/GUI/TestJobModel.cpp
@@ -65,7 +65,7 @@ TEST(TestJobsSet, saveNonXMLData)
     job_item->updateFileName();
 
     // save first time
-    jobs.writeDatafiles(projectDir);
+    jobs.saveAllDatafields(projectDir);
     QTest::qSleep(10);
 
     // check existence of data on disk
@@ -82,7 +82,7 @@ TEST(TestJobsSet, saveNonXMLData)
 
     // modify data and save the project.
     job_item->simulatedDataItem()->setDatafield(UTest::GUI::makeData2D(103.));
-    jobs.writeDatafiles(projectDir);
+    jobs.saveAllDatafields(projectDir);
     QTest::qSleep(10);
 
     // ensure that the simulated data has been changed
@@ -96,7 +96,7 @@ TEST(TestJobsSet, saveNonXMLData)
     // rename job and check that file on disk changed the name
     job_item->batchInfo()->setJobName("new_job");
     job_item->updateFileName();
-    jobs.writeDatafiles(projectDir);
+    jobs.saveAllDatafields(projectDir);
     QTest::qSleep(10);
 
     // check existence of new files on disk