diff --git a/Base/Axis/FixedBinAxis.cpp b/Base/Axis/MakeScale.cpp
similarity index 97%
rename from Base/Axis/FixedBinAxis.cpp
rename to Base/Axis/MakeScale.cpp
index fdd543a86d7430233f132fb03e092b9aa77d969c..5671e728e2cf0747d5c9cae266df5189cd5060fd 100644
--- a/Base/Axis/FixedBinAxis.cpp
+++ b/Base/Axis/MakeScale.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Base/Axis/FixedBinAxis.cpp
+//! @file      Base/Axis/MakeScale.cpp
 //! @brief     Implement class FixedBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Util/Assert.h"
 
 namespace {
diff --git a/Base/Axis/FixedBinAxis.h b/Base/Axis/MakeScale.h
similarity index 91%
rename from Base/Axis/FixedBinAxis.h
rename to Base/Axis/MakeScale.h
index d227d8530efe4dd2a4159f10a95ce867e4da3981..53e670d23863f455f7cb6deaccda48ee2aa13032 100644
--- a/Base/Axis/FixedBinAxis.h
+++ b/Base/Axis/MakeScale.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Base/Axis/FixedBinAxis.h
+//! @file      Base/Axis/MakeScale.h
 //! @brief     Defines class FixedBinAxis.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_BASE_AXIS_FIXEDBINAXIS_H
-#define BORNAGAIN_BASE_AXIS_FIXEDBINAXIS_H
+#ifndef BORNAGAIN_BASE_AXIS_MAKESCALE_H
+#define BORNAGAIN_BASE_AXIS_MAKESCALE_H
 
 #include "Base/Axis/IAxis.h"
 #include <memory>
@@ -40,4 +40,4 @@ std::unique_ptr<IAxis> uniqueFixedScanAxis(const std::string& name, size_t nbins
 
 #endif // SWIG
 
-#endif // BORNAGAIN_BASE_AXIS_FIXEDBINAXIS_H
+#endif // BORNAGAIN_BASE_AXIS_MAKESCALE_H
diff --git a/Base/Pixel/RectangularPixel.cpp b/Base/Pixel/RectangularPixel.cpp
index 6cdd6afc3ac50e618f360273d6ffdfad6ec005b8..4048ce345707616471302670320c087b77d6a54d 100644
--- a/Base/Pixel/RectangularPixel.cpp
+++ b/Base/Pixel/RectangularPixel.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Base/Pixel/RectangularPixel.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include <numbers>
 using std::numbers::pi;
 
diff --git a/Device/Coord/CoordSystem1D.cpp b/Device/Coord/CoordSystem1D.cpp
index e3232edf073da8e920818c467ff7e5808944d497..d0a3ff9d6236940dadc30f0ff93e6f18f59da066 100644
--- a/Device/Coord/CoordSystem1D.cpp
+++ b/Device/Coord/CoordSystem1D.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Device/Coord/CoordSystem1D.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Const/Units.h"
 #include <numbers>
 using std::numbers::pi;
diff --git a/Device/Coord/CoordSystem2D.cpp b/Device/Coord/CoordSystem2D.cpp
index b0f90f194b16749897b8e6d591ef31b7a9ced7d4..8ca92571c6f3ce22a2e9b3d1ba40422a92510b6a 100644
--- a/Device/Coord/CoordSystem2D.cpp
+++ b/Device/Coord/CoordSystem2D.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Device/Coord/CoordSystem2D.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Const/Units.h"
 #include <numbers>
 using std::numbers::pi;
diff --git a/Device/Data/ArrayUtil.cpp b/Device/Data/ArrayUtil.cpp
index 5f55bb006dd294a4c2d1dfc4dbacc61b34f42697..16df796b90025d206cc2631c6064439c24bfe0e2 100644
--- a/Device/Data/ArrayUtil.cpp
+++ b/Device/Data/ArrayUtil.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Device/Data/ArrayUtil.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Util/Assert.h"
 #include "Device/Data/Datafield.h"
 #include <stdexcept>
diff --git a/Device/Data/DataUtil.cpp b/Device/Data/DataUtil.cpp
index aed82c59adbc3995acecb660ac77911b983e64e4..d6e559d438483cdae2ae1bdaaea7a634c7ab74e4 100644
--- a/Device/Data/DataUtil.cpp
+++ b/Device/Data/DataUtil.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "Device/Data/DataUtil.h"
-#include "Base/Axis/FixedBinAxis.h"
 #include "Base/Axis/Frame.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Math/FourierTransform.h"
 #include "Base/Util/Assert.h"
 #include "Device/Data/ArrayUtil.h"
diff --git a/Device/Detector/OffspecDetector.cpp b/Device/Detector/OffspecDetector.cpp
index d735b1ff0099be9401af66c5e3cea21f19f9c2ab..11b16fbd9fa68f7a2b44075e92a1eaaa1bce1e11 100644
--- a/Device/Detector/OffspecDetector.cpp
+++ b/Device/Detector/OffspecDetector.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Device/Detector/OffspecDetector.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Pixel/SphericalPixel.h"
 #include "Base/Util/Assert.h"
 
diff --git a/Device/Detector/RectangularDetector.cpp b/Device/Detector/RectangularDetector.cpp
index 69b0d526e7cf346dd121066f6cc3fba6f4f7f145..710dccf4685225c2fc097403655728e53b496988 100644
--- a/Device/Detector/RectangularDetector.cpp
+++ b/Device/Detector/RectangularDetector.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Device/Detector/RectangularDetector.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Const/Units.h"
 #include <numbers>
 using std::numbers::pi;
diff --git a/Device/Detector/SphericalDetector.cpp b/Device/Detector/SphericalDetector.cpp
index 35ac03a9928ece8101020118aa71817479f92e11..da895f2fafd1700cdfa0c3b8bd554225bc335de5 100644
--- a/Device/Detector/SphericalDetector.cpp
+++ b/Device/Detector/SphericalDetector.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Device/Detector/SphericalDetector.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Const/Units.h"
 #include <numbers>
 using std::numbers::pi;
diff --git a/Device/IO/DataFormatUtil.cpp b/Device/IO/DataFormatUtil.cpp
index b251e332d6d3e69f3beb82aecfc17c36c6facc96..0cf6b3d24deec1accba2ff080fd2d017e0c3f539 100644
--- a/Device/IO/DataFormatUtil.cpp
+++ b/Device/IO/DataFormatUtil.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Device/IO/DataFormatUtil.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Util/FileSystemUtil.h"
 #include "Base/Util/StringUtil.h"
 #include "Device/Data/Datafield.h"
diff --git a/Device/IO/ReadReflectometry.cpp b/Device/IO/ReadReflectometry.cpp
index f4c8bec0af58c9fc91527bb7f396cc7c3afdbe1b..3cae554ca0f199e458a8780fcb35c98556363f46 100644
--- a/Device/IO/ReadReflectometry.cpp
+++ b/Device/IO/ReadReflectometry.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Device/IO/ReadReflectometry.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Util/StringUtil.h"
 #include "Device/Data/Datafield.h"
 #include "Device/IO/DataFormatUtil.h"
diff --git a/Device/IO/ReadWriteNicos.cpp b/Device/IO/ReadWriteNicos.cpp
index a5d33ceb282c50a67f44820d35b18042b0689953..2286a9c1509b513753206fadf2a17d96dfe75c71 100644
--- a/Device/IO/ReadWriteNicos.cpp
+++ b/Device/IO/ReadWriteNicos.cpp
@@ -13,8 +13,8 @@
 //  ************************************************************************************************
 
 #include "Device/IO/ReadWriteNicos.h"
-#include "Base/Axis/FixedBinAxis.h"
 #include "Base/Axis/Frame.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Util/StringUtil.h"
 #include "Device/Data/Datafield.h"
 #include <memory>
diff --git a/Device/IO/ReadWriteTiff.cpp b/Device/IO/ReadWriteTiff.cpp
index 02136136af37fb50dba611c1b53febba26afdb42..44019324c0977d9de8c73559507b266333148e38 100644
--- a/Device/IO/ReadWriteTiff.cpp
+++ b/Device/IO/ReadWriteTiff.cpp
@@ -15,8 +15,8 @@
 #ifdef BA_TIFF_SUPPORT
 
 #include "Device/IO/ReadWriteTiff.h"
-#include "Base/Axis/FixedBinAxis.h"
 #include "Base/Axis/Frame.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Util/Assert.h"
 #include "Base/Util/SysUtil.h"
 #include "Device/Data/Datafield.h"
diff --git a/GUI/Model/Axis/BasicAxisItem.cpp b/GUI/Model/Axis/BasicAxisItem.cpp
index 5f48563aefda7ed56e3d8de7d0027ee14728e31a..6eb2a19c8b2dbeef9a22cc40b383f718b5a39931 100644
--- a/GUI/Model/Axis/BasicAxisItem.cpp
+++ b/GUI/Model/Axis/BasicAxisItem.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Axis/BasicAxisItem.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "GUI/Support/XML/UtilXML.h"
 
 namespace {
diff --git a/GUI/Model/Axis/PointwiseAxisItem.cpp b/GUI/Model/Axis/PointwiseAxisItem.cpp
index 1e24f5aa53ae0f78acc72dba997d138fe3f8256c..bbcafeeba6ff589382197910eb776bf520924007 100644
--- a/GUI/Model/Axis/PointwiseAxisItem.cpp
+++ b/GUI/Model/Axis/PointwiseAxisItem.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Model/Axis/PointwiseAxisItem.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Device/Coord/ICoordSystem.h"
 #include "Device/Data/Datafield.h"
 #include "Device/IO/ReadWriteINT.h"
diff --git a/GUI/Model/Descriptor/AxisProperty.h b/GUI/Model/Descriptor/AxisProperty.h
index 0d4e00d74783fa1ba49372cf1d6811c33a6139ab..4665365f90bbd754fcf469ca1e11af5505001245 100644
--- a/GUI/Model/Descriptor/AxisProperty.h
+++ b/GUI/Model/Descriptor/AxisProperty.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_MODEL_DESCRIPTOR_AXISPROPERTY_H
 #define BORNAGAIN_GUI_MODEL_DESCRIPTOR_AXISPROPERTY_H
 
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "GUI/Model/Descriptor/DoubleProperty.h"
 #include <memory>
 
diff --git a/GUI/View/Loaders/QREDataLoader.cpp b/GUI/View/Loaders/QREDataLoader.cpp
index 54984c979b97cd28a13f79dc1d86d8ef78dbce3f..5adae3a921d5b584310fa6dced1ed8361a2e05ac 100644
--- a/GUI/View/Loaders/QREDataLoader.cpp
+++ b/GUI/View/Loaders/QREDataLoader.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Loaders/QREDataLoader.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Util/Assert.h"
 #include "Device/Coord/CoordSystem1D.h"
 #include "Device/Data/Datafield.h"
diff --git a/Sim/Export/PyFmt2.cpp b/Sim/Export/PyFmt2.cpp
index cf77700992af9c0276fe5629db503bdac236e587..1992bb224772047500dc1e7d35aa02d25d3c12a9 100644
--- a/Sim/Export/PyFmt2.cpp
+++ b/Sim/Export/PyFmt2.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Sim/Export/PyFmt2.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Const/Units.h"
 #include "Base/Py/PyFmt.h"
 #include "Base/Util/Algorithms.h"
diff --git a/Sim/Scan/AlphaScan.cpp b/Sim/Scan/AlphaScan.cpp
index 5694afcf415af855ccc36ae48a13737eff1bacaa..a4a7a784ad7d37101fd8ac1537f309e5e7f6ebd4 100644
--- a/Sim/Scan/AlphaScan.cpp
+++ b/Sim/Scan/AlphaScan.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Sim/Scan/AlphaScan.h"
-#include "Base/Axis/FixedBinAxis.h" // FixedScanAxis
+#include "Base/Axis/MakeScale.h" // FixedScanAxis
 #include "Device/Beam/IFootprintFactor.h"
 #include "Device/Coord/CoordSystem1D.h"
 #include "Device/Pol/PolFilter.h"
diff --git a/Sim/Scan/QzScan.cpp b/Sim/Scan/QzScan.cpp
index cdd7e4753c46aefd8a0ea97da19f8ca6a84bd4c8..fbdef5d9995e0afab268c155ab8d352d0f78322c 100644
--- a/Sim/Scan/QzScan.cpp
+++ b/Sim/Scan/QzScan.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Sim/Scan/QzScan.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Util/Assert.h"
 #include "Device/Coord/CoordSystem1D.h"
 #include "Device/Pol/PolFilter.h"
diff --git a/Tests/Functional/CoreSpecial/CoreIOPathTest.cpp b/Tests/Functional/CoreSpecial/CoreIOPathTest.cpp
index c583314b9f5524a1dd9fdbf0e0be6573b8df5021..b629033f4ef56d98a9a1f75615533c9eb6fd312f 100644
--- a/Tests/Functional/CoreSpecial/CoreIOPathTest.cpp
+++ b/Tests/Functional/CoreSpecial/CoreIOPathTest.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "BATesting.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Util/FileSystemUtil.h"
 #include "Device/Data/Datafield.h"
 #include "Device/Histo/DiffUtil.h"
diff --git a/Tests/SimFactory/MakeSimulations.cpp b/Tests/SimFactory/MakeSimulations.cpp
index 24b8ac0d8e4dd39a14431e0d3b41da4f2c6fddd4..c0d31b22ee005b606cf7d3b60d700e28f859e575 100644
--- a/Tests/SimFactory/MakeSimulations.cpp
+++ b/Tests/SimFactory/MakeSimulations.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Tests/SimFactory/MakeSimulations.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Const/Units.h"
 #include "Device/Beam/Beam.h"
 #include "Device/Beam/FootprintGauss.h"
diff --git a/Tests/Unit/Device/ArrayUtilsTest.cpp b/Tests/Unit/Device/ArrayUtilsTest.cpp
index 0ee80eace5928f7f6f5525817e0907742d019188..f4463b3c38d20bf6a26867bd5f8bbe9c25fdc509 100644
--- a/Tests/Unit/Device/ArrayUtilsTest.cpp
+++ b/Tests/Unit/Device/ArrayUtilsTest.cpp
@@ -1,4 +1,4 @@
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Device/Data/ArrayUtil.h"
 #include "Device/Data/Datafield.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/Device/DepthprobeConverterTest.cpp b/Tests/Unit/Device/DepthprobeConverterTest.cpp
index 9de8a68371bb27d2e19c88e5d790bdc2a1dd4ea6..1fc3cb3578820eb3261f0553ee2239c242e583b9 100644
--- a/Tests/Unit/Device/DepthprobeConverterTest.cpp
+++ b/Tests/Unit/Device/DepthprobeConverterTest.cpp
@@ -1,4 +1,4 @@
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Const/Units.h"
 #include <numbers>
 using std::numbers::pi;
diff --git a/Tests/Unit/Device/FixedBinAxisTest.cpp b/Tests/Unit/Device/FixedBinAxisTest.cpp
index 0e065d33122f9cd5d80cbccf45ff39e63b2e194c..e0306b1692cd6560d2cf34fb33108a8ad0b33075 100644
--- a/Tests/Unit/Device/FixedBinAxisTest.cpp
+++ b/Tests/Unit/Device/FixedBinAxisTest.cpp
@@ -1,4 +1,4 @@
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Device/IO/DataFormatUtil.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <iostream>
diff --git a/Tests/Unit/Device/IOReaderWriterTest.cpp b/Tests/Unit/Device/IOReaderWriterTest.cpp
index 55d48dd1d1113747a17d356215acc609240f59be..9a5ffcc55ccfeec29e5a7312ae7790a67b11f075 100644
--- a/Tests/Unit/Device/IOReaderWriterTest.cpp
+++ b/Tests/Unit/Device/IOReaderWriterTest.cpp
@@ -1,4 +1,4 @@
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Device/Data/Datafield.h"
 #include "Device/IO/ReadWriteINT.h"
 #include "Device/IO/ReadWriteNumpyTXT.h"
diff --git a/Tests/Unit/Device/IntensityDataFunctionsTest.cpp b/Tests/Unit/Device/IntensityDataFunctionsTest.cpp
index 75271f0e7778db73dfbee10eb2b4d18765eb6dfd..489c3e926dd49a3c2d5af2c37c0ca5648d0f3a4d 100644
--- a/Tests/Unit/Device/IntensityDataFunctionsTest.cpp
+++ b/Tests/Unit/Device/IntensityDataFunctionsTest.cpp
@@ -1,6 +1,6 @@
-#include "Base/Axis/FixedBinAxis.h"
 #include "Base/Axis/Frame.h"
 #include "Base/Axis/FrameUtil.h"
+#include "Base/Axis/MakeScale.h"
 #include "Device/Data/DataUtil.h"
 #include "Device/Data/Datafield.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/Device/OffspecConverterTest.cpp b/Tests/Unit/Device/OffspecConverterTest.cpp
index 555c9b2566557a1eedee635709d7d931688a0200..7ec29b840ad4e96fb2b5426cb03f552716b6f0a7 100644
--- a/Tests/Unit/Device/OffspecConverterTest.cpp
+++ b/Tests/Unit/Device/OffspecConverterTest.cpp
@@ -1,4 +1,4 @@
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Const/Units.h"
 #include "Device/Beam/Beam.h"
 #include "Device/Coord/CoordSystem2D.h"
diff --git a/Tests/Unit/Device/PointwiseAxisTest.cpp b/Tests/Unit/Device/PointwiseAxisTest.cpp
index 41b3b5af46f6938a8758b32b76ed833a187be755..f194bd9e2cb0cb802bac8e67e9e4034bcedf5249 100644
--- a/Tests/Unit/Device/PointwiseAxisTest.cpp
+++ b/Tests/Unit/Device/PointwiseAxisTest.cpp
@@ -1,4 +1,4 @@
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Device/IO/DataFormatUtil.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <iostream>
diff --git a/Tests/Unit/Device/PowerfieldTest.cpp b/Tests/Unit/Device/PowerfieldTest.cpp
index f6e22ca04365626e3ad04868112e6d3bfb266fc0..0fa3c0133056baeaa40a9f13e218492796e7ef47 100644
--- a/Tests/Unit/Device/PowerfieldTest.cpp
+++ b/Tests/Unit/Device/PowerfieldTest.cpp
@@ -1,5 +1,5 @@
-#include "Base/Axis/FixedBinAxis.h"
 #include "Base/Axis/Frame.h"
+#include "Base/Axis/MakeScale.h"
 #include "Device/Data/DataUtil.h"
 #include "Device/Data/Datafield.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/Device/RectangularConverterTest.cpp b/Tests/Unit/Device/RectangularConverterTest.cpp
index 451dace621746defd9708d10f156a779875d7f86..95605c5a8fea23755615108b9e4b7403358672e2 100644
--- a/Tests/Unit/Device/RectangularConverterTest.cpp
+++ b/Tests/Unit/Device/RectangularConverterTest.cpp
@@ -1,4 +1,4 @@
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Const/Units.h"
 #include <numbers>
 using std::numbers::pi;
diff --git a/Tests/Unit/Device/RegionOfInterestTest.cpp b/Tests/Unit/Device/RegionOfInterestTest.cpp
index 7c4bc5b4124bb64609fdc253f430bcbf51b72e18..983246be1fee9072d7fe72e0203eb50f1b4df877 100644
--- a/Tests/Unit/Device/RegionOfInterestTest.cpp
+++ b/Tests/Unit/Device/RegionOfInterestTest.cpp
@@ -1,4 +1,4 @@
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Device/Detector/SphericalDetector.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <memory>
diff --git a/Tests/Unit/Device/SphericalConverterTest.cpp b/Tests/Unit/Device/SphericalConverterTest.cpp
index 80eddd2cee912c2e0eafce2753ac882dd1d49edc..24865ad2d64f66c4cfc61db21d94e11b18f37a0e 100644
--- a/Tests/Unit/Device/SphericalConverterTest.cpp
+++ b/Tests/Unit/Device/SphericalConverterTest.cpp
@@ -1,4 +1,4 @@
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Const/Units.h"
 #include "Device/Beam/Beam.h"
 #include "Device/Coord/CoordSystem2D.h"
diff --git a/Tests/Unit/Device/SphericalDetectorTest.cpp b/Tests/Unit/Device/SphericalDetectorTest.cpp
index 5318187ce9f70df9d20d0b30a5f22a939aaac0b5..4b24c94e0eb0fff885b387791082df1884b7274a 100644
--- a/Tests/Unit/Device/SphericalDetectorTest.cpp
+++ b/Tests/Unit/Device/SphericalDetectorTest.cpp
@@ -1,5 +1,5 @@
 #include "Device/Detector/SphericalDetector.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Const/Units.h"
 #include "Device/Beam/Beam.h"
 #include "Device/Detector/SimulationAreaIterator.h"
diff --git a/Tests/Unit/GUI/TestRealModel.cpp b/Tests/Unit/GUI/TestRealModel.cpp
index d0f9d38924075bac955f9551d18032bc5dcdb68b..ec512bd4d90974be876f709614ded5fb2da72806 100644
--- a/Tests/Unit/GUI/TestRealModel.cpp
+++ b/Tests/Unit/GUI/TestRealModel.cpp
@@ -1,4 +1,4 @@
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Device/Data/Datafield.h"
 #include "Device/IO/IOFactory.h"
 #include "GUI/Model/Data/DataItem.h"
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index b7d86fceadf64ada356c9f9dc3b03b67283297d4..c8ccb374b60c91fa8597c50e5e69cbb7be17546b 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "Tests/Unit/GUI/Utils.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Device/Data/Datafield.h"
 #include "Device/Histo/DiffUtil.h"
 #include "Device/IO/IOFactory.h"
diff --git a/Tests/Unit/Sim/CoordSystem1DTest.cpp b/Tests/Unit/Sim/CoordSystem1DTest.cpp
index 59c6034b3b63af6a3f8e9b613b803b498e1868e3..a8c9c987954196a8672d5180b5647f80f4dc00dc 100644
--- a/Tests/Unit/Sim/CoordSystem1DTest.cpp
+++ b/Tests/Unit/Sim/CoordSystem1DTest.cpp
@@ -1,5 +1,5 @@
 #include "Device/Coord/CoordSystem1D.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Const/Units.h"
 #include <numbers>
 using std::numbers::pi;
diff --git a/Tests/Unit/Sim/FittingTestHelper.h b/Tests/Unit/Sim/FittingTestHelper.h
index b4399dac23896db5ef6a9c3bb0554ad851534699..15ccd226323988899e840759cc2df055998bc05b 100644
--- a/Tests/Unit/Sim/FittingTestHelper.h
+++ b/Tests/Unit/Sim/FittingTestHelper.h
@@ -1,7 +1,7 @@
 #ifndef BORNAGAIN_TESTS_UNIT_SIM_FITTINGTESTHELPER_H
 #define BORNAGAIN_TESTS_UNIT_SIM_FITTINGTESTHELPER_H
 
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Const/Units.h"
 #include "Device/Beam/Beam.h"
 #include "Device/Data/Datafield.h"
diff --git a/Tests/Unit/Sim/SpecularScanTest.cpp b/Tests/Unit/Sim/SpecularScanTest.cpp
index a273495a68deda8826cc192d61fbf5ee6bf5f541..1cd97a0d2831aca5ae13975902745fc5d51cd8c5 100644
--- a/Tests/Unit/Sim/SpecularScanTest.cpp
+++ b/Tests/Unit/Sim/SpecularScanTest.cpp
@@ -1,4 +1,4 @@
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Param/Distrib/Distributions.h"
 #include "Param/Distrib/ParameterSample.h"
 #include "Resample/Element/SpecularElement.h"
diff --git a/Tests/Unit/Sim/SpecularSimulationTest.cpp b/Tests/Unit/Sim/SpecularSimulationTest.cpp
index 5d8ba57fec820332c29605e7fe56b0292bb86375..7c7679c77450f956a2cbf491e7515a1060a703b8 100644
--- a/Tests/Unit/Sim/SpecularSimulationTest.cpp
+++ b/Tests/Unit/Sim/SpecularSimulationTest.cpp
@@ -1,5 +1,5 @@
 #include "Sim/Simulation/SpecularSimulation.h"
-#include "Base/Axis/FixedBinAxis.h"
+#include "Base/Axis/MakeScale.h"
 #include "Base/Const/Units.h"
 #include <numbers>
 using std::numbers::pi;
diff --git a/Wrap/Swig/libBornAgainBase.i b/Wrap/Swig/libBornAgainBase.i
index 4e89bdffd09f30fff7815a9535349abca56c0554..723786bfa42abb766337d55ebaf1ed6395348630 100644
--- a/Wrap/Swig/libBornAgainBase.i
+++ b/Wrap/Swig/libBornAgainBase.i
@@ -18,12 +18,12 @@
 
 %{
 #include <heinz/Complex.h>
+#include "Base/Axis/Frame.h"
+#include "Base/Axis/MakeScale.h"
+#include "Base/Const/Units.h"
 #include "Base/Types/ICloneable.h"
 #include "Base/Types/Span.h"
-#include "Base/Const/Units.h"
 #include "Base/Util/ThreadInfo.h"
-#include "Base/Axis/FixedBinAxis.h"
-#include "Base/Axis/Frame.h"
 #include "Base/Vector/RotMatrix.h"
 %}
 
@@ -40,7 +40,7 @@
 
 %include "Base/Axis/Bin.h"
 %include "Base/Axis/IAxis.h"
-%include "Base/Axis/FixedBinAxis.h"
+%include "Base/Axis/MakeScale.h"
 %include "Base/Axis/Frame.h"
 
 %template(R3) Vec3<double>;
diff --git a/auto/Wrap/libBornAgainBase_wrap.cpp b/auto/Wrap/libBornAgainBase_wrap.cpp
index 4f8b5c5791932e6525ca8fafeb70088af0fb75fd..fb6cba1503008a827c230b7495bf196659118d75 100644
--- a/auto/Wrap/libBornAgainBase_wrap.cpp
+++ b/auto/Wrap/libBornAgainBase_wrap.cpp
@@ -6982,12 +6982,12 @@ SWIGINTERN std::vector< std::pair< double,double > >::iterator std_vector_Sl_std
 SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_1(std::vector< std::pair< double,double > > *self,std::vector< std::pair< double,double > >::iterator pos,std::vector< std::pair< double,double > >::size_type n,std::vector< std::pair< double,double > >::value_type const &x){ self->insert(pos, n, x); }
 
 #include <heinz/Complex.h>
+#include "Base/Axis/Frame.h"
+#include "Base/Axis/MakeScale.h"
+#include "Base/Const/Units.h"
 #include "Base/Types/ICloneable.h"
 #include "Base/Types/Span.h"
-#include "Base/Const/Units.h"
 #include "Base/Util/ThreadInfo.h"
-#include "Base/Axis/FixedBinAxis.h"
-#include "Base/Axis/Frame.h"
 #include "Base/Vector/RotMatrix.h"