diff --git a/GUI/Models/Project/projectdocument.cpp b/GUI/Models/Project/ProjectDocument.cpp
similarity index 98%
rename from GUI/Models/Project/projectdocument.cpp
rename to GUI/Models/Project/ProjectDocument.cpp
index 516f161825f46de539a83807364655175761dbf8..e053a79cbfb420c770f30a40b7cb06203a29f8be 100644
--- a/GUI/Models/Project/projectdocument.cpp
+++ b/GUI/Models/Project/ProjectDocument.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Project/projectdocument.cpp
+//! @file      GUI/Models/Project/ProjectDocument.cpp
 //! @brief     Implements class ProjectDocument
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/Models/Data/DocumentModel.h"
 #include "GUI/Models/Job/JobModel.h"
 #include "GUI/Models/Project/LinkInstrumentManager.h"
diff --git a/GUI/Models/Project/projectdocument.h b/GUI/Models/Project/ProjectDocument.h
similarity index 98%
rename from GUI/Models/Project/projectdocument.h
rename to GUI/Models/Project/ProjectDocument.h
index de633b63b00ed17b52d97040c0a954499a830926..2fb8e061ec3ed2a93f318c65c4e0f0fb15bf5589 100644
--- a/GUI/Models/Project/projectdocument.h
+++ b/GUI/Models/Project/ProjectDocument.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Models/Project/projectdocument.h
+//! @file      GUI/Models/Project/ProjectDocument.h
 //! @brief     Defines class ProjectDocument
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/GUI/Models/Project/ProjectUtils.cpp b/GUI/Models/Project/ProjectUtils.cpp
index f86b266648bceceb447a6b69867258b668476ea6..4b10008c188937c28cf2b4bc2ec88fdfd0c8d999 100644
--- a/GUI/Models/Project/ProjectUtils.cpp
+++ b/GUI/Models/Project/ProjectUtils.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Models/Project/ProjectUtils.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include <QFileInfo>
 
 QString GUI::Project::Utils::projectName(const QString& projectFileName)
