diff --git a/GUI/coregui/Models/JobItemFunctions.cpp b/GUI/coregui/Models/ItemFileNameUtils.cpp
similarity index 80%
rename from GUI/coregui/Models/JobItemFunctions.cpp
rename to GUI/coregui/Models/ItemFileNameUtils.cpp
index ce86726d7e70eb780794bb952a809038c5dfa22e..02c68c5124a3f290367774966258f5c492702c5f 100644
--- a/GUI/coregui/Models/JobItemFunctions.cpp
+++ b/GUI/coregui/Models/ItemFileNameUtils.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/coregui/Models/JobItemFunctions.cpp
-//! @brief     Defines auxiliary functions in JobItemFunctions namespace.
+//! @file      GUI/coregui/Models/ItemFileNameUtils.cpp
+//! @brief     Defines auxiliary functions in ItemFileNameUtils namespace.
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
 //
 // ************************************************************************** //
 
-#include "JobItemFunctions.h"
+#include "ItemFileNameUtils.h"
 #include "GUIHelpers.h"
 #include "InstrumentItems.h"
 #include "JobItem.h"
@@ -32,26 +32,26 @@ QString intensityDataFileName(const QString& itemName, const QString& prefix);
 
 //! Constructs the name of the file with simulated intensities.
 
-QString JobItemFunctions::jobResultsFileName(const JobItem& jobItem)
+QString ItemFileNameUtils::jobResultsFileName(const JobItem& jobItem)
 {
     return intensityDataFileName(jobItem.itemName(), jobdata_file_prefix);
 }
 
 //! Constructs the name of the file with reference data.
 
-QString JobItemFunctions::jobReferenceFileName(const JobItem& jobItem)
+QString ItemFileNameUtils::jobReferenceFileName(const JobItem& jobItem)
 {
     return intensityDataFileName(jobItem.itemName(), refdata_file_prefix);
 }
 
 //! Constructs the name of the intensity file belonging to real data item.
 
-QString JobItemFunctions::realDataFileName(const RealDataItem& realDataItem)
+QString ItemFileNameUtils::realDataFileName(const RealDataItem& realDataItem)
 {
     return intensityDataFileName(realDataItem.itemName(), realdata_file_prefix);
 }
 
