diff --git a/GUI/View/Device/AxisForm.cpp b/GUI/View/Device/AxisForm.cpp
index f8f00cc27ea86b6f20c829b6906dac5679d66d26..d6149ac4ec6970b6d67de6acf7901e55c0df4839 100644
--- a/GUI/View/Device/AxisForm.cpp
+++ b/GUI/View/Device/AxisForm.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Device/AxisForm.h"
 #include "GUI/Model/Descriptor/AxisProperty.h"
 #include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
 #include <QFormLayout>
 
diff --git a/GUI/View/Device/BackgroundForm.cpp b/GUI/View/Device/BackgroundForm.cpp
index 9b469971103d4d16b5bccbc83068949b018b017b..75fce7ef1945041f74b5579a32af0dcd74f1ad85 100644
--- a/GUI/View/Device/BackgroundForm.cpp
+++ b/GUI/View/Device/BackgroundForm.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Sim/BackgroundItems.h"
 #include "GUI/Model/Sim/InstrumentItems.h"
 #include "GUI/View/Numeric/ComboUtil.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
 
 BackgroundForm::BackgroundForm(QWidget* parent, InstrumentItem* instrument)
diff --git a/GUI/View/Device/DetectorEditor.cpp b/GUI/View/Device/DetectorEditor.cpp
index bbb8b218e015115f9f86d8ff7cb3ab0c3fe66d57..e1295d3e67efb76f88dd0d49b23b068d62071c0a 100644
--- a/GUI/View/Device/DetectorEditor.cpp
+++ b/GUI/View/Device/DetectorEditor.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Model/Sim/InstrumentItems.h"
 #include "GUI/View/Device/SpanForm.h"
 #include "GUI/View/Numeric/ComboUtil.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
 #include "GUI/View/Numeric/SafeSpinBox.h"
 #include <QFormLayout>
