diff --git a/GUI/Model/Mask/MaskContainerItem.h b/GUI/Model/Mask/MaskContainerItem.h
index 3b227940245e511a82fad2b1c0011ede1e4f86cf..d683d40e5b6dfb4216e1706841eb519cb2336ce9 100644
--- a/GUI/Model/Mask/MaskContainerItem.h
+++ b/GUI/Model/Mask/MaskContainerItem.h
@@ -17,7 +17,7 @@
 
 #include "GUI/Model/Descriptor/SelectionProperty.h"
 #include "GUI/Model/Mask/MaskItemCatalog.h"
-#include "GUI/Model/Mask/MaskObject.h"
+#include "GUI/Model/Mask/OverlayItem.h"
 #include <QModelIndex>
 
 class Frame;
diff --git a/GUI/Model/Mask/MaskItems.h b/GUI/Model/Mask/MaskItems.h
index dad6a503906f0af86a548ca23eebb5e80968481e..685f0435e13f3da486b0f2b87cf87386d4318baa 100644
--- a/GUI/Model/Mask/MaskItems.h
+++ b/GUI/Model/Mask/MaskItems.h
@@ -18,7 +18,7 @@
 #include "Base/Types/OwningVector.h"
 #include "GUI/Model/Descriptor/DoubleProperty.h"
 #include "GUI/Model/Descriptor/SelectionProperty.h"
-#include "GUI/Model/Mask/MaskObject.h"
+#include "GUI/Model/Mask/OverlayItem.h"
 
 class IShape2D;
 
diff --git a/GUI/Model/Mask/MaskObject.cpp b/GUI/Model/Mask/OverlayItem.cpp
similarity index 88%
rename from GUI/Model/Mask/MaskObject.cpp
rename to GUI/Model/Mask/OverlayItem.cpp
index 0ca46027c6dcc81b6ce1f4d06e4b1b159511d3a3..4d0aff72f726d93fd4f95b4a169143bb333f39be 100644
--- a/GUI/Model/Mask/MaskObject.cpp
+++ b/GUI/Model/Mask/OverlayItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Mask/MaskObject.cpp
+//! @file      GUI/Model/Mask/OverlayItem.cpp
 //! @brief     Implements class MaskObject.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Mask/MaskObject.h"
+#include "GUI/Model/Mask/OverlayItem.h"
 
 MaskObject::MaskObject() = default;
 
diff --git a/GUI/Model/Mask/MaskObject.h b/GUI/Model/Mask/OverlayItem.h
similarity index 82%
rename from GUI/Model/Mask/MaskObject.h
rename to GUI/Model/Mask/OverlayItem.h
index a9d27b7f6d83a8c0709db71a7a42e47f3e8b9b16..82eb7eda6c5ad30daad84fb1f0d753a95a4674a4 100644
--- a/GUI/Model/Mask/MaskObject.h
+++ b/GUI/Model/Mask/OverlayItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Mask/MaskObject.h
+//! @file      GUI/Model/Mask/OverlayItem.h
 //! @brief     Defines class MaskObject.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_MASK_MASKOBJECT_H
-#define BORNAGAIN_GUI_MODEL_MASK_MASKOBJECT_H
+#ifndef BORNAGAIN_GUI_MODEL_MASK_OVERLAYITEM_H
+#define BORNAGAIN_GUI_MODEL_MASK_OVERLAYITEM_H
 
 #include <QObject>
 
@@ -31,4 +31,4 @@ signals:
     void maskToBeDestroyed(MaskObject* sender = nullptr);
 };
 
-#endif // BORNAGAIN_GUI_MODEL_MASK_MASKOBJECT_H
+#endif // BORNAGAIN_GUI_MODEL_MASK_OVERLAYITEM_H