diff --git a/GUI/Model/Axis/AxisItems.cpp b/GUI/Model/Axis/AxisItems.cpp
index 3a0ea9e6fb9abd70f387522a817ce4caefaa8a1b..3432fbcd6e404c7b09e75df0ee9d16e0c713de29 100644
--- a/GUI/Model/Axis/AxisItems.cpp
+++ b/GUI/Model/Axis/AxisItems.cpp
@@ -87,7 +87,7 @@ void BasicAxisItem::setTitle(const QString& title)
     emit axisTitleChanged();
 }
 
-std::unique_ptr<IAxis> BasicAxisItem::createAxis(double scale) const
+std::unique_ptr<IAxis> BasicAxisItem::itemToAxis(double scale) const
 {
     return std::make_unique<FixedBinAxis>(title().toStdString(), binCount(), min() * scale,
                                           max() * scale);
diff --git a/GUI/Model/Axis/AxisItems.h b/GUI/Model/Axis/AxisItems.h
index 6c1a7cac8fb8997ff4c038aa65127ac8f9545abc..bf03dec167d9a452b041e24ee67699a31030bcea 100644
--- a/GUI/Model/Axis/AxisItems.h
+++ b/GUI/Model/Axis/AxisItems.h
@@ -32,7 +32,7 @@ public:
     virtual void readFrom(QXmlStreamReader* r);
 
 public:
-    virtual std::unique_ptr<IAxis> createAxis(double scale) const;
+    virtual std::unique_ptr<IAxis> itemToAxis(double scale) const;
 
     int binCount() const;
     void setBinCount(size_t value);
diff --git a/GUI/Model/Axis/PointwiseAxisItem.cpp b/GUI/Model/Axis/PointwiseAxisItem.cpp
index 44578f148e39e76a0ebf9b77b1b450b0d84f27c5..01b4a899ee3914d7915fca4899b5632c99355317 100644
--- a/GUI/Model/Axis/PointwiseAxisItem.cpp
+++ b/GUI/Model/Axis/PointwiseAxisItem.cpp
@@ -59,7 +59,7 @@ QString PointwiseAxisItem::nativeAxisUnits() const
     return m_nativeAxisUnits;
 }
 