diff --git a/GUI/View/Device/DistributionSelector.cpp b/GUI/View/Device/DistributionSelector.cpp
index 7f801e400e7a5ff22ab2800bc0b9b892a69ec395..5f6b1f40921d95d81c0531c03fb655a3afbb6359 100644
--- a/GUI/View/Device/DistributionSelector.cpp
+++ b/GUI/View/Device/DistributionSelector.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Model/Util/Backup.h"
 #include "GUI/View/Device/DistributionPlot.h"
 #include "GUI/View/Numeric/ComboUtil.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
 
 DistributionSelector::DistributionSelector(std::optional<MeanConfig> mean_config,
diff --git a/GUI/View/Device/FootprintForm.cpp b/GUI/View/Device/FootprintForm.cpp
index 5a0cdd90d6f7252a49c9ccb3a62f38806118f5ef..e518c2223b1c3c1aeb204220161d4cc96b8336f4 100644
--- a/GUI/View/Device/FootprintForm.cpp
+++ b/GUI/View/Device/FootprintForm.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Model/Beam/SourceItems.h"
 #include "GUI/Model/Sim/InstrumentItems.h"
 #include "GUI/View/Numeric/ComboUtil.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
 
 FootprintForm::FootprintForm(QWidget* parent, SourceItem* item)
diff --git a/GUI/View/Device/GISASBeamEditor.cpp b/GUI/View/Device/GISASBeamEditor.cpp
index d52d19f7c8a98ee88020ac79b00e9134b35141d2..505e815a16f302237787ab00d63695ead69b4744 100644
--- a/GUI/View/Device/GISASBeamEditor.cpp
+++ b/GUI/View/Device/GISASBeamEditor.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Model/Beam/SourceItems.h"
 #include "GUI/View/Device/DistributionEditor.h"
 #include "GUI/View/Device/FootprintForm.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include <QFormLayout>
 #include <QLineEdit>
 
diff --git a/GUI/View/Device/PolarizationAnalysisEditor.cpp b/GUI/View/Device/PolarizationAnalysisEditor.cpp
index 19b47366346190a5945a6e9492e4d02a7cd78423..0e97d6e6d30c66ce72a0845fd91f01a5ce7d77da 100644
--- a/GUI/View/Device/PolarizationAnalysisEditor.cpp
+++ b/GUI/View/Device/PolarizationAnalysisEditor.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Device/PolarizationAnalysisEditor.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Sim/InstrumentItems.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
 #include <QCheckBox>
 #include <QLabel>
diff --git a/GUI/View/Device/ScanEditor.cpp b/GUI/View/Device/ScanEditor.cpp
index 32aaa36c6e4e9a6e6b0070aa77b5d7c8028c4b96..65a2cdc9813a266926bf16447bc1782cf2ff7df9 100644
--- a/GUI/View/Device/ScanEditor.cpp
+++ b/GUI/View/Device/ScanEditor.cpp
@@ -23,7 +23,7 @@
 #include "GUI/View/Device/AlphaScanEditor.h"
 #include "GUI/View/Device/DistributionEditor.h"
 #include "GUI/View/Device/FootprintForm.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include <QFormLayout>
 #include <QLineEdit>
 
diff --git a/GUI/View/Device/SpanForm.cpp b/GUI/View/Device/SpanForm.cpp
index 26568807f94376e5ccd85dea803d1cc6c406d663..ec4de043b6194807bad6f1dbb9fe93aad43f6dc4 100644
--- a/GUI/View/Device/SpanForm.cpp
+++ b/GUI/View/Device/SpanForm.cpp
@@ -16,7 +16,7 @@
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Descriptor/SpanProperty.h"
 #include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
 #include <QFormLayout>
 
diff --git a/GUI/View/Material/MaterialEditorDialog.cpp b/GUI/View/Material/MaterialEditorDialog.cpp
index e4d03bb46dff91f0264f361c02df8cfba1ce0503..9c9e1ebe514f435a3449799a3b78af372017cad4 100644
--- a/GUI/View/Material/MaterialEditorDialog.cpp
+++ b/GUI/View/Material/MaterialEditorDialog.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Model/Sample/SampleItem.h"
 #include "GUI/View/Base/Fontsize.h"
 #include "GUI/View/Material/MaterialsQModel.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include "GUI/View/Setup/ActionFactory.h"
 #include "GUI/View/Widget/StyledToolbar.h"
 #include "GUI/View/Widget/WidgetSettings.h"
diff --git a/GUI/View/Numeric/DoubleSpinBox.cpp b/GUI/View/Numeric/DSpinBox.cpp
similarity index 97%
rename from GUI/View/Numeric/DoubleSpinBox.cpp
rename to GUI/View/Numeric/DSpinBox.cpp
index 04abe2d87dc8a15bf5a2b7b6f543c2883f335a32..4cf424b8b2982d156fc8958784a7e54d6b6dcfbd 100644
--- a/GUI/View/Numeric/DoubleSpinBox.cpp
+++ b/GUI/View/Numeric/DSpinBox.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Numeric/DoubleSpinBox.cpp
+//! @file      GUI/View/Numeric/DSpinBox.cpp
 //! @brief     Implements class DoubleSpinBox.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,11 +12,11 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Numeric/DoubleSpinBox.h"
 #include "Base/Math/Numeric.h"
 #include "Base/Util/Assert.h"
 #include "Base/Util/StringUtil.h"
 #include "GUI/Model/Descriptor/DoubleProperty.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include <QLineEdit>
 #include <QRegularExpression>
 #include <QWheelEvent>
diff --git a/GUI/View/Numeric/DoubleSpinBox.h b/GUI/View/Numeric/DSpinBox.h
similarity index 90%
rename from GUI/View/Numeric/DoubleSpinBox.h
rename to GUI/View/Numeric/DSpinBox.h
index 715cdb95a7a20d57cc0f46f8082a839e2389694b..8fbb6ddc79f59acf501cb1c2fd499dbfc4586c2f 100644
--- a/GUI/View/Numeric/DoubleSpinBox.h
+++ b/GUI/View/Numeric/DSpinBox.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Numeric/DoubleSpinBox.h
+//! @file      GUI/View/Numeric/DSpinBox.h
 //! @brief     Defines class DoubleSpinBox.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_NUMERIC_DOUBLESPINBOX_H
-#define BORNAGAIN_GUI_VIEW_NUMERIC_DOUBLESPINBOX_H
+#ifndef BORNAGAIN_GUI_VIEW_NUMERIC_DSPINBOX_H
+#define BORNAGAIN_GUI_VIEW_NUMERIC_DSPINBOX_H
 
 #include <QAbstractSpinBox>
 
@@ -54,4 +54,4 @@ private:
     double m_step;
 };
 
-#endif // BORNAGAIN_GUI_VIEW_NUMERIC_DOUBLESPINBOX_H
+#endif // BORNAGAIN_GUI_VIEW_NUMERIC_DSPINBOX_H
diff --git a/GUI/View/Numeric/NumWidgetUtil.cpp b/GUI/View/Numeric/NumWidgetUtil.cpp
index a91d79dd2d3f89336d0cc59fedad59ed4857f509..3a7fb9f11e43c5412b317b58d8a4566e40f35cce 100644
--- a/GUI/View/Numeric/NumWidgetUtil.cpp
+++ b/GUI/View/Numeric/NumWidgetUtil.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Numeric/NumWidgetUtil.h"
 #include "GUI/Model/Descriptor/DoubleProperty.h"
 #include "GUI/View/Base/CustomEventFilters.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include <QLabel>
 #include <QLineEdit>
 