diff --git a/GUI/Session/SessionData.h b/GUI/Session/SessionData.h
index 3b74da15f5173950a7f5d6fc2b3bb8d52c211fc2..9f355fdbda43f6f693b5fe0c2b92300c72b34354 100644
--- a/GUI/Session/SessionData.h
+++ b/GUI/Session/SessionData.h
@@ -16,7 +16,7 @@
 #define BORNAGAIN_GUI_SESSION_SESSIONDATA_H
 
 #include "GUI/Models/Instrument/InstrumentLibrary.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 
 struct SessionData {
     SessionData();
diff --git a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
index e4c63ddb6528b8fd91b56811ff3c476100582656..8deee0f9e93c824f9b108dae0557c5ae8716f696 100644
--- a/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Items/RealDataItem.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
 #include "GUI/Models/Project/LinkInstrumentManager.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/Views/Main/mainwindow.h"
 #include <QComboBox>
 #include <QLabel>
diff --git a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
index 3a506d27b63f09ede309afb0888761564bbcfd62..9e645835831f8a40b5784a9ecc88c0b6ab4ef1e7 100644
--- a/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
+++ b/GUI/Views/ImportDataWidgets/RealDataSelectorWidget.cpp
@@ -23,7 +23,7 @@
 #include "GUI/Views/ImportDataWidgets/RealDataPropertiesWidget.h"
 #include "GUI/Views/ImportDataWidgets/RealDataTreeModel.h"
 #include "GUI/Views/Main/mainwindow.h"
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/ProjectManager.h"
 #include "GUI/Widgets/Common/ItemViewOverlayButtons.h"
 #include "GUI/Widgets/Common/StyledToolBar.h"
 #include "GUI/utils/Error.h"
diff --git a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
index 62212679ac5e297637c62fc3f242539a34269c22..95b4ec772cf7060f4aab35dd05b5e1d28c35e40d 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentListView.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Views/InstrumentWidgets/InstrumentListView.h"
 #include "GUI/Items/InstrumentItems.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/Session/SessionData.h"
 #include "GUI/Views/InstrumentWidgets/InstrumentLibraryEditor.h"
 #include "GUI/Views/InstrumentWidgets/InstrumentListModel.h"
diff --git a/GUI/Views/InstrumentWidgets/InstrumentView.cpp b/GUI/Views/InstrumentWidgets/InstrumentView.cpp
index 7e6c73513f43a0c058fd2eb099466685d218644b..f4f39529cec6c83c2b198df9b9e53149b955c212 100644
--- a/GUI/Views/InstrumentWidgets/InstrumentView.cpp
+++ b/GUI/Views/InstrumentWidgets/InstrumentView.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Views/InstrumentWidgets/InstrumentView.h"
 #include "GUI/Items/InstrumentItems.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/Views/InstrumentWidgets/InstrumentEditor.h"
 #include "GUI/Views/InstrumentWidgets/InstrumentListView.h"
 #include "GUI/Widgets/Common/StyledToolBar.h"
diff --git a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
index caa8d34341e65a0fa7e47924a5ac780c7492b27f..1a3005a39f32cfc27c6d8e7bc3e0b3195bf0c431 100644
--- a/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
+++ b/GUI/Views/IntensityDataWidgets/IntensityDataCanvas.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Views/IntensityDataWidgets/ColorMapCanvas.h"
 #include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
 #include "GUI/Views/Main/mainwindow.h"
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/ProjectManager.h"
 #include "GUI/utils/GUIHelpers.h"
 #include <QAction>
 #include <QMouseEvent>
diff --git a/GUI/Views/JobWidgets/JobView.cpp b/GUI/Views/JobWidgets/JobView.cpp
index 54da2b51d75344e2436685d99c457b3b6541ac9c..3a2ee62c766d5cc51f37cb723e2bd000b8a1257d 100644
--- a/GUI/Views/JobWidgets/JobView.cpp
+++ b/GUI/Views/JobWidgets/JobView.cpp
@@ -23,7 +23,7 @@
 #include "GUI/Views/JobWidgets/JobSelectorWidget.h"
 #include "GUI/Views/JobWidgets/JobViewActivities.h"
 #include "GUI/Views/Main/mainwindow.h"
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/ProjectManager.h"
 #include "GUI/Widgets/Common/DocksController.h"
 #include <QMenu>
 
diff --git a/GUI/Views/Main/aboutapplicationdialog.cpp b/GUI/Views/Main/AboutDialog.cpp
similarity index 97%
rename from GUI/Views/Main/aboutapplicationdialog.cpp
rename to GUI/Views/Main/AboutDialog.cpp
index f518dfeffce983f3120ea5c9942156eae31d6936..46c43f0c4883e43e8bc11f9bb6074c342d66d64a 100644
--- a/GUI/Views/Main/aboutapplicationdialog.cpp
+++ b/GUI/Views/Main/AboutDialog.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/Main/aboutapplicationdialog.cpp
+//! @file      GUI/Views/Main/AboutDialog.cpp
 //! @brief     Implements class AboutApplicationDialog
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Views/Main/aboutapplicationdialog.h"
+#include "GUI/Views/Main/AboutDialog.h"
 #include "GUI/Widgets/Common/DesignerHelper.h"
 #include "GUI/utils/CustomEventFilters.h"
 #include "GUI/utils/Helpers.h"
diff --git a/GUI/Views/Main/aboutapplicationdialog.h b/GUI/Views/Main/AboutDialog.h
similarity index 79%
rename from GUI/Views/Main/aboutapplicationdialog.h
rename to GUI/Views/Main/AboutDialog.h
index 8e0a0fbe5e33b8e6d37b3db4a2393b8ffd440297..28694e4accacf59b98df747f8fa32bf99d6df45a 100644
--- a/GUI/Views/Main/aboutapplicationdialog.h
+++ b/GUI/Views/Main/AboutDialog.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/Main/aboutapplicationdialog.h
+//! @file      GUI/Views/Main/AboutDialog.h
 //! @brief     Defines class AboutApplicationDialog
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEWS_MAIN_ABOUTAPPLICATIONDIALOG_H
-#define BORNAGAIN_GUI_VIEWS_MAIN_ABOUTAPPLICATIONDIALOG_H
+#ifndef BORNAGAIN_GUI_VIEWS_MAIN_ABOUTDIALOG_H
+#define BORNAGAIN_GUI_VIEWS_MAIN_ABOUTDIALOG_H
 
 #include <QDialog>
 
@@ -32,4 +32,4 @@ private:
     QBoxLayout* createButtonLayout();
 };
 
