diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index baeb0de976514b3d0abdfaa64ef0208042125d10..50cb9a7444c0711ed9c18f920d5dd2ce7fef4f4e 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -133,7 +133,7 @@ DatafilesSet* ProjectDocument::realModel()
     return m_real_model.get();
 }
 
-JobsSet* ProjectDocument::jobModel()
+JobsSet* ProjectDocument::jobsSet()
 {
     return m_job_model.get();
 }
diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h
index 6517668dc259e2872bcda0e409c10310a37c9f14..c3751a32d35e601af125f0a6b25976e59efe978c 100644
--- a/GUI/Model/Project/ProjectDocument.h
+++ b/GUI/Model/Project/ProjectDocument.h
@@ -61,7 +61,7 @@ public:
     InstrumentsSet* instrumentsSet();
     SamplesSet* sampleModel();
     DatafilesSet* realModel();
-    JobsSet* jobModel();
+    JobsSet* jobsSet();
     SimulationOptionsItem* simulationOptionsItem();
 
     LinkInstrumentManager* linkInstrumentManager();
diff --git a/GUI/View/Job/JobView.cpp b/GUI/View/Job/JobView.cpp
index da3e0a23643f2d2cc6bb2c0368cbe5dd84f0f299..2a1e88b090176acf5367a6672b0fd0e113b97098 100644
--- a/GUI/View/Job/JobView.cpp
+++ b/GUI/View/Job/JobView.cpp
@@ -56,8 +56,8 @@ JobView::JobView(QProgressBar* progressBar)
 
     //... Subwindows
 
-    m_job_selector = new JobSelector(gDoc->jobModel(), this);
-    m_job_real_time_widget = new JobRealTimeWidget(gDoc->jobModel(), this);
+    m_job_selector = new JobSelector(gDoc->jobsSet(), this);
+    m_job_real_time_widget = new JobRealTimeWidget(gDoc->jobsSet(), this);
 
     m_docks->addWidget(JobViewFlags::JOB_LIST_DOCK, m_job_selector, Qt::LeftDockWidgetArea);
     m_docks->addWidget(JobViewFlags::REAL_TIME_DOCK, m_job_real_time_widget,
@@ -75,7 +75,7 @@ JobView::JobView(QProgressBar* progressBar)
     //... Connects signals related to JobItem
 
     // Focus request: JobsSet -> this
-    connect(gDoc->jobModel(), &JobsSet::jobSelected, this, &JobView::onJobSelected);
+    connect(gDoc->jobsSet(), &JobsSet::jobSelected, this, &JobView::onJobSelected);
 
     // JobItem selection: JobSelector -> this
     connect(m_job_selector, &JobSelector::selectedJobsChanged, this,
@@ -84,7 +84,7 @@ JobView::JobView(QProgressBar* progressBar)
     connect(m_fit_activity_panel, &FitActivityPanel::showLog, m_job_message_panel,
             &JobMessagePanel::setLog);
 
-    connect(gDoc->jobModel(), &JobsSet::globalProgress, [pb = progressBar](int progress) {
+    connect(gDoc->jobsSet(), &JobsSet::globalProgress, [pb = progressBar](int progress) {
         if (progress < 0 || progress >= 100)
             pb->hide();
         else {
diff --git a/GUI/View/JobControl/JobListing.cpp b/GUI/View/JobControl/JobListing.cpp
index c7bd8af37d08a1446510a151466644a2b2d6675d..7019bf544c95f6f7854a7bcfd3c7fa246d9e2538 100644
--- a/GUI/View/JobControl/JobListing.cpp
+++ b/GUI/View/JobControl/JobListing.cpp
@@ -142,7 +142,7 @@ void JobListing::onItemSelectionChanged()
 
     QModelIndexList selected = m_list_view->selectionModel()->selectedIndexes();
     if (selected.size() == 1)
-        gDoc->jobModel()->setSelectedIndex(selected.first().row());
+        gDoc->jobsSet()->setSelectedIndex(selected.first().row());
 
     emit selectedJobsChanged(selectedJobItems());
 }
@@ -273,7 +273,7 @@ void JobListing::ensureItemSelected(int lastSelectedRow)
 
 void JobListing::restoreSelection()
 {
-    int lastUsed = gDoc->jobModel()->selectedIndex();
+    int lastUsed = gDoc->jobsSet()->selectedIndex();
     if (lastUsed >= 0 && lastUsed < m_model->rowCount()) {
         QModelIndex lastUsedIndex = m_model->index(lastUsed, 0, QModelIndex());
         m_list_view->selectionModel()->select(lastUsedIndex, QItemSelectionModel::ClearAndSelect);
diff --git a/GUI/View/Main/MainWindow.cpp b/GUI/View/Main/MainWindow.cpp
index 5a9f9707fddb4f7933ac7564bed4aaee3268bd63..7ebda94fec56bbe9a6a26a65eccf7aef904768be 100644
--- a/GUI/View/Main/MainWindow.cpp
+++ b/GUI/View/Main/MainWindow.cpp
@@ -159,7 +159,7 @@ void MainWindow::onRunSimulationShortcut()
 
 void MainWindow::closeEvent(QCloseEvent* event)
 {
-    if (gDoc && gDoc->jobModel()->hasUnfinishedJobs()) {
+    if (gDoc && gDoc->jobsSet()->hasUnfinishedJobs()) {
         QMessageBox::warning(this, "Cannot quit the application.",
                              "Cannot quit the application while jobs are running.\n"
                              "Cancel running jobs or wait until they are completed.");
diff --git a/GUI/View/Project/SimulationView.cpp b/GUI/View/Project/SimulationView.cpp
index 5b02a0d38f9d1a25101e826b381c3c48a2a25c58..0d807711aff114b4873225e02006739db7f93ac2 100644
--- a/GUI/View/Project/SimulationView.cpp
+++ b/GUI/View/Project/SimulationView.cpp
@@ -286,7 +286,7 @@ void SimulationView::simulate()
                              "Cannot run the job with current settings\n\n" + msg);
         return;
     }
-    JobsSet* jobModel = gDoc->jobModel();
+    JobsSet* jobModel = gDoc->jobsSet();
     JobItem* jobItem = jobModel->addJobItem(selectedSampleItem(), selectedInstrumentItem(),
                                             selectedDatafileItem(), *optionsItem());
     jobModel->runJob(jobItem);