diff --git a/GUI/View/Sample/HeinzFormLayout.cpp b/GUI/View/Sample/HeinzFormLayout.cpp
index 686ebfbe95e41162fcddfbc08f6c23b8b1d248c8..48913ee5eb664029eae1fc09f83e5c5d7dcdf61a 100644
--- a/GUI/View/Sample/HeinzFormLayout.cpp
+++ b/GUI/View/Sample/HeinzFormLayout.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Sample/HeinzFormLayout.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Descriptor/VectorProperty.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include "GUI/View/Sample/LayerEditorUtil.h"
 #include "GUI/View/Sample/SampleEditorController.h"
 #include "GUI/View/Widget/GroupBoxes.h"
diff --git a/GUI/View/Sample/LayerEditorUtil.cpp b/GUI/View/Sample/LayerEditorUtil.cpp
index 71eb73f463ef67539d9a5e9b92df0bbe74e61aa3..7881ce00d5752f41bd7668fab6f72d0fda2e21be 100644
--- a/GUI/View/Sample/LayerEditorUtil.cpp
+++ b/GUI/View/Sample/LayerEditorUtil.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Model/Sample/CoreAndShellItem.h"
 #include "GUI/Model/Sample/MesocrystalItem.h"
 #include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include "GUI/View/Sample/CompoundForm.h"
 #include "GUI/View/Sample/CoreAndShellForm.h"
 #include "GUI/View/Sample/MesocrystalForm.h"
diff --git a/GUI/View/Sample/MaterialInplaceForm.cpp b/GUI/View/Sample/MaterialInplaceForm.cpp
index 42a9dd63c25e6278b56a327874ace28dbb7d9a27..d5a741e86964ae06d7e03c24acb481cf403d0d75 100644
--- a/GUI/View/Sample/MaterialInplaceForm.cpp
+++ b/GUI/View/Sample/MaterialInplaceForm.cpp
@@ -22,7 +22,7 @@
 #include "GUI/Model/Util/Backup.h"
 #include "GUI/View/Base/LayoutUtil.h"
 #include "GUI/View/Material/MaterialEditorDialog.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include "GUI/View/Sample/LayerEditorUtil.h"
 #include "GUI/View/Sample/SampleEditorController.h"
 #include "GUI/View/Sample/SampleForm.h"
diff --git a/GUI/View/Sample/ParticleLayoutForm.cpp b/GUI/View/Sample/ParticleLayoutForm.cpp
index e7164e88b45c6883db0707f22a736514bb550a62..414daab3a5b4049fd7ceb5a3c4f3476deee940d7 100644
--- a/GUI/View/Sample/ParticleLayoutForm.cpp
+++ b/GUI/View/Sample/ParticleLayoutForm.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Model/Sample/LayerItem.h"
 #include "GUI/Model/Sample/ParticleLayoutItem.h"
 #include "GUI/View/Base/ActionFactory.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include "GUI/View/Sample/HeinzFormLayout.h"
 #include "GUI/View/Sample/InterferenceForm.h"
 #include "GUI/View/Sample/LayerEditorUtil.h"
diff --git a/GUI/View/Setup/AxisPanel.cpp b/GUI/View/Setup/AxisPanel.cpp
index fb615bc37d9b812e66766754b2b79e05c6b0346c..540698c16c81952e94c07519bc014d991eb8c4fc 100644
--- a/GUI/View/Setup/AxisPanel.cpp
+++ b/GUI/View/Setup/AxisPanel.cpp
@@ -24,7 +24,7 @@
 #include "GUI/Model/Project/DataSource.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Base/LayoutUtil.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
 #include "GUI/View/Widget/GroupBoxes.h"
 #include <QAction>
diff --git a/GUI/View/Setup/MasksPanel.cpp b/GUI/View/Setup/MasksPanel.cpp
index ce60b7492f1b44f5dc67961fbca296e8559e159f..1275a06b6389bbe414a717cf5cd9a2c31f032985 100644
--- a/GUI/View/Setup/MasksPanel.cpp
+++ b/GUI/View/Setup/MasksPanel.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Base/LayoutUtil.h"
 #include "GUI/View/Modelview/SetView.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
+#include "GUI/View/Numeric/DSpinBox.h"
 #include "GUI/View/Widget/GroupBoxes.h"
 #include <QCheckBox>
 #include <QLineEdit>