diff --git a/Core/Algorithms/inc/DistributionWeighter.h b/Core/Algorithms/inc/DistributionHandler.h
similarity index 82%
rename from Core/Algorithms/inc/DistributionWeighter.h
rename to Core/Algorithms/inc/DistributionHandler.h
index cc70bacd9411fc2af494c9adfa7c96061a421279..7163cec9abd618bccbb1211513c973fbd87107f7 100644
--- a/Core/Algorithms/inc/DistributionWeighter.h
+++ b/Core/Algorithms/inc/DistributionHandler.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/inc/DistributionWeighter.h
-//! @brief     Defines class DistributionWeighter.
+//! @file      Algorithms/inc/DistributionHandler.h
+//! @brief     Defines class DistributionHandler.
 //!
 //! @homepage  http://apps.jcns.fz-juelich.de/BornAgain
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -13,8 +13,8 @@
 //
 // ************************************************************************** //
 
-#ifndef DISTRIBUTIONWEIGHTER_H_
-#define DISTRIBUTIONWEIGHTER_H_
+#ifndef DISTRIBUTIONHANDLER_H_
+#define DISTRIBUTIONHANDLER_H_
 
 #include "IParameterized.h"
 #include "ParameterDistribution.h"
@@ -22,15 +22,15 @@
 
 class IDistribution1D;
 
-//! @class DistributionWeighter
+//! @class DistributionHandler
 //! @ingroup algorithms_internal
 //! @brief Provides the functionality to average over parameter distributions
 //! with weights
-class DistributionWeighter : public IParameterized
+class DistributionHandler : public IParameterized
 {
 public:
-	DistributionWeighter();
-	~DistributionWeighter();
+	DistributionHandler();
+	~DistributionHandler();
 
 	//! add a samples parameter distribution
 	void addParameterDistribution(const std::string &param_name,
@@ -53,4 +53,4 @@ private:
 };
 
 
-#endif /* DISTRIBUTIONWEIGHTER_H_ */
+#endif /* DISTRIBUTIONHANDLER_H_ */
diff --git a/Core/Algorithms/src/DistributionWeighter.cpp b/Core/Algorithms/src/DistributionHandler.cpp
similarity index 82%
rename from Core/Algorithms/src/DistributionWeighter.cpp
rename to Core/Algorithms/src/DistributionHandler.cpp
index db9c6f9a10ca8127d1fc4226b442d89e71b10c86..556aea13320c2d76dea7765781120d63584ec40e 100644
--- a/Core/Algorithms/src/DistributionWeighter.cpp
+++ b/Core/Algorithms/src/DistributionHandler.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Algorithms/src/DistributionWeighter.cpp
-//! @brief     Implements class DistributionWeighter.
+//! @file      Algorithms/src/DistributionHandler.cpp
+//! @brief     Implements class DistributionHandler.
 //!
 //! @homepage  http://apps.jcns.fz-juelich.de/BornAgain
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -13,18 +13,18 @@
 //
 // ************************************************************************** //
 
-#include "DistributionWeighter.h"
+#include "DistributionHandler.h"
 
-DistributionWeighter::DistributionWeighter()
+DistributionHandler::DistributionHandler()
 : m_nbr_combinations(1)
 {
 }
 
-DistributionWeighter::~DistributionWeighter()
+DistributionHandler::~DistributionHandler()
 {
 }
 
-void DistributionWeighter::addParameterDistribution(
+void DistributionHandler::addParameterDistribution(
 		const std::string &param_name, const IDistribution1D &distribution,
 		size_t nbr_samples, double sigma_factor)
 {
@@ -37,12 +37,12 @@ void DistributionWeighter::addParameterDistribution(
 	}
 }
 
-size_t DistributionWeighter::getTotalNumberOfSamples() const
+size_t DistributionHandler::getTotalNumberOfSamples() const
 {
 	return m_nbr_combinations;
 }
 
-double DistributionWeighter::setParameterValues(ParameterPool *p_parameter_pool,
+double DistributionHandler::setParameterValues(ParameterPool *p_parameter_pool,
 		size_t index)
 {
 	if (index >= m_nbr_combinations) {