From aa7414f2e2f9c89956499e6993c8ce4727c0346a Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Fri, 7 Apr 2023 15:42:28 +0200
Subject: [PATCH] unify file names -> Util.h
---
Base/Py/PyFmt.cpp | 2 +-
Base/Py/{PyUtils.h => PyUtil.h} | 8 ++++----
Base/Py/PyUtils.cpp | 4 ++--
Base/Util/{FileSystemUtils.h => FileSystemUtil.h} | 8 ++++----
Base/Util/FileSystemUtils.cpp | 4 ++--
Base/Util/{StringUtils.h => StringUtil.h} | 8 ++++----
Base/Util/StringUtils.cpp | 2 +-
Base/Util/{SysUtils.h => SysUtil.h} | 8 ++++----
Base/Util/SysUtils.cpp | 2 +-
Device/Data/{ArrayUtils.h => ArrayUtil.h} | 8 ++++----
Device/Data/ArrayUtils.cpp | 2 +-
Device/Data/{DataUtils.h => DataUtil.h} | 8 ++++----
Device/Data/DataUtils.cpp | 4 ++--
Device/IO/{DataFormatUtils.h => DataFormatUtil.h} | 8 ++++----
Device/IO/DataFormatUtils.cpp | 6 +++---
Device/IO/IOFactory.cpp | 4 ++--
Device/IO/ReadReflectometry.cpp | 4 ++--
Device/IO/ReadWriteINT.cpp | 6 +++---
Device/IO/ReadWriteNicos.cpp | 2 +-
Device/IO/ReadWriteNumpyTXT.cpp | 6 +++---
Device/IO/ReadWriteTiff.cpp | 2 +-
Fit/Adapter/GSLLevenbergMarquardtMinimizer.cpp | 4 ++--
Fit/Adapter/GSLMultiMinimizer.cpp | 2 +-
Fit/Adapter/MinimizerAdapter.cpp | 2 +-
Fit/Adapter/Minuit2Minimizer.cpp | 2 +-
Fit/Adapter/Report.cpp | 2 +-
Fit/Minimizer/MinimizerCatalog.cpp | 2 +-
Fit/Minimizer/MinimizerOptions.cpp | 2 +-
Fit/Minimizer/MinimizerResult.cpp | 2 +-
Fit/Tools/{MinimizerUtils.h => MinimizerUtil.h} | 8 ++++----
Fit/Tools/MinimizerUtils.cpp | 2 +-
Fit/Tools/{StringUtils.h => StringUtil.h} | 8 ++++----
Fit/Tools/StringUtils.cpp | 2 +-
GUI/Model/Data/IntensityDataItem.cpp | 2 +-
GUI/Model/Data/{JobItemUtils.h => JobItemUtil.h} | 8 ++++----
GUI/Model/Data/JobItemUtils.cpp | 2 +-
GUI/Model/Data/RealItem.cpp | 6 +++---
GUI/Model/Data/SpecularDataItem.cpp | 2 +-
GUI/Model/FromCore/ItemizeSample.cpp | 2 +-
GUI/Model/Job/JobItem.cpp | 4 ++--
GUI/Model/Job/MinimizerItem.cpp | 2 +-
GUI/Model/Model/JobModel.cpp | 2 +-
.../Model/{ParameterTreeUtils.h => ParameterTreeUtil.h} | 8 ++++----
GUI/Model/Model/ParameterTreeUtils.cpp | 2 +-
GUI/Model/Project/ProjectDocument.cpp | 2 +-
.../IO/{ItemFileNameUtils.h => ItemFileNameUtil.h} | 8 ++++----
GUI/Support/IO/ItemFileNameUtils.cpp | 2 +-
GUI/Support/IO/{ProjectUtils.h => ProjectUtil.h} | 8 ++++----
GUI/Support/IO/ProjectUtils.cpp | 2 +-
GUI/Support/Util/DesignerHelper.cpp | 2 +-
GUI/Support/Util/QCP_Util.cpp | 2 +-
GUI/Support/Util/{StyleUtils.h => StyleUtil.h} | 8 ++++----
GUI/Support/Util/StyleUtils.cpp | 2 +-
GUI/View/Common/IntensityDataPropertyWidget.cpp | 4 ++--
GUI/View/Device/AxisPropertyForm.cpp | 2 +-
GUI/View/Device/BackgroundForm.cpp | 2 +-
GUI/View/Device/DetectorAlignmentForm.cpp | 2 +-
GUI/View/Device/FootprintForm.cpp | 2 +-
GUI/View/Device/ResolutionForm.cpp | 2 +-
GUI/View/Fit/MinimizerSettingsWidget.cpp | 4 ++--
GUI/View/Import/{ImportDataUtils.h => ImportDataUtil.h} | 8 ++++----
GUI/View/Import/ImportDataUtils.cpp | 4 ++--
GUI/View/Import/RealDataSelectorWidget.cpp | 2 +-
GUI/View/Info/OverlayLabelWidget.cpp | 2 +-
GUI/View/Instrument/DetectorEditor.cpp | 2 +-
GUI/View/Instrument/DistributionEditor.cpp | 2 +-
GUI/View/Instrument/InstrumentLibraryEditor.cpp | 2 +-
GUI/View/Instrument/PolarizationAnalysisEditor.cpp | 2 +-
GUI/View/Main/ActionManager.cpp | 2 +-
GUI/View/Mask/MaskEditorPropertyPanel.cpp | 2 +-
GUI/View/MaterialEditor/MaterialEditorDialog.cpp | 2 +-
GUI/View/Numeric/{NumWidgetUtils.h => NumWidgetUtil.h} | 8 ++++----
GUI/View/Numeric/NumWidgetUtils.cpp | 2 +-
GUI/View/Plot2D/IntensityDataFFTPresenter.cpp | 2 +-
GUI/View/PlotComparison/FitComparisonWidget.cpp | 2 +-
GUI/View/PlotComparison/FitComparisonWidget1D.cpp | 2 +-
GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp | 4 ++--
GUI/View/PlotUtil/ColorMap.cpp | 2 +-
GUI/View/PlotUtil/PlotConstants.h | 2 +-
GUI/View/PlotUtil/{RangeUtils.h => RangeUtil.h} | 8 ++++----
GUI/View/PlotUtil/RangeUtils.cpp | 4 ++--
GUI/View/PlotUtil/StatusLabel.cpp | 2 +-
GUI/View/Project/AutosaveController.cpp | 2 +-
GUI/View/Project/NewProjectDialog.cpp | 2 +-
GUI/View/Project/ProjectManager.cpp | 2 +-
GUI/View/Project/PyImportAssistant.cpp | 4 ++--
GUI/View/Projection/ProjectionsPlot.cpp | 2 +-
GUI/View/SampleDesigner/CompoundForm.cpp | 2 +-
GUI/View/SampleDesigner/FormLayouter.cpp | 2 +-
GUI/View/SampleDesigner/InterferenceForm.cpp | 2 +-
.../{LayerEditorUtils.h => LayerEditorUtil.h} | 8 ++++----
GUI/View/SampleDesigner/LayerEditorUtils.cpp | 2 +-
GUI/View/SampleDesigner/LayerForm.cpp | 2 +-
GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp | 2 +-
GUI/View/SampleDesigner/MaterialInplaceForm.cpp | 4 ++--
GUI/View/SampleDesigner/ParticleLayoutForm.cpp | 2 +-
GUI/View/SampleDesigner/SampleListView.cpp | 2 +-
GUI/View/SampleDesigner/SelectionContainerForm.h | 4 ++--
GUI/View/SampleView/RealspaceBuilder.cpp | 2 +-
GUI/View/Tool/{LayoutUtils.h => LayoutUtil.h} | 8 ++++----
GUI/View/Tool/LayoutUtils.cpp | 2 +-
GUI/View/Toplevel/ProjectsView.cpp | 2 +-
GUI/View/Toplevel/PythonScriptWidget.cpp | 2 +-
Img3D/Build/{BuilderUtils.h => BuilderUtil.h} | 8 ++++----
Img3D/Build/BuilderUtils.cpp | 2 +-
Param/Node/INode.cpp | 2 +-
Param/Node/{NodeUtils.h => NodeUtil.h} | 8 ++++----
Resample/Processed/ReSample.cpp | 4 ++--
Resample/Processed/Slicer.cpp | 2 +-
Resample/Slice/Slice.cpp | 2 +-
Sample/Aggregate/ParticleLayout.cpp | 2 +-
Sample/Material/IMaterialImpl.cpp | 2 +-
Sample/Material/MaterialFactoryFuncs.cpp | 2 +-
Sample/Material/{MaterialUtils.h => MaterialUtil.h} | 8 ++++----
Sample/Material/MaterialUtils.cpp | 2 +-
Sample/Multilayer/Layer.cpp | 2 +-
Sample/Multilayer/MultiLayer.cpp | 4 ++--
Sample/Multilayer/{MultilayerUtils.h => MultilayerUtil.h} | 8 ++++----
Sample/Multilayer/MultilayerUtils.cpp | 2 +-
Sample/Multilayer/PyImport.cpp | 2 +-
Sample/Particle/IFormFactor.cpp | 2 +-
Sim/Export/PyFmt2.cpp | 2 +-
Sim/Export/SampleToPython.cpp | 2 +-
Sim/Export/SimulationToPython.cpp | 2 +-
Sim/Fitting/FitObjective.cpp | 2 +-
Sim/Fitting/FitObjective.h | 2 +-
Sim/Fitting/FitPrintService.cpp | 2 +-
Sim/Fitting/ObjectiveMetric.cpp | 2 +-
.../{ObjectiveMetricUtils.h => ObjectiveMetricUtil.h} | 8 ++++----
Sim/Fitting/ObjectiveMetricUtils.cpp | 2 +-
Sim/Simulation/ISimulation.cpp | 2 +-
Tests/Functional/Consistence/CompareTwoReferences.cpp | 2 +-
Tests/Functional/CoreSpecial/CoreIOPathTest.cpp | 2 +-
.../Functional/CoreSpecial/FourierTransformationTest.cpp | 4 ++--
Tests/Suite/GUI/Check.cpp | 2 +-
Tests/Suite/Persist/Check.cpp | 2 +-
Tests/Suite/Py/Check.cpp | 2 +-
Tests/Unit/Base/FileSystemUtilsTest.cpp | 2 +-
Tests/Unit/Base/StringUtilsTest.cpp | 2 +-
Tests/Unit/Device/ArrayUtilsTest.cpp | 2 +-
Tests/Unit/Device/FixedBinAxisTest.cpp | 2 +-
Tests/Unit/Device/IntensityDataFunctionsTest.cpp | 2 +-
Tests/Unit/Device/PointwiseAxisTest.cpp | 2 +-
Tests/Unit/Device/PowerfieldTest.cpp | 2 +-
Tests/Unit/Device/SpectrumTest.cpp | 2 +-
Tests/Unit/Device/VariableBinAxisTest.cpp | 2 +-
Tests/Unit/GUI/TestAutosaveController.cpp | 4 ++--
Tests/Unit/GUI/TestDataItems.cpp | 2 +-
Tests/Unit/GUI/TestLinkInstrument.cpp | 2 +-
Tests/Unit/GUI/TestProjectDocument.cpp | 4 ++--
Tests/Unit/GUI/TestProjectUtils.cpp | 4 ++--
Tests/Unit/GUI/Utils.cpp | 2 +-
Tests/Unit/PyBinding/Embedded.cpp | 2 +-
Tests/Unit/PyBinding/PyInfo.cpp | 2 +-
Tests/Unit/Resample/MaterialTest.cpp | 2 +-
Tests/Unit/Sample/MultiLayerTest.cpp | 2 +-
Tests/Unit/Sim/ObjectiveMetricTest.cpp | 2 +-
Tests/Unit/Sim/ParticleLayoutTest.cpp | 2 +-
Wrap/Swig/libBornAgainDevice.i | 6 +++---
auto/Wrap/libBornAgainDevice_wrap.cpp | 2 +-
160 files changed, 263 insertions(+), 263 deletions(-)
rename Base/Py/{PyUtils.h => PyUtil.h} (92%)
rename Base/Util/{FileSystemUtils.h => FileSystemUtil.h} (93%)
rename Base/Util/{StringUtils.h => StringUtil.h} (94%)
rename Base/Util/{SysUtils.h => SysUtil.h} (84%)
rename Device/Data/{ArrayUtils.h => ArrayUtil.h} (88%)
rename Device/Data/{DataUtils.h => DataUtil.h} (92%)
rename Device/IO/{DataFormatUtils.h => DataFormatUtil.h} (90%)
rename Fit/Tools/{MinimizerUtils.h => MinimizerUtil.h} (86%)
rename Fit/Tools/{StringUtils.h => StringUtil.h} (88%)
rename GUI/Model/Data/{JobItemUtils.h => JobItemUtil.h} (89%)
rename GUI/Model/Model/{ParameterTreeUtils.h => ParameterTreeUtil.h} (93%)
rename GUI/Support/IO/{ItemFileNameUtils.h => ItemFileNameUtil.h} (83%)
rename GUI/Support/IO/{ProjectUtils.h => ProjectUtil.h} (90%)
rename GUI/Support/Util/{StyleUtils.h => StyleUtil.h} (87%)
rename GUI/View/Import/{ImportDataUtils.h => ImportDataUtil.h} (88%)
rename GUI/View/Numeric/{NumWidgetUtils.h => NumWidgetUtil.h} (97%)
rename GUI/View/PlotUtil/{RangeUtils.h => RangeUtil.h} (91%)
rename GUI/View/SampleDesigner/{LayerEditorUtils.h => LayerEditorUtil.h} (93%)
rename GUI/View/Tool/{LayoutUtils.h => LayoutUtil.h} (88%)
rename Img3D/Build/{BuilderUtils.h => BuilderUtil.h} (92%)
rename Param/Node/{NodeUtils.h => NodeUtil.h} (91%)
rename Sample/Material/{MaterialUtils.h => MaterialUtil.h} (91%)
rename Sample/Multilayer/{MultilayerUtils.h => MultilayerUtil.h} (83%)
rename Sim/Fitting/{ObjectiveMetricUtils.h => ObjectiveMetricUtil.h} (89%)
diff --git a/Base/Py/PyFmt.cpp b/Base/Py/PyFmt.cpp
index d97604d8fae..678c13ea79a 100644
--- a/Base/Py/PyFmt.cpp
+++ b/Base/Py/PyFmt.cpp
@@ -16,7 +16,7 @@
#include "Base/Const/Units.h" // printDegrees
#include "Base/Math/Constants.h"
#include "Base/Util/Algorithms.h"
-#include "Base/Util/StringUtils.h"
+#include "Base/Util/StringUtil.h"
#include <iomanip>
namespace Py::Fmt {
diff --git a/Base/Py/PyUtils.h b/Base/Py/PyUtil.h
similarity index 92%
rename from Base/Py/PyUtils.h
rename to Base/Py/PyUtil.h
index 087598d37e7..07343351d33 100644
--- a/Base/Py/PyUtils.h
+++ b/Base/Py/PyUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Base/Py/PyUtils.h
+//! @file Base/Py/PyUtil.h
//! @brief Defines PyUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_BASE_PY_PYUTILS_H
-#define BORNAGAIN_BASE_PY_PYUTILS_H
+#ifndef BORNAGAIN_BASE_PY_PYUTIL_H
+#define BORNAGAIN_BASE_PY_PYUTIL_H
#ifdef BORNAGAIN_PYTHON
@@ -54,4 +54,4 @@ PyObject* createNumpyArray(const std::vector<double>& data);
#endif // BORNAGAIN_PYTHON
-#endif // BORNAGAIN_BASE_PY_PYUTILS_H
+#endif // BORNAGAIN_BASE_PY_PYUTIL_H
diff --git a/Base/Py/PyUtils.cpp b/Base/Py/PyUtils.cpp
index d75c5e45c63..94a803ad6be 100644
--- a/Base/Py/PyUtils.cpp
+++ b/Base/Py/PyUtils.cpp
@@ -14,10 +14,10 @@
#ifdef BORNAGAIN_PYTHON
-#include "Base/Py/PyUtils.h"
+#include "Base/Py/PyUtil.h"
#include "Base/Py/PyCore.h"
#include "Base/Util/Assert.h"
-#include "Base/Util/SysUtils.h"
+#include "Base/Util/SysUtil.h"
#include <iostream>
#include <sstream>
#include <stdexcept>
diff --git a/Base/Util/FileSystemUtils.h b/Base/Util/FileSystemUtil.h
similarity index 93%
rename from Base/Util/FileSystemUtils.h
rename to Base/Util/FileSystemUtil.h
index f2594e95c3b..aac662e9fb7 100644
--- a/Base/Util/FileSystemUtils.h
+++ b/Base/Util/FileSystemUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Base/Util/FileSystemUtils.h
+//! @file Base/Util/FileSystemUtil.h
//! @brief Defines namespace FileSystemUtils.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_BASE_UTIL_FILESYSTEMUTILS_H
-#define BORNAGAIN_BASE_UTIL_FILESYSTEMUTILS_H
+#ifndef BORNAGAIN_BASE_UTIL_FILESYSTEMUTIL_H
+#define BORNAGAIN_BASE_UTIL_FILESYSTEMUTIL_H
#include <string>
#include <vector>
@@ -67,4 +67,4 @@ bool IsFileExists(const std::string& path);
} // namespace BaseUtils::Filesystem
-#endif // BORNAGAIN_BASE_UTIL_FILESYSTEMUTILS_H
+#endif // BORNAGAIN_BASE_UTIL_FILESYSTEMUTIL_H
diff --git a/Base/Util/FileSystemUtils.cpp b/Base/Util/FileSystemUtils.cpp
index 18f84dba60e..b4424f62846 100644
--- a/Base/Util/FileSystemUtils.cpp
+++ b/Base/Util/FileSystemUtils.cpp
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "Base/Util/FileSystemUtils.h"
+#include "Base/Util/FileSystemUtil.h"
#include "Base/Util/Assert.h"
-#include "Base/Util/StringUtils.h"
+#include "Base/Util/StringUtil.h"
#include <codecvt> //
#include <filesystem>
#include <locale>
diff --git a/Base/Util/StringUtils.h b/Base/Util/StringUtil.h
similarity index 94%
rename from Base/Util/StringUtils.h
rename to Base/Util/StringUtil.h
index 60cd1bebf14..a6adc2b7a26 100644
--- a/Base/Util/StringUtils.h
+++ b/Base/Util/StringUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Base/Util/StringUtils.h
+//! @file Base/Util/StringUtil.h
//! @brief Defines a few helper functions
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_BASE_UTIL_STRINGUTILS_H
-#define BORNAGAIN_BASE_UTIL_STRINGUTILS_H
+#ifndef BORNAGAIN_BASE_UTIL_STRINGUTIL_H
+#define BORNAGAIN_BASE_UTIL_STRINGUTIL_H
#include <iomanip>
#include <sstream>
@@ -77,4 +77,4 @@ std::string BaseUtils::String::scientific(const T value, int n)
return out.str();
}
-#endif // BORNAGAIN_BASE_UTIL_STRINGUTILS_H
+#endif // BORNAGAIN_BASE_UTIL_STRINGUTIL_H
diff --git a/Base/Util/StringUtils.cpp b/Base/Util/StringUtils.cpp
index 2e87133d0ad..880adb98384 100644
--- a/Base/Util/StringUtils.cpp
+++ b/Base/Util/StringUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Base/Util/StringUtils.h"
+#include "Base/Util/StringUtil.h"
#include <boost/algorithm/string.hpp>
#include <charconv>
#include <regex>
diff --git a/Base/Util/SysUtils.h b/Base/Util/SysUtil.h
similarity index 84%
rename from Base/Util/SysUtils.h
rename to Base/Util/SysUtil.h
index b37181e65cc..9025521d992 100644
--- a/Base/Util/SysUtils.h
+++ b/Base/Util/SysUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Base/Util/SysUtils.h
+//! @file Base/Util/SysUtil.h
//! @brief Defines various stuff in namespace Utils.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_BASE_UTIL_SYSUTILS_H
-#define BORNAGAIN_BASE_UTIL_SYSUTILS_H
+#ifndef BORNAGAIN_BASE_UTIL_SYSUTIL_H
+#define BORNAGAIN_BASE_UTIL_SYSUTIL_H
#include <string>
@@ -31,4 +31,4 @@ std::string getenv(const std::string& name);
} // namespace BaseUtils::System
-#endif // BORNAGAIN_BASE_UTIL_SYSUTILS_H
+#endif // BORNAGAIN_BASE_UTIL_SYSUTIL_H
diff --git a/Base/Util/SysUtils.cpp b/Base/Util/SysUtils.cpp
index b00556d6337..3c4eea0f57f 100644
--- a/Base/Util/SysUtils.cpp
+++ b/Base/Util/SysUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Base/Util/SysUtils.h"
+#include "Base/Util/SysUtil.h"
#include <chrono>
#include <iomanip>
#include <iostream>
diff --git a/Device/Data/ArrayUtils.h b/Device/Data/ArrayUtil.h
similarity index 88%
rename from Device/Data/ArrayUtils.h
rename to Device/Data/ArrayUtil.h
index 0220ed5a000..67dfac5373d 100644
--- a/Device/Data/ArrayUtils.h
+++ b/Device/Data/ArrayUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Device/Data/ArrayUtils.h
+//! @file Device/Data/ArrayUtil.h
//! @brief Defines various functions to interact from numpy on Python side
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_DEVICE_DATA_ARRAYUTILS_H
-#define BORNAGAIN_DEVICE_DATA_ARRAYUTILS_H
+#ifndef BORNAGAIN_DEVICE_DATA_ARRAYUTIL_H
+#define BORNAGAIN_DEVICE_DATA_ARRAYUTIL_H
#include <memory>
#include <vector>
@@ -42,4 +42,4 @@ std::vector<std::vector<double>> createVector2D(const Datafield& data);
} // namespace DataUtils::Array
-#endif // BORNAGAIN_DEVICE_DATA_ARRAYUTILS_H
+#endif // BORNAGAIN_DEVICE_DATA_ARRAYUTIL_H
diff --git a/Device/Data/ArrayUtils.cpp b/Device/Data/ArrayUtils.cpp
index 20eb0445e1c..beca06cc878 100644
--- a/Device/Data/ArrayUtils.cpp
+++ b/Device/Data/ArrayUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Device/Data/ArrayUtils.h"
+#include "Device/Data/ArrayUtil.h"
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Util/Assert.h"
#include "Device/Data/Datafield.h"
diff --git a/Device/Data/DataUtils.h b/Device/Data/DataUtil.h
similarity index 92%
rename from Device/Data/DataUtils.h
rename to Device/Data/DataUtil.h
index d65b987f8b8..f57a51424c0 100644
--- a/Device/Data/DataUtils.h
+++ b/Device/Data/DataUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Device/Data/DataUtils.h
+//! @file Device/Data/DataUtil.h
//! @brief Defines namespace DataUtils.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_DEVICE_DATA_DATAUTILS_H
-#define BORNAGAIN_DEVICE_DATA_DATAUTILS_H
+#ifndef BORNAGAIN_DEVICE_DATA_DATAUTIL_H
+#define BORNAGAIN_DEVICE_DATA_DATAUTIL_H
#include <memory>
#include <string>
@@ -54,4 +54,4 @@ std::unique_ptr<Datafield> createFFT(const Datafield& data);
} // namespace DataUtils::Data
-#endif // BORNAGAIN_DEVICE_DATA_DATAUTILS_H
+#endif // BORNAGAIN_DEVICE_DATA_DATAUTIL_H
diff --git a/Device/Data/DataUtils.cpp b/Device/Data/DataUtils.cpp
index 96476e2f64f..f41c14a8173 100644
--- a/Device/Data/DataUtils.cpp
+++ b/Device/Data/DataUtils.cpp
@@ -12,13 +12,13 @@
//
// ************************************************************************************************
-#include "Device/Data/DataUtils.h"
+#include "Device/Data/DataUtil.h"
#include "Base/Axis/Bin.h"
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/Frame.h"
#include "Base/Math/FourierTransform.h"
#include "Base/Util/Assert.h"
-#include "Device/Data/ArrayUtils.h"
+#include "Device/Data/ArrayUtil.h"
#include "Device/Data/Datafield.h"
#include <algorithm>
#include <cmath>
diff --git a/Device/IO/DataFormatUtils.h b/Device/IO/DataFormatUtil.h
similarity index 90%
rename from Device/IO/DataFormatUtils.h
rename to Device/IO/DataFormatUtil.h
index 51afa77c2ae..2aa94a31f86 100644
--- a/Device/IO/DataFormatUtils.h
+++ b/Device/IO/DataFormatUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Device/IO/DataFormatUtils.h
+//! @file Device/IO/DataFormatUtil.h
//! @brief Defines class DatafieldIOFactory.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_DEVICE_IO_DATAFORMATUTILS_H
-#define BORNAGAIN_DEVICE_IO_DATAFORMATUTILS_H
+#ifndef BORNAGAIN_DEVICE_IO_DATAFORMATUTIL_H
+#define BORNAGAIN_DEVICE_IO_DATAFORMATUTIL_H
#include <string>
#include <vector>
@@ -56,4 +56,4 @@ void readLineOfDoubles(std::vector<double>& buffer, std::istringstream& iss);
} // namespace DataUtils::Format
-#endif // BORNAGAIN_DEVICE_IO_DATAFORMATUTILS_H
+#endif // BORNAGAIN_DEVICE_IO_DATAFORMATUTIL_H
diff --git a/Device/IO/DataFormatUtils.cpp b/Device/IO/DataFormatUtils.cpp
index cf29df2cf49..76df5216d8c 100644
--- a/Device/IO/DataFormatUtils.cpp
+++ b/Device/IO/DataFormatUtils.cpp
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#include "Device/IO/DataFormatUtils.h"
+#include "Device/IO/DataFormatUtil.h"
#include "Base/Axis/DiscreteAxis.h"
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/HistoAxis.h"
-#include "Base/Util/FileSystemUtils.h"
-#include "Base/Util/StringUtils.h"
+#include "Base/Util/FileSystemUtil.h"
+#include "Base/Util/StringUtil.h"
#include "Device/Data/Datafield.h"
#include <functional>
#include <iostream>
diff --git a/Device/IO/IOFactory.cpp b/Device/IO/IOFactory.cpp
index 60b9082425c..28f4d8e107d 100644
--- a/Device/IO/IOFactory.cpp
+++ b/Device/IO/IOFactory.cpp
@@ -14,11 +14,11 @@
#include "Device/IO/IOFactory.h"
#include "Base/Util/Assert.h"
-#include "Base/Util/FileSystemUtils.h"
+#include "Base/Util/FileSystemUtil.h"
#include "Device/Data/Datafield.h"
#include "Device/Histo/DiffUtil.h"
#include "Device/Histo/SimulationResult.h"
-#include "Device/IO/DataFormatUtils.h"
+#include "Device/IO/DataFormatUtil.h"
#include "Device/IO/ReadReflectometry.h"
#include "Device/IO/ReadWriteINT.h"
#include "Device/IO/ReadWriteNicos.h"
diff --git a/Device/IO/ReadReflectometry.cpp b/Device/IO/ReadReflectometry.cpp
index a0da99098f7..1931f15e5db 100644
--- a/Device/IO/ReadReflectometry.cpp
+++ b/Device/IO/ReadReflectometry.cpp
@@ -14,9 +14,9 @@
#include "Device/IO/ReadReflectometry.h"
#include "Base/Axis/DiscreteAxis.h"
-#include "Base/Util/StringUtils.h"
+#include "Base/Util/StringUtil.h"
#include "Device/Data/Datafield.h"
-#include "Device/IO/DataFormatUtils.h"
+#include "Device/IO/DataFormatUtil.h"
#include <map>
// #bamigration +++ this works only if separator is space or tab; it does not
diff --git a/Device/IO/ReadWriteINT.cpp b/Device/IO/ReadWriteINT.cpp
index 63841aa4c18..92c2eed5962 100644
--- a/Device/IO/ReadWriteINT.cpp
+++ b/Device/IO/ReadWriteINT.cpp
@@ -15,10 +15,10 @@
#include "Device/IO/ReadWriteINT.h"
#include "Base/Axis/Bin.h"
#include "Base/Axis/IAxis.h"
-#include "Base/Util/StringUtils.h"
-#include "Device/Data/ArrayUtils.h"
+#include "Base/Util/StringUtil.h"
+#include "Device/Data/ArrayUtil.h"
#include "Device/Data/Datafield.h"
-#include "Device/IO/DataFormatUtils.h"
+#include "Device/IO/DataFormatUtil.h"
#include <iostream>
Datafield* ReadWriteINT::readDatafield(std::istream& input_stream)
diff --git a/Device/IO/ReadWriteNicos.cpp b/Device/IO/ReadWriteNicos.cpp
index cb69e49ea36..88e5a157497 100644
--- a/Device/IO/ReadWriteNicos.cpp
+++ b/Device/IO/ReadWriteNicos.cpp
@@ -15,7 +15,7 @@
#include "Device/IO/ReadWriteNicos.h"
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/Frame.h"
-#include "Base/Util/StringUtils.h"
+#include "Base/Util/StringUtil.h"
#include "Device/Data/Datafield.h"
#include <memory>
diff --git a/Device/IO/ReadWriteNumpyTXT.cpp b/Device/IO/ReadWriteNumpyTXT.cpp
index 1970d89c62a..23449e651d1 100644
--- a/Device/IO/ReadWriteNumpyTXT.cpp
+++ b/Device/IO/ReadWriteNumpyTXT.cpp
@@ -15,10 +15,10 @@
#include "Device/IO/ReadWriteNumpyTXT.h"
#include "Base/Axis/Bin.h"
#include "Base/Axis/IAxis.h"
-#include "Base/Util/StringUtils.h"
-#include "Device/Data/ArrayUtils.h"
+#include "Base/Util/StringUtil.h"
+#include "Device/Data/ArrayUtil.h"
#include "Device/Data/Datafield.h"
-#include "Device/IO/DataFormatUtils.h"
+#include "Device/IO/DataFormatUtil.h"
#include <string>
#include <vector>
diff --git a/Device/IO/ReadWriteTiff.cpp b/Device/IO/ReadWriteTiff.cpp
index 1a7dd6da689..143bea7b6ba 100644
--- a/Device/IO/ReadWriteTiff.cpp
+++ b/Device/IO/ReadWriteTiff.cpp
@@ -18,7 +18,7 @@
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/Frame.h"
#include "Base/Util/Assert.h"
-#include "Base/Util/SysUtils.h"
+#include "Base/Util/SysUtil.h"
#include "Device/Data/Datafield.h"
#include <cstring> // memcpy
#include <memory>
diff --git a/Fit/Adapter/GSLLevenbergMarquardtMinimizer.cpp b/Fit/Adapter/GSLLevenbergMarquardtMinimizer.cpp
index b1784c9729d..dcd4890e08c 100644
--- a/Fit/Adapter/GSLLevenbergMarquardtMinimizer.cpp
+++ b/Fit/Adapter/GSLLevenbergMarquardtMinimizer.cpp
@@ -14,8 +14,8 @@
#include "Fit/Adapter/GSLLevenbergMarquardtMinimizer.h"
#include "Fit/Adapter/GSLMultiMinimizer.h"
-#include "Fit/Tools/MinimizerUtils.h"
-#include "Fit/Tools/StringUtils.h"
+#include "Fit/Tools/MinimizerUtil.h"
+#include "Fit/Tools/StringUtil.h"
#include <stdexcept>
#ifdef _WIN32
diff --git a/Fit/Adapter/GSLMultiMinimizer.cpp b/Fit/Adapter/GSLMultiMinimizer.cpp
index 35e4a771fef..1eb0680cffa 100644
--- a/Fit/Adapter/GSLMultiMinimizer.cpp
+++ b/Fit/Adapter/GSLMultiMinimizer.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Fit/Adapter/GSLMultiMinimizer.h"
-#include "Fit/Tools/MinimizerUtils.h"
+#include "Fit/Tools/MinimizerUtil.h"
#include <string>
#ifdef _WIN32
diff --git a/Fit/Adapter/MinimizerAdapter.cpp b/Fit/Adapter/MinimizerAdapter.cpp
index ee023f98db3..b9d95e83aec 100644
--- a/Fit/Adapter/MinimizerAdapter.cpp
+++ b/Fit/Adapter/MinimizerAdapter.cpp
@@ -17,7 +17,7 @@
#include "Fit/Adapter/Report.h"
#include "Fit/Adapter/RootResidualFunction.h"
#include "Fit/Adapter/RootScalarFunction.h"
-#include "Fit/Tools/StringUtils.h"
+#include "Fit/Tools/StringUtil.h"
#include <Math/Minimizer.h>
#include <utility>
diff --git a/Fit/Adapter/Minuit2Minimizer.cpp b/Fit/Adapter/Minuit2Minimizer.cpp
index dc38ada1460..4094f0b4e8f 100644
--- a/Fit/Adapter/Minuit2Minimizer.cpp
+++ b/Fit/Adapter/Minuit2Minimizer.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Fit/Adapter/Minuit2Minimizer.h"
-#include "Fit/Tools/StringUtils.h"
+#include "Fit/Tools/StringUtil.h"
#include <Minuit2/Minuit2Minimizer.h>
namespace {
diff --git a/Fit/Adapter/Report.cpp b/Fit/Adapter/Report.cpp
index cbafc2ab494..0ff42835e9b 100644
--- a/Fit/Adapter/Report.cpp
+++ b/Fit/Adapter/Report.cpp
@@ -14,7 +14,7 @@
#include "Fit/Adapter/Report.h"
#include "Fit/Adapter/MinimizerAdapter.h"
-#include "Fit/Tools/MinimizerUtils.h"
+#include "Fit/Tools/MinimizerUtil.h"
#include <iomanip>
#include <sstream>
diff --git a/Fit/Minimizer/MinimizerCatalog.cpp b/Fit/Minimizer/MinimizerCatalog.cpp
index acb2bc36450..380cffbc274 100644
--- a/Fit/Minimizer/MinimizerCatalog.cpp
+++ b/Fit/Minimizer/MinimizerCatalog.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Fit/Minimizer/MinimizerCatalog.h"
-#include "Fit/Tools/MinimizerUtils.h"
+#include "Fit/Tools/MinimizerUtil.h"
#include <boost/format.hpp>
#include <sstream>
diff --git a/Fit/Minimizer/MinimizerOptions.cpp b/Fit/Minimizer/MinimizerOptions.cpp
index b81583a9841..c60feed4caa 100644
--- a/Fit/Minimizer/MinimizerOptions.cpp
+++ b/Fit/Minimizer/MinimizerOptions.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Fit/Minimizer/MinimizerOptions.h"
-#include "Fit/Tools/StringUtils.h"
+#include "Fit/Tools/StringUtil.h"
#include <iostream>
#include <sstream>
#include <stdexcept>
diff --git a/Fit/Minimizer/MinimizerResult.cpp b/Fit/Minimizer/MinimizerResult.cpp
index 043840e762b..e6d22261db3 100644
--- a/Fit/Minimizer/MinimizerResult.cpp
+++ b/Fit/Minimizer/MinimizerResult.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Fit/Minimizer/MinimizerResult.h"
-#include "Fit/Tools/MinimizerUtils.h"
+#include "Fit/Tools/MinimizerUtil.h"
#include <boost/format.hpp>
#include <sstream>
diff --git a/Fit/Tools/MinimizerUtils.h b/Fit/Tools/MinimizerUtil.h
similarity index 86%
rename from Fit/Tools/MinimizerUtils.h
rename to Fit/Tools/MinimizerUtil.h
index 38d076057f4..b707feed937 100644
--- a/Fit/Tools/MinimizerUtils.h
+++ b/Fit/Tools/MinimizerUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Fit/Tools/MinimizerUtils.h
+//! @file Fit/Tools/MinimizerUtil.h
//! @brief Declares namespace MinimizerUtils.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_FIT_TOOLS_MINIMIZERUTILS_H
-#define BORNAGAIN_FIT_TOOLS_MINIMIZERUTILS_H
+#ifndef BORNAGAIN_FIT_TOOLS_MINIMIZERUTIL_H
+#define BORNAGAIN_FIT_TOOLS_MINIMIZERUTIL_H
#include <map>
#include <string>
@@ -38,4 +38,4 @@ std::string sectionString(const std::string& sectionName = "", size_t report_wid
} // namespace mumufit::utils
-#endif // BORNAGAIN_FIT_TOOLS_MINIMIZERUTILS_H
+#endif // BORNAGAIN_FIT_TOOLS_MINIMIZERUTIL_H
diff --git a/Fit/Tools/MinimizerUtils.cpp b/Fit/Tools/MinimizerUtils.cpp
index 41a27d7c6f1..917c6a24b5f 100644
--- a/Fit/Tools/MinimizerUtils.cpp
+++ b/Fit/Tools/MinimizerUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Fit/Tools/MinimizerUtils.h"
+#include "Fit/Tools/MinimizerUtil.h"
#include <algorithm>
#include <cmath>
#include <limits>
diff --git a/Fit/Tools/StringUtils.h b/Fit/Tools/StringUtil.h
similarity index 88%
rename from Fit/Tools/StringUtils.h
rename to Fit/Tools/StringUtil.h
index 6f99328efa3..a2f5985a0b0 100644
--- a/Fit/Tools/StringUtils.h
+++ b/Fit/Tools/StringUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Fit/Tools/StringUtils.h
+//! @file Fit/Tools/StringUtil.h
//! @brief Defines a few helper functions
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_FIT_TOOLS_STRINGUTILS_H
-#define BORNAGAIN_FIT_TOOLS_STRINGUTILS_H
+#ifndef BORNAGAIN_FIT_TOOLS_STRINGUTIL_H
+#define BORNAGAIN_FIT_TOOLS_STRINGUTIL_H
#include <iomanip>
#include <sstream>
@@ -44,4 +44,4 @@ std::string scientific(const T value, int n)
} // namespace mumufit::stringUtils
-#endif // BORNAGAIN_FIT_TOOLS_STRINGUTILS_H
+#endif // BORNAGAIN_FIT_TOOLS_STRINGUTIL_H
diff --git a/Fit/Tools/StringUtils.cpp b/Fit/Tools/StringUtils.cpp
index bc120812dfb..4da62fff33d 100644
--- a/Fit/Tools/StringUtils.cpp
+++ b/Fit/Tools/StringUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Fit/Tools/StringUtils.h"
+#include "Fit/Tools/StringUtil.h"
#include <boost/algorithm/string.hpp>
#include <regex>
diff --git a/GUI/Model/Data/IntensityDataItem.cpp b/GUI/Model/Data/IntensityDataItem.cpp
index 163fa8ae39f..a3403de1f73 100644
--- a/GUI/Model/Data/IntensityDataItem.cpp
+++ b/GUI/Model/Data/IntensityDataItem.cpp
@@ -16,7 +16,7 @@
#include "Base/Axis/IAxis.h"
#include "Device/Data/Datafield.h"
#include "GUI/Model/Axis/AxisItems.h"
-#include "GUI/Model/Data/JobItemUtils.h"
+#include "GUI/Model/Data/JobItemUtil.h"
#include "GUI/Model/Data/MaskUnitsConverter.h"
#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/Support/IO/ImportDataInfo.h"
diff --git a/GUI/Model/Data/JobItemUtils.h b/GUI/Model/Data/JobItemUtil.h
similarity index 89%
rename from GUI/Model/Data/JobItemUtils.h
rename to GUI/Model/Data/JobItemUtil.h
index 72fe5b6828a..664c3a10113 100644
--- a/GUI/Model/Data/JobItemUtils.h
+++ b/GUI/Model/Data/JobItemUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Data/JobItemUtils.h
+//! @file GUI/Model/Data/JobItemUtil.h
//! @brief Defines namespace GUI::Model::JobItemUtils
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DATA_JOBITEMUTILS_H
-#define BORNAGAIN_GUI_MODEL_DATA_JOBITEMUTILS_H
+#ifndef BORNAGAIN_GUI_MODEL_DATA_JOBITEMUTIL_H
+#define BORNAGAIN_GUI_MODEL_DATA_JOBITEMUTIL_H
#include "Device/Detector/IDetector.h"
#include "GUI/Model/Data/ComboProperty.h"
@@ -45,4 +45,4 @@ ComboProperty availableUnits(const ICoordSystem& converter);
} // namespace GUI::Model::JobItemUtils
-#endif // BORNAGAIN_GUI_MODEL_DATA_JOBITEMUTILS_H
+#endif // BORNAGAIN_GUI_MODEL_DATA_JOBITEMUTIL_H
diff --git a/GUI/Model/Data/JobItemUtils.cpp b/GUI/Model/Data/JobItemUtils.cpp
index f9cd69444f2..c4517a21747 100644
--- a/GUI/Model/Data/JobItemUtils.cpp
+++ b/GUI/Model/Data/JobItemUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Data/JobItemUtils.h"
+#include "GUI/Model/Data/JobItemUtil.h"
#include "Device/Coord/ICoordSystem.h"
#include "Device/Data/Datafield.h"
#include "Device/Histo/SimulationResult.h"
diff --git a/GUI/Model/Data/RealItem.cpp b/GUI/Model/Data/RealItem.cpp
index 19060d6b904..13ea1d16744 100644
--- a/GUI/Model/Data/RealItem.cpp
+++ b/GUI/Model/Data/RealItem.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Model/Data/RealItem.h"
-#include "Device/Data/DataUtils.h"
+#include "Device/Data/DataUtil.h"
#include "Device/Data/Datafield.h"
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/JobItemUtils.h"
+#include "GUI/Model/Data/JobItemUtil.h"
#include "GUI/Model/Data/ProjectionItems.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
@@ -24,7 +24,7 @@
#include "GUI/Support/IO/AbstractDataLoader1D.h"
#include "GUI/Support/IO/DataLoaders1D.h"
#include "GUI/Support/IO/ImportDataInfo.h"
-#include "GUI/Support/IO/ItemFileNameUtils.h"
+#include "GUI/Support/IO/ItemFileNameUtil.h"
#include "GUI/Support/Util/Error.h"
#include "GUI/Support/XML/Backup.h"
#include "GUI/Support/XML/DeserializationException.h"
diff --git a/GUI/Model/Data/SpecularDataItem.cpp b/GUI/Model/Data/SpecularDataItem.cpp
index ebdaac49ff4..e5dfcf051ea 100644
--- a/GUI/Model/Data/SpecularDataItem.cpp
+++ b/GUI/Model/Data/SpecularDataItem.cpp
@@ -17,7 +17,7 @@
#include "Base/Util/Assert.h"
#include "Device/Data/Datafield.h"
#include "GUI/Model/Axis/AxisItems.h"
-#include "GUI/Model/Data/JobItemUtils.h"
+#include "GUI/Model/Data/JobItemUtil.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/Support/Util/Error.h"
#include "GUI/Support/XML/UtilXML.h"
diff --git a/GUI/Model/FromCore/ItemizeSample.cpp b/GUI/Model/FromCore/ItemizeSample.cpp
index 204f4c10859..5c95f62fb43 100644
--- a/GUI/Model/FromCore/ItemizeSample.cpp
+++ b/GUI/Model/FromCore/ItemizeSample.cpp
@@ -22,7 +22,7 @@
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/Model/Sample/SampleItem.h"
-#include "Param/Node/NodeUtils.h"
+#include "Param/Node/NodeUtil.h"
#include "Sample/Aggregate/Interferences.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/HardParticle/HardParticles.h"
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index cd80b284dd6..b1bee2e2388 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -16,7 +16,7 @@
#include "Device/Data/Datafield.h"
#include "Device/Detector/SimulationAreaIterator.h" // roiIndex
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/JobItemUtils.h"
+#include "GUI/Model/Data/JobItemUtil.h"
#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Device/BackgroundItems.h"
@@ -26,7 +26,7 @@
#include "GUI/Model/Job/MinimizerItem.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
#include "GUI/Model/Sample/SampleItem.h"
-#include "GUI/Support/IO/ItemFileNameUtils.h"
+#include "GUI/Support/IO/ItemFileNameUtil.h"
#include "GUI/Support/Util/Error.h"
#include <stdexcept> // domain_error
diff --git a/GUI/Model/Job/MinimizerItem.cpp b/GUI/Model/Job/MinimizerItem.cpp
index 0359b31800e..6828888c386 100644
--- a/GUI/Model/Job/MinimizerItem.cpp
+++ b/GUI/Model/Job/MinimizerItem.cpp
@@ -22,7 +22,7 @@
#include "GUI/Model/CatJob/MinimizerItemCatalog.h"
#include "GUI/Support/XML/UtilXML.h"
#include "Sim/Fitting/ObjectiveMetric.h"
-#include "Sim/Fitting/ObjectiveMetricUtils.h"
+#include "Sim/Fitting/ObjectiveMetricUtil.h"
namespace {
diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp
index c324dd05f9e..e6d9478610c 100644
--- a/GUI/Model/Model/JobModel.cpp
+++ b/GUI/Model/Model/JobModel.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
-#include "GUI/Model/Model/ParameterTreeUtils.h"
+#include "GUI/Model/Model/ParameterTreeUtil.h"
#include "GUI/Model/Sample/SampleItem.h"
#include "GUI/Support/Util/Error.h"
diff --git a/GUI/Model/Model/ParameterTreeUtils.h b/GUI/Model/Model/ParameterTreeUtil.h
similarity index 93%
rename from GUI/Model/Model/ParameterTreeUtils.h
rename to GUI/Model/Model/ParameterTreeUtil.h
index 7a9f9480470..a50c617460b 100644
--- a/GUI/Model/Model/ParameterTreeUtils.h
+++ b/GUI/Model/Model/ParameterTreeUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Model/ParameterTreeUtils.h
+//! @file GUI/Model/Model/ParameterTreeUtil.h
//! @brief Defines namespace GUI::Model::ParameterTreeUtils
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_MODEL_PARAMETERTREEUTILS_H
-#define BORNAGAIN_GUI_MODEL_MODEL_PARAMETERTREEUTILS_H
+#ifndef BORNAGAIN_GUI_MODEL_MODEL_PARAMETERTREEUTIL_H
+#define BORNAGAIN_GUI_MODEL_MODEL_PARAMETERTREEUTIL_H
#include <QPair>
#include <QString>
@@ -81,4 +81,4 @@ private:
bool m_recreateBackupValues;
};
-#endif // BORNAGAIN_GUI_MODEL_MODEL_PARAMETERTREEUTILS_H
+#endif // BORNAGAIN_GUI_MODEL_MODEL_PARAMETERTREEUTIL_H
diff --git a/GUI/Model/Model/ParameterTreeUtils.cpp b/GUI/Model/Model/ParameterTreeUtils.cpp
index 86e52a42611..1b2f32b9313 100644
--- a/GUI/Model/Model/ParameterTreeUtils.cpp
+++ b/GUI/Model/Model/ParameterTreeUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Model/ParameterTreeUtils.h"
+#include "GUI/Model/Model/ParameterTreeUtil.h"
#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/BeamAngleItems.h"
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index 99db1b151fb..2f6f65cf0dc 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -20,7 +20,7 @@
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/SampleItem.h"
#include "GUI/Support/Data/ID.h"
-#include "GUI/Support/IO/ProjectUtils.h"
+#include "GUI/Support/IO/ProjectUtil.h"
#include "GUI/Support/Util/Error.h"
#include "GUI/Support/Util/MessageService.h"
#include "GUI/Support/Util/Path.h"
diff --git a/GUI/Support/IO/ItemFileNameUtils.h b/GUI/Support/IO/ItemFileNameUtil.h
similarity index 83%
rename from GUI/Support/IO/ItemFileNameUtils.h
rename to GUI/Support/IO/ItemFileNameUtil.h
index 281861fc41f..75bb3907cc2 100644
--- a/GUI/Support/IO/ItemFileNameUtils.h
+++ b/GUI/Support/IO/ItemFileNameUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Support/IO/ItemFileNameUtils.h
+//! @file GUI/Support/IO/ItemFileNameUtil.h
//! @brief Defines namespace GUI::Model::FilenameUtils
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_SUPPORT_IO_ITEMFILENAMEUTILS_H
-#define BORNAGAIN_GUI_SUPPORT_IO_ITEMFILENAMEUTILS_H
+#ifndef BORNAGAIN_GUI_SUPPORT_IO_ITEMFILENAMEUTIL_H
+#define BORNAGAIN_GUI_SUPPORT_IO_ITEMFILENAMEUTIL_H
#include <QStringList>
@@ -35,4 +35,4 @@ QStringList nonXMLFileNameFilters();
} // namespace GUI::Model::FilenameUtils
-#endif // BORNAGAIN_GUI_SUPPORT_IO_ITEMFILENAMEUTILS_H
+#endif // BORNAGAIN_GUI_SUPPORT_IO_ITEMFILENAMEUTIL_H
diff --git a/GUI/Support/IO/ItemFileNameUtils.cpp b/GUI/Support/IO/ItemFileNameUtils.cpp
index 7151f817beb..4b732dfc2c4 100644
--- a/GUI/Support/IO/ItemFileNameUtils.cpp
+++ b/GUI/Support/IO/ItemFileNameUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Support/IO/ItemFileNameUtils.h"
+#include "GUI/Support/IO/ItemFileNameUtil.h"
#include "GUI/Support/Util/Path.h"
namespace {
diff --git a/GUI/Support/IO/ProjectUtils.h b/GUI/Support/IO/ProjectUtil.h
similarity index 90%
rename from GUI/Support/IO/ProjectUtils.h
rename to GUI/Support/IO/ProjectUtil.h
index 811ec334694..362d3c0922f 100644
--- a/GUI/Support/IO/ProjectUtils.h
+++ b/GUI/Support/IO/ProjectUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Support/IO/ProjectUtils.h
+//! @file GUI/Support/IO/ProjectUtil.h
//! @brief Defines namespace GUI::Project::Utils
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_SUPPORT_IO_PROJECTUTILS_H
-#define BORNAGAIN_GUI_SUPPORT_IO_PROJECTUTILS_H
+#ifndef BORNAGAIN_GUI_SUPPORT_IO_PROJECTUTIL_H
+#define BORNAGAIN_GUI_SUPPORT_IO_PROJECTUTIL_H
#include <QString>
@@ -49,4 +49,4 @@ bool isAutosave(const QString& projectFullPath);
} // namespace GUI::Project::Utils
-#endif // BORNAGAIN_GUI_SUPPORT_IO_PROJECTUTILS_H
+#endif // BORNAGAIN_GUI_SUPPORT_IO_PROJECTUTIL_H
diff --git a/GUI/Support/IO/ProjectUtils.cpp b/GUI/Support/IO/ProjectUtils.cpp
index 70fe8f9c2ce..31627d8a666 100644
--- a/GUI/Support/IO/ProjectUtils.cpp
+++ b/GUI/Support/IO/ProjectUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Support/IO/ProjectUtils.h"
+#include "GUI/Support/IO/ProjectUtil.h"
#include <QFileInfo>
QString GUI::Project::Utils::projectName(const QString& projectFullPath)
diff --git a/GUI/Support/Util/DesignerHelper.cpp b/GUI/Support/Util/DesignerHelper.cpp
index 792af00dd6c..67a9a634dce 100644
--- a/GUI/Support/Util/DesignerHelper.cpp
+++ b/GUI/Support/Util/DesignerHelper.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Support/Util/DesignerHelper.h"
-#include "GUI/Support/Util/StyleUtils.h"
+#include "GUI/Support/Util/StyleUtil.h"
int DesignerHelper::getSectionFontSize()
{
diff --git a/GUI/Support/Util/QCP_Util.cpp b/GUI/Support/Util/QCP_Util.cpp
index d059635ea13..fa2368dbf1a 100644
--- a/GUI/Support/Util/QCP_Util.cpp
+++ b/GUI/Support/Util/QCP_Util.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Support/Util/QCP_Util.h"
-#include "GUI/Support/Util/StyleUtils.h"
+#include "GUI/Support/Util/StyleUtil.h"
#include <qcustomplot.h>
namespace {
diff --git a/GUI/Support/Util/StyleUtils.h b/GUI/Support/Util/StyleUtil.h
similarity index 87%
rename from GUI/Support/Util/StyleUtils.h
rename to GUI/Support/Util/StyleUtil.h
index 06f607661ce..18b1afd2e41 100644
--- a/GUI/Support/Util/StyleUtils.h
+++ b/GUI/Support/Util/StyleUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Support/Util/StyleUtils.h
+//! @file GUI/Support/Util/StyleUtil.h
//! @brief Defines GUI::StyleUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_SUPPORT_UTIL_STYLEUTILS_H
-#define BORNAGAIN_GUI_SUPPORT_UTIL_STYLEUTILS_H
+#ifndef BORNAGAIN_GUI_SUPPORT_UTIL_STYLEUTIL_H
+#define BORNAGAIN_GUI_SUPPORT_UTIL_STYLEUTIL_H
#include <QFont>
#include <QString>
@@ -48,4 +48,4 @@ int SystemPointSize();
} // namespace GUI::Util::Style
-#endif // BORNAGAIN_GUI_SUPPORT_UTIL_STYLEUTILS_H
+#endif // BORNAGAIN_GUI_SUPPORT_UTIL_STYLEUTIL_H
diff --git a/GUI/Support/Util/StyleUtils.cpp b/GUI/Support/Util/StyleUtils.cpp
index 72c9eef780c..3704443769a 100644
--- a/GUI/Support/Util/StyleUtils.cpp
+++ b/GUI/Support/Util/StyleUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Support/Util/StyleUtils.h"
+#include "GUI/Support/Util/StyleUtil.h"
#include "Base/Util/Assert.h"
#include "GUI/Support/Util/DesignerHelper.h"
#include <QApplication>
diff --git a/GUI/View/Common/IntensityDataPropertyWidget.cpp b/GUI/View/Common/IntensityDataPropertyWidget.cpp
index 2a014e339bb..6a852d6c143 100644
--- a/GUI/View/Common/IntensityDataPropertyWidget.cpp
+++ b/GUI/View/Common/IntensityDataPropertyWidget.cpp
@@ -17,8 +17,8 @@
#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"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
+#include "GUI/View/Tool/LayoutUtil.h"
#include <QGroupBox>
#include <QLineEdit>
diff --git a/GUI/View/Device/AxisPropertyForm.cpp b/GUI/View/Device/AxisPropertyForm.cpp
index cb77a5add0d..6ab3c182a55 100644
--- a/GUI/View/Device/AxisPropertyForm.cpp
+++ b/GUI/View/Device/AxisPropertyForm.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Descriptor/AxisProperty.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
-#include "GUI/View/Numeric/NumWidgetUtils.h"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
AxisPropertyForm::AxisPropertyForm(QWidget* parent, const QString& groupTitle,
diff --git a/GUI/View/Device/BackgroundForm.cpp b/GUI/View/Device/BackgroundForm.cpp
index ed34f6a0b34..ad4e280f060 100644
--- a/GUI/View/Device/BackgroundForm.cpp
+++ b/GUI/View/Device/BackgroundForm.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
-#include "GUI/View/Numeric/NumWidgetUtils.h"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
BackgroundForm::BackgroundForm(QWidget* parent, InstrumentItem* instrument)
diff --git a/GUI/View/Device/DetectorAlignmentForm.cpp b/GUI/View/Device/DetectorAlignmentForm.cpp
index b92703017f5..c388247bc4d 100644
--- a/GUI/View/Device/DetectorAlignmentForm.cpp
+++ b/GUI/View/Device/DetectorAlignmentForm.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Device/DetectorAlignmentForm.h"
#include "GUI/Model/Device/RectangularDetectorItem.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
-#include "GUI/View/Numeric/NumWidgetUtils.h"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
#include <QLabel>
namespace {
diff --git a/GUI/View/Device/FootprintForm.cpp b/GUI/View/Device/FootprintForm.cpp
index 34f618ce212..34e13476bb1 100644
--- a/GUI/View/Device/FootprintForm.cpp
+++ b/GUI/View/Device/FootprintForm.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/SourceItems.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
-#include "GUI/View/Numeric/NumWidgetUtils.h"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
FootprintForm::FootprintForm(QWidget* parent, ScanItem* item)
diff --git a/GUI/View/Device/ResolutionForm.cpp b/GUI/View/Device/ResolutionForm.cpp
index ed227ba3629..8ff67cc98ae 100644
--- a/GUI/View/Device/ResolutionForm.cpp
+++ b/GUI/View/Device/ResolutionForm.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Device/DetectorItem.h"
#include "GUI/Model/Device/ResolutionFunctionItems.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
-#include "GUI/View/Numeric/NumWidgetUtils.h"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
ResolutionForm::ResolutionForm(Unit unit, QWidget* parent, DetectorItem* item)
diff --git a/GUI/View/Fit/MinimizerSettingsWidget.cpp b/GUI/View/Fit/MinimizerSettingsWidget.cpp
index 39e90b6a3da..dbe866aa06a 100644
--- a/GUI/View/Fit/MinimizerSettingsWidget.cpp
+++ b/GUI/View/Fit/MinimizerSettingsWidget.cpp
@@ -16,8 +16,8 @@
#include "Base/Util/Assert.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Numeric/NumWidgetUtils.h"
-#include "GUI/View/Tool/LayoutUtils.h"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
+#include "GUI/View/Tool/LayoutUtil.h"
#include <QStandardItemModel>
MinimizerSettingsWidget::MinimizerSettingsWidget(QWidget* parent)
diff --git a/GUI/View/Import/ImportDataUtils.h b/GUI/View/Import/ImportDataUtil.h
similarity index 88%
rename from GUI/View/Import/ImportDataUtils.h
rename to GUI/View/Import/ImportDataUtil.h
index 41b810d5ecf..f2ec6c517a4 100644
--- a/GUI/View/Import/ImportDataUtils.h
+++ b/GUI/View/Import/ImportDataUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Import/ImportDataUtils.h
+//! @file GUI/View/Import/ImportDataUtil.h
//! @brief Defines ImportDataUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_IMPORT_IMPORTDATAUTILS_H
-#define BORNAGAIN_GUI_VIEW_IMPORT_IMPORTDATAUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_IMPORT_IMPORTDATAUTIL_H
+#define BORNAGAIN_GUI_VIEW_IMPORT_IMPORTDATAUTIL_H
#include "Device/IO/IOFactory.h"
#include <QString>
@@ -43,4 +43,4 @@ QString Import1dData(RealItem* realItem, const AbstractDataLoader* selectedLoade
} // namespace GUI::View::ImportDataUtils
-#endif // BORNAGAIN_GUI_VIEW_IMPORT_IMPORTDATAUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_IMPORT_IMPORTDATAUTIL_H
diff --git a/GUI/View/Import/ImportDataUtils.cpp b/GUI/View/Import/ImportDataUtils.cpp
index 8f25c7aef47..40d30cd031f 100644
--- a/GUI/View/Import/ImportDataUtils.cpp
+++ b/GUI/View/Import/ImportDataUtils.cpp
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/View/Import/ImportDataUtils.h"
+#include "GUI/View/Import/ImportDataUtil.h"
#include "Device/Data/Datafield.h"
-#include "Device/IO/DataFormatUtils.h"
+#include "Device/IO/DataFormatUtil.h"
#include "GUI/Model/Data/RealItem.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/View/Loaders/QREDataLoader.h"
diff --git a/GUI/View/Import/RealDataSelectorWidget.cpp b/GUI/View/Import/RealDataSelectorWidget.cpp
index f48702ff0c1..c507d50b4ef 100644
--- a/GUI/View/Import/RealDataSelectorWidget.cpp
+++ b/GUI/View/Import/RealDataSelectorWidget.cpp
@@ -19,7 +19,7 @@
#include "GUI/Support/IO/AbstractDataLoader1D.h"
#include "GUI/Support/IO/DataLoaders1D.h"
#include "GUI/Support/Util/Error.h"
-#include "GUI/View/Import/ImportDataUtils.h"
+#include "GUI/View/Import/ImportDataUtil.h"
#include "GUI/View/Import/RealDataPropertiesWidget.h"
#include "GUI/View/Import/RealDataTreeModel.h"
#include "GUI/View/Info/MessageBox.h"
diff --git a/GUI/View/Info/OverlayLabelWidget.cpp b/GUI/View/Info/OverlayLabelWidget.cpp
index f03a6c6c935..f915a6b30ec 100644
--- a/GUI/View/Info/OverlayLabelWidget.cpp
+++ b/GUI/View/Info/OverlayLabelWidget.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Info/OverlayLabelWidget.h"
#include "GUI/Support/Util/DesignerHelper.h"
-#include "GUI/Support/Util/StyleUtils.h"
+#include "GUI/Support/Util/StyleUtil.h"
#include <QPainter>
OverlayLabelWidget::OverlayLabelWidget(QWidget* parent)
diff --git a/GUI/View/Instrument/DetectorEditor.cpp b/GUI/View/Instrument/DetectorEditor.cpp
index 59225a87eea..fa1cabba51b 100644
--- a/GUI/View/Instrument/DetectorEditor.cpp
+++ b/GUI/View/Instrument/DetectorEditor.cpp
@@ -18,7 +18,7 @@
#include "GUI/Model/Device/SphericalDetectorItem.h"
#include "GUI/View/Device/RectangularDetectorForm.h"
#include "GUI/View/Device/SphericalDetectorForm.h"
-#include "GUI/View/Numeric/NumWidgetUtils.h"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index 4cd1a378c89..09c2945eb6f 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Instrument/DistributionEditor.cpp
@@ -18,7 +18,7 @@
#include "GUI/Support/XML/Backup.h"
#include "GUI/View/Instrument/DistributionPlot.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
-#include "GUI/View/Numeric/NumWidgetUtils.h"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/View/Numeric/ScientificSpinBox.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
diff --git a/GUI/View/Instrument/InstrumentLibraryEditor.cpp b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
index 9b391c80e2e..ae84ce12e77 100644
--- a/GUI/View/Instrument/InstrumentLibraryEditor.cpp
+++ b/GUI/View/Instrument/InstrumentLibraryEditor.cpp
@@ -16,7 +16,7 @@
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/InstrumentLibrary.h"
-#include "GUI/Support/Util/StyleUtils.h"
+#include "GUI/Support/Util/StyleUtil.h"
#include "GUI/View/Instrument/DepthprobeInstrumentEditor.h"
#include "GUI/View/Instrument/GISASInstrumentEditor.h"
#include "GUI/View/Instrument/OffspecInstrumentEditor.h"
diff --git a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp b/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
index 6808c5fd895..04e53ce6705 100644
--- a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
+++ b/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Instrument/PolarizationAnalysisEditor.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
-#include "GUI/View/Numeric/NumWidgetUtils.h"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
#include <QLabel>
diff --git a/GUI/View/Main/ActionManager.cpp b/GUI/View/Main/ActionManager.cpp
index 09f32df1361..51c69872f22 100644
--- a/GUI/View/Main/ActionManager.cpp
+++ b/GUI/View/Main/ActionManager.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Main/ActionManager.h"
#include "Base/Util/Assert.h"
-#include "Base/Util/SysUtils.h"
+#include "Base/Util/SysUtil.h"
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Support/Util/Path.h"
#include "GUI/View/Instrument/InstrumentView.h"
diff --git a/GUI/View/Mask/MaskEditorPropertyPanel.cpp b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
index a985d08c0f2..9d24d45c86a 100644
--- a/GUI/View/Mask/MaskEditorPropertyPanel.cpp
+++ b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
@@ -20,7 +20,7 @@
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Numeric/NumberUtil.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
-#include "GUI/View/Tool/LayoutUtils.h"
+#include "GUI/View/Tool/LayoutUtil.h"
#include <QCheckBox>
#include <QGroupBox>
#include <QLineEdit>
diff --git a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
index 109164aa897..d6490ff413b 100644
--- a/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/View/MaterialEditor/MaterialEditorDialog.cpp
@@ -18,7 +18,7 @@
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/MaterialModel.h"
#include "GUI/Model/Sample/SampleItem.h"
-#include "GUI/Support/Util/StyleUtils.h"
+#include "GUI/Support/Util/StyleUtil.h"
#include "GUI/View/MaterialEditor/MaterialEditorModel.h"
#include "GUI/View/Numeric/NumberUtil.h"
#include "GUI/View/Tool/mainwindow_constants.h"
diff --git a/GUI/View/Numeric/NumWidgetUtils.h b/GUI/View/Numeric/NumWidgetUtil.h
similarity index 97%
rename from GUI/View/Numeric/NumWidgetUtils.h
rename to GUI/View/Numeric/NumWidgetUtil.h
index 0ebb065780f..ab02b9c055a 100644
--- a/GUI/View/Numeric/NumWidgetUtils.h
+++ b/GUI/View/Numeric/NumWidgetUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Numeric/NumWidgetUtils.h
+//! @file GUI/View/Numeric/NumWidgetUtil.h
//! @brief Defines GUI::Util namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_NUMERIC_NUMWIDGETUTILS_H
-#define BORNAGAIN_GUI_VIEW_NUMERIC_NUMWIDGETUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_NUMERIC_NUMWIDGETUTIL_H
+#define BORNAGAIN_GUI_VIEW_NUMERIC_NUMWIDGETUTIL_H
#include "Fit/Param/RealLimits.h"
#include "GUI/Model/Descriptor/SelectionProperty.h"
@@ -154,4 +154,4 @@ QDoubleSpinBox* createDoubleSpinbox(std::function<double()> getter,
bool easyScrollable = true);
} // namespace GUI::Util
-#endif // BORNAGAIN_GUI_VIEW_NUMERIC_NUMWIDGETUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_NUMERIC_NUMWIDGETUTIL_H
diff --git a/GUI/View/Numeric/NumWidgetUtils.cpp b/GUI/View/Numeric/NumWidgetUtils.cpp
index 9fdf97c0233..a4e3838c6b3 100644
--- a/GUI/View/Numeric/NumWidgetUtils.cpp
+++ b/GUI/View/Numeric/NumWidgetUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Numeric/NumWidgetUtils.h"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/Model/Data/ComboProperty.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Numeric/NumberUtil.h"
diff --git a/GUI/View/Plot2D/IntensityDataFFTPresenter.cpp b/GUI/View/Plot2D/IntensityDataFFTPresenter.cpp
index 5cfcfa402d7..bfb65271cbf 100644
--- a/GUI/View/Plot2D/IntensityDataFFTPresenter.cpp
+++ b/GUI/View/Plot2D/IntensityDataFFTPresenter.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Plot2D/IntensityDataFFTPresenter.h"
#include "Base/Util/Assert.h"
-#include "Device/Data/DataUtils.h"
+#include "Device/Data/DataUtil.h"
#include "Device/Data/Datafield.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Support/Util/Error.h"
diff --git a/GUI/View/PlotComparison/FitComparisonWidget.cpp b/GUI/View/PlotComparison/FitComparisonWidget.cpp
index 59d37185268..ccd79680d9d 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget.cpp
@@ -26,7 +26,7 @@
#include "GUI/View/PlotComparison/FitFlowWidget.h"
#include "GUI/View/PlotUtil/ColorMap.h"
#include "GUI/View/PlotUtil/PlotStatusLabel.h"
-#include "GUI/View/PlotUtil/RangeUtils.h"
+#include "GUI/View/PlotUtil/RangeUtil.h"
#include <QAction>
#include <QVBoxLayout>
diff --git a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
index e666066ac14..21ef0568604 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
@@ -26,7 +26,7 @@
#include "GUI/View/PlotSpecular/SpecularPlot.h"
#include "GUI/View/PlotSpecular/SpecularPlotCanvas.h"
#include "GUI/View/PlotUtil/PlotStatusLabel.h"
-#include "GUI/View/PlotUtil/RangeUtils.h"
+#include "GUI/View/PlotUtil/RangeUtil.h"
FitComparisonWidget1D::FitComparisonWidget1D(QWidget* parent)
: DataAccessWidget(parent)
diff --git a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
index 1137c71f5c1..e6fd574c2aa 100644
--- a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
+++ b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
@@ -18,8 +18,8 @@
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
-#include "GUI/View/Numeric/NumWidgetUtils.h"
-#include "GUI/View/Tool/LayoutUtils.h"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
+#include "GUI/View/Tool/LayoutUtil.h"
#include <QAction>
#include <QCheckBox>
#include <QFormLayout>
diff --git a/GUI/View/PlotUtil/ColorMap.cpp b/GUI/View/PlotUtil/ColorMap.cpp
index 69cad753849..76330d7fe84 100644
--- a/GUI/View/PlotUtil/ColorMap.cpp
+++ b/GUI/View/PlotUtil/ColorMap.cpp
@@ -20,7 +20,7 @@
#include "GUI/Support/Util/QCP_Util.h"
#include "GUI/View/PlotUtil/PlotConstants.h"
#include "GUI/View/PlotUtil/PlotEventInfo.h"
-#include "GUI/View/PlotUtil/RangeUtils.h"
+#include "GUI/View/PlotUtil/RangeUtil.h"
#include "GUI/View/Tool/UpdateTimer.h"
#include <qcustomplot.h>
diff --git a/GUI/View/PlotUtil/PlotConstants.h b/GUI/View/PlotUtil/PlotConstants.h
index 73706c7b6c8..0fd7bcca556 100644
--- a/GUI/View/PlotUtil/PlotConstants.h
+++ b/GUI/View/PlotUtil/PlotConstants.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_PLOTUTIL_PLOTCONSTANTS_H
#define BORNAGAIN_GUI_VIEW_PLOTUTIL_PLOTCONSTANTS_H
-#include "GUI/Support/Util/StyleUtils.h"
+#include "GUI/Support/Util/StyleUtil.h"
#include <QSize>
namespace GUI::Constants {
diff --git a/GUI/View/PlotUtil/RangeUtils.h b/GUI/View/PlotUtil/RangeUtil.h
similarity index 91%
rename from GUI/View/PlotUtil/RangeUtils.h
rename to GUI/View/PlotUtil/RangeUtil.h
index 2a0bd6bcae1..19ea99c243e 100644
--- a/GUI/View/PlotUtil/RangeUtils.h
+++ b/GUI/View/PlotUtil/RangeUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/PlotUtil/RangeUtils.h
+//! @file GUI/View/PlotUtil/RangeUtil.h
//! @brief Defines RangeUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_PLOTUTIL_RANGEUTILS_H
-#define BORNAGAIN_GUI_VIEW_PLOTUTIL_RANGEUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_PLOTUTIL_RANGEUTIL_H
+#define BORNAGAIN_GUI_VIEW_PLOTUTIL_RANGEUTIL_H
#include <QList>
@@ -68,4 +68,4 @@ QList<AmplitudeAxisItem*> valueAxesFromIntensityItems(const QList<IntensityDataI
} // namespace GUI::View::RangeUtils
-#endif // BORNAGAIN_GUI_VIEW_PLOTUTIL_RANGEUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_PLOTUTIL_RANGEUTIL_H
diff --git a/GUI/View/PlotUtil/RangeUtils.cpp b/GUI/View/PlotUtil/RangeUtils.cpp
index 93d05d54791..6c285a3f8b8 100644
--- a/GUI/View/PlotUtil/RangeUtils.cpp
+++ b/GUI/View/PlotUtil/RangeUtils.cpp
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#include "GUI/View/PlotUtil/RangeUtils.h"
+#include "GUI/View/PlotUtil/RangeUtil.h"
#include "GUI/Model/Axis/AxisItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Support/Util/Error.h"
-#include "GUI/Support/Util/StyleUtils.h"
+#include "GUI/Support/Util/StyleUtil.h"
#include <qcustomplot.h>
namespace {
diff --git a/GUI/View/PlotUtil/StatusLabel.cpp b/GUI/View/PlotUtil/StatusLabel.cpp
index 8c16b74bc6a..9875852bc68 100644
--- a/GUI/View/PlotUtil/StatusLabel.cpp
+++ b/GUI/View/PlotUtil/StatusLabel.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/PlotUtil/StatusLabel.h"
-#include "GUI/Support/Util/StyleUtils.h"
+#include "GUI/Support/Util/StyleUtil.h"
#include <QColor>
#include <QFont>
#include <QPainter>
diff --git a/GUI/View/Project/AutosaveController.cpp b/GUI/View/Project/AutosaveController.cpp
index 170a2b90718..8e895c1b8da 100644
--- a/GUI/View/Project/AutosaveController.cpp
+++ b/GUI/View/Project/AutosaveController.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Project/AutosaveController.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Support/IO/ProjectUtils.h"
+#include "GUI/Support/IO/ProjectUtil.h"
#include "GUI/View/Tool/UpdateTimer.h"
#include <QDir>
diff --git a/GUI/View/Project/NewProjectDialog.cpp b/GUI/View/Project/NewProjectDialog.cpp
index 701895200ad..b93c0105a38 100644
--- a/GUI/View/Project/NewProjectDialog.cpp
+++ b/GUI/View/Project/NewProjectDialog.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Project/NewProjectDialog.h"
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Support/IO/ProjectUtils.h"
+#include "GUI/Support/IO/ProjectUtil.h"
#include <QFileDialog>
#include <QGroupBox>
#include <QLabel>
diff --git a/GUI/View/Project/ProjectManager.cpp b/GUI/View/Project/ProjectManager.cpp
index 840ca3ef0cc..50fc0a49498 100644
--- a/GUI/View/Project/ProjectManager.cpp
+++ b/GUI/View/Project/ProjectManager.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Project/ProjectManager.h"
#include "Base/Util/Assert.h"
#include "GUI/Application/ApplicationSettings.h"
-#include "GUI/Support/IO/ProjectUtils.h"
+#include "GUI/Support/IO/ProjectUtil.h"
#include "GUI/Support/Util/Error.h"
#include "GUI/Support/Util/MessageService.h"
#include "GUI/View/Info/MessageBox.h"
diff --git a/GUI/View/Project/PyImportAssistant.cpp b/GUI/View/Project/PyImportAssistant.cpp
index ce5541d25b5..045f78c71a5 100644
--- a/GUI/View/Project/PyImportAssistant.cpp
+++ b/GUI/View/Project/PyImportAssistant.cpp
@@ -17,11 +17,11 @@
#include "GUI/View/Project/PyImportAssistant.h"
#include "BABuild.h"
#include "Base/Util/Assert.h"
-#include "Base/Util/SysUtils.h"
+#include "Base/Util/SysUtil.h"
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Model/FromCore/ItemizeSample.h"
#include "GUI/Model/FromCore/ItemizeSimulation.h"
-#include "GUI/Support/IO/ProjectUtils.h"
+#include "GUI/Support/IO/ProjectUtil.h"
#include "GUI/Support/Util/Path.h"
#include "GUI/Support/Util/String.h"
#include "GUI/View/Info/ComboSelectorDialog.h"
diff --git a/GUI/View/Projection/ProjectionsPlot.cpp b/GUI/View/Projection/ProjectionsPlot.cpp
index efa21304df1..bc2669bd156 100644
--- a/GUI/View/Projection/ProjectionsPlot.cpp
+++ b/GUI/View/Projection/ProjectionsPlot.cpp
@@ -21,7 +21,7 @@
#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"
+#include "GUI/View/PlotUtil/RangeUtil.h"
#include <boost/polymorphic_cast.hpp>
#include <qcustomplot.h>
#include <utility>
diff --git a/GUI/View/SampleDesigner/CompoundForm.cpp b/GUI/View/SampleDesigner/CompoundForm.cpp
index f07e364f476..1878339685c 100644
--- a/GUI/View/SampleDesigner/CompoundForm.cpp
+++ b/GUI/View/SampleDesigner/CompoundForm.cpp
@@ -16,7 +16,7 @@
#include "GUI/Model/Sample/CompoundItem.h"
#include "GUI/Support/Util/ActionFactory.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
-#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
+#include "GUI/View/SampleDesigner/LayerEditorUtil.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
#include <QAction>
diff --git a/GUI/View/SampleDesigner/FormLayouter.cpp b/GUI/View/SampleDesigner/FormLayouter.cpp
index 9469fa7ecb5..d2af060a287 100644
--- a/GUI/View/SampleDesigner/FormLayouter.cpp
+++ b/GUI/View/SampleDesigner/FormLayouter.cpp
@@ -16,7 +16,7 @@
#include "Base/Util/Assert.h"
#include "GUI/Model/Descriptor/VectorProperty.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
-#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
+#include "GUI/View/SampleDesigner/LayerEditorUtil.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
#include <QFormLayout>
diff --git a/GUI/View/SampleDesigner/InterferenceForm.cpp b/GUI/View/SampleDesigner/InterferenceForm.cpp
index 8812aa45cb3..16bd8a10aa4 100644
--- a/GUI/View/SampleDesigner/InterferenceForm.cpp
+++ b/GUI/View/SampleDesigner/InterferenceForm.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/Sample/Lattice2DItems.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/Support/Util/CustomEventFilters.h"
-#include "GUI/View/Numeric/NumWidgetUtils.h"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/LatticeTypeSelectionForm.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/View/SampleDesigner/LayerEditorUtils.h b/GUI/View/SampleDesigner/LayerEditorUtil.h
similarity index 93%
rename from GUI/View/SampleDesigner/LayerEditorUtils.h
rename to GUI/View/SampleDesigner/LayerEditorUtil.h
index 75952dc9859..0639e7dcab9 100644
--- a/GUI/View/SampleDesigner/LayerEditorUtils.h
+++ b/GUI/View/SampleDesigner/LayerEditorUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/SampleDesigner/LayerEditorUtils.h
+//! @file GUI/View/SampleDesigner/LayerEditorUtil.h
//! @brief Defines class LayerEditorUtils
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYEREDITORUTILS_H
-#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYEREDITORUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYEREDITORUTIL_H
+#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYEREDITORUTIL_H
#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
@@ -87,4 +87,4 @@ QList<QColor> predefinedLayerColors();
} // namespace LayerEditorUtils
-#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYEREDITORUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYEREDITORUTIL_H
diff --git a/GUI/View/SampleDesigner/LayerEditorUtils.cpp b/GUI/View/SampleDesigner/LayerEditorUtils.cpp
index 4125746cbc4..902366960c6 100644
--- a/GUI/View/SampleDesigner/LayerEditorUtils.cpp
+++ b/GUI/View/SampleDesigner/LayerEditorUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
+#include "GUI/View/SampleDesigner/LayerEditorUtil.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Sample/CompoundItem.h"
#include "GUI/Model/Sample/CoreAndShellItem.h"
diff --git a/GUI/View/SampleDesigner/LayerForm.cpp b/GUI/View/SampleDesigner/LayerForm.cpp
index 4be8963aa3c..c92f6c242d9 100644
--- a/GUI/View/SampleDesigner/LayerForm.cpp
+++ b/GUI/View/SampleDesigner/LayerForm.cpp
@@ -20,7 +20,7 @@
#include "GUI/Model/Sample/SampleItem.h"
#include "GUI/Support/Util/ActionFactory.h"
#include "GUI/Support/Util/WidgetMoverButton.h"
-#include "GUI/View/Numeric/NumWidgetUtils.h"
+#include "GUI/View/Numeric/NumWidgetUtil.h"
#include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
#include "GUI/View/SampleDesigner/ParticleLayoutForm.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
diff --git a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
index ead176725a2..32ab46bafa9 100644
--- a/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
+++ b/GUI/View/SampleDesigner/LayerOrientedSampleEditor.cpp
@@ -17,7 +17,7 @@
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/SampleItem.h"
-#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
+#include "GUI/View/SampleDesigner/LayerEditorUtil.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
#include "GUI/View/SampleDesigner/SampleForm.h"
#include "GUI/View/Widget/StyledToolbar.h"
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
index c3e055c43b9..0110d4b2fa4 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
@@ -22,10 +22,10 @@
#include "GUI/View/MaterialEditor/MaterialEditorDialog.h"
#include "GUI/View/Numeric/DoubleLineEdit.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
-#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
+#include "GUI/View/SampleDesigner/LayerEditorUtil.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
#include "GUI/View/Tool/Globals.h"
-#include "GUI/View/Tool/LayoutUtils.h"
+#include "GUI/View/Tool/LayoutUtil.h"
#include <QGridLayout>
#include <QLabel>
#include <QPushButton>
diff --git a/GUI/View/SampleDesigner/ParticleLayoutForm.cpp b/GUI/View/SampleDesigner/ParticleLayoutForm.cpp
index 06987ba3f88..5f477b7b2a9 100644
--- a/GUI/View/SampleDesigner/ParticleLayoutForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleLayoutForm.cpp
@@ -21,7 +21,7 @@
#include "GUI/Support/Util/ActionFactory.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/SampleDesigner/InterferenceForm.h"
-#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
+#include "GUI/View/SampleDesigner/LayerEditorUtil.h"
#include "GUI/View/SampleDesigner/LayerForm.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
diff --git a/GUI/View/SampleDesigner/SampleListView.cpp b/GUI/View/SampleDesigner/SampleListView.cpp
index b9e2ffd766f..9b97b07bb31 100644
--- a/GUI/View/SampleDesigner/SampleListView.cpp
+++ b/GUI/View/SampleDesigner/SampleListView.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/SampleListView.h"
-#include "Base/Util/SysUtils.h"
+#include "Base/Util/SysUtil.h"
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Model/FromCore/GUIExamplesFactory.h"
#include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/View/SampleDesigner/SelectionContainerForm.h b/GUI/View/SampleDesigner/SelectionContainerForm.h
index 7ef028b46e3..549cf01b3d1 100644
--- a/GUI/View/SampleDesigner/SelectionContainerForm.h
+++ b/GUI/View/SampleDesigner/SelectionContainerForm.h
@@ -16,9 +16,9 @@
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
#include "GUI/Support/Util/CustomEventFilters.h"
-#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
+#include "GUI/View/SampleDesigner/LayerEditorUtil.h"
#include "GUI/View/SampleDesigner/SampleEditorController.h"
-#include "GUI/View/Tool/LayoutUtils.h"
+#include "GUI/View/Tool/LayoutUtil.h"
#include <QComboBox>
#include <QGridLayout>
diff --git a/GUI/View/SampleView/RealspaceBuilder.cpp b/GUI/View/SampleView/RealspaceBuilder.cpp
index a9cdacaba7c..d42dd31ee5f 100644
--- a/GUI/View/SampleView/RealspaceBuilder.cpp
+++ b/GUI/View/SampleView/RealspaceBuilder.cpp
@@ -22,7 +22,7 @@
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/Model/Sample/SampleItem.h"
-#include "Img3D/Build/BuilderUtils.h"
+#include "Img3D/Build/BuilderUtil.h"
#include "Img3D/Build/Particle3DContainer.h"
#include "Img3D/Build/PositionBuilders.h"
#include "Img3D/Model/Layer.h"
diff --git a/GUI/View/Tool/LayoutUtils.h b/GUI/View/Tool/LayoutUtil.h
similarity index 88%
rename from GUI/View/Tool/LayoutUtils.h
rename to GUI/View/Tool/LayoutUtil.h
index d771f1198ed..3351260d816 100644
--- a/GUI/View/Tool/LayoutUtils.h
+++ b/GUI/View/Tool/LayoutUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Tool/LayoutUtils.h
+//! @file GUI/View/Tool/LayoutUtil.h
//! @brief Defines namespace GUI::Util::Layout
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTILS_H
-#define BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTIL_H
+#define BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTIL_H
class QLayout;
class QGridLayout;
@@ -41,4 +41,4 @@ QWidget* placeHolder();
} // namespace GUI::Util::Layout
-#endif // BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_TOOL_LAYOUTUTIL_H
diff --git a/GUI/View/Tool/LayoutUtils.cpp b/GUI/View/Tool/LayoutUtils.cpp
index c65f3a60fdd..3226e2e1c4c 100644
--- a/GUI/View/Tool/LayoutUtils.cpp
+++ b/GUI/View/Tool/LayoutUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Tool/LayoutUtils.h"
+#include "GUI/View/Tool/LayoutUtil.h"
#include <QBoxLayout>
#include <QGridLayout>
#include <QLayoutItem>
diff --git a/GUI/View/Toplevel/ProjectsView.cpp b/GUI/View/Toplevel/ProjectsView.cpp
index 98dcf3d377d..b215c62a6bd 100644
--- a/GUI/View/Toplevel/ProjectsView.cpp
+++ b/GUI/View/Toplevel/ProjectsView.cpp
@@ -16,7 +16,7 @@
#include "GUI/Support/Util/Path.h"
#include "GUI/View/Project/ProjectManager.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
-#include "GUI/View/Tool/LayoutUtils.h"
+#include "GUI/View/Tool/LayoutUtil.h"
#include "ui_ProjectsView.h"
#include <QCommandLinkButton>
#include <QDesktopServices>
diff --git a/GUI/View/Toplevel/PythonScriptWidget.cpp b/GUI/View/Toplevel/PythonScriptWidget.cpp
index c6f6eed18a3..b1937a38b9e 100644
--- a/GUI/View/Toplevel/PythonScriptWidget.cpp
+++ b/GUI/View/Toplevel/PythonScriptWidget.cpp
@@ -16,7 +16,7 @@
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Model/ToCore/SimulationToCore.h"
#include "GUI/Support/Util/DesignerHelper.h"
-#include "GUI/Support/Util/StyleUtils.h"
+#include "GUI/Support/Util/StyleUtil.h"
#include "GUI/View/Info/CautionSign.h"
#include "GUI/View/Info/PythonSyntaxHighlighter.h"
#include "GUI/View/Widget/StyledToolbar.h"
diff --git a/Img3D/Build/BuilderUtils.h b/Img3D/Build/BuilderUtil.h
similarity index 92%
rename from Img3D/Build/BuilderUtils.h
rename to Img3D/Build/BuilderUtil.h
index 8e2301f2aec..076db35ac7c 100644
--- a/Img3D/Build/BuilderUtils.h
+++ b/Img3D/Build/BuilderUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Img3D/Build/BuilderUtils.h
+//! @file Img3D/Build/BuilderUtil.h
//! @brief Defines Img3D::BuilderUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_IMG3D_BUILD_BUILDERUTILS_H
-#define BORNAGAIN_IMG3D_BUILD_BUILDERUTILS_H
+#ifndef BORNAGAIN_IMG3D_BUILD_BUILDERUTIL_H
+#define BORNAGAIN_IMG3D_BUILD_BUILDERUTIL_H
#include "Img3D/Type/FloatVector3D.h"
#include <QColor>
@@ -60,4 +60,4 @@ private:
} // namespace Img3D
-#endif // BORNAGAIN_IMG3D_BUILD_BUILDERUTILS_H
+#endif // BORNAGAIN_IMG3D_BUILD_BUILDERUTIL_H
diff --git a/Img3D/Build/BuilderUtils.cpp b/Img3D/Build/BuilderUtils.cpp
index e9d053bee9c..c290f062942 100644
--- a/Img3D/Build/BuilderUtils.cpp
+++ b/Img3D/Build/BuilderUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Img3D/Build/BuilderUtils.h"
+#include "Img3D/Build/BuilderUtil.h"
#include "Base/Const/Units.h"
#include "Base/Util/Assert.h"
#include "Img3D/Build/Particle3DContainer.h"
diff --git a/Param/Node/INode.cpp b/Param/Node/INode.cpp
index c1d71812c95..20f1c0e8ee0 100644
--- a/Param/Node/INode.cpp
+++ b/Param/Node/INode.cpp
@@ -14,7 +14,7 @@
#include "Param/Node/INode.h"
#include "Base/Util/Assert.h"
-#include "Base/Util/StringUtils.h"
+#include "Base/Util/StringUtil.h"
#include <algorithm>
#include <iostream>
#include <utility>
diff --git a/Param/Node/NodeUtils.h b/Param/Node/NodeUtil.h
similarity index 91%
rename from Param/Node/NodeUtils.h
rename to Param/Node/NodeUtil.h
index 12f0010a76c..11b736666bc 100644
--- a/Param/Node/NodeUtils.h
+++ b/Param/Node/NodeUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Param/Node/NodeUtils.h
+//! @file Param/Node/NodeUtil.h
//! @brief Defines collection of utility functions for INode.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_PARAM_NODE_NODEUTILS_H
-#define BORNAGAIN_PARAM_NODE_NODEUTILS_H
+#ifndef BORNAGAIN_PARAM_NODE_NODEUTIL_H
+#define BORNAGAIN_PARAM_NODE_NODEUTIL_H
#include "Base/Util/Assert.h"
#include "Param/Node/INode.h"
@@ -61,4 +61,4 @@ std::vector<const T*> AllDescendantsOfType(const INode& node)
} // namespace NodeUtils
-#endif // BORNAGAIN_PARAM_NODE_NODEUTILS_H
+#endif // BORNAGAIN_PARAM_NODE_NODEUTIL_H
diff --git a/Resample/Processed/ReSample.cpp b/Resample/Processed/ReSample.cpp
index fca9642005e..a9f828334c5 100644
--- a/Resample/Processed/ReSample.cpp
+++ b/Resample/Processed/ReSample.cpp
@@ -27,11 +27,11 @@
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/Interface/LayerRoughness.h"
#include "Sample/Material/MaterialBySLDImpl.h"
-#include "Sample/Material/MaterialUtils.h"
+#include "Sample/Material/MaterialUtil.h"
#include "Sample/Material/RefractiveMaterialImpl.h"
#include "Sample/Multilayer/Layer.h"
#include "Sample/Multilayer/MultiLayer.h"
-#include "Sample/Multilayer/MultilayerUtils.h"
+#include "Sample/Multilayer/MultilayerUtil.h"
#include "Sample/Particle/IParticle.h"
#include <iomanip>
#include <iostream>
diff --git a/Resample/Processed/Slicer.cpp b/Resample/Processed/Slicer.cpp
index 2b2df1bda09..fc84a6f9a91 100644
--- a/Resample/Processed/Slicer.cpp
+++ b/Resample/Processed/Slicer.cpp
@@ -22,7 +22,7 @@
#include "Resample/Particle/ReParticle.h"
#include "Resample/Slice/ZLimits.h"
#include "Sample/HardParticle/HardParticles.h"
-#include "Sample/Material/MaterialUtils.h"
+#include "Sample/Material/MaterialUtil.h"
#include "Sample/Particle/Compound.h"
#include "Sample/Particle/CoreAndShell.h"
#include "Sample/Particle/Crystal.h"
diff --git a/Resample/Slice/Slice.cpp b/Resample/Slice/Slice.cpp
index 378fd86d876..b6525adaafa 100644
--- a/Resample/Slice/Slice.cpp
+++ b/Resample/Slice/Slice.cpp
@@ -17,7 +17,7 @@
#include "Base/Spin/SpinMatrix.h"
#include "Resample/Slice/SliceStack.h"
#include "Sample/Interface/LayerRoughness.h"
-#include "Sample/Material/MaterialUtils.h"
+#include "Sample/Material/MaterialUtil.h"
#include <utility>
Slice::Slice(const ZLimits& zRange, Material material, const R3& B_field,
diff --git a/Sample/Aggregate/ParticleLayout.cpp b/Sample/Aggregate/ParticleLayout.cpp
index 1dcacacac1d..96f27905f9c 100644
--- a/Sample/Aggregate/ParticleLayout.cpp
+++ b/Sample/Aggregate/ParticleLayout.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Sample/Aggregate/ParticleLayout.h"
-#include "Base/Util/StringUtils.h"
+#include "Base/Util/StringUtil.h"
#include "Sample/Aggregate/InterferenceNone.h"
#include "Sample/Particle/Particle.h"
diff --git a/Sample/Material/IMaterialImpl.cpp b/Sample/Material/IMaterialImpl.cpp
index 3206af8dc2c..917f227ad8b 100644
--- a/Sample/Material/IMaterialImpl.cpp
+++ b/Sample/Material/IMaterialImpl.cpp
@@ -16,7 +16,7 @@
#include "Base/Const/PhysicalConstants.h"
#include "Base/Spin/SpinMatrix.h"
#include "Base/Vector/WavevectorInfo.h"
-#include "Sample/Material/MaterialUtils.h"
+#include "Sample/Material/MaterialUtil.h"
#include <memory>
namespace {
diff --git a/Sample/Material/MaterialFactoryFuncs.cpp b/Sample/Material/MaterialFactoryFuncs.cpp
index 99d24f781ca..fada1eb4e88 100644
--- a/Sample/Material/MaterialFactoryFuncs.cpp
+++ b/Sample/Material/MaterialFactoryFuncs.cpp
@@ -14,7 +14,7 @@
#include "Base/Const/Units.h"
#include "Sample/Material/MaterialBySLDImpl.h"
-#include "Sample/Material/MaterialUtils.h"
+#include "Sample/Material/MaterialUtil.h"
#include "Sample/Material/RefractiveMaterialImpl.h"
Material RefractiveMaterial(const std::string& name, complex_t refractive_index, R3 magnetization)
diff --git a/Sample/Material/MaterialUtils.h b/Sample/Material/MaterialUtil.h
similarity index 91%
rename from Sample/Material/MaterialUtils.h
rename to Sample/Material/MaterialUtil.h
index 32f5cb92531..b45c08bd35b 100644
--- a/Sample/Material/MaterialUtils.h
+++ b/Sample/Material/MaterialUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Material/MaterialUtils.h
+//! @file Sample/Material/MaterialUtil.h
//! @brief Declares functions in namespace MaterialUtils
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_MATERIAL_MATERIALUTILS_H
-#define BORNAGAIN_SAMPLE_MATERIAL_MATERIALUTILS_H
+#ifndef BORNAGAIN_SAMPLE_MATERIAL_MATERIALUTIL_H
+#define BORNAGAIN_SAMPLE_MATERIAL_MATERIALUTIL_H
#include "Sample/Material/Admixtures.h"
#include "Sample/Material/Material.h"
@@ -56,4 +56,4 @@ Material averagedMaterial(const Material& base_mat, const Admixtures& admixtures
} // namespace MaterialUtils
-#endif // BORNAGAIN_SAMPLE_MATERIAL_MATERIALUTILS_H
+#endif // BORNAGAIN_SAMPLE_MATERIAL_MATERIALUTIL_H
diff --git a/Sample/Material/MaterialUtils.cpp b/Sample/Material/MaterialUtils.cpp
index d17b820ef63..bf922b59891 100644
--- a/Sample/Material/MaterialUtils.cpp
+++ b/Sample/Material/MaterialUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/Material/MaterialUtils.h"
+#include "Sample/Material/MaterialUtil.h"
#include "Base/Const/PhysicalConstants.h"
#include "Base/Spin/SpinMatrix.h"
#include "Base/Util/Assert.h"
diff --git a/Sample/Multilayer/Layer.cpp b/Sample/Multilayer/Layer.cpp
index 2c9e81939e5..efee90b7d9e 100644
--- a/Sample/Multilayer/Layer.cpp
+++ b/Sample/Multilayer/Layer.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Sample/Multilayer/Layer.h"
-#include "Base/Util/StringUtils.h"
+#include "Base/Util/StringUtil.h"
#include "Sample/Aggregate/ParticleLayout.h"
//! Constructor of a layer with thickness and material
diff --git a/Sample/Multilayer/MultiLayer.cpp b/Sample/Multilayer/MultiLayer.cpp
index 4cd39d72c8a..48910f199c2 100644
--- a/Sample/Multilayer/MultiLayer.cpp
+++ b/Sample/Multilayer/MultiLayer.cpp
@@ -14,11 +14,11 @@
#include "Sample/Multilayer/MultiLayer.h"
#include "Base/Util/Assert.h"
-#include "Base/Util/StringUtils.h"
+#include "Base/Util/StringUtil.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/Interface/LayerInterface.h"
#include "Sample/Interface/LayerRoughness.h"
-#include "Sample/Material/MaterialUtils.h"
+#include "Sample/Material/MaterialUtil.h"
#include "Sample/Multilayer/Layer.h"
#include <utility>
diff --git a/Sample/Multilayer/MultilayerUtils.h b/Sample/Multilayer/MultilayerUtil.h
similarity index 83%
rename from Sample/Multilayer/MultilayerUtils.h
rename to Sample/Multilayer/MultilayerUtil.h
index a3914714497..3862c880cca 100644
--- a/Sample/Multilayer/MultilayerUtils.h
+++ b/Sample/Multilayer/MultilayerUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sample/Multilayer/MultilayerUtils.h
+//! @file Sample/Multilayer/MultilayerUtil.h
//! @brief Defines namespace SampleUtils::Multilayer.
//!
//! @homepage http://www.bornagainproject.org
@@ -16,8 +16,8 @@
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYERUTILS_H
-#define BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYERUTILS_H
+#ifndef BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYERUTIL_H
+#define BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYERUTIL_H
#include <cstddef>
@@ -39,4 +39,4 @@ bool hasRoughness(const MultiLayer& sample);
} // namespace SampleUtils::Multilayer
-#endif // BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYERUTILS_H
+#endif // BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYERUTIL_H
diff --git a/Sample/Multilayer/MultilayerUtils.cpp b/Sample/Multilayer/MultilayerUtils.cpp
index 3fe5077ff99..b67640b6023 100644
--- a/Sample/Multilayer/MultilayerUtils.cpp
+++ b/Sample/Multilayer/MultilayerUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sample/Multilayer/MultilayerUtils.h"
+#include "Sample/Multilayer/MultilayerUtil.h"
#include "Base/Util/Assert.h"
#include "Sample/Interface/LayerInterface.h"
#include "Sample/Multilayer/Layer.h"
diff --git a/Sample/Multilayer/PyImport.cpp b/Sample/Multilayer/PyImport.cpp
index 56b8832fabd..81bd3f2fe81 100644
--- a/Sample/Multilayer/PyImport.cpp
+++ b/Sample/Multilayer/PyImport.cpp
@@ -16,7 +16,7 @@
#include "Sample/Multilayer/PyImport.h"
#include "Base/Py/PyCore.h"
-#include "Base/Py/PyUtils.h"
+#include "Base/Py/PyUtil.h"
#include "Sample/Multilayer/MultiLayer.h"
namespace {
diff --git a/Sample/Particle/IFormFactor.cpp b/Sample/Particle/IFormFactor.cpp
index d29c3c0c122..593c8f16493 100644
--- a/Sample/Particle/IFormFactor.cpp
+++ b/Sample/Particle/IFormFactor.cpp
@@ -16,7 +16,7 @@
#include "Base/Py/PyFmt.h"
#include "Base/Types/Span.h"
#include "Base/Util/Assert.h"
-#include "Base/Util/StringUtils.h"
+#include "Base/Util/StringUtil.h"
#include "Base/Vector/WavevectorInfo.h"
#include "Sample/Particle/PolyhedralUtil.h"
#include "Sample/Scattering/Rotations.h"
diff --git a/Sim/Export/PyFmt2.cpp b/Sim/Export/PyFmt2.cpp
index 09da90af368..8dcbeadb930 100644
--- a/Sim/Export/PyFmt2.cpp
+++ b/Sim/Export/PyFmt2.cpp
@@ -20,7 +20,7 @@
#include "Base/Py/PyFmt.h"
#include "Base/Util/Algorithms.h"
#include "Base/Util/Assert.h"
-#include "Base/Util/StringUtils.h"
+#include "Base/Util/StringUtil.h"
#include "Device/Mask/Ellipse.h"
#include "Device/Mask/InfinitePlane.h"
#include "Device/Mask/Line.h"
diff --git a/Sim/Export/SampleToPython.cpp b/Sim/Export/SampleToPython.cpp
index b4cba243a89..ecd58f5f46b 100644
--- a/Sim/Export/SampleToPython.cpp
+++ b/Sim/Export/SampleToPython.cpp
@@ -16,7 +16,7 @@
#include "Base/Py/PyFmt.h"
#include "Base/Util/Assert.h"
#include "Base/Vector/RotMatrix.h"
-#include "Param/Node/NodeUtils.h"
+#include "Param/Node/NodeUtil.h"
#include "Sample/Aggregate/Interferences.h"
#include "Sample/Aggregate/ParticleLayout.h"
#include "Sample/Interface/LayerInterface.h"
diff --git a/Sim/Export/SimulationToPython.cpp b/Sim/Export/SimulationToPython.cpp
index 2a4f93b4158..a9a33513376 100644
--- a/Sim/Export/SimulationToPython.cpp
+++ b/Sim/Export/SimulationToPython.cpp
@@ -27,7 +27,7 @@
#include "Device/Resolution/ConvolutionDetectorResolution.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "Param/Distrib/Distributions.h"
-#include "Param/Node/NodeUtils.h"
+#include "Param/Node/NodeUtil.h"
#include "Resample/Options/SimulationOptions.h"
#include "Sim/Background/ConstantBackground.h"
#include "Sim/Background/PoissonBackground.h"
diff --git a/Sim/Fitting/FitObjective.cpp b/Sim/Fitting/FitObjective.cpp
index 9bd376c3546..ff8af7b16f9 100644
--- a/Sim/Fitting/FitObjective.cpp
+++ b/Sim/Fitting/FitObjective.cpp
@@ -18,7 +18,7 @@
#include "Fit/Minimizer/MinimizerResult.h"
#include "Sim/Fitting/FitStatus.h"
#include "Sim/Fitting/ObjectiveMetric.h"
-#include "Sim/Fitting/ObjectiveMetricUtils.h"
+#include "Sim/Fitting/ObjectiveMetricUtil.h"
#include "Sim/Fitting/PyFittingCallbacks.h"
#include "Sim/Fitting/SimDataPair.h"
#include "Sim/Residual/ChiSquaredModule.h"
diff --git a/Sim/Fitting/FitObjective.h b/Sim/Fitting/FitObjective.h
index c070bad3363..60d281b0d2b 100644
--- a/Sim/Fitting/FitObjective.h
+++ b/Sim/Fitting/FitObjective.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_SIM_FITTING_FITOBJECTIVE_H
#define BORNAGAIN_SIM_FITTING_FITOBJECTIVE_H
-#include "Device/Data/ArrayUtils.h"
+#include "Device/Data/ArrayUtil.h"
#include "Sim/Fitting/FitTypes.h"
class FitStatus;
diff --git a/Sim/Fitting/FitPrintService.cpp b/Sim/Fitting/FitPrintService.cpp
index d91333c61d8..589f6422fca 100644
--- a/Sim/Fitting/FitPrintService.cpp
+++ b/Sim/Fitting/FitPrintService.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Sim/Fitting/FitPrintService.h"
-#include "Base/Util/StringUtils.h"
+#include "Base/Util/StringUtil.h"
#include "Fit/Minimizer/MinimizerResult.h"
#include "Sim/Fitting/FitObjective.h"
#include "Sim/Fitting/IterationInfo.h"
diff --git a/Sim/Fitting/ObjectiveMetric.cpp b/Sim/Fitting/ObjectiveMetric.cpp
index 7aff6d2728e..b3a16da10a3 100644
--- a/Sim/Fitting/ObjectiveMetric.cpp
+++ b/Sim/Fitting/ObjectiveMetric.cpp
@@ -14,7 +14,7 @@
#include "Sim/Fitting/ObjectiveMetric.h"
#include "Device/Data/Datafield.h"
-#include "Sim/Fitting/ObjectiveMetricUtils.h"
+#include "Sim/Fitting/ObjectiveMetricUtil.h"
#include "Sim/Fitting/SimDataPair.h"
#include <cmath>
#include <limits>
diff --git a/Sim/Fitting/ObjectiveMetricUtils.h b/Sim/Fitting/ObjectiveMetricUtil.h
similarity index 89%
rename from Sim/Fitting/ObjectiveMetricUtils.h
rename to Sim/Fitting/ObjectiveMetricUtil.h
index ecee869694e..fcf4a5fa6c2 100644
--- a/Sim/Fitting/ObjectiveMetricUtils.h
+++ b/Sim/Fitting/ObjectiveMetricUtil.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Sim/Fitting/ObjectiveMetricUtils.h
+//! @file Sim/Fitting/ObjectiveMetricUtil.h
//! @brief Defines ObjectiveMetric utilities and corresponding namespace.
//!
//! @homepage http://www.bornagainproject.org
@@ -15,8 +15,8 @@
#ifdef SWIG
#error no need to expose this header to Swig
#endif // SWIG
-#ifndef BORNAGAIN_SIM_FITTING_OBJECTIVEMETRICUTILS_H
-#define BORNAGAIN_SIM_FITTING_OBJECTIVEMETRICUTILS_H
+#ifndef BORNAGAIN_SIM_FITTING_OBJECTIVEMETRICUTIL_H
+#define BORNAGAIN_SIM_FITTING_OBJECTIVEMETRICUTIL_H
#include <functional>
#include <memory>
@@ -57,4 +57,4 @@ std::string defaultMetricName();
} // namespace ObjectiveMetricUtils
-#endif // BORNAGAIN_SIM_FITTING_OBJECTIVEMETRICUTILS_H
+#endif // BORNAGAIN_SIM_FITTING_OBJECTIVEMETRICUTIL_H
diff --git a/Sim/Fitting/ObjectiveMetricUtils.cpp b/Sim/Fitting/ObjectiveMetricUtils.cpp
index 5e60cb3f143..806ad5ff0f2 100644
--- a/Sim/Fitting/ObjectiveMetricUtils.cpp
+++ b/Sim/Fitting/ObjectiveMetricUtils.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Sim/Fitting/ObjectiveMetricUtils.h"
+#include "Sim/Fitting/ObjectiveMetricUtil.h"
#include "Sim/Fitting/ObjectiveMetric.h"
#include <algorithm>
#include <cmath>
diff --git a/Sim/Simulation/ISimulation.cpp b/Sim/Simulation/ISimulation.cpp
index d619625782c..5174f460105 100644
--- a/Sim/Simulation/ISimulation.cpp
+++ b/Sim/Simulation/ISimulation.cpp
@@ -15,7 +15,7 @@
#include "Sim/Simulation/ISimulation.h"
#include "Base/Progress/ProgressHandler.h"
#include "Base/Util/Assert.h"
-#include "Base/Util/StringUtils.h"
+#include "Base/Util/StringUtil.h"
#include "Device/Histo/SimulationResult.h"
#include "Param/Distrib/DistributionHandler.h"
#include "Resample/Options/SimulationOptions.h"
diff --git a/Tests/Functional/Consistence/CompareTwoReferences.cpp b/Tests/Functional/Consistence/CompareTwoReferences.cpp
index 765130fd811..905a0b664ac 100644
--- a/Tests/Functional/Consistence/CompareTwoReferences.cpp
+++ b/Tests/Functional/Consistence/CompareTwoReferences.cpp
@@ -14,7 +14,7 @@
#include "BATesting.h"
#include "Base/Util/Assert.h"
-#include "Base/Util/FileSystemUtils.h"
+#include "Base/Util/FileSystemUtil.h"
#include "Device/Data/Datafield.h"
#include "Device/Histo/DiffUtil.h"
#include "Device/IO/IOFactory.h"
diff --git a/Tests/Functional/CoreSpecial/CoreIOPathTest.cpp b/Tests/Functional/CoreSpecial/CoreIOPathTest.cpp
index 7cd4a51cab3..56b6d680664 100644
--- a/Tests/Functional/CoreSpecial/CoreIOPathTest.cpp
+++ b/Tests/Functional/CoreSpecial/CoreIOPathTest.cpp
@@ -14,7 +14,7 @@
#include "BATesting.h"
#include "Base/Axis/FixedBinAxis.h"
-#include "Base/Util/FileSystemUtils.h"
+#include "Base/Util/FileSystemUtil.h"
#include "Device/Data/Datafield.h"
#include "Device/Histo/DiffUtil.h"
#include "Device/IO/IOFactory.h"
diff --git a/Tests/Functional/CoreSpecial/FourierTransformationTest.cpp b/Tests/Functional/CoreSpecial/FourierTransformationTest.cpp
index 83e2caac663..04bb2372695 100644
--- a/Tests/Functional/CoreSpecial/FourierTransformationTest.cpp
+++ b/Tests/Functional/CoreSpecial/FourierTransformationTest.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "BATesting.h"
-#include "Base/Util/FileSystemUtils.h"
-#include "Device/Data/DataUtils.h"
+#include "Base/Util/FileSystemUtil.h"
+#include "Device/Data/DataUtil.h"
#include "Device/Data/Datafield.h"
#include "Device/Histo/DiffUtil.h"
#include "Device/IO/IOFactory.h"
diff --git a/Tests/Suite/GUI/Check.cpp b/Tests/Suite/GUI/Check.cpp
index c0040ff68ea..d043d9bc97d 100644
--- a/Tests/Suite/GUI/Check.cpp
+++ b/Tests/Suite/GUI/Check.cpp
@@ -14,7 +14,7 @@
#include "BABuild.h"
#include "BATesting.h"
-#include "Base/Util/FileSystemUtils.h"
+#include "Base/Util/FileSystemUtil.h"
#include "Device/Data/Datafield.h"
#include "Device/Histo/DiffUtil.h"
#include "Device/Histo/SimulationResult.h"
diff --git a/Tests/Suite/Persist/Check.cpp b/Tests/Suite/Persist/Check.cpp
index 67498c594ed..7bda386f180 100644
--- a/Tests/Suite/Persist/Check.cpp
+++ b/Tests/Suite/Persist/Check.cpp
@@ -15,7 +15,7 @@
#include "BABuild.h"
#include "BATesting.h"
#include "Base/Util/Assert.h"
-#include "Base/Util/FileSystemUtils.h"
+#include "Base/Util/FileSystemUtil.h"
#include "Device/Data/Datafield.h"
#include "Device/Histo/DiffUtil.h"
#include "Device/Histo/SimulationResult.h"
diff --git a/Tests/Suite/Py/Check.cpp b/Tests/Suite/Py/Check.cpp
index 1b99d25f6eb..c35c401e604 100644
--- a/Tests/Suite/Py/Check.cpp
+++ b/Tests/Suite/Py/Check.cpp
@@ -14,7 +14,7 @@
#include "BABuild.h"
#include "BATesting.h"
-#include "Base/Util/FileSystemUtils.h"
+#include "Base/Util/FileSystemUtil.h"
#include "Device/Data/Datafield.h"
#include "Device/Histo/DiffUtil.h"
#include "Device/Histo/SimulationResult.h"
diff --git a/Tests/Unit/Base/FileSystemUtilsTest.cpp b/Tests/Unit/Base/FileSystemUtilsTest.cpp
index e2e42ca2294..2c9b3b6bf21 100644
--- a/Tests/Unit/Base/FileSystemUtilsTest.cpp
+++ b/Tests/Unit/Base/FileSystemUtilsTest.cpp
@@ -1,4 +1,4 @@
-#include "Base/Util/FileSystemUtils.h"
+#include "Base/Util/FileSystemUtil.h"
#include "BATesting.h"
#include "Tests/GTestWrapper/google_test.h"
#include <filesystem>
diff --git a/Tests/Unit/Base/StringUtilsTest.cpp b/Tests/Unit/Base/StringUtilsTest.cpp
index 67a03ce41e6..d841fc06754 100644
--- a/Tests/Unit/Base/StringUtilsTest.cpp
+++ b/Tests/Unit/Base/StringUtilsTest.cpp
@@ -1,4 +1,4 @@
-#include "Base/Util/StringUtils.h"
+#include "Base/Util/StringUtil.h"
#include "BATesting.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/Device/ArrayUtilsTest.cpp b/Tests/Unit/Device/ArrayUtilsTest.cpp
index a2c6f8bdd74..7eaeccea207 100644
--- a/Tests/Unit/Device/ArrayUtilsTest.cpp
+++ b/Tests/Unit/Device/ArrayUtilsTest.cpp
@@ -1,4 +1,4 @@
-#include "Device/Data/ArrayUtils.h"
+#include "Device/Data/ArrayUtil.h"
#include "Base/Axis/FixedBinAxis.h"
#include "Device/Data/Datafield.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/Device/FixedBinAxisTest.cpp b/Tests/Unit/Device/FixedBinAxisTest.cpp
index 6107b99ca0c..ac4a71813e4 100644
--- a/Tests/Unit/Device/FixedBinAxisTest.cpp
+++ b/Tests/Unit/Device/FixedBinAxisTest.cpp
@@ -1,6 +1,6 @@
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/Bin.h"
-#include "Device/IO/DataFormatUtils.h"
+#include "Device/IO/DataFormatUtil.h"
#include "Tests/GTestWrapper/google_test.h"
#include <iostream>
diff --git a/Tests/Unit/Device/IntensityDataFunctionsTest.cpp b/Tests/Unit/Device/IntensityDataFunctionsTest.cpp
index 13e9a388303..fc87d29022c 100644
--- a/Tests/Unit/Device/IntensityDataFunctionsTest.cpp
+++ b/Tests/Unit/Device/IntensityDataFunctionsTest.cpp
@@ -2,7 +2,7 @@
#include "Base/Axis/Frame.h"
#include "Base/Axis/FrameUtil.h"
#include "Base/Axis/HistoAxis.h"
-#include "Device/Data/DataUtils.h"
+#include "Device/Data/DataUtil.h"
#include "Device/Data/Datafield.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/Device/PointwiseAxisTest.cpp b/Tests/Unit/Device/PointwiseAxisTest.cpp
index 44aabbc7eb1..8f20bb8fbaa 100644
--- a/Tests/Unit/Device/PointwiseAxisTest.cpp
+++ b/Tests/Unit/Device/PointwiseAxisTest.cpp
@@ -1,7 +1,7 @@
#include "Base/Axis/Bin.h"
#include "Base/Axis/DiscreteAxis.h"
#include "Base/Axis/FixedBinAxis.h"
-#include "Device/IO/DataFormatUtils.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 b4bc4cb6b17..ecc889b8e8f 100644
--- a/Tests/Unit/Device/PowerfieldTest.cpp
+++ b/Tests/Unit/Device/PowerfieldTest.cpp
@@ -2,7 +2,7 @@
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/Frame.h"
#include "Base/Axis/HistoAxis.h"
-#include "Device/Data/DataUtils.h"
+#include "Device/Data/DataUtil.h"
#include "Device/Data/Datafield.h"
#include "Tests/GTestWrapper/google_test.h"
#include <algorithm>
diff --git a/Tests/Unit/Device/SpectrumTest.cpp b/Tests/Unit/Device/SpectrumTest.cpp
index 802c15e2dd8..bd1507c47a8 100644
--- a/Tests/Unit/Device/SpectrumTest.cpp
+++ b/Tests/Unit/Device/SpectrumTest.cpp
@@ -1,4 +1,4 @@
-#include "Device/Data/DataUtils.h"
+#include "Device/Data/DataUtil.h"
#include "Tests/GTestWrapper/google_test.h"
#include <iostream>
#include <tspectrum.h>
diff --git a/Tests/Unit/Device/VariableBinAxisTest.cpp b/Tests/Unit/Device/VariableBinAxisTest.cpp
index c9cbcbe8bc6..55d2d896e82 100644
--- a/Tests/Unit/Device/VariableBinAxisTest.cpp
+++ b/Tests/Unit/Device/VariableBinAxisTest.cpp
@@ -1,6 +1,6 @@
#include "Base/Axis/Bin.h"
#include "Base/Axis/HistoAxis.h"
-#include "Device/IO/DataFormatUtils.h"
+#include "Device/IO/DataFormatUtil.h"
#include "Tests/GTestWrapper/google_test.h"
TEST(HistoAxisTest, VectorOfUnitLength)
diff --git a/Tests/Unit/GUI/TestAutosaveController.cpp b/Tests/Unit/GUI/TestAutosaveController.cpp
index 2e51ca781e4..6f53bbf811e 100644
--- a/Tests/Unit/GUI/TestAutosaveController.cpp
+++ b/Tests/Unit/GUI/TestAutosaveController.cpp
@@ -1,9 +1,9 @@
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/JobItemUtils.h"
+#include "GUI/Model/Data/JobItemUtil.h"
#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Support/IO/AbstractDataLoader.h"
-#include "GUI/Support/IO/ProjectUtils.h"
+#include "GUI/Support/IO/ProjectUtil.h"
#include "GUI/Support/Util/Path.h"
#include "GUI/View/Project/AutosaveController.h"
#include "GUI/View/Project/ProjectManager.h"
diff --git a/Tests/Unit/GUI/TestDataItems.cpp b/Tests/Unit/GUI/TestDataItems.cpp
index 5fb00411ae0..730a28f0e6e 100644
--- a/Tests/Unit/GUI/TestDataItems.cpp
+++ b/Tests/Unit/GUI/TestDataItems.cpp
@@ -1,4 +1,4 @@
-#include "Device/Data/ArrayUtils.h"
+#include "Device/Data/ArrayUtil.h"
#include "Device/Data/Datafield.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index b5469dfdb57..4bfaa2512b7 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -1,5 +1,5 @@
#include "GUI/Model/Axis/AxisItems.h"
-#include "GUI/Model/Data/JobItemUtils.h"
+#include "GUI/Model/Data/JobItemUtil.h"
#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Device/RectangularDetectorItem.h"
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index 043dbe4a5cd..29a8d17a35f 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -1,11 +1,11 @@
#include "GUI/Model/Data/IntensityDataItem.h"
-#include "GUI/Model/Data/JobItemUtils.h"
+#include "GUI/Model/Data/JobItemUtil.h"
#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/Model/Model/RealModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/IO/AbstractDataLoader.h"
-#include "GUI/Support/IO/ProjectUtils.h"
+#include "GUI/Support/IO/ProjectUtil.h"
#include "GUI/Support/Util/Error.h"
#include "GUI/Support/Util/Path.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestProjectUtils.cpp b/Tests/Unit/GUI/TestProjectUtils.cpp
index ab963e44d82..b23c273dfd9 100644
--- a/Tests/Unit/GUI/TestProjectUtils.cpp
+++ b/Tests/Unit/GUI/TestProjectUtils.cpp
@@ -1,5 +1,5 @@
-#include "GUI/Support/IO/ItemFileNameUtils.h"
-#include "GUI/Support/IO/ProjectUtils.h"
+#include "GUI/Support/IO/ItemFileNameUtil.h"
+#include "GUI/Support/IO/ProjectUtil.h"
#include "GUI/Support/Util/Error.h"
#include "Tests/GTestWrapper/google_test.h"
#include "Utils.h"
diff --git a/Tests/Unit/GUI/Utils.cpp b/Tests/Unit/GUI/Utils.cpp
index 1172c6533c8..367fe693adb 100644
--- a/Tests/Unit/GUI/Utils.cpp
+++ b/Tests/Unit/GUI/Utils.cpp
@@ -20,7 +20,7 @@
#include "GUI/Model/Data/DataItem.h"
#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Model/RealModel.h"
-#include "GUI/Support/IO/ProjectUtils.h"
+#include "GUI/Support/IO/ProjectUtil.h"
namespace {
diff --git a/Tests/Unit/PyBinding/Embedded.cpp b/Tests/Unit/PyBinding/Embedded.cpp
index 6705365119a..32df688c65e 100644
--- a/Tests/Unit/PyBinding/Embedded.cpp
+++ b/Tests/Unit/PyBinding/Embedded.cpp
@@ -14,7 +14,7 @@
#include "BABuild.h"
#include "Base/Py/PyCore.h"
#include "Base/Py/PyFmt.h"
-#include "Base/Py/PyUtils.h"
+#include "Base/Py/PyUtil.h"
#include "Sample/Multilayer/MultiLayer.h"
#include "Sample/Multilayer/PyImport.h"
#include "Sample/StandardSamples/ExemplarySamples.h"
diff --git a/Tests/Unit/PyBinding/PyInfo.cpp b/Tests/Unit/PyBinding/PyInfo.cpp
index dfca94a95a7..df863f777a2 100644
--- a/Tests/Unit/PyBinding/PyInfo.cpp
+++ b/Tests/Unit/PyBinding/PyInfo.cpp
@@ -14,7 +14,7 @@
#include "BABuild.h"
#include "BAVersion.h"
#include "Base/Py/PyCore.h"
-#include "Base/Py/PyUtils.h"
+#include "Base/Py/PyUtil.h"
#include "Tests/GTestWrapper/google_test.h"
#include <iostream>
diff --git a/Tests/Unit/Resample/MaterialTest.cpp b/Tests/Unit/Resample/MaterialTest.cpp
index 9bc5d64ae04..03be7fd7d6f 100644
--- a/Tests/Unit/Resample/MaterialTest.cpp
+++ b/Tests/Unit/Resample/MaterialTest.cpp
@@ -2,7 +2,7 @@
#include "Base/Vector/RotMatrix.h"
#include "Base/Vector/WavevectorInfo.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
-#include "Sample/Material/MaterialUtils.h"
+#include "Sample/Material/MaterialUtil.h"
#include "Sample/Scattering/Rotations.h"
#include "Tests/GTestWrapper/google_test.h"
#include <iostream>
diff --git a/Tests/Unit/Sample/MultiLayerTest.cpp b/Tests/Unit/Sample/MultiLayerTest.cpp
index f7a947ec756..e23fdb20144 100644
--- a/Tests/Unit/Sample/MultiLayerTest.cpp
+++ b/Tests/Unit/Sample/MultiLayerTest.cpp
@@ -6,7 +6,7 @@
#include "Sample/Interface/LayerRoughness.h"
#include "Sample/Material/MaterialFactoryFuncs.h"
#include "Sample/Multilayer/Layer.h"
-#include "Sample/Multilayer/MultilayerUtils.h"
+#include "Sample/Multilayer/MultilayerUtil.h"
#include "Tests/GTestWrapper/google_test.h"
class MultiLayerTest : public ::testing::Test {
diff --git a/Tests/Unit/Sim/ObjectiveMetricTest.cpp b/Tests/Unit/Sim/ObjectiveMetricTest.cpp
index 7bc7ae1f08f..69056b09bfb 100644
--- a/Tests/Unit/Sim/ObjectiveMetricTest.cpp
+++ b/Tests/Unit/Sim/ObjectiveMetricTest.cpp
@@ -1,5 +1,5 @@
#include "Sim/Fitting/ObjectiveMetric.h"
-#include "Sim/Fitting/ObjectiveMetricUtils.h"
+#include "Sim/Fitting/ObjectiveMetricUtil.h"
#include "Tests/GTestWrapper/google_test.h"
#include <cmath>
diff --git a/Tests/Unit/Sim/ParticleLayoutTest.cpp b/Tests/Unit/Sim/ParticleLayoutTest.cpp
index 9678b767efa..4f94831164a 100644
--- a/Tests/Unit/Sim/ParticleLayoutTest.cpp
+++ b/Tests/Unit/Sim/ParticleLayoutTest.cpp
@@ -1,6 +1,6 @@
#include "Sample/Aggregate/ParticleLayout.h"
#include "Base/Const/Units.h"
-#include "Param/Node/NodeUtils.h"
+#include "Param/Node/NodeUtil.h"
#include "Sample/Aggregate/Interference1DLattice.h"
#include "Sample/Aggregate/InterferenceNone.h"
#include "Sample/HardParticle/Sphere.h"
diff --git a/Wrap/Swig/libBornAgainDevice.i b/Wrap/Swig/libBornAgainDevice.i
index 462a83ca310..b100fe50527 100644
--- a/Wrap/Swig/libBornAgainDevice.i
+++ b/Wrap/Swig/libBornAgainDevice.i
@@ -25,7 +25,7 @@
#include "Device/Beam/Beam.h"
#include "Device/Beam/FootprintGauss.h"
#include "Device/Beam/FootprintSquare.h"
-#include "Device/Data/DataUtils.h"
+#include "Device/Data/DataUtil.h"
#include "Device/Histo/DiffUtil.h"
#include "Device/Histo/SimulationResult.h"
#include "Device/Detector/RectangularDetector.h"
@@ -56,7 +56,7 @@
%include "Device/Data/Datafield.h"
%include "Device/Histo/DiffUtil.h"
-%include "Device/Data/DataUtils.h"
+%include "Device/Data/DataUtil.h"
%include "Device/Beam/Beam.h"
%include "Device/Beam/IFootprintFactor.h"
@@ -79,6 +79,6 @@
%include "Device/Detector/OffspecDetector.h"
%include "Device/Detector/SphericalDetector.h"
-%include "Device/Data/DataUtils.h"
+%include "Device/Data/DataUtil.h"
%include "Device/IO/IOFactory.h"
%include "Device/Histo/SimulationResult.h"
diff --git a/auto/Wrap/libBornAgainDevice_wrap.cpp b/auto/Wrap/libBornAgainDevice_wrap.cpp
index 7954367e655..36c5cf945c9 100644
--- a/auto/Wrap/libBornAgainDevice_wrap.cpp
+++ b/auto/Wrap/libBornAgainDevice_wrap.cpp
@@ -7021,7 +7021,7 @@ SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_
#include "Device/Beam/Beam.h"
#include "Device/Beam/FootprintGauss.h"
#include "Device/Beam/FootprintSquare.h"
-#include "Device/Data/DataUtils.h"
+#include "Device/Data/DataUtil.h"
#include "Device/Histo/DiffUtil.h"
#include "Device/Histo/SimulationResult.h"
#include "Device/Detector/RectangularDetector.h"
--
GitLab