diff --git a/Device/Histo/IntensityDataIOFactory.cpp b/Device/Histo/IntensityDataIOFactory.cpp
index 0aee14036a2e4ce4930f85ab397e46afb060de24..24a7012eb0312f708a4354872a9df73d654512b8 100644
--- a/Device/Histo/IntensityDataIOFactory.cpp
+++ b/Device/Histo/IntensityDataIOFactory.cpp
@@ -17,7 +17,7 @@
 #include "Device/Histo/IHistogram.h"
 #include "Device/Histo/SimulationResult.h"
 #include "Device/InputOutput/DataFormatUtils.h"
-#include "Device/InputOutput/OutputDataReadReflectometry.h"
+#include "Device/InputOutput/ReadReflectometry.h"
 #include "Device/InputOutput/ReadWriteINT.h"
 #include "Device/InputOutput/ReadWriteNicos.h"
 #include "Device/InputOutput/ReadWriteNumpyTXT.h"
diff --git a/Device/InputOutput/OutputDataReadReflectometry.cpp b/Device/InputOutput/ReadReflectometry.cpp
similarity index 96%
rename from Device/InputOutput/OutputDataReadReflectometry.cpp
rename to Device/InputOutput/ReadReflectometry.cpp
index eb2224cdc455bab70bd835cb51146209a277e3f2..2306dfd4335c93740ca68c37c21722eadeb2fa76 100644
--- a/Device/InputOutput/OutputDataReadReflectometry.cpp
+++ b/Device/InputOutput/ReadReflectometry.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Device/InputOutput/OutputDataReadReflectometry.cpp
+//! @file      Device/InputOutput/ReadReflectometry.cpp
 //! @brief     Implements class OutputDataReadWriteReflectometry.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "Device/InputOutput/OutputDataReadReflectometry.h"
+#include "Device/InputOutput/ReadReflectometry.h"
 #include "Base/Axis/PointwiseAxis.h"
 #include "Base/Util/StringUtils.h"
 #include "Device/Data/OutputData.h"
diff --git a/Device/InputOutput/OutputDataReadReflectometry.h b/Device/InputOutput/ReadReflectometry.h
similarity index 77%
rename from Device/InputOutput/OutputDataReadReflectometry.h
rename to Device/InputOutput/ReadReflectometry.h
index 767f3b18c0143ab7a9d904522979443527574919..d50d8f033bf51f995fbc0bef8106f753819627bd 100644
--- a/Device/InputOutput/OutputDataReadReflectometry.h
+++ b/Device/InputOutput/ReadReflectometry.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Device/InputOutput/OutputDataReadReflectometry.h
+//! @file      Device/InputOutput/ReadReflectometry.h
 //! @brief     Defines OutputDataReadReflectometry
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -17,8 +17,8 @@
 #endif
 
 #ifndef USER_API
-#ifndef BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAREADREFLECTOMETRY_H
-#define BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAREADREFLECTOMETRY_H
+#ifndef BORNAGAIN_DEVICE_INPUTOUTPUT_READREFLECTOMETRY_H
+#define BORNAGAIN_DEVICE_INPUTOUTPUT_READREFLECTOMETRY_H
 
 #include <istream>
 
@@ -32,5 +32,5 @@ public:
     OutputData<double>* readOutputData(std::istream& inStream);
 };
 
-#endif // BORNAGAIN_DEVICE_INPUTOUTPUT_OUTPUTDATAREADREFLECTOMETRY_H
+#endif // BORNAGAIN_DEVICE_INPUTOUTPUT_READREFLECTOMETRY_H
 #endif // USER_API
diff --git a/GUI/Model/Project/OutputDataIOService.cpp b/GUI/Model/Project/IOService.cpp
similarity index 97%
rename from GUI/Model/Project/OutputDataIOService.cpp
rename to GUI/Model/Project/IOService.cpp
index 1aa6675cf4cae125c0d1dcb7a466fd9a10984d1b..73e88808eb5ddb781d006141f0bd1e2a1e516821 100644
--- a/GUI/Model/Project/OutputDataIOService.cpp
+++ b/GUI/Model/Project/IOService.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Project/OutputDataIOService.cpp
+//! @file      GUI/Model/Project/IOService.cpp
 //! @brief     Implements class OutputDataIOService
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Model/Project/OutputDataIOService.h"
+#include "GUI/Model/Project/IOService.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Model/ApplicationModels.h"
 #include "GUI/Model/Model/ModelPath.h"
