diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index 91ee0bf98b8f1019c45a96a5c9209b81637f1071..69245c914a8b065e23d499d055c928f15c8ada97 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -121,7 +121,7 @@ InstrumentsSet* ProjectDocument::instrumentsSet()
     return m_instruments.get();
 }
 
-SamplesSet* ProjectDocument::sampleModel()
+SamplesSet* ProjectDocument::samples()
 {
     return m_samples.get();
 }
diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h
index cf485ab5847bc111c3636e2df50a5e8e9c1a5d16..a61628ecb5319346d3cdefaf5ed542e23d463cff 100644
--- a/GUI/Model/Project/ProjectDocument.h
+++ b/GUI/Model/Project/ProjectDocument.h
@@ -58,7 +58,7 @@ public:
     void setProjectFullPath(const QString& fullPath);
 
     InstrumentsSet* instrumentsSet();
-    SamplesSet* sampleModel();
+    SamplesSet* samples();
     DatafilesSet* realModel();
     JobsSet* jobsSet();
     SimulationOptionsItem* simulationOptionsItem();
diff --git a/GUI/View/Sample/SamplesQListView.cpp b/GUI/View/Sample/SamplesQListView.cpp
index 4a629c358bd134eba6e811eb9a43ed461394c210..9db6a4fd2cadb0de00aa4f027c808bc11c4aa122 100644
--- a/GUI/View/Sample/SamplesQListView.cpp
+++ b/GUI/View/Sample/SamplesQListView.cpp
@@ -192,20 +192,20 @@ QList<QAction*> SamplesQListView::getOverlayActions(const QModelIndex& index, bo
 
 void SamplesQListView::onCurrentChanged(const QModelIndex& index)
 {
-    gDoc->sampleModel()->setCurrentIndex(index.row());
+    gDoc->samples()->setCurrentIndex(index.row());
     emit currentSampleChanged(m_model->itemForIndex(index));
 }
 
 void SamplesQListView::restoreSelection()
 {
-    int selected = gDoc->sampleModel()->currentIndex();
+    int selected = gDoc->samples()->currentIndex();
     if (selected < 0 || selected >= m_model->rowCount())
         selected = m_model->rowCount() - 1;
 
     QModelIndex currentIndex = m_model->index(selected, 0, QModelIndex());
     if (currentIndex.isValid()) {
         selectionModel()->select(currentIndex, QItemSelectionModel::ClearAndSelect);
-        setCurrentSample(gDoc->sampleModel()->sampleItems()[selected]);
+        setCurrentSample(gDoc->samples()->sampleItems()[selected]);
     }
 }
 
diff --git a/GUI/View/Sample/SamplesQModel.cpp b/GUI/View/Sample/SamplesQModel.cpp
index 7d6cb6621433d54c636a5bd092c84f009d01218a..ef3222a07dc950cdea0af9946fb5a76c0e3ac4e6 100644
--- a/GUI/View/Sample/SamplesQModel.cpp
+++ b/GUI/View/Sample/SamplesQModel.cpp
@@ -24,7 +24,7 @@
 #include "Sample/Multilayer/MultiLayer.h"
 
 SamplesQModel::SamplesQModel()
-    : m_sample_items(gDoc->sampleModel())
+    : m_sample_items(gDoc->samples())
 {
 }
 
diff --git a/GUI/View/Views/SimulationView.cpp b/GUI/View/Views/SimulationView.cpp
index 8323dc00ad6759607eb63b8be264c44f38fea53f..e39d6e1c24553a8c7c625a0c3e5ce4f2d0a9cbba 100644
--- a/GUI/View/Views/SimulationView.cpp
+++ b/GUI/View/Views/SimulationView.cpp
@@ -221,7 +221,7 @@ void SimulationView::writeOptionsToUI()
     // -- selection group
     updateSelection(m_instrument_combo, gDoc->instrumentsSet()->instrumentNames(),
                     optionsItem()->selectedInstrumentIndex());
-    updateSelection(m_sample_combo, gDoc->sampleModel()->sampleNames(),
+    updateSelection(m_sample_combo, gDoc->samples()->sampleNames(),
                     optionsItem()->selectedSampleIndex());
     updateSelection(m_real_data_combo, gDoc->realModel()->realItemNames(),
                     optionsItem()->selectedDataIndex(), true);
@@ -398,7 +398,7 @@ SimulationOptionsItem* SimulationView::optionsItem() const
 
 const SampleItem* SimulationView::selectedSampleItem() const
 {
-    return gDoc->sampleModel()->sampleItems().value(m_sample_combo->currentIndex(), nullptr);
+    return gDoc->samples()->sampleItems().value(m_sample_combo->currentIndex(), nullptr);
 }
 
 const InstrumentItem* SimulationView::selectedInstrumentItem() const