diff --git a/GUI/Model/Device/RealItem.cpp b/GUI/Model/Device/RealItem.cpp
index 3f6f5c59a8af4ef27e175e98922463609abe413d..6dcedac98336f87cffa95455ec6d479125d94ae0 100644
--- a/GUI/Model/Device/RealItem.cpp
+++ b/GUI/Model/Device/RealItem.cpp
@@ -257,10 +257,10 @@ void RealItem::rotateData()
 void RealItem::updateDataFileName()
 {
     if (DataItem* item = dataItem())
-        item->setFileName(GUI::Model::FilenameUtil::realDataFileName(realItemName()));
+        item->setFileName(GUI::FilenameUtil::realDataFileName(realItemName()));
 
     if (DataItem* item = nativeDataItem())
-        item->setFileName(GUI::Model::FilenameUtil::nativeDataFileName(realItemName()));
+        item->setFileName(GUI::FilenameUtil::nativeDataFileName(realItemName()));
 }
 
 void RealItem::writeTo(QXmlStreamWriter* w) const
diff --git a/GUI/Model/FromCore/ItemizeSimulation.h b/GUI/Model/FromCore/ItemizeSimulation.h
index f00d627b0804c3d4af72442bade96f122c43feed..1299a00403357ff8cbf5215778608f2d966349b6 100644
--- a/GUI/Model/FromCore/ItemizeSimulation.h
+++ b/GUI/Model/FromCore/ItemizeSimulation.h
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/Model/FromCore/ItemizeSimulation.h
-//! @brief     Defines namespace GUI::Model::ObjectBuilder
+//! @brief     Defines namespace GUI::ObjectBuilder
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 6f1f2abbcc7f71a1accce4794f7c0685992fbe72..95b962949f4a594881d6ab8232836304465c9296 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -658,13 +658,13 @@ void JobItem::readDataFiles(const QString& projectDir, MessageService* messageSe
 void JobItem::updateDataFileName()
 {
     if (DataItem* item = simulatedDataItem())
-        item->setFileName(GUI::Model::FilenameUtil::jobResultsFileName(jobName()));
+        item->setFileName(GUI::FilenameUtil::jobResultsFileName(jobName()));
 
     if (RealItem* real = realItem()) {
         if (DataItem* item = real->dataItem())
-            item->setFileName(GUI::Model::FilenameUtil::jobReferenceFileName(jobName()));
+            item->setFileName(GUI::FilenameUtil::jobReferenceFileName(jobName()));
 
         if (DataItem* item = real->nativeDataItem())
-            item->setFileName(GUI::Model::FilenameUtil::jobNativeDataFileName(identifier()));
+            item->setFileName(GUI::FilenameUtil::jobNativeDataFileName(identifier()));
     }
 }
diff --git a/GUI/Model/Model/ParameterTreeUtil.h b/GUI/Model/Model/ParameterTreeUtil.h
index afc38f1faa6ee2cb38cacba18f242f06c478c26d..a23008029c950a5d33e1cdc83d65fa7428824661 100644
--- a/GUI/Model/Model/ParameterTreeUtil.h
+++ b/GUI/Model/Model/ParameterTreeUtil.h
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/Model/Model/ParameterTreeUtil.h
-//! @brief     Defines namespace GUI::Model::ParameterTreeUtil
+//! @brief     Defines namespace GUI::ParameterTreeUtil
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
diff --git a/GUI/Support/Util/ItemFileNameUtil.cpp b/GUI/Support/Util/ItemFileNameUtil.cpp
index e1fcb0264432ca064bffe5a5fe62fa25f05bb638..01ca48ca6a8894ed61072d605302a9c4bd97cd9e 100644
--- a/GUI/Support/Util/ItemFileNameUtil.cpp
+++ b/GUI/Support/Util/ItemFileNameUtil.cpp
@@ -35,31 +35,31 @@ QString intensityDataFileName(const QString& itemName, const QString& prefix)
 
 //! Constructs the name of the file with simulated intensities.
 
-QString GUI::Model::FilenameUtil::jobResultsFileName(const QString& itemName)
+QString GUI::FilenameUtil::jobResultsFileName(const QString& itemName)
 {
     return intensityDataFileName(itemName, jobdata_file_prefix);
 }
 
 //! Constructs the name of the file with reference data.
 
-QString GUI::Model::FilenameUtil::jobReferenceFileName(const QString& itemName)
+QString GUI::FilenameUtil::jobReferenceFileName(const QString& itemName)
 {
     return intensityDataFileName(itemName, refdata_file_prefix);
 }
 
-QString GUI::Model::FilenameUtil::jobNativeDataFileName(const QString& id)
+QString GUI::FilenameUtil::jobNativeDataFileName(const QString& id)
 {
     return intensityDataFileName(id, nativedata_file_prefix);
 }
 
 //! Constructs the name of the intensity file belonging to real data item.
 
-QString GUI::Model::FilenameUtil::realDataFileName(const QString& dataName)
+QString GUI::FilenameUtil::realDataFileName(const QString& dataName)
 {
     return intensityDataFileName(dataName, realdata_file_prefix);
 }
 
-QString GUI::Model::FilenameUtil::nativeDataFileName(const QString& dataName)
+QString GUI::FilenameUtil::nativeDataFileName(const QString& dataName)
 {
     return intensityDataFileName(dataName, nativedata_file_prefix);
 }
diff --git a/GUI/Support/Util/ItemFileNameUtil.h b/GUI/Support/Util/ItemFileNameUtil.h
index d51f5b3f42783e634ba676709cd2aa7983dbe91b..a4e4d61a6540a10ac873763cd0c6ce9107039771 100644
--- a/GUI/Support/Util/ItemFileNameUtil.h
+++ b/GUI/Support/Util/ItemFileNameUtil.h
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/Support/Util/ItemFileNameUtil.h
-//! @brief     Defines namespace GUI::Model::FilenameUtil
+//! @brief     Defines namespace GUI::FilenameUtil
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -19,7 +19,7 @@
 
 //! Contains set of convenience methods for JobItem and its children.
 
-namespace GUI::Model::FilenameUtil {
+namespace GUI::FilenameUtil {
 
 QString jobResultsFileName(const QString& itemName);
 
@@ -31,6 +31,6 @@ QString realDataFileName(const QString& dataName);
 
 QString nativeDataFileName(const QString& dataName);
 
-} // namespace GUI::Model::FilenameUtil
+} // namespace GUI::FilenameUtil
 
 #endif // BORNAGAIN_GUI_SUPPORT_UTIL_ITEMFILENAMEUTIL_H
diff --git a/GUI/View/Project/PyImportAssistant.cpp b/GUI/View/Project/PyImportAssistant.cpp
index 1614830d759e34a8db9b3b1db1fac620b527ddcd..30d7b4a62aa170d175c63a74fdc82897f1403b9b 100644
--- a/GUI/View/Project/PyImportAssistant.cpp
+++ b/GUI/View/Project/PyImportAssistant.cpp
@@ -207,8 +207,7 @@ SampleItem* PyImportAssistant::itemizeSample(const MultiLayer& sample)
         QString message("Exception thrown while trying to build GUI models.\n"
                         "GUI models might be in inconsistent state.\n\n");
         QString details = QString::fromStdString(std::string(ex.what()));
-        DetailedMessageBox(GUI::Global::mainWindow, "GUI::Model::ObjectBuilder failure", message,
-                           details)
+        DetailedMessageBox(GUI::Global::mainWindow, "GUI::ObjectBuilder failure", message, details)
             .exec();
         return nullptr;
     }