diff --git a/GUI/Model/Project/OutputDataIOService.h b/GUI/Model/Project/IOService.h
similarity index 84%
rename from GUI/Model/Project/OutputDataIOService.h
rename to GUI/Model/Project/IOService.h
index ecc863d80c28c6ab948d73811160beff214fd0e1..7c2867bf2da3b1464d84eb4483708536fb7b4dc8 100644
--- a/GUI/Model/Project/OutputDataIOService.h
+++ b/GUI/Model/Project/IOService.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Model/Project/OutputDataIOService.h
+//! @file      GUI/Model/Project/IOService.h
 //! @brief     Defines class OutputDataIOService
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,10 +12,10 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_MODEL_PROJECT_OUTPUTDATAIOSERVICE_H
-#define BORNAGAIN_GUI_MODEL_PROJECT_OUTPUTDATAIOSERVICE_H
+#ifndef BORNAGAIN_GUI_MODEL_PROJECT_IOSERVICE_H
+#define BORNAGAIN_GUI_MODEL_PROJECT_IOSERVICE_H
 
-#include "GUI/Support/IO/OutputDataIOHistory.h"
+#include "GUI/Support/IO/IOHistory.h"
 #include <QObject>
 
 class ApplicationModels;
@@ -49,4 +49,4 @@ private:
     ApplicationModels* m_applicationModels;
 };
 
-#endif // BORNAGAIN_GUI_MODEL_PROJECT_OUTPUTDATAIOSERVICE_H
+#endif // BORNAGAIN_GUI_MODEL_PROJECT_IOSERVICE_H
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index c369553496349551b8f7ed494fdc27d052fcc447..00a8a8bb5bfe0fbe71a599eb7f4cd846685d3ec8 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Model/Model/JobModel.h"
 #include "GUI/Model/Model/RealDataModel.h"
 #include "GUI/Model/Project/LinkInstrumentManager.h"
-#include "GUI/Model/Project/OutputDataIOService.h"
+#include "GUI/Model/Project/IOService.h"
 #include "GUI/Model/Sample/ItemWithMaterial.h"
 #include "GUI/Model/Sample/MaterialItem.h"
 #include "GUI/Model/Sample/MultiLayerItem.h"
diff --git a/GUI/Support/IO/OutputDataIOHistory.cpp b/GUI/Support/IO/IOHistory.cpp
similarity index 97%
rename from GUI/Support/IO/OutputDataIOHistory.cpp
rename to GUI/Support/IO/IOHistory.cpp
index de7b3d35320e45a303b67808eaeb73957fdbd5de..02a09812b0aacd280132be2febbe4d25250e7762 100644
--- a/GUI/Support/IO/OutputDataIOHistory.cpp
+++ b/GUI/Support/IO/IOHistory.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Support/IO/OutputDataIOHistory.cpp
+//! @file      GUI/Support/IO/IOHistory.cpp
 //! @brief     Defines OutputDataIOHistory classes
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Support/IO/OutputDataIOHistory.h"
+#include "GUI/Support/IO/IOHistory.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Support/IO/SaveLoadInterface.h"
 #include "GUI/Util/Error.h"
diff --git a/GUI/Support/IO/OutputDataIOHistory.h b/GUI/Support/IO/IOHistory.h
similarity index 90%
rename from GUI/Support/IO/OutputDataIOHistory.h
rename to GUI/Support/IO/IOHistory.h
index 0710938c95e46cc8d8b61e284a05eccf350d77ef..ceb71f6149a62110d2f57785eda761bf4a06a779 100644
--- a/GUI/Support/IO/OutputDataIOHistory.h
+++ b/GUI/Support/IO/IOHistory.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Support/IO/OutputDataIOHistory.h
+//! @file      GUI/Support/IO/IOHistory.h
 //! @brief     Defines OutputDataIOHistory classes
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_SUPPORT_IO_OUTPUTDATAIOHISTORY_H
-#define BORNAGAIN_GUI_SUPPORT_IO_OUTPUTDATAIOHISTORY_H
+#ifndef BORNAGAIN_GUI_SUPPORT_IO_IOHISTORY_H
+#define BORNAGAIN_GUI_SUPPORT_IO_IOHISTORY_H
 
 #include <QDateTime>
 #include <QMap>
@@ -83,4 +83,4 @@ private:
     QMap<QString, OutputDataDirHistory> m_dir_history;
 };
 
