diff --git a/GUI/Model/Model/DatafilesModel.cpp b/GUI/Model/Model/DatafilesTree.cpp
similarity index 81%
rename from GUI/Model/Model/DatafilesModel.cpp
rename to GUI/Model/Model/DatafilesTree.cpp
index 495b358077ba1a1fa43a62645f19f73fa13f6cea..b44ce6b38d964cd4c6b6a377cd21a3bf2cdbdc27 100644
--- a/GUI/Model/Model/DatafilesModel.cpp
+++ b/GUI/Model/Model/DatafilesTree.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Model/DatafilesModel.cpp
-//! @brief     Implements class DatafilesModel.
+//! @file      GUI/Model/Model/DatafilesTree.cpp
+//! @brief     Implements class DatafilesTree.
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Model/DatafilesModel.h"
+#include "GUI/Model/Model/DatafilesTree.h"
 #include "GUI/Model/Device/RealItem.h"
 #include "GUI/Model/Model/RealModel.h"
 #include <QApplication>
@@ -27,7 +27,7 @@ const std::set<size_t> availableRanks{1, 2};
 } // namespace
 
 
-DatafilesModel::DatafilesModel(QObject* parent, RealModel* model)
+DatafilesTree::DatafilesTree(QObject* parent, RealModel* model)
     : QAbstractItemModel(parent)
     , m_model(model)
 {
@@ -37,7 +37,7 @@ DatafilesModel::DatafilesModel(QObject* parent, RealModel* model)
     updateSubscriptions();
 }
 
