diff --git a/GUI/coregui/Models/ItemCatalogue.cpp b/GUI/coregui/Models/ItemCatalogue.cpp
index 1dc6bb5aac034e08792278074c7fdbde1f9f0dbf..ccaeaeedf02f6b94b8699908c3083fb977043fee 100644
--- a/GUI/coregui/Models/ItemCatalogue.cpp
+++ b/GUI/coregui/Models/ItemCatalogue.cpp
@@ -34,7 +34,7 @@
 #include "LayerItem.h"
 #include "LayerRoughnessItems.h"
 #include "MaskItems.h"
-#include "MaterialDataItem.h"
+#include "MaterialDataItems.h"
 #include "MaterialItem.h"
 #include "MesoCrystalItem.h"
 #include "MinimizerItem.h"
diff --git a/GUI/coregui/Models/MaterialDataItem.cpp b/GUI/coregui/Models/MaterialDataItems.cpp
similarity index 91%
rename from GUI/coregui/Models/MaterialDataItem.cpp
rename to GUI/coregui/Models/MaterialDataItems.cpp
index 63838da66ce3633e55cfa05e1f209b4624d0a693..18333fb5044e7af0ef7085a713d8ab73858be195 100644
--- a/GUI/coregui/Models/MaterialDataItem.cpp
+++ b/GUI/coregui/Models/MaterialDataItems.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/coregui/Models/RefractiveIndexItem.cpp
-//! @brief     Implements class RefractiveIndexItem
+//! @file      GUI/coregui/Models/MaterialDataItems.cpp
+//! @brief     Implements MaterialDataItems classes
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
 //
 // ************************************************************************** //
 
-#include "MaterialDataItem.h"
+#include "MaterialDataItems.h"
 
 const QString MaterialDataItem::P_REAL = "real";
 const QString MaterialDataItem::P_IMAG = "imag";
diff --git a/GUI/coregui/Models/MaterialDataItem.h b/GUI/coregui/Models/MaterialDataItems.h
similarity index 81%
rename from GUI/coregui/Models/MaterialDataItem.h
rename to GUI/coregui/Models/MaterialDataItems.h
index 47043335bd84c8eb607d1dca98d3fb03242ed705..da3676997199f1d7240070b7bc2d1f0d5d5e8f02 100644
--- a/GUI/coregui/Models/MaterialDataItem.h
+++ b/GUI/coregui/Models/MaterialDataItems.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/coregui/Models/RefractiveIndexItem.h
-//! @brief     Defines class RefractiveIndexItem
+//! @file      GUI/coregui/Models/MaterialDataItems.h
+//! @brief     Defines MaterialDataItems classes
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef MATERIALDATAITEM_H
-#define MATERIALDATAITEM_H
+#ifndef MATERIALDATAITEMS_H
+#define MATERIALDATAITEMS_H
 
 #include "SessionItem.h"
 
@@ -35,4 +35,4 @@ private:
     void updateLabel();
 };
 
-#endif // MATERIALDATAITEM_H
+#endif // MATERIALDATAITEMS_H
diff --git a/GUI/coregui/Models/MaterialItem.cpp b/GUI/coregui/Models/MaterialItem.cpp
index 018536f284f964510d999809cb3f2d0075dab2d0..4bb1c657aec596f1f48d504c8fbe1f3cd5385c01 100644
--- a/GUI/coregui/Models/MaterialItem.cpp
+++ b/GUI/coregui/Models/MaterialItem.cpp
@@ -15,7 +15,7 @@
 #include "MaterialItem.h"
 #include "ExternalProperty.h"
 #include "GUIHelpers.h"
-#include "MaterialDataItem.h"
+#include "MaterialDataItems.h"
 #include "MaterialFactoryFuncs.h"
 #include "SessionItemUtils.h"
 #include "MaterialItemUtils.h"
diff --git a/GUI/coregui/Models/MaterialModel.cpp b/GUI/coregui/Models/MaterialModel.cpp
index 27741256c0a167248fc152b15adb5e6d2612cb94..03c718dd5fd92b3b88946be7fa4cdcbce2b13d4f 100644
--- a/GUI/coregui/Models/MaterialModel.cpp
+++ b/GUI/coregui/Models/MaterialModel.cpp
@@ -15,7 +15,7 @@
 #include "MaterialModel.h"
 #include "MaterialItemUtils.h"
 #include "GUIHelpers.h"
-#include "MaterialDataItem.h"
+#include "MaterialDataItems.h"
 #include "AppSvc.h"
 
 MaterialModel::MaterialModel(QObject* parent) : SessionModel(SessionXML::MaterialModelTag, parent)
diff --git a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
index 3cd27d8e0ab4dc7ffc86a7f4091ccd80f29682f7..dd6e3001599741a35a21a670623eef21d029d27c 100644
--- a/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
+++ b/GUI/coregui/Views/MaterialEditor/MaterialItemUtils.cpp
@@ -13,7 +13,7 @@
 // ************************************************************************** //
 
 #include "MaterialItemUtils.h"
-#include "MaterialDataItem.h"
+#include "MaterialDataItems.h"
 #include "ComboProperty.h"
 #include "DesignerHelper.h"
 #include "GUIHelpers.h"
diff --git a/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp b/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
index 765f7b9950e3f29d08aa097808ea61953d198399..80f9333bec898c1b004c66b295cc155cbdbce975 100644
--- a/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
+++ b/GUI/coregui/Views/PropertyEditor/TestComponentView.cpp
@@ -27,7 +27,7 @@
 #include "minisplitter.h"
 #include "ComponentFlatView.h"
 #include "MaterialItem.h"
-#include "MaterialDataItem.h"
+#include "MaterialDataItems.h"
 #include "MaterialItemUtils.h"
 #include "ComponentEditor.h"
 #include "MaterialModel.h"
diff --git a/Tests/UnitTests/GUI/TestMaterialModel.h b/Tests/UnitTests/GUI/TestMaterialModel.h
index ab856a252c2de80015d88a088c2d8f5c87d8e32f..22d0d9b11dfae3501f7778e1ba8be7901aba9023 100644
--- a/Tests/UnitTests/GUI/TestMaterialModel.h
+++ b/Tests/UnitTests/GUI/TestMaterialModel.h
@@ -1,7 +1,7 @@
 #include "google_test.h"
 #include "MaterialModel.h"
 #include "MaterialItem.h"
-#include "MaterialDataItem.h"
+#include "MaterialDataItems.h"
 #include "MaterialItemUtils.h"
 #include <memory>