-#endif // BORNAGAIN_GUI_SUPPORT_IO_OUTPUTDATAIOHISTORY_H
+#endif // BORNAGAIN_GUI_SUPPORT_IO_IOHISTORY_H
diff --git a/GUI/Support/IO/OutputDataUtils.cpp b/GUI/Support/IO/IOUtils.cpp
similarity index 91%
rename from GUI/Support/IO/OutputDataUtils.cpp
rename to GUI/Support/IO/IOUtils.cpp
index f5378732aaadd464c7446b3d57ac387bdda36ef8..f166055d407eeeeca0148dbb9fd8e46223f42e64 100644
--- a/GUI/Support/IO/OutputDataUtils.cpp
+++ b/GUI/Support/IO/IOUtils.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Support/IO/OutputDataUtils.cpp
+//! @file      GUI/Support/IO/IOUtils.cpp
 //! @brief     Implements OutputDataUtils namespace
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Support/IO/OutputDataUtils.h"
+#include "GUI/Support/IO/IOUtils.h"
 #include "Device/Data/OutputData.h"
 
 std::unique_ptr<OutputData<double>> GUI::Util::Output::binifyAxes(const OutputData<double>& data)
diff --git a/GUI/Support/IO/OutputDataUtils.h b/GUI/Support/IO/IOUtils.h
similarity index 80%
rename from GUI/Support/IO/OutputDataUtils.h
rename to GUI/Support/IO/IOUtils.h
index 82ceda0c0808d61ee3720a7eaaf00bea58d208bc..f8264e8f81a08e818a5922e5dba46b8e954554ab 100644
--- a/GUI/Support/IO/OutputDataUtils.h
+++ b/GUI/Support/IO/IOUtils.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Support/IO/OutputDataUtils.h
+//! @file      GUI/Support/IO/IOUtils.h
 //! @brief     Defines namespace GUI::Util::Output
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_SUPPORT_IO_OUTPUTDATAUTILS_H
-#define BORNAGAIN_GUI_SUPPORT_IO_OUTPUTDATAUTILS_H
+#ifndef BORNAGAIN_GUI_SUPPORT_IO_IOUTILS_H
+#define BORNAGAIN_GUI_SUPPORT_IO_IOUTILS_H
 
 #include <memory>
 
@@ -29,4 +29,4 @@ std::unique_ptr<OutputData<double>> binifyAxes(const OutputData<double>& data);
 
 } // namespace GUI::Util::Output
 
-#endif // BORNAGAIN_GUI_SUPPORT_IO_OUTPUTDATAUTILS_H
+#endif // BORNAGAIN_GUI_SUPPORT_IO_IOUTILS_H
diff --git a/GUI/Support/IO/ImportDataInfo.cpp b/GUI/Support/IO/ImportDataInfo.cpp
index b1071dcbfe9a456a109f88e0652b59c25a41a4eb..cd9ab6dfd32bf7b560b68a4407f83ea14c511b27 100644
--- a/GUI/Support/IO/ImportDataInfo.cpp
+++ b/GUI/Support/IO/ImportDataInfo.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Support/IO/ImportDataInfo.h"
 #include "Device/Coord/AxisNames.h"
 #include "Device/Data/OutputData.h"
-#include "GUI/Support/IO/OutputDataUtils.h"
+#include "GUI/Support/IO/IOUtils.h"
 #include "GUI/Util/CoordName.h"
 #include "GUI/Util/Error.h"
 #include <memory>
diff --git a/GUI/View/Import/ImportDataUtils.cpp b/GUI/View/Import/ImportDataUtils.cpp
index 0e640739cf421c7c48aee66c87d2607eaf2d6289..d7973bc00396222d1ea9bf73fca01714364ab494 100644
--- a/GUI/View/Import/ImportDataUtils.cpp
+++ b/GUI/View/Import/ImportDataUtils.cpp
@@ -17,7 +17,7 @@
 #include "Device/InputOutput/DataFormatUtils.h"
 #include "GUI/Model/Data/RealDataItem.h"
 #include "GUI/Support/IO/ImportDataInfo.h"
-#include "GUI/Support/IO/OutputDataUtils.h"
+#include "GUI/Support/IO/IOUtils.h"
 #include "GUI/View/Loaders/QREDataLoader.h"
 #include <QApplication>
 #include <QMessageBox>