-void DatafilesModel::refreshAfterModelChange()
+void DatafilesTree::refreshAfterModelChange()
 {
     for (auto rank : ::availableRanks) {
         if (!m_items[rank - 1].isEmpty()) {
@@ -50,7 +50,7 @@ void DatafilesModel::refreshAfterModelChange()
     updateSubscriptions();
 }
 
-void DatafilesModel::removeDataItem(RealItem* item)
+void DatafilesTree::removeDataItem(RealItem* item)
 {
     QModelIndex index = indexForItem(item);
     if (!index.isValid())
@@ -64,7 +64,7 @@ void DatafilesModel::removeDataItem(RealItem* item)
     endRemoveRows();
 }
 
-RealItem* DatafilesModel::injectDataItem(int rank)
+RealItem* DatafilesTree::injectDataItem(int rank)
 {
     auto* newItem = m_model->insertDataItem(rank);
     const int rowOfItem = m_model->realItems(rank).indexOf(newItem);
@@ -75,7 +75,7 @@ RealItem* DatafilesModel::injectDataItem(int rank)
     return newItem;
 }
 
-RealItem* DatafilesModel::topMostItem() const
+RealItem* DatafilesTree::topMostItem() const
 {
     if (!m_items[0].isEmpty())
         return m_items[0].first();
@@ -84,12 +84,12 @@ RealItem* DatafilesModel::topMostItem() const
     return nullptr;
 }
 
-QModelIndex DatafilesModel::indexOfHeadline(int rank) const
+QModelIndex DatafilesTree::indexOfHeadline(int rank) const
 {
     return createIndex(rank - 1, 0, nullptr);
 }
 
-QModelIndex DatafilesModel::index(int row, int column, const QModelIndex& parent) const
+QModelIndex DatafilesTree::index(int row, int column, const QModelIndex& parent) const
 {
     if (!hasIndex(row, column, parent))
         return QModelIndex();
@@ -104,7 +104,7 @@ QModelIndex DatafilesModel::index(int row, int column, const QModelIndex& parent
     return QModelIndex();
 }
 
-QModelIndex DatafilesModel::parent(const QModelIndex& index) const
+QModelIndex DatafilesTree::parent(const QModelIndex& index) const
 {
     if (!index.isValid())
         return QModelIndex();
@@ -115,12 +115,12 @@ QModelIndex DatafilesModel::parent(const QModelIndex& index) const
     return indexOfHeadline(itemForIndex(index)->rank());
 }
 
-int DatafilesModel::columnCount(const QModelIndex& /*parent*/) const
+int DatafilesTree::columnCount(const QModelIndex& /*parent*/) const
 {
     return 1;
 }
 
-int DatafilesModel::rowCount(const QModelIndex& parent) const
+int DatafilesTree::rowCount(const QModelIndex& parent) const
 {
     if (!parent.isValid())
         return ::availableRanks.size();
@@ -133,7 +133,7 @@ int DatafilesModel::rowCount(const QModelIndex& parent) const
     return 0;
 }
 
-QVariant DatafilesModel::data(const QModelIndex& index, int role) const
+QVariant DatafilesTree::data(const QModelIndex& index, int role) const
 {
     if (isHeadline(index)) {
         QString title = (index == indexOfHeadline(1)) ? "1D Data" : "2D Data";
@@ -185,7 +185,7 @@ QVariant DatafilesModel::data(const QModelIndex& index, int role) const
     return QVariant();
 }
 
-Qt::ItemFlags DatafilesModel::flags(const QModelIndex& index) const
+Qt::ItemFlags DatafilesTree::flags(const QModelIndex& index) const
 {
     if (isHeadline(index) || !index.isValid())
         return Qt::NoItemFlags;
@@ -199,7 +199,7 @@ Qt::ItemFlags DatafilesModel::flags(const QModelIndex& index) const
     return f;
 }
 
-bool DatafilesModel::setData(const QModelIndex& index, const QVariant& value, int role)
+bool DatafilesTree::setData(const QModelIndex& index, const QVariant& value, int role)
 {
     if (!index.isValid())
         return false;
@@ -213,7 +213,7 @@ bool DatafilesModel::setData(const QModelIndex& index, const QVariant& value, in
     return false;
 }
 
-RealItem* DatafilesModel::itemForIndex(const QModelIndex& index) const
+RealItem* DatafilesTree::itemForIndex(const QModelIndex& index) const
 {
     if (!index.isValid())
         return nullptr;
@@ -221,7 +221,7 @@ RealItem* DatafilesModel::itemForIndex(const QModelIndex& index) const
     return reinterpret_cast<RealItem*>(index.internalPointer());
 }
 
-QModelIndex DatafilesModel::indexForItem(RealItem* item) const
+QModelIndex DatafilesTree::indexForItem(RealItem* item) const
 {
     if (item == nullptr)
         return QModelIndex();
@@ -233,7 +233,7 @@ QModelIndex DatafilesModel::indexForItem(RealItem* item) const
     return QModelIndex();
 }
 
-bool DatafilesModel::isHeadline(const QModelIndex& index) const
+bool DatafilesTree::isHeadline(const QModelIndex& index) const
 {
     if (!index.isValid())
         return false;
@@ -241,7 +241,7 @@ bool DatafilesModel::isHeadline(const QModelIndex& index) const
     return index.internalPointer() == nullptr;
 }
 
-void DatafilesModel::updateSubscriptions()
+void DatafilesTree::updateSubscriptions()
 {
     for (auto* item : m_items[0])
         connect(item, &RealItem::importContentsProcessed, this,
@@ -252,7 +252,7 @@ void DatafilesModel::updateSubscriptions()
                 [this, item]() { onContentsProcessed(item); });
 }
 
-void DatafilesModel::onContentsProcessed(RealItem* item)
+void DatafilesTree::onContentsProcessed(RealItem* item)
 {
     QModelIndex index = indexForItem(item);
     emit dataChanged(index, index);
diff --git a/GUI/Model/Model/DatafilesModel.h b/GUI/Model/Model/DatafilesTree.h
similarity index 84%
rename from GUI/Model/Model/DatafilesModel.h
rename to GUI/Model/Model/DatafilesTree.h
index f978a04c5cd3d41faf9b4ac591159018658754b4..6aa136a0968fed4c8a44feba06cd3ef4aed03f81 100644
--- a/GUI/Model/Model/DatafilesModel.h
+++ b/GUI/Model/Model/DatafilesTree.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Model/DatafilesModel.h
-//! @brief     Defines class DatafilesModel.
+//! @file      GUI/Model/Model/DatafilesTree.h
+//! @brief     Defines class DatafilesTree.
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_MODEL_DATAFILESMODEL_H
-#define BORNAGAIN_GUI_MODEL_MODEL_DATAFILESMODEL_H
+#ifndef BORNAGAIN_GUI_MODEL_MODEL_DATAFILESTREE_H
+#define BORNAGAIN_GUI_MODEL_MODEL_DATAFILESTREE_H
 
 #include <QAbstractItemModel>
 #include <QSet>
@@ -22,10 +22,10 @@ class RealModel;
 class RealItem;
 
 //! Tree model for real data item selection. Used for the tree in the import view.
-class DatafilesModel : public QAbstractItemModel {
+class DatafilesTree : public QAbstractItemModel {
     Q_OBJECT
 public:
-    explicit DatafilesModel(QObject* parent, RealModel* model);
+    explicit DatafilesTree(QObject* parent, RealModel* model);
 
     QModelIndex index(int row, int column,
                       const QModelIndex& parent = QModelIndex()) const override;
@@ -59,4 +59,4 @@ private:
     QVector<RealItem*> m_items[2]; //< Items borrowed from realModel. Never delete the ptrs!
 };
 
-#endif // BORNAGAIN_GUI_MODEL_MODEL_DATAFILESMODEL_H
+#endif // BORNAGAIN_GUI_MODEL_MODEL_DATAFILESTREE_H
diff --git a/GUI/View/Data/DatafilesSelector.cpp b/GUI/View/Data/DatafilesSelector.cpp
index 1e9676b79cf5f82e79775977561aac009d2ae4d6..42959408f5f88963a27d9cf54666c1db143a26a4 100644
--- a/GUI/View/Data/DatafilesSelector.cpp
+++ b/GUI/View/Data/DatafilesSelector.cpp
@@ -18,7 +18,7 @@
 #include "Device/IO/IOFactory.h"
 #include "GUI/Model/Data/DataItem.h"
 #include "GUI/Model/Device/RealItem.h"
-#include "GUI/Model/Model/DatafilesModel.h"
+#include "GUI/Model/Model/DatafilesTree.h"
 #include "GUI/View/Data/DatafileEditor.h"
 #include "GUI/View/Data/Legacy1dDialog.h"
 #include "GUI/View/Info/MessageBox.h"
@@ -67,7 +67,7 @@ DatafilesSelector::DatafilesSelector(QWidget* parent, ProjectDocument* document)
     , m_renameDataAction(new QAction(this))
     , m_removeDataAction(new QAction(this))
     , m_treeView(new QTreeView(this))
-    , m_treeModel(new DatafilesModel(this, document->realModel()))
+    , m_treeModel(new DatafilesTree(this, document->realModel()))
     , m_editor(new DatafileEditor(this, document))
     , m_document(document)
 {
diff --git a/GUI/View/Data/DatafilesSelector.h b/GUI/View/Data/DatafilesSelector.h
index 785af24fdd83412ae1533ac68dfea4ce544589d1..ae615c7ec9d827665c82ce159d8f1b7f526e072d 100644
--- a/GUI/View/Data/DatafilesSelector.h
+++ b/GUI/View/Data/DatafilesSelector.h
@@ -22,7 +22,7 @@ class ProjectDocument;
 class QModelIndex;
 class QTreeView;
 class RealItem;
-class DatafilesModel;
+class DatafilesTree;
 
 //! For viewing and selecting loaded datafiles.
 //!
@@ -67,7 +67,7 @@ private:
     QList<QAction*> getOverlayActions(const QModelIndex& index, bool asHover);
 
     QTreeView* m_treeView;
-    DatafilesModel* m_treeModel;
+    DatafilesTree* m_treeModel;
     DatafileEditor* m_editor;
 
     ProjectDocument* m_document;