-#endif // BORNAGAIN_GUI_VIEWS_MAIN_ABOUTAPPLICATIONDIALOG_H
+#endif // BORNAGAIN_GUI_VIEWS_MAIN_ABOUTDIALOG_H
diff --git a/GUI/Views/Main/AutosaveController.cpp b/GUI/Views/Main/AutosaveController.cpp
index d8d8f2ba350af117e902737c938f389caeb62e15..44905dad2ab423affab9bf75547288baaad8032f 100644
--- a/GUI/Views/Main/AutosaveController.cpp
+++ b/GUI/Views/Main/AutosaveController.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/Main/AutosaveController.h"
 #include "GUI/Models/Project/ProjectUtils.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/Widgets/Common/UpdateTimer.h"
 #include <QDir>
 
diff --git a/GUI/Views/Main/projectmanager.cpp b/GUI/Views/Main/ProjectManager.cpp
similarity index 99%
rename from GUI/Views/Main/projectmanager.cpp
rename to GUI/Views/Main/ProjectManager.cpp
index 1594ffe288abe213a2898e20cc9f4b6d0175c94d..aa5d422b498844e844325562d70b1c491e14937c 100644
--- a/GUI/Views/Main/projectmanager.cpp
+++ b/GUI/Views/Main/ProjectManager.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/Main/projectmanager.cpp
+//! @file      GUI/Views/Main/ProjectManager.cpp
 //! @brief     Implements class ProjectManager
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,12 +12,12 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/ProjectManager.h"
 #include "Base/Utils/Assert.h"
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/Models/Data/ApplicationModels.h"
 #include "GUI/Models/Project/ProjectUtils.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/Session/SessionData.h"
 #include "GUI/Views/Main/SaveService.h"
 #include "GUI/Views/Main/mainwindow.h"
diff --git a/GUI/Views/Main/projectmanager.h b/GUI/Views/Main/ProjectManager.h
similarity index 97%
rename from GUI/Views/Main/projectmanager.h
rename to GUI/Views/Main/ProjectManager.h
index cc715f8443bd2d5ce5f96dc1f43e20672c80c284..88772c56390b209dc2e0d3726a7aa2ca8f36c30a 100644
--- a/GUI/Views/Main/projectmanager.h
+++ b/GUI/Views/Main/ProjectManager.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/Main/projectmanager.h
+//! @file      GUI/Views/Main/ProjectManager.h
 //! @brief     Defines class ProjectManager
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEWS_MAIN_PROJECTMANAGER_H
 #define BORNAGAIN_GUI_VIEWS_MAIN_PROJECTMANAGER_H
 
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include <QObject>
 #include <QStringList>
 
diff --git a/GUI/Views/Main/PyImportAssistant.cpp b/GUI/Views/Main/PyImportAssistant.cpp
index 5d35a529d21f98e9bc9e85c8adc92142cf376f78..a495a088da39de1ef49c31ef024c22b529eddbd8 100644
--- a/GUI/Views/Main/PyImportAssistant.cpp
+++ b/GUI/Views/Main/PyImportAssistant.cpp
@@ -22,7 +22,7 @@
 #include "GUI/Models/Data/GUIObjectBuilder.h"
 #include "GUI/Models/Project/ProjectUtils.h"
 #include "GUI/Models/Sample/GUIDomainSampleVisitor.h"
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/ProjectManager.h"
 #include "GUI/Widgets/Info/ComboSelectorDialog.h"
 #include "GUI/Widgets/Info/DetailedMessageBox.h"
 #include "GUI/utils/GUIHelpers.h"