diff --git a/GUI/View/Loaders/AutomaticDataLoader1D.cpp b/GUI/View/Loaders/AutomaticDataLoader1D.cpp
index 42588f00c800edd3a490ed264f146383b95da4ad..974a050632ba026c8a7a0325bb54cc2b6224f1a5 100644
--- a/GUI/View/Loaders/AutomaticDataLoader1D.cpp
+++ b/GUI/View/Loaders/AutomaticDataLoader1D.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Loaders/AutomaticDataLoader1D.h"
-#include "Device/InputOutput/OutputDataReadReflectometry.h"
+#include "Device/InputOutput/ReadReflectometry.h"
 #include "GUI/Model/Data/RealDataItem.h"
 #include "GUI/Model/Data/SpecularDataItem.h"
 #include "GUI/Support/IO/ImportDataInfo.h"
diff --git a/Tests/Unit/GUI/TestOutputDataIOService.cpp b/Tests/Unit/GUI/TestOutputDataIOService.cpp
index b143821a02065448ce425f682942f51c7b713703..28785196cae1e996f1c8e203b76d79e2cc141ce8 100644
--- a/Tests/Unit/GUI/TestOutputDataIOService.cpp
+++ b/Tests/Unit/GUI/TestOutputDataIOService.cpp
@@ -7,7 +7,7 @@
 #include "GUI/Model/Model/JobFunctions.h"
 #include "GUI/Model/Model/JobModel.h"
 #include "GUI/Model/Model/RealDataModel.h"
-#include "GUI/Model/Project/OutputDataIOService.h"
+#include "GUI/Model/Project/IOService.h"
 #include "GUI/Support/IO/ImportDataInfo.h"
 #include "GUI/Support/IO/ProjectUtils.h"
 #include "GUI/Util/Error.h"
diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i
index 5ecd5d17aaf8bfa448d078d33deb886f0ffe0cd8..b5b803eba122412ceef8f7ff7ab6e2b4fe75ca07 100644
--- a/auto/Wrap/doxygenDevice.i
+++ b/auto/Wrap/doxygenDevice.i
@@ -2093,7 +2093,7 @@ Swaps iterators.
 
 Class for reading reflectometry data from ASCII file.
 
-C++ includes: OutputDataReadReflectometry.h
+C++ includes: ReadReflectometry.h
 ";
 
 %feature("docstring")  OutputDataReadReflectometry::readOutputData "OutputData< double > * OutputDataReadReflectometry::readOutputData(std::istream &inStream)
@@ -2105,7 +2105,7 @@ C++ includes: OutputDataReadReflectometry.h
 
 Class for reading and writing BornAgain native IntensityData from ASCII file.
 
-C++ includes: OutputDataReadWriteINT.h
+C++ includes: ReadWriteINT.h
 ";
 
 %feature("docstring")  OutputDataReadWriteINT::readOutputData "OutputData< double > * OutputDataReadWriteINT::readOutputData(std::istream &input_stream)
@@ -2120,7 +2120,7 @@ C++ includes: OutputDataReadWriteINT.h
 
 Class for reading and writing  OutputData from simple ASCII file with the layout as in numpy.savetxt.
 
-C++ includes: OutputDataReadWriteNumpyTXT.h
+C++ includes: ReadWriteNumpyTXT.h
 ";
 
 %feature("docstring")  OutputDataReadWriteNumpyTXT::readOutputData "OutputData< double > * OutputDataReadWriteNumpyTXT::readOutputData(std::istream &input_stream)
@@ -3131,34 +3131,34 @@ make Swappable
 // File: DataFormatUtils_8h.xml
 
 
-// File: OutputDataReadReflectometry_8cpp.xml
+// File: ReadReflectometry_8cpp.xml
 
 
-// File: OutputDataReadReflectometry_8h.xml
+// File: ReadReflectometry_8h.xml
 
 
-// File: OutputDataReadWriteINT_8cpp.xml
+// File: ReadWriteINT_8cpp.xml
 
 
-// File: OutputDataReadWriteINT_8h.xml
+// File: ReadWriteINT_8h.xml
 
 
-// File: OutputDataReadWriteNicos_8cpp.xml
+// File: ReadWriteNicos_8cpp.xml
 
 
-// File: OutputDataReadWriteNicos_8h.xml
+// File: ReadWriteNicos_8h.xml
 
 
-// File: OutputDataReadWriteNumpyTXT_8cpp.xml
+// File: ReadWriteNumpyTXT_8cpp.xml
 
 
-// File: OutputDataReadWriteNumpyTXT_8h.xml
+// File: ReadWriteNumpyTXT_8h.xml
 
 
-// File: OutputDataReadWriteTiff_8cpp.xml
+// File: ReadWriteTiff_8cpp.xml
 
 
-// File: OutputDataReadWriteTiff_8h.xml
+// File: ReadWriteTiff_8h.xml
 
 
 // File: Instrument_8cpp.xml