diff --git a/GUI/Model/Job/FitSuiteItem.cpp b/GUI/Model/Job/FitSuiteItem.cpp
index 8c26cbd35b337752de8e12ff656c12cb91573db1..2f78646d81648a636ce90bea35a449a82b40e646 100644
--- a/GUI/Model/Job/FitSuiteItem.cpp
+++ b/GUI/Model/Job/FitSuiteItem.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Model/Job/FitSuiteItem.h"
 #include "GUI/Model/Job/FitParameterContainerItem.h"
-#include "GUI/Model/Mini/MinimizerItem.h"
+#include "GUI/Model/Mini/MinimizerItems.h"
 #include "GUI/Support/XML/UtilXML.h"
 
 namespace {
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 8b4c41d3d743e4130c7644c62a66519ba813018b..5b2b2f7749d7bb19a9ecdcfd80c5640d60edc10e 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -30,7 +30,7 @@
 #include "GUI/Model/Job/ParameterTreeItems.h"
 #include "GUI/Model/Mask/MaskList.h"
 #include "GUI/Model/Mask/MaskUnitsConverter.h"
-#include "GUI/Model/Mini/MinimizerItem.h"
+#include "GUI/Model/Mini/MinimizerItems.h"
 #include "GUI/Model/Sample/SampleItem.h"
 #include "GUI/Support/Data/JobStatus.h"
 #include "GUI/Support/Data/SimulationOptionsItem.h"
diff --git a/GUI/Model/Mini/MinimizerItem.cpp b/GUI/Model/Mini/MinimizerItem.cpp
index 224de9ba166cf8a7f998164309a19cc58b59325e..8fb5253b7313147699aa8626ef6dafc7d8a82289 100644
--- a/GUI/Model/Mini/MinimizerItem.cpp
+++ b/GUI/Model/Mini/MinimizerItem.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/Model/Mini/MinimizerItem.cpp
-//! @brief     Implements class MinimizerItem.
+//! @brief     Implements class MinimizerItem and children.
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,6 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Mini/MinimizerItem.h"
 #include "Base/Util/Assert.h"
 #include "Fit/Suite/GSLLevenbergMarquardtMinimizer.h"
 #include "Fit/Suite/GSLMultiMinimizer.h"
@@ -20,6 +19,7 @@
 #include "Fit/Suite/Minuit2Minimizer.h"
 #include "Fit/Suite/SimAnMinimizer.h"
 #include "GUI/Model/Mini/MinimizerItemCatalog.h"
+#include "GUI/Model/Mini/MinimizerItems.h"
 #include "GUI/Support/XML/UtilXML.h"
 #include "Sim/Fitting/ObjectiveMetric.h"
 #include "Sim/Fitting/ObjectiveMetricUtil.h"
diff --git a/GUI/Model/Mini/MinimizerItem.h b/GUI/Model/Mini/MinimizerItems.h
similarity index 97%
rename from GUI/Model/Mini/MinimizerItem.h
rename to GUI/Model/Mini/MinimizerItems.h
index ad52eca275c66da79921df79b956479690dcc080..dd4c758cd64dafa0c799596a620aaa0b4ff0d6cf 100644
--- a/GUI/Model/Mini/MinimizerItem.h
+++ b/GUI/Model/Mini/MinimizerItems.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Mini/MinimizerItem.h
-//! @brief     Defines class MinimizerItem.
+//! @file      GUI/Model/Mini/MinimizerItems.h
+//! @brief     Defines class MinimizerItem and children.
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_MINI_MINIMIZERITEM_H
-#define BORNAGAIN_GUI_MODEL_MINI_MINIMIZERITEM_H
+#ifndef BORNAGAIN_GUI_MODEL_MINI_MINIMIZERITEMS_H
+#define BORNAGAIN_GUI_MODEL_MINI_MINIMIZERITEMS_H
 
 #include "GUI/Support/Data/ComboProperty.h"
 
@@ -273,4 +273,4 @@ private:
     int m_max_iterations;
 };
 
-#endif // BORNAGAIN_GUI_MODEL_MINI_MINIMIZERITEM_H
+#endif // BORNAGAIN_GUI_MODEL_MINI_MINIMIZERITEMS_H
diff --git a/GUI/View/FitControl/FitObjectiveBuilder.cpp b/GUI/View/FitControl/FitObjectiveBuilder.cpp
index 9d09895eeb9b3e8f1b6921dbbe79b65c99cf24b1..72a38f81538400e43139fc0548c1515a899cb2b6 100644
--- a/GUI/View/FitControl/FitObjectiveBuilder.cpp
+++ b/GUI/View/FitControl/FitObjectiveBuilder.cpp
@@ -22,7 +22,7 @@
 #include "GUI/Model/Job/FitParameterContainerItem.h"
 #include "GUI/Model/Job/FitSuiteItem.h"
 #include "GUI/Model/Job/JobItem.h"
-#include "GUI/Model/Mini/MinimizerItem.h"
+#include "GUI/Model/Mini/MinimizerItems.h"
 #include "GUI/Model/ToCore/SimulationToCore.h"
 #include "GUI/View/FitControl/GUIFitObserver.h"
 #include "Sim/Fitting/FitObjective.h"
diff --git a/GUI/View/FitControl/MinimizerSettingsWidget.h b/GUI/View/FitControl/MinimizerSettingsWidget.h
index 9e260266140adf48f35d8c93cffb3145e5d9bb86..b69e78c8fb00cf1d266f2896d8b600668349aac4 100644
--- a/GUI/View/FitControl/MinimizerSettingsWidget.h
+++ b/GUI/View/FitControl/MinimizerSettingsWidget.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_FITCONTROL_MINIMIZERSETTINGSWIDGET_H
 #define BORNAGAIN_GUI_VIEW_FITCONTROL_MINIMIZERSETTINGSWIDGET_H
 
-#include "GUI/Model/Mini/MinimizerItem.h"
+#include "GUI/Model/Mini/MinimizerItems.h"
 #include <QFormLayout>
 #include <QWidget>
 
diff --git a/Tests/Unit/GUI/TestFitParameterModel.cpp b/Tests/Unit/GUI/TestFitParameterModel.cpp
index b1f4b27fa423c854fbe15956d233e0e5a5c26210..196dc88495c8f58f6a160b93d1ebece1530cd28d 100644
--- a/Tests/Unit/GUI/TestFitParameterModel.cpp
+++ b/Tests/Unit/GUI/TestFitParameterModel.cpp
@@ -3,7 +3,7 @@
 #include "GUI/Model/Job/FitParameterItem.h"
 #include "GUI/Model/Job/FitParameterLinkItem.h"
 #include "GUI/Model/Job/FitSuiteItem.h"
-#include "GUI/Model/Mini/MinimizerItem.h"
+#include "GUI/Model/Mini/MinimizerItems.h"
 #include "GUI/Model/Tune/FitParameterModel.h"
 #include "Tests/GTestWrapper/google_test.h"