diff --git a/Core/Fitting/SimDataPair.cpp b/Core/Fitting/SimDataPair.cpp
index f6ab295de6a02a47f90d6b46d24930a123cdbad0..29f50b8548d98e857489d999cf80ec67bdb3b4ca 100644
--- a/Core/Fitting/SimDataPair.cpp
+++ b/Core/Fitting/SimDataPair.cpp
@@ -15,7 +15,7 @@
#include "Core/Fitting/SimDataPair.h"
#include "Base/Math/Numeric.h"
#include "Core/Scan/UnitConverter1D.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Core/Simulation/includeSimulations.h"
#include "Device/Data/DataUtils.h"
diff --git a/Core/Simulation/DepthProbeSimulation.cpp b/Core/Simulation/DepthProbeSimulation.cpp
index b23198d758802a0a58d79c9493d5286c32ee39c4..535814835cdb2f5ece61d050936e3d310ebf48cd 100644
--- a/Core/Simulation/DepthProbeSimulation.cpp
+++ b/Core/Simulation/DepthProbeSimulation.cpp
@@ -16,7 +16,7 @@
#include "Core/Computation/DepthProbeComputation.h"
#include "Core/Computation/IBackground.h"
#include "Device/Beam/IFootprintFactor.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Device/Detector/SpecularDetector1D.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
diff --git a/Core/Simulation/GISASSimulation.cpp b/Core/Simulation/GISASSimulation.cpp
index b97a1056f61f2f314786e2c56f1534b7745981c3..fa98019d9af8cb2ffc9804216dfefc42559a2ae8 100644
--- a/Core/Simulation/GISASSimulation.cpp
+++ b/Core/Simulation/GISASSimulation.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Core/Simulation/GISASSimulation.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Sample/SampleBuilderEngine/ISampleBuilder.h"
GISASSimulation::GISASSimulation(const Beam& beam, const MultiLayer& sample,
diff --git a/Core/Simulation/OffSpecularSimulation.cpp b/Core/Simulation/OffSpecularSimulation.cpp
index f9b002bf15a49dfc00688137919cc7af609c0984..ff8fe0d03dbcca208c508e57e34a1212da947e7c 100644
--- a/Core/Simulation/OffSpecularSimulation.cpp
+++ b/Core/Simulation/OffSpecularSimulation.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Core/Simulation/OffSpecularSimulation.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Param/Base/ParameterPool.h"
#include "Param/Base/RealParameter.h"
#include "Param/Distrib/Distributions.h"
diff --git a/Device/Detector/SimpleUnitConverters.cpp b/Device/Detector/UnitConverter2D.cpp
similarity index 99%
rename from Device/Detector/SimpleUnitConverters.cpp
rename to Device/Detector/UnitConverter2D.cpp
index 10e08f5f967a7472ef337e3a219cb5c8e94612a9..411dead2e0967926c367d5430ef9b53a25f8a36c 100644
--- a/Device/Detector/SimpleUnitConverters.cpp
+++ b/Device/Detector/UnitConverter2D.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Device/Detector/SimpleUnitConverters.cpp
+//! @file Device/Detector/UnitConverter2D.cpp
//! @brief Implements IUnitConverter classes.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Base/Const/Units.h"
#include "Base/Math/Constants.h"
#include "Base/Pixel/RectangularPixel.h"
diff --git a/Device/Detector/SimpleUnitConverters.h b/Device/Detector/UnitConverter2D.h
similarity index 99%
rename from Device/Detector/SimpleUnitConverters.h
rename to Device/Detector/UnitConverter2D.h
index b2f52e59eda679fb1a346406ec5e90fbf1b1ec83..0e47eb9935c30c00bb1406b4fc3f76c01e4898d5 100644
--- a/Device/Detector/SimpleUnitConverters.h
+++ b/Device/Detector/UnitConverter2D.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Device/Detector/SimpleUnitConverters.h
+//! @file Device/Detector/UnitConverter2D.h
//! @brief Defines interface UnitConverterSimple and its subclasses.
//!
//! @homepage http://www.bornagainproject.org
diff --git a/GUI/coregui/Models/DepthProbeInstrumentItem.cpp b/GUI/coregui/Models/DepthProbeInstrumentItem.cpp
index 9cb127634dc38ab39113d3b1481f5f32d4d77095..1c6f5399e44fb4c1b8759e9108a38f06a5df5ac5 100644
--- a/GUI/coregui/Models/DepthProbeInstrumentItem.cpp
+++ b/GUI/coregui/Models/DepthProbeInstrumentItem.cpp
@@ -15,7 +15,7 @@
#include "GUI/coregui/Models/DepthProbeInstrumentItem.h"
#include "Base/Const/Units.h"
#include "Core/Simulation/DepthProbeSimulation.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/BeamItems.h"
#include "GUI/coregui/Models/BeamWavelengthItem.h"
diff --git a/GUI/coregui/Models/DomainObjectBuilder.cpp b/GUI/coregui/Models/DomainObjectBuilder.cpp
index 91946b33fc72d1acecbce8412469b1c166594f51..0b548a24d8921229e69e29e9e5a12c447de3da9d 100644
--- a/GUI/coregui/Models/DomainObjectBuilder.cpp
+++ b/GUI/coregui/Models/DomainObjectBuilder.cpp
@@ -16,7 +16,7 @@
#include "Base/Const/Units.h"
#include "Core/Scan/UnitConverter1D.h"
#include "Device/Detector/IDetector2D.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "GUI/coregui/Models/AxesItems.h"
#include "GUI/coregui/Models/ComboProperty.h"
#include "GUI/coregui/Models/DepthProbeInstrumentItem.h"
diff --git a/Tests/UnitTests/Core/Core/DepthProbeConverterTest.cpp b/Tests/UnitTests/Core/Core/DepthProbeConverterTest.cpp
index b7b0653beabe8c0772093443d285951126235721..ae0bcd7a710f7c247ca05b425e21df7afde3f696 100644
--- a/Tests/UnitTests/Core/Core/DepthProbeConverterTest.cpp
+++ b/Tests/UnitTests/Core/Core/DepthProbeConverterTest.cpp
@@ -2,7 +2,7 @@
#include "Base/Const/Units.h"
#include "Base/Math/Constants.h"
#include "Device/Beam/Beam.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Tests/GTestWrapper/google_test.h"
class DepthProbeConverterTest : public ::testing::Test {
diff --git a/Tests/UnitTests/Core/Instrument/OffSpecularConverterTest.cpp b/Tests/UnitTests/Core/Instrument/OffSpecularConverterTest.cpp
index 7cc188c596325dfddc81d5c4d034f57fddc6e133..00981acf6264522a20b8695f62d37c072096891a 100644
--- a/Tests/UnitTests/Core/Instrument/OffSpecularConverterTest.cpp
+++ b/Tests/UnitTests/Core/Instrument/OffSpecularConverterTest.cpp
@@ -1,6 +1,6 @@
#include "Base/Const/Units.h"
#include "Device/Beam/Beam.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Device/Detector/SphericalDetector.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/UnitTests/Core/Instrument/RectangularConverterTest.cpp b/Tests/UnitTests/Core/Instrument/RectangularConverterTest.cpp
index 9e30d02554e4a7ff170848de320952dc57c5045d..0f7aca1215d635fb70ee780ffa0b8879c807fff6 100644
--- a/Tests/UnitTests/Core/Instrument/RectangularConverterTest.cpp
+++ b/Tests/UnitTests/Core/Instrument/RectangularConverterTest.cpp
@@ -1,7 +1,7 @@
#include "Base/Const/Units.h"
#include "Device/Beam/Beam.h"
#include "Device/Detector/RectangularDetector.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Tests/GTestWrapper/google_test.h"
#include <cmath>
diff --git a/Tests/UnitTests/Core/Instrument/SphericalConverterTest.cpp b/Tests/UnitTests/Core/Instrument/SphericalConverterTest.cpp
index a849606e3172b0e6e8ecdb53575c250f7e1867c5..0823271f580e6b86a73825a7ecf21bbc6733a655 100644
--- a/Tests/UnitTests/Core/Instrument/SphericalConverterTest.cpp
+++ b/Tests/UnitTests/Core/Instrument/SphericalConverterTest.cpp
@@ -1,6 +1,6 @@
#include "Base/Const/Units.h"
#include "Device/Beam/Beam.h"
-#include "Device/Detector/SimpleUnitConverters.h"
+#include "Device/Detector/UnitConverter2D.h"
#include "Device/Detector/SphericalDetector.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i
index e6e275b5b8d84121123c1763a736d30e217a379d..2d46df823e663944afd8625b93c9e953a84c2c1a 100644
--- a/auto/Wrap/doxygenDevice.i
+++ b/auto/Wrap/doxygenDevice.i
@@ -224,7 +224,7 @@ C++ includes: CumulativeValue.h
DepthProbeConverter class handles the unit translations for depth probe simulations Its default units are radians for x-axis and nm for y-axis
-C++ includes: SimpleUnitConverters.h
+C++ includes: UnitConverter2D.h
";
%feature("docstring") DepthProbeConverter::DepthProbeConverter "DepthProbeConverter::DepthProbeConverter(const Beam &beam, const IAxis &alpha_axis, const IAxis &z_axis)
@@ -1456,7 +1456,7 @@ Returns true if area defined by two bins is inside or on border of polygon (more
Interface to provide axis translations to different units for simulation output.
Child classes are currently declared in
- Device/Detector/SimpleUnitConverters.h,
+Device/Detector/SimpleUnitConverters.h,
Core/Scan/UnitConverter1D.h.
@@ -1582,7 +1582,7 @@ C++ includes: LLData.h
IUnitConverter class that handles the unit translations for off-specular simulations with a spherical detector Its default units are radians for both axes
-C++ includes: SimpleUnitConverters.h
+C++ includes: UnitConverter2D.h
";
%feature("docstring") OffSpecularConverter::OffSpecularConverter "OffSpecularConverter::OffSpecularConverter(const IDetector2D &detector, const Beam &beam, const IAxis &alpha_axis)
@@ -2146,7 +2146,7 @@ Returns true if area defined by two bins is inside or on border of polygon (more
IUnitConverter class that handles the unit translations for rectangular detectors Its default units are mm for both axes
-C++ includes: SimpleUnitConverters.h
+C++ includes: UnitConverter2D.h
";
%feature("docstring") RectangularConverter::RectangularConverter "RectangularConverter::RectangularConverter(const RectangularDetector &detector, const Beam &beam)
@@ -2588,7 +2588,7 @@ Return default axes units.
IUnitConverter class that handles the unit translations for spherical detectors Its default units are radians for both axes
-C++ includes: SimpleUnitConverters.h
+C++ includes: UnitConverter2D.h
";
%feature("docstring") SphericalConverter::SphericalConverter "SphericalConverter::SphericalConverter(const SphericalDetector &detector, const Beam &beam)
@@ -2689,7 +2689,7 @@ return default axes units
Interface for objects that provide axis translations to different units for IDetector objects
-C++ includes: SimpleUnitConverters.h
+C++ includes: UnitConverter2D.h
";
%feature("docstring") UnitConverterSimple::UnitConverterSimple "UnitConverterSimple::UnitConverterSimple(const Beam &beam)
@@ -2759,7 +2759,7 @@ Returns true if area defined by two bins is inside or on border of polygon (more
// File: namespace_0d11.xml
-// File: namespace_0d28.xml
+// File: namespace_0d36.xml
// File: namespace_0d51.xml
@@ -3040,12 +3040,6 @@ make Swappable
// File: RectangularDetector_8h.xml
-// File: SimpleUnitConverters_8cpp.xml
-
-
-// File: SimpleUnitConverters_8h.xml
-
-
// File: SimulationArea_8cpp.xml
@@ -3070,6 +3064,12 @@ make Swappable
// File: SphericalDetector_8h.xml
+// File: UnitConverter2D_8cpp.xml
+
+
+// File: UnitConverter2D_8h.xml
+
+
// File: Histogram1D_8cpp.xml