diff --git a/GUI/Views/Main/SaveService.cpp b/GUI/Views/Main/SaveService.cpp
index 7eb9d98b4b67bdfbe09d4c684630897c3e0ccd8d..20997c70e1d22d366a0a5675c7a065aa7949c290 100644
--- a/GUI/Views/Main/SaveService.cpp
+++ b/GUI/Views/Main/SaveService.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Views/Main/SaveService.h"
 #include "Base/Utils/Assert.h"
 #include "GUI/Models/Project/ProjectUtils.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/Views/Main/AutosaveController.h"
 #include "GUI/Views/Main/SaveThread.h"
 #include "GUI/utils/Error.h"
diff --git a/GUI/Views/Main/SaveThread.cpp b/GUI/Views/Main/SaveThread.cpp
index 3bf98202aab9202e6f019692f54532a10eaaea0f..377c1eb4b885f445d896492fe394734f53865f2f 100644
--- a/GUI/Views/Main/SaveThread.cpp
+++ b/GUI/Views/Main/SaveThread.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/Main/SaveThread.h"
 #include "Base/Utils/Assert.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 
 SaveThread::SaveThread(QObject* parent) : QThread(parent), m_document(nullptr) {}
 
diff --git a/GUI/Views/Main/actionmanager.cpp b/GUI/Views/Main/actionmanager.cpp
index eed1a429a6aae84a53c1f6a161413c34dc0200fd..0a3fcbc84a7e9c6ee6c9931449837dc14d903b8c 100644
--- a/GUI/Views/Main/actionmanager.cpp
+++ b/GUI/Views/Main/actionmanager.cpp
@@ -19,9 +19,9 @@
 #include "GUI/Session/SessionData.h"
 #include "GUI/Views/JobWidgets/JobView.h"
 #include "GUI/Views/Main/PyImportAssistant.h"
-#include "GUI/Views/Main/aboutapplicationdialog.h"
+#include "GUI/Views/Main/AboutDialog.h"
 #include "GUI/Views/Main/mainwindow.h"
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/ProjectManager.h"
 #include "GUI/Views/Toplevel/SampleView.h"
 #include "GUI/utils/hostosinfo.h"
 #include "GUI/utils/mainwindow_constants.h"
diff --git a/GUI/Views/Main/mainwindow.cpp b/GUI/Views/Main/mainwindow.cpp
index 6e0b3b10a939948c8188c3989827a30dc930c097..bff6e1adf31717427b9a02e7ec0fc9c04a6fd7e5 100644
--- a/GUI/Views/Main/mainwindow.cpp
+++ b/GUI/Views/Main/mainwindow.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Views/InstrumentWidgets/InstrumentView.h"
 #include "GUI/Views/JobWidgets/JobView.h"
 #include "GUI/Views/Main/actionmanager.h"
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/ProjectManager.h"
 #include "GUI/Views/Toplevel/ImportDataView.h"
 #include "GUI/Views/Toplevel/ProjectSettingsView.h"
 #include "GUI/Views/Toplevel/SampleView.h"
diff --git a/GUI/Views/Main/newprojectdialog.cpp b/GUI/Views/Main/newprojectdialog.cpp
index 00680944557a37923ca5a19a74c8a8f5aaacf1df..c6fc4f0b1e5590ffe9b9b7f679cc9328851ad3e4 100644
--- a/GUI/Views/Main/newprojectdialog.cpp
+++ b/GUI/Views/Main/newprojectdialog.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/Views/Main/newprojectdialog.h"
 #include "GUI/Application/GlobalSettings.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include <QFileDialog>
 #include <QGroupBox>
 #include <QLabel>
diff --git a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
index 98b4b973bb5864d4e533ff03ff29b8148760a185..8a14056b34d1d12392fcc01d99cb3851b9bac479 100644
--- a/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
+++ b/GUI/Views/MaskWidgets/MaskEditorCanvas.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Views/IntensityDataWidgets/ColorMap.h"
 #include "GUI/Views/IntensityDataWidgets/PlotStatusLabel.h"
 #include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/ProjectManager.h"
 #include "GUI/Views/MaskWidgets/MaskGraphicsScene.h"
 #include "GUI/Views/MaskWidgets/MaskGraphicsView.h"
 #include "GUI/Views/MaskWidgets/MaskResultsPresenter.h"
