diff --git a/Base/Util/FileSystemUtil.cpp b/Base/Util/FileSystemUtil.cpp
index 847c8d8d9fae0384f4186f5decdd1d48915ace7c..163d60269ecc17d95d232ea960818e609b09d003 100644
--- a/Base/Util/FileSystemUtil.cpp
+++ b/Base/Util/FileSystemUtil.cpp
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#include "Base/Util/FileSystemUtil.h"
 #include "Base/Util/Assert.h"
+#include "Base/Util/PathUtil.h"
 #include "Base/Util/StringUtil.h"
 #include <codecvt> //
 #include <filesystem>
diff --git a/Base/Util/FileSystemUtil.h b/Base/Util/PathUtil.h
similarity index 93%
rename from Base/Util/FileSystemUtil.h
rename to Base/Util/PathUtil.h
index ccedb533fb9853ce9fcd436f802f935c40c24bb9..7ec6be2771b19a052d345ea49f0b04045b272ea0 100644
--- a/Base/Util/FileSystemUtil.h
+++ b/Base/Util/PathUtil.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Base/Util/FileSystemUtil.h
+//! @file      Base/Util/PathUtil.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_FILESYSTEMUTIL_H
-#define BORNAGAIN_BASE_UTIL_FILESYSTEMUTIL_H
+#ifndef BORNAGAIN_BASE_UTIL_PATHUTIL_H
+#define BORNAGAIN_BASE_UTIL_PATHUTIL_H
 
 #include <string>
 #include <vector>
@@ -67,4 +67,4 @@ bool IsFileExists(const std::string& path);
 
 } // namespace Util::Path
 
-#endif // BORNAGAIN_BASE_UTIL_FILESYSTEMUTIL_H
+#endif // BORNAGAIN_BASE_UTIL_PATHUTIL_H
diff --git a/Device/IO/DataFormatUtil.cpp b/Device/IO/DataFormatUtil.cpp
index 69f0c743c3b24ea87fcbd7389e5935e843796abc..ea382ba5eb00f8c7e0c3ca840f66babf68c1129f 100644
--- a/Device/IO/DataFormatUtil.cpp
+++ b/Device/IO/DataFormatUtil.cpp
@@ -14,7 +14,7 @@
 
 #include "Device/IO/DataFormatUtil.h"
 #include "Base/Axis/MakeScale.h"
-#include "Base/Util/FileSystemUtil.h"
+#include "Base/Util/PathUtil.h"
 #include "Base/Util/StringUtil.h"
 #include "Device/Data/Datafield.h"
 #include <cmath> // ignoreDenormalized
diff --git a/Device/IO/IOFactory.cpp b/Device/IO/IOFactory.cpp
index 6c275663b0ee6c2ec890b3cb73bdcccb115bfa02..6a1284dcace7ad965c82ece51a671f882e44b9b4 100644
--- a/Device/IO/IOFactory.cpp
+++ b/Device/IO/IOFactory.cpp
@@ -14,7 +14,7 @@
 
 #include "Device/IO/IOFactory.h"
 #include "Base/Util/Assert.h"
-#include "Base/Util/FileSystemUtil.h"
+#include "Base/Util/PathUtil.h"
 #include "Base/Util/StringUtil.h"
 #include "Device/Data/Datafield.h"
 #include "Device/Histo/DiffUtil.h"
diff --git a/Tests/Functional/Consistence/CompareTwoReferences.cpp b/Tests/Functional/Consistence/CompareTwoReferences.cpp
index fe5852b50d72155fd2e860e46fd7724917371a57..a5641776376ac47573433a0bc1b76c10541844c3 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/FileSystemUtil.h"
+#include "Base/Util/PathUtil.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 2f3f8dda7c76fde41ecc367f8110290ba2cb3e92..650482352209702764cedda1ed2a32c5d19969cd 100644
--- a/Tests/Functional/CoreSpecial/CoreIOPathTest.cpp
+++ b/Tests/Functional/CoreSpecial/CoreIOPathTest.cpp
@@ -14,7 +14,7 @@
 
 #include "BATesting.h"
 #include "Base/Axis/MakeScale.h"
-#include "Base/Util/FileSystemUtil.h"
+#include "Base/Util/PathUtil.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 0ec620c389a736fb70afe0d8a8ce88cf6f0ee901..b64ec8ff5def34f7380702bd99ebc2b51f26f11f 100644
--- a/Tests/Functional/CoreSpecial/FourierTransformationTest.cpp
+++ b/Tests/Functional/CoreSpecial/FourierTransformationTest.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "BATesting.h"
-#include "Base/Util/FileSystemUtil.h"
+#include "Base/Util/PathUtil.h"
 #include "Device/Data/DataUtil.h"
 #include "Device/Data/Datafield.h"
 #include "Device/Histo/DiffUtil.h"
diff --git a/Tests/Suite/GUI/Check.cpp b/Tests/Suite/GUI/Check.cpp
index 71f9df47dd1eb268a4446530580a4ba4b4e22142..d29da8f3a66db21086ba6d710334cb80c0dad8fe 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/FileSystemUtil.h"
+#include "Base/Util/PathUtil.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 5d454c1f41340592879c39570bab7516bbf63a5b..cc2893267aa355cc24ae56e5bc0830f7be0afc1d 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/FileSystemUtil.h"
+#include "Base/Util/PathUtil.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 c05018f70efdcdd3f35709597a1a6ef318f78735..42888df32be8a7ad02da7d17a7dc17f60fdddd39 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/FileSystemUtil.h"
+#include "Base/Util/PathUtil.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 d8991e1e230d5f5dca048070c71aad91537a204f..b65bd165ae971af396827878de213808c55f04d6 100644
--- a/Tests/Unit/Base/FileSystemUtilsTest.cpp
+++ b/Tests/Unit/Base/FileSystemUtilsTest.cpp
@@ -1,5 +1,5 @@
 #include "BATesting.h"
-#include "Base/Util/FileSystemUtil.h"
+#include "Base/Util/PathUtil.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <filesystem>
 #include <fstream>