-std::unique_ptr<IAxis> PointwiseAxisItem::createAxis(double scale) const
+std::unique_ptr<IAxis> PointwiseAxisItem::itemToAxis(double scale) const
 {
     if (!checkValidity())
         return nullptr;
diff --git a/GUI/Model/Axis/PointwiseAxisItem.h b/GUI/Model/Axis/PointwiseAxisItem.h
index 475ccb4b94b0f52919d25fdec26b4d678708fab2..8710ee35695584b2f9c14e1180bc79791847efaa 100644
--- a/GUI/Model/Axis/PointwiseAxisItem.h
+++ b/GUI/Model/Axis/PointwiseAxisItem.h
@@ -34,7 +34,7 @@ public:
     const IAxis* axis() const;
     QString nativeAxisUnits() const;
 
-    std::unique_ptr<IAxis> createAxis(double scale) const override;
+    std::unique_ptr<IAxis> itemToAxis(double scale) const override;
 
     void updateIndicators();
 
diff --git a/GUI/Model/Data/IntensityDataItem.cpp b/GUI/Model/Data/IntensityDataItem.cpp
index febe48032af85e88f6d093b8c42e44724b176010..163fa8ae39f44bdd7c3f02400ddd2cabd03b4fe8 100644
--- a/GUI/Model/Data/IntensityDataItem.cpp
+++ b/GUI/Model/Data/IntensityDataItem.cpp
@@ -15,10 +15,10 @@
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "Base/Axis/IAxis.h"
 #include "Device/Data/Datafield.h"
-#include "GUI/Model/Data/JobItemUtils.h"
-#include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Data/JobItemUtils.h"
 #include "GUI/Model/Data/MaskUnitsConverter.h"
+#include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Support/IO/ImportDataInfo.h"
 #include "GUI/Support/Util/Error.h"
 #include "GUI/Support/Util/QCP_Util.h"
diff --git a/GUI/Model/Data/SpecularDataItem.cpp b/GUI/Model/Data/SpecularDataItem.cpp
index dde201b96089e693bb61efedbebd5535566bf7c8..ebdaac49ff4e3cc6f57901c5e7c3048a7672fcaa 100644
--- a/GUI/Model/Data/SpecularDataItem.cpp
+++ b/GUI/Model/Data/SpecularDataItem.cpp
@@ -16,8 +16,8 @@
 #include "Base/Axis/IAxis.h"
 #include "Base/Util/Assert.h"
 #include "Device/Data/Datafield.h"
-#include "GUI/Model/Data/JobItemUtils.h"
 #include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Data/JobItemUtils.h"
 #include "GUI/Support/IO/ImportDataInfo.h"
 #include "GUI/Support/Util/Error.h"
 #include "GUI/Support/XML/UtilXML.h"
diff --git a/GUI/Model/Device/DetectorItem.h b/GUI/Model/Device/DetectorItem.h
index eca52b098ef188ecdd2fda43e6c80ea4f9ec5baa..8a43a6536ed42bf1347888c7dde7a3a94928a12d 100644
--- a/GUI/Model/Device/DetectorItem.h
+++ b/GUI/Model/Device/DetectorItem.h
@@ -16,8 +16,8 @@
 #define BORNAGAIN_GUI_MODEL_DEVICE_DETECTORITEM_H
 
 #include "GUI/Model/CatDevice/ResolutionFunctionItemCatalog.h"
-#include "GUI/Model/Descriptor/SelectionProperty.h"
 #include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Descriptor/SelectionProperty.h"
 
 class IDetector;
 class IResolutionFunction2D;
diff --git a/GUI/Model/Device/GrazingScanItem.cpp b/GUI/Model/Device/GrazingScanItem.cpp
index 984df284964ef2a38d2e09083f095eeb5e6906fd..dcb148458ffec6cf01d9bae4c21b89da09146854 100644
--- a/GUI/Model/Device/GrazingScanItem.cpp
+++ b/GUI/Model/Device/GrazingScanItem.cpp
@@ -16,8 +16,8 @@
 #include "Base/Axis/IAxis.h"
 #include "Base/Const/Units.h"
 #include "Base/Util/Assert.h"
-#include "GUI/Model/Descriptor/DistributionItems.h"
 #include "GUI/Model/Axis/PointwiseAxisItem.h"
+#include "GUI/Model/Descriptor/DistributionItems.h"
 
 namespace {
 
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index bfa54940442707b3dd26483aaf9051ef52b5e093..cef57efb96c19380e6a5b2fd2dc513dfdcb12cd4 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -21,6 +21,7 @@
 #include "Device/Coord/CoordSystem2D.h"
 #include "Device/Data/Datafield.h"
 #include "Device/Detector/OffspecDetector.h"
+#include "GUI/Model/Axis/PointwiseAxisItem.h"
 #include "GUI/Model/CatDevice/InstrumentItemCatalog.h"
 #include "GUI/Model/Data/DataItem.h"
 #include "GUI/Model/Data/RealItem.h"
@@ -31,7 +32,6 @@
 #include "GUI/Model/Device/GrazingScanItem.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Model/Device/OffspecDetectorItem.h"
-#include "GUI/Model/Axis/PointwiseAxisItem.h"
 #include "GUI/Model/Device/RectangularDetectorItem.h"
 #include "GUI/Model/Sample/SampleItem.h"
 #include "GUI/Support/Util/CoordName.h"
@@ -288,7 +288,7 @@ std::unique_ptr<IBeamScan> ScanningFunctionality::createScan() const
 {
     BasicAxisItem* const axis_item = scanItem()->inclinationAxisItem();
 
-    auto result = std::make_unique<AlphaScan>(*axis_item->createAxis(Units::deg));
+    auto result = std::make_unique<AlphaScan>(*axis_item->itemToAxis(Units::deg));
     result->setIntensity(scanItem()->intensity());
 
     FootprintItemCatalog::CatalogedType* const footprint_item =
@@ -420,7 +420,7 @@ const ICoordSystem* SpecularInstrumentItem::createCoordSystem() const
                                               native_units);
     }
 
-    return new AngularReflectometryCoords(scanItem()->wavelength(), *axis_item->createAxis(1.0),
+    return new AngularReflectometryCoords(scanItem()->wavelength(), *axis_item->itemToAxis(1.0),
                                           Coords::DEGREES);
 }
 
diff --git a/GUI/Model/Device/InstrumentNotifier.cpp b/GUI/Model/Device/InstrumentNotifier.cpp
index c146b9ad3d93578790fd5ac5aa56d905ca1dbc71..a144593290a7a4f3367307d782a1cfc746210cce 100644
--- a/GUI/Model/Device/InstrumentNotifier.cpp
+++ b/GUI/Model/Device/InstrumentNotifier.cpp
@@ -13,9 +13,9 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Device/InstrumentNotifier.h"
+#include "GUI/Model/Axis/PointwiseAxisItem.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Model/Device/MultiInstrumentNotifier.h"
-#include "GUI/Model/Axis/PointwiseAxisItem.h"
 
 InstrumentNotifier::InstrumentNotifier(MultiInstrumentNotifier* ec, InstrumentItem* instrument)
     : m_instrumentItem(instrument)
diff --git a/GUI/Model/Device/SourceItems.cpp b/GUI/Model/Device/SourceItems.cpp
index 1da8497de2399d0911a4dfe4925fdf46febaa9cb..ecb7a4c0eef3b3c2f7828226309c85a83b762deb 100644
--- a/GUI/Model/Device/SourceItems.cpp
+++ b/GUI/Model/Device/SourceItems.cpp
@@ -19,11 +19,11 @@
 #include "Device/Beam/Beam.h"
 #include "Device/Beam/FootprintGauss.h"
 #include "Device/Beam/FootprintSquare.h"
+#include "GUI/Model/Axis/PointwiseAxisItem.h"
 #include "GUI/Model/Device/BeamAngleItems.h"
 #include "GUI/Model/Device/BeamWavelengthItem.h"
 #include "GUI/Model/Device/FootprintItems.h"
 #include "GUI/Model/Device/GrazingScanItem.h"
-#include "GUI/Model/Axis/PointwiseAxisItem.h"
 #include "Sim/Scan/IBeamScan.h"
 
 namespace {
diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp
index 13a0f3d241d9ea5ef9f57d4c2c0a1665491f3a68..9f3f752cfa2e076a6db757a3d450019093c691f3 100644
--- a/GUI/Model/FromCore/ItemizeSimulation.cpp
+++ b/GUI/Model/FromCore/ItemizeSimulation.cpp
@@ -25,8 +25,8 @@
 #include "Device/Mask/Rectangle.h"
 #include "Device/Resolution/ConvolutionDetectorResolution.h"
 #include "Device/Resolution/ResolutionFunction2DGaussian.h"
-#include "GUI/Model/Descriptor/DistributionItems.h"
 #include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Descriptor/DistributionItems.h"
 #include "GUI/Model/Device/BeamAngleItems.h"
 #include "GUI/Model/Device/BeamWavelengthItem.h"
 #include "GUI/Model/Device/GrazingScanItem.h"
diff --git a/GUI/View/Common/IntensityDataPropertyWidget.cpp b/GUI/View/Common/IntensityDataPropertyWidget.cpp
index 312bf7da5b8a7df8c820eade5c0e0588292671cb..2a014e339bb1b571904539344cd35794312cdd8a 100644
--- a/GUI/View/Common/IntensityDataPropertyWidget.cpp
+++ b/GUI/View/Common/IntensityDataPropertyWidget.cpp
@@ -14,8 +14,8 @@
 
 #include "GUI/View/Common/IntensityDataPropertyWidget.h"
 #include "Base/Util/Assert.h"
-#include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Numeric/NumWidgetUtils.h"
 #include "GUI/View/Tool/LayoutUtils.h"
diff --git a/GUI/View/Mask/MaskContainerView.cpp b/GUI/View/Mask/MaskContainerView.cpp
index 9dc72cbbd1a44047af04a6fcb853960b4781449a..0213da4a989359a1c6da4ce28ca9f8fb52888d18 100644
--- a/GUI/View/Mask/MaskContainerView.cpp
+++ b/GUI/View/Mask/MaskContainerView.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Mask/MaskContainerView.h"
-#include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/View/Mask/ISceneAdaptor.h"
 #include <QBrush>
 #include <QPainter>
diff --git a/GUI/View/Mask/MaskGraphicsScene.cpp b/GUI/View/Mask/MaskGraphicsScene.cpp
index a9a76b44dc86912e00bdbb60b98e29b21b3a0048..dd0b292243ad5ff7e7344a1f25f0763a45237fd6 100644
--- a/GUI/View/Mask/MaskGraphicsScene.cpp
+++ b/GUI/View/Mask/MaskGraphicsScene.cpp
@@ -14,8 +14,8 @@
 
 #include "GUI/View/Mask/MaskGraphicsScene.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Util/Error.h"
 #include "GUI/View/Mask/ColorMapSceneAdaptor.h"
diff --git a/GUI/View/Mask/MaskViewFactory.cpp b/GUI/View/Mask/MaskViewFactory.cpp
index a2d47fe14daf677c4e423615a6cfe993ab956879..6657951be8c374fad6af923de12576cc206fe913 100644
--- a/GUI/View/Mask/MaskViewFactory.cpp
+++ b/GUI/View/Mask/MaskViewFactory.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Mask/MaskViewFactory.h"
-#include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Support/Util/Error.h"
 #include "GUI/View/Mask/EllipseView.h"
 #include "GUI/View/Mask/LineViews.h"
diff --git a/GUI/View/PlotComparison/FitComparisonWidget.cpp b/GUI/View/PlotComparison/FitComparisonWidget.cpp
index fe859d04b73d0851c8775e66df5b4aebbc20d4e3..59d37185268f6a1172ffcfa3b29b0458cec42aa2 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget.cpp
@@ -15,9 +15,9 @@
 #include "GUI/View/PlotComparison/FitComparisonWidget.h"
 #include "Base/Util/Assert.h"
 #include "Device/Histo/DiffUtil.h"
+#include "GUI/Model/Axis/AxisItems.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
-#include "GUI/Model/Axis/AxisItems.h"
 #include "GUI/Model/Job/FitSuiteItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Util/ActionFactory.h"
diff --git a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
index 07c522db4e5a7503aa8a72e6362f81de974ca5b4..e666066ac143eeb4e9ef621932c8a1f773f45904 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
@@ -15,8 +15,8 @@
 #include "GUI/View/PlotComparison/FitComparisonWidget1D.h"
 #include "Base/Util/Assert.h"
 #include "Device/Histo/DiffUtil.h"
-#include "GUI/Model/Data/SpecularDataItem.h"
 #include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Data/SpecularDataItem.h"
 #include "GUI/Model/Job/FitSuiteItem.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
index de5064f108afc9e9d06debb9acc15cf2d08fd4d1..1137c71f5c17a3b298fa4df42b3439809c396f0e 100644
--- a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
+++ b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
@@ -13,9 +13,9 @@
 //  ************************************************************************************************
 
 #include "GUI/View/PlotSpecular/SpecularDataPropertyWidget.h"
+#include "GUI/Model/Axis/AxisItems.h"
 #include "GUI/Model/Data/ComboProperty.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
-#include "GUI/Model/Axis/AxisItems.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
 #include "GUI/View/Numeric/NumWidgetUtils.h"
diff --git a/GUI/View/PlotSpecular/SpecularPlot.cpp b/GUI/View/PlotSpecular/SpecularPlot.cpp
index 02c167cc52f7791c8b09be5fa9f6602b5c2c3a73..8774d998bec395ce7dd6075b75a2bd804476b63c 100644
--- a/GUI/View/PlotSpecular/SpecularPlot.cpp
+++ b/GUI/View/PlotSpecular/SpecularPlot.cpp
@@ -16,8 +16,8 @@
 #include "Base/Axis/Frame.h"
 #include "Base/Util/Assert.h"
 #include "Device/Data/Datafield.h"
-#include "GUI/Model/Data/SpecularDataItem.h"
 #include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Data/SpecularDataItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Util/QCP_Util.h"
 #include "GUI/View/PlotUtil/PlotConstants.h"
diff --git a/GUI/View/PlotUtil/ColorMap.cpp b/GUI/View/PlotUtil/ColorMap.cpp
index e4600fdcd4e78d226fbed495baadb4b07b82af02..69cad753849dd2a54be94ecf35f21f6191468764 100644
--- a/GUI/View/PlotUtil/ColorMap.cpp
+++ b/GUI/View/PlotUtil/ColorMap.cpp
@@ -14,8 +14,8 @@
 
 #include "GUI/View/PlotUtil/ColorMap.h"
 #include "Device/Data/Datafield.h"
-#include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Support/Util/QCP_Util.h"
 #include "GUI/View/PlotUtil/PlotConstants.h"
diff --git a/GUI/View/PlotUtil/RangeUtils.cpp b/GUI/View/PlotUtil/RangeUtils.cpp
index acf9e5f2c68dfcd1f7af2c3f71bbd766900c402e..93d05d547913df2afde7f2cff16d3059f27b655b 100644
--- a/GUI/View/PlotUtil/RangeUtils.cpp
+++ b/GUI/View/PlotUtil/RangeUtils.cpp
@@ -13,9 +13,9 @@
 //  ************************************************************************************************
 
 #include "GUI/View/PlotUtil/RangeUtils.h"
+#include "GUI/Model/Axis/AxisItems.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
-#include "GUI/Model/Axis/AxisItems.h"
 #include "GUI/Support/Util/Error.h"
 #include "GUI/Support/Util/StyleUtils.h"
 #include <qcustomplot.h>
diff --git a/GUI/View/Projection/ProjectionsEditorCanvas.cpp b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
index 4c646598fc5552016355943603db3576b22626ea..7d22b0d8af658fba7e503065d7e817bb96510050 100644
--- a/GUI/View/Projection/ProjectionsEditorCanvas.cpp
+++ b/GUI/View/Projection/ProjectionsEditorCanvas.cpp
@@ -14,8 +14,8 @@
 
 #include "GUI/View/Projection/ProjectionsEditorCanvas.h"
 #include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Mask/MaskGraphicsScene.h"
 #include "GUI/View/Mask/MaskGraphicsView.h"
diff --git a/GUI/View/Projection/ProjectionsPlot.cpp b/GUI/View/Projection/ProjectionsPlot.cpp
index 2b58db53da8858ed6b230a6369f8f489e5236640..efa21304df14d3e4007345b897868fca8ff99825 100644
--- a/GUI/View/Projection/ProjectionsPlot.cpp
+++ b/GUI/View/Projection/ProjectionsPlot.cpp
@@ -15,10 +15,10 @@
 #include "GUI/View/Projection/ProjectionsPlot.h"
 #include "Base/Axis/IAxis.h"
 #include "Device/Data/Datafield.h"
-#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Model/Axis/AxisItems.h"
+#include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Data/MaskItems.h"
+#include "GUI/Model/Data/ProjectionItems.h"
 #include "GUI/Support/Util/QCP_Util.h"
 #include "GUI/View/PlotUtil/PlotConstants.h"
 #include "GUI/View/PlotUtil/RangeUtils.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 7b72c9680a5b7588fb72f7a5644c96379f4b538e..b5469dfdb57965a3746e709bf3f06fc5ee74c864 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -1,6 +1,6 @@
+#include "GUI/Model/Axis/AxisItems.h"
 #include "GUI/Model/Data/JobItemUtils.h"
 #include "GUI/Model/Data/RealItem.h"
-#include "GUI/Model/Axis/AxisItems.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Model/Device/RectangularDetectorItem.h"
 #include "GUI/Model/Model/RealModel.h"