diff --git a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
index 5f58d747d4d7d6673885a294da49160bfe47c3a1..fdfb0d6ab4191abcccc3cff1e10780d69d17ea1b 100644
--- a/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
+++ b/GUI/Views/MaterialEditor/MaterialEditorDialog.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Items/VectorItem.h"
 #include "GUI/Models/Material/MaterialModel.h"
 #include "GUI/Models/Material/MaterialModelStore.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Views/Main/mainwindow.h"
 #include "GUI/Views/MaterialEditor/MaterialEditorModel.h"
diff --git a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
index 0ac51c564a20a0fb14aaa014a62b865d914e5930..8e8591a6d95ff3a5c4180bd6b25f793d0ff77358 100644
--- a/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/Views/ProjectionsWidgets/SaveProjectionsAssistant.cpp
@@ -20,7 +20,7 @@
 #include "GUI/Items/IntensityDataItem.h"
 #include "GUI/Items/MaskItems.h"
 #include "GUI/Items/ProjectionItems.h"
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/ProjectManager.h"
 #include "GUI/utils/Error.h"
 #include <QFileDialog>
 #include <QTextStream>
diff --git a/GUI/Views/PropertyEditor/CustomEditors.cpp b/GUI/Views/PropertyEditor/CustomEditors.cpp
index f890bb08045610b1923ee22be6e25ecce82a6dc6..c1ae86f98d2e62fe74764f8d222d385151210fc8 100644
--- a/GUI/Views/PropertyEditor/CustomEditors.cpp
+++ b/GUI/Views/PropertyEditor/CustomEditors.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Items/MaterialItemUtils.h"
 #include "GUI/Models/Group/ComboProperty.h"
 #include "GUI/Session/SessionData.h"
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/ProjectManager.h"
 #include "GUI/Views/MaterialEditor/MaterialEditorDialog.h"
 #include "GUI/Widgets/Common/ScientificSpinBox.h"
 #include "GUI/utils/CustomEventFilters.h"
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
index 2c7859b7d08f33f41cb96a12019f7e7361e46615..900f4081c2fb2cc63d36d17d01cc8ac16d7c3b91 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Items/SessionItemUtils.h"
 #include "GUI/Models/Parameter/FilterPropertyProxy.h"
 #include "GUI/Models/Sample/SampleModel.h"
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/ProjectManager.h"
 #include "GUI/Views/RealSpaceWidgets/RealSpaceBuilder.h"
 #include "GUI/Views/RealSpaceWidgets/RealSpaceModel.h"
 #include "GUI/Views/RealSpaceWidgets/RealSpaceView.h"
diff --git a/GUI/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index 3d6003228cfaa937411218c1fc7682d2162fa4a2..fab13f2ae3303f9b90e450620659c7e50049943f 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -22,7 +22,7 @@
 #include "GUI/Items/ParticleLayoutItem.h"
 #include "GUI/Items/RotationItems.h"
 #include "GUI/Models/Parameter/FilterPropertyProxy.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/Models/Sample/GUIExamplesFactory.h"
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Views/SampleDesigner/DesignerMimeData.h"
diff --git a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
index 20041c813c7a5b31ece73247531558b3cd084be3..1a5766448225dc00c583eeb04dbb050beb673b51 100644
--- a/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
+++ b/GUI/Views/SpecularDataWidgets/SpecularDataCanvas.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Views/SpecularDataWidgets/SpecularDataCanvas.h"
 #include "GUI/Items/SpecularDataItem.h"
 #include "GUI/Views/IntensityDataWidgets/SavePlotAssistant.h"
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/ProjectManager.h"
 #include "GUI/Views/SpecularDataWidgets/SpecularPlotCanvas.h"
 #include <qcustomplot.h>
 