-QString JobItemFunctions::instrumentDataFileName(const InstrumentItem& instrumentItem)
+QString ItemFileNameUtils::instrumentDataFileName(const InstrumentItem& instrumentItem)
 {
     auto instrument_id = instrumentItem.getItemValue(InstrumentItem::P_IDENTIFIER).toString();
     return intensityDataFileName(instrument_id, instrument_file_prefix);
@@ -59,7 +59,7 @@ QString JobItemFunctions::instrumentDataFileName(const InstrumentItem& instrumen
 
 //! Returns list of fileName filters related to nonXML data stored by JobModel and RealDataModel.
 
-QStringList JobItemFunctions::nonXMLFileNameFilters()
+QStringList ItemFileNameUtils::nonXMLFileNameFilters()
 {
     QStringList result = QStringList()
         << QString(jobdata_file_prefix+"_*.int.gz")
diff --git a/GUI/coregui/Models/JobItemFunctions.h b/GUI/coregui/Models/ItemFileNameUtils.h
similarity index 87%
rename from GUI/coregui/Models/JobItemFunctions.h
rename to GUI/coregui/Models/ItemFileNameUtils.h
index fc450db426f7be3366ffd121d488d8e8ad7e97c6..8210c4b8ca8233e7f3dddd2fd002d3222775187b 100644
--- a/GUI/coregui/Models/JobItemFunctions.h
+++ b/GUI/coregui/Models/ItemFileNameUtils.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/coregui/Models/JobItemFunctions.h
-//! @brief     Defines auxiliary functions in JobItemFunctions namespace.
+//! @file      GUI/coregui/Models/ItemFileNameUtils.h
+//! @brief     Defines auxiliary functions in ItemFileNameUtils namespace.
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -24,7 +24,7 @@ class RealDataItem;
 
 //! Contains set of convenience methods for JobItem and its children.
 
-namespace JobItemFunctions
+namespace ItemFileNameUtils
 {
 
 BA_CORE_API_ QString jobResultsFileName(const JobItem& jobItem);
diff --git a/GUI/coregui/Models/JobItem.cpp b/GUI/coregui/Models/JobItem.cpp
index 2fcb20409d7bcf8e606296ae47eba105faae669c..3d594eea48892a298f060713cf6eaea9bf50d9a3 100644
--- a/GUI/coregui/Models/JobItem.cpp
+++ b/GUI/coregui/Models/JobItem.cpp
@@ -19,7 +19,7 @@
 #include "GUIHelpers.h"
 #include "InstrumentItems.h"
 #include "IntensityDataItem.h"
-#include "JobItemFunctions.h"
+#include "ItemFileNameUtils.h"
 #include "JobItemUtils.h"
 #include "MaskUnitsConverter.h"
 #include "MultiLayerItem.h"
@@ -269,12 +269,12 @@ void JobItem::updateIntensityDataFileName()
 {
     if (DataItem* item = dataItem())
         item->setItemValue(DataItem::P_FILE_NAME,
-                           JobItemFunctions::jobResultsFileName(*this));
+                           ItemFileNameUtils::jobResultsFileName(*this));
 
     if (RealDataItem* realItem = realDataItem())
         if (DataItem* item = realItem->dataItem())
             item->setItemValue(DataItem::P_FILE_NAME,
-                               JobItemFunctions::jobReferenceFileName(*this));
+                               ItemFileNameUtils::jobReferenceFileName(*this));
 }
 
 SimulationOptionsItem* JobItem::simulationOptionsItem()
diff --git a/GUI/coregui/Models/JobModelFunctions.cpp b/GUI/coregui/Models/JobModelFunctions.cpp
index 622113fcae4520b969cd5757d98cbc01b94f6bc6..2315fde7d9b06c70306aa5eacf62f9dff9f7359a 100644
--- a/GUI/coregui/Models/JobModelFunctions.cpp
+++ b/GUI/coregui/Models/JobModelFunctions.cpp
@@ -24,7 +24,7 @@
 #include "InstrumentItems.h"
 #include "IntensityDataItem.h"
 #include "JobItem.h"
-#include "JobItemFunctions.h"
+#include "ItemFileNameUtils.h"
 #include "JobItemUtils.h"
 #include "JobModel.h"
 #include "MaskItems.h"
@@ -110,7 +110,7 @@ void JobModelFunctions::copyRealDataItem(JobItem* jobItem, const RealDataItem* r
 
     // adapting the name to job name
     realDataItemCopy->dataItem()->setItemValue(DataItem::P_FILE_NAME,
-                                               JobItemFunctions::jobReferenceFileName(*jobItem));
+                                               ItemFileNameUtils::jobReferenceFileName(*jobItem));
 }
 
 //! Links RealDataItem to the JobItem's instrument.
diff --git a/GUI/coregui/Models/RealDataItem.cpp b/GUI/coregui/Models/RealDataItem.cpp
index 1c2836c20dfd5309bb11a75aa9ec355670dc18f5..799a31e5f15a85aa1c413dba1b50d52f70e3a28d 100644
--- a/GUI/coregui/Models/RealDataItem.cpp
+++ b/GUI/coregui/Models/RealDataItem.cpp
@@ -17,7 +17,7 @@
 #include "ImportDataUtils.h"
 #include "IntensityDataItem.h"
 #include "InstrumentItems.h"
-#include "JobItemFunctions.h"
+#include "ItemFileNameUtils.h"
 #include "JobItemUtils.h"
 #include "SessionModel.h"
 #include "SpecularDataItem.h"
@@ -145,7 +145,7 @@ MaskContainerItem* RealDataItem::maskContainerItem()
 void RealDataItem::updateIntensityDataFileName()
 {
     if (DataItem* item = dataItem())
-        item->setItemValue(DataItem::P_FILE_NAME, JobItemFunctions::realDataFileName(*this));
+        item->setItemValue(DataItem::P_FILE_NAME, ItemFileNameUtils::realDataFileName(*this));
 }
 
 void RealDataItem::updateToInstrument()
diff --git a/GUI/coregui/mainwindow/ProjectUtils.cpp b/GUI/coregui/mainwindow/ProjectUtils.cpp
index 17e2afb8014f4e797a24fbbe17c1563a56186c8a..9dafdfce19f7d0441301b185eda2d09cbfcfe4e7 100644
--- a/GUI/coregui/mainwindow/ProjectUtils.cpp
+++ b/GUI/coregui/mainwindow/ProjectUtils.cpp
@@ -15,7 +15,7 @@
 #include "ProjectUtils.h"
 #include "projectdocument.h"
 #include "GUIHelpers.h"
-#include "JobItemFunctions.h"
+#include "ItemFileNameUtils.h"
 #include "AppSvc.h"
 #include "projectmanager.h"
 #include <QFileInfo>
@@ -81,7 +81,7 @@ QStringList ProjectUtils::nonXMLDataInDir(const QString &dirname)
         throw GUIHelpers::Error("ProjectUtils::nonXMLDataInDir() -> Error. Non existing "
                                 "directory '"+dirname+"'.");
 
-    return dir.entryList(JobItemFunctions::nonXMLFileNameFilters());
+    return dir.entryList(ItemFileNameUtils::nonXMLFileNameFilters());
 }
 
 bool ProjectUtils::removeRecursively(const QString &dirname)