diff --git a/GUI/Model/Beam/SourceItems.cpp b/GUI/Model/Beam/SourceItems.cpp
index 046e9c7cf7e6c2d27a9259c17d18fd89ff059365..9b7b0b086e32eab2b61eaf98efade0913c6d4c7b 100644
--- a/GUI/Model/Beam/SourceItems.cpp
+++ b/GUI/Model/Beam/SourceItems.cpp
@@ -155,7 +155,7 @@ void SourceItem::setFootprint(const IFootprint* footprint)
 
 BeamItem::BeamItem()
 {
-    m_wavelength_item = std::make_unique<BeamWavelengthItem>();
+    m_wavelength_item = std::make_unique<BeamDistributionItem>();
     m_inclination_angle_item = std::make_unique<BeamInclinationAngleItem>();
 }
 
@@ -218,7 +218,7 @@ std::unique_ptr<Beam> BeamItem::createBeam() const
 ScanItem::ScanItem()
 {
     m_grazing_scan_item = std::make_unique<GrazingScanItem>();
-    m_wavelength_item = std::make_unique<BeamWavelengthItem>();
+    m_wavelength_item = std::make_unique<BeamDistributionItem>();
 }
 
 void ScanItem::setScan(const BeamScan* scan)
diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp
index f3c5f939e9e98a7656d64b8181e6cb85aa42474e..0148034cf54ff1a7d24ac18584e32177e433c6d0 100644
--- a/GUI/Model/FromCore/ItemizeSimulation.cpp
+++ b/GUI/Model/FromCore/ItemizeSimulation.cpp
@@ -28,7 +28,7 @@
 #include "Device/Resolution/ResolutionFunction2DGaussian.h"
 #include "GUI/Model/Axis/BasicAxisItem.h"
 #include "GUI/Model/Beam/BeamAngleItems.h"
-#include "GUI/Model/Beam/BeamWavelengthItem.h"
+#include "GUI/Model/Beam/BeamDistributionItem.h"
 #include "GUI/Model/Beam/DistributionItems.h"
 #include "GUI/Model/Beam/GrazingScanItem.h"
 #include "GUI/Model/Beam/SourceItems.h"
diff --git a/GUI/Model/Job/ParameterTreeBuilder.cpp b/GUI/Model/Job/ParameterTreeBuilder.cpp
index 297fa5a9713effe341fa21af9f8382379a30d3b6..ee7668a70ba3b62868c9f385b82530951dfbe571 100644
--- a/GUI/Model/Job/ParameterTreeBuilder.cpp
+++ b/GUI/Model/Job/ParameterTreeBuilder.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Model/Job/ParameterTreeBuilder.h"
 #include "GUI/Model/Beam/BeamAngleItems.h"
-#include "GUI/Model/Beam/BeamWavelengthItem.h"
+#include "GUI/Model/Beam/BeamDistributionItem.h"
 #include "GUI/Model/Beam/DistributionItems.h"
 #include "GUI/Model/Beam/SourceItems.h"
 #include "GUI/Model/Detector/DetectorItem.h"
diff --git a/GUI/Model/Sim/InstrumentItems.cpp b/GUI/Model/Sim/InstrumentItems.cpp
index 0d0a86399f34646235da471a3ca5014487353f4e..157d5e15ea9f501d390482be49d8bbb103ea0199 100644
--- a/GUI/Model/Sim/InstrumentItems.cpp
+++ b/GUI/Model/Sim/InstrumentItems.cpp
@@ -25,7 +25,7 @@
 #include "Device/Detector/OffspecDetector.h"
 #include "GUI/Model/Axis/PointwiseAxisItem.h"
 #include "GUI/Model/Beam/BeamAngleItems.h"
-#include "GUI/Model/Beam/BeamWavelengthItem.h"
+#include "GUI/Model/Beam/BeamDistributionItem.h"
 #include "GUI/Model/Beam/DistributionItems.h"
 #include "GUI/Model/Beam/FootprintItems.h"
 #include "GUI/Model/Beam/GrazingScanItem.h"
@@ -199,7 +199,7 @@ std::unique_ptr<PhysicalScan> ScanningInstrumentItem::createScan(const Scale& ax
     result->setFootprint(footprint_item->createFootprint().get());
 
     {
-        const BeamWavelengthItem* it = scanItem()->wavelengthItem();
+        const BeamDistributionItem* it = scanItem()->wavelengthItem();
         ASSERT(it);
         const auto* distr_item =
             dynamic_cast<const SymmetricDistributionItem*>(it->distributionItem());
diff --git a/GUI/View/Device/GISASBeamEditor.cpp b/GUI/View/Device/GISASBeamEditor.cpp
index 64640e643b73a698e6d8da1e5baca89bd0381c6b..a1e708bf0daaa678a4bf5c05c347f6c8ccb10800 100644
--- a/GUI/View/Device/GISASBeamEditor.cpp
+++ b/GUI/View/Device/GISASBeamEditor.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Device/GISASBeamEditor.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Beam/BeamAngleItems.h"
-#include "GUI/Model/Beam/BeamWavelengthItem.h"
+#include "GUI/Model/Beam/BeamDistributionItem.h"
 #include "GUI/Model/Beam/SourceItems.h"
 #include "GUI/View/Device/DistributionEditor.h"
 #include "GUI/View/Device/FootprintForm.h"
diff --git a/GUI/View/Device/ScanEditor.cpp b/GUI/View/Device/ScanEditor.cpp
index b2d9bc825235ed02b209ad8196d290f5751a6749..74675b8959a34523228b8916b7dcc3d9c8efb892 100644
--- a/GUI/View/Device/ScanEditor.cpp
+++ b/GUI/View/Device/ScanEditor.cpp
@@ -16,7 +16,7 @@
 #include "Base/Axis/Frame.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Axis/PointwiseAxisItem.h"
-#include "GUI/Model/Beam/BeamWavelengthItem.h"
+#include "GUI/Model/Beam/BeamDistributionItem.h"
 #include "GUI/Model/Beam/SourceItems.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Model/Sim/InstrumentsSet.h"