diff --git a/GUI/Views/Toplevel/ImportDataView.cpp b/GUI/Views/Toplevel/ImportDataView.cpp
index cd723d635be84ac1f79cc60c096222fe13599007..06b17aa9dbb80bdc89bdc63bb0b9d36a9eb2f32b 100644
--- a/GUI/Views/Toplevel/ImportDataView.cpp
+++ b/GUI/Views/Toplevel/ImportDataView.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Views/Toplevel/ImportDataView.h"
 #include "GUI/Items/RealDataItem.h"
 #include "GUI/Models/Data/RealDataModel.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/Views/ImportDataWidgets/RealDataSelectorWidget.h"
 #include "GUI/Views/Main/mainwindow.h"
 #include "GUI/utils/mainwindow_constants.h"
diff --git a/GUI/Views/Toplevel/ProjectSettingsView.cpp b/GUI/Views/Toplevel/ProjectSettingsView.cpp
index 12981b31947b4c60fd2d4a63cd33de8c4feb7c37..c3c9dea5e4980fa5a95ca7415e3fba8831b5fef4 100644
--- a/GUI/Views/Toplevel/ProjectSettingsView.cpp
+++ b/GUI/Views/Toplevel/ProjectSettingsView.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Application/GlobalSettings.h"
 #include "GUI/Models/Data/ApplicationModels.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
 #include "GUI/utils/qstringutils.h"
