diff --git a/GUI/Mapper/ComponentUtils.cpp b/GUI/Mapper/ComponentUtils.cpp
index 450b48a329df56fe81f04b840fc53e70c09c492a..500a988ad21503dac81b3f11a0253e9ac00fec41 100644
--- a/GUI/Mapper/ComponentUtils.cpp
+++ b/GUI/Mapper/ComponentUtils.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Models/Group/GroupItem.h"
 #include "GUI/Models/Material/MaterialDataItems.h"
 #include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 
 namespace {
 QList<const SessionItem*> groupItems(const GroupItem& item);
diff --git a/GUI/Models/Job/ParameterTreeUtils.cpp b/GUI/Models/Job/ParameterTreeUtils.cpp
index 75fb26d8c2fcf785d8c03eb71760a8d50031e1c8..8440f0d9cbb38fce8e26d1979b90a8f2ea19f181 100644
--- a/GUI/Models/Job/ParameterTreeUtils.cpp
+++ b/GUI/Models/Job/ParameterTreeUtils.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Models/Material/MaterialItemContainer.h"
 #include "GUI/Models/Parameter/ParameterTreeItems.h"
 #include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "GUI/utils/Error.h"
 #include <QStack>
 
diff --git a/GUI/Models/Parameter/FilterPropertyProxy.cpp b/GUI/Models/Parameter/FilterPropertyProxy.cpp
index 03407370b71e1b18ad38539c3fb792e69cec55c7..eab900ace453f5decdc33b629b8f5f2a9c953cc5 100644
--- a/GUI/Models/Parameter/FilterPropertyProxy.cpp
+++ b/GUI/Models/Parameter/FilterPropertyProxy.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Models/Group/GroupItem.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 
 int FilterPropertyProxy::columnCount(const QModelIndex& parent) const
 {
diff --git a/GUI/Models/Varia/PropertyItem.cpp b/GUI/Models/Parameter/PropertyItem.cpp
similarity index 85%
rename from GUI/Models/Varia/PropertyItem.cpp
rename to GUI/Models/Parameter/PropertyItem.cpp
index 441e90a39018c26e5f0222ecc03496db8da2e273..227e6cdf1cdd2b37b9ab6fd8b98ff769a3c397c8 100644
--- a/GUI/Models/Varia/PropertyItem.cpp
+++ b/GUI/Models/Parameter/PropertyItem.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Varia/PropertyItem.cpp
+//! @file      GUI/Models/Parameter/PropertyItem.cpp
 //! @brief     Implements class PropertyItem
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,6 +12,6 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 
 PropertyItem::PropertyItem() : SessionItem(M_TYPE) {}
diff --git a/GUI/Models/Varia/PropertyItem.h b/GUI/Models/Parameter/PropertyItem.h
similarity index 77%
rename from GUI/Models/Varia/PropertyItem.h
rename to GUI/Models/Parameter/PropertyItem.h
index 35b017da12e78e71f3a3ade8e965e12da8806bf6..676920da69b255f37ce102216600a4ee6e1bf059 100644
--- a/GUI/Models/Varia/PropertyItem.h
+++ b/GUI/Models/Parameter/PropertyItem.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Varia/PropertyItem.h
+//! @file      GUI/Models/Parameter/PropertyItem.h
 //! @brief     Defines class PropertyItem
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODELS_VARIA_PROPERTYITEM_H
-#define BORNAGAIN_GUI_MODELS_VARIA_PROPERTYITEM_H
+#ifndef BORNAGAIN_GUI_MODELS_PARAMETER_PROPERTYITEM_H
+#define BORNAGAIN_GUI_MODELS_PARAMETER_PROPERTYITEM_H
 
 #include "GUI/Models/Session/SessionItem.h"
 
@@ -25,4 +25,4 @@ public:
     PropertyItem();
 };
 
-#endif // BORNAGAIN_GUI_MODELS_VARIA_PROPERTYITEM_H
+#endif // BORNAGAIN_GUI_MODELS_PARAMETER_PROPERTYITEM_H
diff --git a/GUI/Models/Sample/SampleModel.cpp b/GUI/Models/Sample/SampleModel.cpp
index 69019163d4b27738ff643b74e1dbbcdb03e78b06..ab30d0da4ee6dea68fbb4825f80150e9db4f3e7e 100644
--- a/GUI/Models/Sample/SampleModel.cpp
+++ b/GUI/Models/Sample/SampleModel.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Models/Material/MaterialItemUtils.h"
 #include "GUI/Models/Sample/MultiLayerItem.h"
 #include "GUI/Models/Varia/ItemWithMaterial.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include <QApplication>
 #include <QFontMetrics>
 #include <QPixmap>
diff --git a/GUI/Models/Session/SessionItem.cpp b/GUI/Models/Session/SessionItem.cpp
index 126ac2defed57ff0645e654a155cd44bf81d6f87..05d4e7b0bb03a61036f8f9dee8776200490d6ef5 100644
--- a/GUI/Models/Session/SessionItem.cpp
+++ b/GUI/Models/Session/SessionItem.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Models/Session/SessionItemUtils.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/Models/Varia/ItemFactory.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 
 //! Constructs new item with given model type. The type must be defined.
 SessionItem::SessionItem(const QString& modelType)
diff --git a/GUI/Models/Session/SessionItemUtils.cpp b/GUI/Models/Session/SessionItemUtils.cpp
index 80133b522f21fd3490371aa35f1b329bceaabeac..118f12f6fcca40695a294c6be394dbda502b76ec 100644
--- a/GUI/Models/Session/SessionItemUtils.cpp
+++ b/GUI/Models/Session/SessionItemUtils.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Models/Sample/ParticleCompositionItem.h"
 #include "GUI/Models/Sample/ParticleCoreShellItem.h"
 #include "GUI/Models/Session/SessionGraphicsItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include <QColor>
 #include <QIcon>
 #include <QPixmap>
diff --git a/GUI/Models/Varia/ItemCatalog.cpp b/GUI/Models/Varia/ItemCatalog.cpp
index d6f3ab00078185a05b03d25dd3d862935da03808..d9be19b398fc25c2254dc80db20883822d56a823 100644
--- a/GUI/Models/Varia/ItemCatalog.cpp
+++ b/GUI/Models/Varia/ItemCatalog.cpp
@@ -57,7 +57,7 @@
 #include "GUI/Models/Trafo/RotationItems.h"
 #include "GUI/Models/Trafo/TransformationItem.h"
 #include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "GUI/Models/Varia/RealLimitsItems.h"
 #include "GUI/Models/Varia/SimulationOptionsItem.h"
 #include "GUI/utils/Error.h"
diff --git a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
index d840f6e51bcb3027bfa016460836548b3b527140..1664998902fc76ecb9f5a983f11d81ffe2eb74c9 100644
--- a/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
+++ b/GUI/Views/MaskWidgets/MaskGraphicsScene.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Models/Instrument/MaskItems.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/Models/Trafo/ProjectionItems.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "GUI/Views/MaskWidgets/ColorMapSceneAdaptor.h"
 #include "GUI/Views/MaskWidgets/MaskGraphicsProxy.h"
 #include "GUI/Views/MaskWidgets/MaskViewFactory.h"
diff --git a/Tests/Unit/GUI/TestAxesItems.cpp b/Tests/Unit/GUI/TestAxesItems.cpp
index 8d93a972e749a4c15a80787788a1bc6cf05c7f59..60864ba804049c14c43bb3acbcc1964601135628 100644
--- a/Tests/Unit/GUI/TestAxesItems.cpp
+++ b/Tests/Unit/GUI/TestAxesItems.cpp
@@ -3,7 +3,7 @@
 #include "Base/Const/Units.h"
 #include "GUI/Models/Data/AxesItems.h"
 #include "GUI/Models/Domain/TransformFromDomain.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "GUI/utils/Error.h"
 #include "Tests/GTestWrapper/google_test.h"
 
diff --git a/Tests/Unit/GUI/TestProxyModelStrategy.cpp b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
index bdb0772eb74bcff21e0084024a53f36b1f9bc4a8..e7c449bcc48215cabb4b2866c7342836d80031c2 100644
--- a/Tests/Unit/GUI/TestProxyModelStrategy.cpp
+++ b/Tests/Unit/GUI/TestProxyModelStrategy.cpp
@@ -6,7 +6,7 @@
 #include "GUI/Models/Sample/ParticleItem.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class TestProxyModelStrategy : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestSessionItemUtils.cpp b/Tests/Unit/GUI/TestSessionItemUtils.cpp
index eb363d6f8a20496d78cad8738a3f4ad896dcf4a6..188ee7cb0e8a8f4dc481c05241ff903d91105247 100644
--- a/Tests/Unit/GUI/TestSessionItemUtils.cpp
+++ b/Tests/Unit/GUI/TestSessionItemUtils.cpp
@@ -2,7 +2,7 @@
 #include "GUI/Models/Session/SessionItemUtils.h"
 #include "GUI/Models/Session/SessionModel.h"
 #include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class TestSessionItemUtils : public ::testing::Test {
diff --git a/Tests/Unit/GUI/TestSessionModel.cpp b/Tests/Unit/GUI/TestSessionModel.cpp
index 8b7d3295818897cdb7d56cf5732d6ab6c3448328..29a9f26fe0c406058a649d2b5eb517e3c91f7c9c 100644
--- a/Tests/Unit/GUI/TestSessionModel.cpp
+++ b/Tests/Unit/GUI/TestSessionModel.cpp
@@ -9,7 +9,7 @@
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Models/Session/SessionItemTags.h"
 #include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <QSignalSpy>
 #include <QXmlStreamWriter>
diff --git a/Tests/Unit/GUI/TestSessionXML.cpp b/Tests/Unit/GUI/TestSessionXML.cpp
index c1696127ab918e87c3a9989d5516a5bf439e9653..cb01cf479ce5df63b40fb7bdf89ffa7d53b1dff7 100644
--- a/Tests/Unit/GUI/TestSessionXML.cpp
+++ b/Tests/Unit/GUI/TestSessionXML.cpp
@@ -3,7 +3,7 @@
 #include "GUI/Models/Sample/MultiLayerItem.h"
 #include "GUI/Models/Sample/ParticleItem.h"
 #include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
diff --git a/Tests/Unit/GUI/Utils.h b/Tests/Unit/GUI/Utils.h
index 753270563c9c7e32b5c4fdfb710b7cc5e8f643dc..77070c34d1baaf187c66395434486d90c6707051 100644
--- a/Tests/Unit/GUI/Utils.h
+++ b/Tests/Unit/GUI/Utils.h
@@ -17,7 +17,7 @@
 #define BORNAGAIN_TESTS_UNIT_GUI_UTILS_H
 
 #include "GUI/Models/Session/SessionXML.h"
-#include "GUI/Models/Varia/PropertyItem.h"
+#include "GUI/Models/Parameter/PropertyItem.h"
 #include <QString>
 #include <QXmlStreamWriter>