diff --git a/GUI/Models/Data/RealDataItem.cpp b/GUI/Models/Data/RealDataItem.cpp
index c2d680f1de9ce4b943a422bcec46113cff949087..e72946856d27832aca252a5a0e7d1c7aff89b2bf 100644
--- a/GUI/Models/Data/RealDataItem.cpp
+++ b/GUI/Models/Data/RealDataItem.cpp
@@ -427,9 +427,9 @@ void RealDataItem::rotateData()
 void RealDataItem::updateNonXMLDataFileNames()
 {
     if (DataItem* item = dataItem())
-        item->setFileName(GUI::Model::FilenameUtils::realDataFileName(*this));
+        item->setFileName(GUI::Model::FilenameUtils::realDataFileName(dataName()));
     if (DataItem* item = nativeData())
-        item->setFileName(GUI::Model::FilenameUtils::nativeDataFileName(*this));
+        item->setFileName(GUI::Model::FilenameUtils::nativeDataFileName(dataName()));
 }
 
 void RealDataItem::updateToInstrument(const InstrumentItem* instrument)
diff --git a/GUI/Models/Varia/ItemFileNameUtils.cpp b/GUI/Models/Varia/ItemFileNameUtils.cpp
index 79c4615cb54f7e62b5b6322aeda4421dd8d02bcd..5e1f3b863998a051f5ccca282e85a75a5f0ec2a9 100644
--- a/GUI/Models/Varia/ItemFileNameUtils.cpp
+++ b/GUI/Models/Varia/ItemFileNameUtils.cpp
@@ -13,7 +13,6 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/Varia/ItemFileNameUtils.h"
-#include "GUI/Models/Data/RealDataItem.h"
 #include "GUI/Models/Instrument/InstrumentItems.h"
 #include "GUI/Models/Job/JobItem.h"
 #include "GUI/utils/Helpers.h"
@@ -57,14 +56,14 @@ QString GUI::Model::FilenameUtils::jobNativeDataFileName(const JobItem& jobItem)
 
 //! Constructs the name of the intensity file belonging to real data item.
 
-QString GUI::Model::FilenameUtils::realDataFileName(const RealDataItem& realDataItem)
+QString GUI::Model::FilenameUtils::realDataFileName(const QString& dataName)
 {
-    return intensityDataFileName(realDataItem.dataName(), realdata_file_prefix);
+    return intensityDataFileName(dataName, realdata_file_prefix);
 }
 
-QString GUI::Model::FilenameUtils::nativeDataFileName(const RealDataItem& realDataItem)
+QString GUI::Model::FilenameUtils::nativeDataFileName(const QString& dataName)
 {
-    return intensityDataFileName(realDataItem.dataName(), nativedata_file_prefix);
+    return intensityDataFileName(dataName, nativedata_file_prefix);
 }
 
 QString GUI::Model::FilenameUtils::instrumentDataFileName(const InstrumentItem& instrumentItem)
diff --git a/GUI/Models/Varia/ItemFileNameUtils.h b/GUI/Models/Varia/ItemFileNameUtils.h
index 745bac59cd6623f4567f02602499455f7141cac8..9cab1f5607ac3d128875ed70335ac6e8f4eb89ca 100644
--- a/GUI/Models/Varia/ItemFileNameUtils.h
+++ b/GUI/Models/Varia/ItemFileNameUtils.h
@@ -31,9 +31,9 @@ QString jobReferenceFileName(const JobItem& jobItem);
 
 QString jobNativeDataFileName(const JobItem& jobItem);
 
-QString realDataFileName(const RealDataItem& realDataItem);
+QString realDataFileName(const QString& dataName);
 
-QString nativeDataFileName(const RealDataItem& realDataItem);
+QString nativeDataFileName(const QString& dataName);
 
 QString instrumentDataFileName(const InstrumentItem& instrumentItem);