diff --git a/GUI/Views/Toplevel/ProjectSettingsView.h b/GUI/Views/Toplevel/ProjectSettingsView.h
index 0918fe9fdaac24a7a92c5aa6456338d9b56b9226..e9c193c9c94c4025d51038b2aa06fa393de946fe 100644
--- a/GUI/Views/Toplevel/ProjectSettingsView.h
+++ b/GUI/Views/Toplevel/ProjectSettingsView.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEWS_TOPLEVEL_PROJECTSETTINGSVIEW_H
 #define BORNAGAIN_GUI_VIEWS_TOPLEVEL_PROJECTSETTINGSVIEW_H
 
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include <QWidget>
 
 namespace Ui {
diff --git a/GUI/Views/Toplevel/SampleView.cpp b/GUI/Views/Toplevel/SampleView.cpp
index adaff6169dac867b73b68b26d4d0e89b88d4c23e..39e97063ffae1e6c9a874899062ec57498c03dc3 100644
--- a/GUI/Views/Toplevel/SampleView.cpp
+++ b/GUI/Views/Toplevel/SampleView.cpp
@@ -15,7 +15,7 @@
 #include "GUI/Views/Toplevel/SampleView.h"
 #include "GUI/Items/MultiLayerItem.h"
 #include "GUI/Models/Parameter/FilterPropertyProxy.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/Views/Main/mainwindow.h"
 #include "GUI/Views/SampleDesigner/DesignerScene.h"
 #include "GUI/Views/SampleDesigner/DesignerView.h"
diff --git a/GUI/Views/Toplevel/SessionModelView.cpp b/GUI/Views/Toplevel/SessionModelView.cpp
index 487a5c1c3b64ad01cd08febdae7cd73d1ff3e257..cefbe2e47c484120b6f34890db1cd30cc40eb9b8 100644
--- a/GUI/Views/Toplevel/SessionModelView.cpp
+++ b/GUI/Views/Toplevel/SessionModelView.cpp
@@ -19,7 +19,7 @@
 #include "GUI/Models/Material/MaterialModel.h"
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Views/Main/mainwindow.h"
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/ProjectManager.h"
 #include "GUI/Views/PropertyEditor/SessionModelDelegate.h"
 #include "GUI/Views/Toplevel/TestView.h"
 #include "GUI/Widgets/Common/ModelTreeView.h"
diff --git a/GUI/Views/Toplevel/SimulationView.cpp b/GUI/Views/Toplevel/SimulationView.cpp
index 658a6387c98202d34be2eb734519ddac7e9b6829..1ec8550eb450d46e698badc04bc3fa656bb5092a 100644
--- a/GUI/Views/Toplevel/SimulationView.cpp
+++ b/GUI/Views/Toplevel/SimulationView.cpp
@@ -24,12 +24,12 @@
 #include "GUI/Models/Data/RealDataModel.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
 #include "GUI/Models/Job/JobModel.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/Models/Sample/SampleModel.h"
 #include "GUI/Models/Sample/SampleValidator.h"
 #include "GUI/Session/SessionData.h"
 #include "GUI/Views/Main/mainwindow.h"
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/ProjectManager.h"
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
 #include "GUI/Views/SimulationWidgets/PythonScriptWidget.h"
 #include "ui_SimulationView.h"
diff --git a/GUI/Views/Toplevel/WelcomeView.cpp b/GUI/Views/Toplevel/WelcomeView.cpp
index cb180785029265b36edfeceaabb1afe0ec365550..9e9f9c801bc1a4f94cd73637add0e752c29a3c25 100644
--- a/GUI/Views/Toplevel/WelcomeView.cpp
+++ b/GUI/Views/Toplevel/WelcomeView.cpp
@@ -13,7 +13,7 @@
 //  ************************************************************************************************
 
 #include "GUI/Views/Toplevel/WelcomeView.h"
-#include "GUI/Views/Main/projectmanager.h"
+#include "GUI/Views/Main/ProjectManager.h"
 #include "GUI/Views/SampleDesigner/GroupBoxCollapser.h"
 #include "GUI/utils/LayoutUtils.h"
 #include "GUI/utils/qstringutils.h"
diff --git a/Tests/Unit/GUI/TestDataItemViews.cpp b/Tests/Unit/GUI/TestDataItemViews.cpp
index 42bb25b752e24bc7356030a9cb72210755132322..26e573fd4406f60f034ce5d2f163decd01bf8222 100644
--- a/Tests/Unit/GUI/TestDataItemViews.cpp
+++ b/Tests/Unit/GUI/TestDataItemViews.cpp
@@ -5,7 +5,7 @@
 #include "GUI/Models/Data/DataPropertyContainer.h"
 #include "GUI/Models/Data/RealDataModel.h"
 #include "GUI/Models/Group/ComboProperty.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/utils/Error.h"
 #include "GUI/utils/MessageService.h"
 #include "Tests/GTestWrapper/google_test.h"
diff --git a/Tests/Unit/GUI/TestLinkInstrument.cpp b/Tests/Unit/GUI/TestLinkInstrument.cpp
index 695c6d55365fe84f37ab1a48ca2ca30822b37dc2..00bb865cbcd590bbaaa17b719fa679cf7d7369cd 100644
--- a/Tests/Unit/GUI/TestLinkInstrument.cpp
+++ b/Tests/Unit/GUI/TestLinkInstrument.cpp
@@ -6,7 +6,7 @@
 #include "GUI/Models/Data/RealDataModel.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
 #include "GUI/Models/Project/LinkInstrumentManager.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include "Tests/Unit/GUI/Utils.h"
 #include <QSignalSpy>
diff --git a/Tests/Unit/GUI/TestProjectDocument.cpp b/Tests/Unit/GUI/TestProjectDocument.cpp
index e7544b4bc93d9ffb9ccf827ede0da99f01721031..aaa351ac792d848f7e0b44b575b0ab47e36ae8ae 100644
--- a/Tests/Unit/GUI/TestProjectDocument.cpp
+++ b/Tests/Unit/GUI/TestProjectDocument.cpp
@@ -6,7 +6,7 @@
 #include "GUI/Models/Data/RealDataModel.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
 #include "GUI/Models/Project/ProjectUtils.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/utils/Helpers.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include "Tests/Unit/GUI/Utils.h"
diff --git a/Tests/Unit/GUI/TestSaveService.cpp b/Tests/Unit/GUI/TestSaveService.cpp
index 8253a150906650d780795f683932cea9385363d6..dfd02e6b0e555436ad8ce3a7d9bde4aca718f23e 100644
--- a/Tests/Unit/GUI/TestSaveService.cpp
+++ b/Tests/Unit/GUI/TestSaveService.cpp
@@ -6,7 +6,7 @@
 #include "GUI/Models/Data/RealDataModel.h"
 #include "GUI/Models/Instrument/InstrumentModel.h"
 #include "GUI/Models/Project/ProjectUtils.h"
-#include "GUI/Models/Project/projectdocument.h"
+#include "GUI/Models/Project/ProjectDocument.h"
 #include "GUI/Views/Main/AutosaveController.h"
 #include "GUI/Views/Main/SaveService.h"
 #include "GUI/utils/Error.h"