diff --git a/commands/command_base.cpp b/commands/command_base.cpp
index bef9da09c..edfc97bf3 100644
--- a/commands/command_base.cpp
+++ b/commands/command_base.cpp
@@ -2,7 +2,7 @@
 
 #include "command_base.h"
 #include "core/qthelper.h" // for updateWindowTitle()
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 
 namespace Command {
 
diff --git a/commands/command_divelist.cpp b/commands/command_divelist.cpp
index 2f226df3f..6eac339f2 100644
--- a/commands/command_divelist.cpp
+++ b/commands/command_divelist.cpp
@@ -5,7 +5,7 @@
 #include "core/display.h" // for amount_selected
 #include "core/qthelper.h"
 #include "core/selection.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 #include "qt-models/filtermodels.h"
 #include "../profile-widget/profilewidget2.h"
 #include "core/divefilter.h"
@@ -143,7 +143,7 @@ DivesAndTripsToAdd DiveListBase::removeDives(DivesAndSitesToRemove &divesAndSite
 	}
 	divesAndSitesToDelete.sites.clear();
 
-	// We send one dives-deleted signal per trip (see comments in DiveListNotifier.h).
+	// We send one dives-deleted signal per trip (see comments in divelistnotifier.h).
 	// Therefore, collect all dives in an array and sort by trip.
 	std::vector<std::pair<dive_trip *, dive *>> dives;
 	dives.reserve(divesToAdd.size());
diff --git a/commands/command_divesite.cpp b/commands/command_divesite.cpp
index 47c46f84e..56372ff41 100644
--- a/commands/command_divesite.cpp
+++ b/commands/command_divesite.cpp
@@ -2,7 +2,7 @@
 
 #include "command_divesite.h"
 #include "core/divesite.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 #include "core/qthelper.h"
 #include "core/subsurface-string.h"
 #include "qt-models/divelocationmodel.h"
diff --git a/commands/command_edit.h b/commands/command_edit.h
index 6c2b2f600..a148550b3 100644
--- a/commands/command_edit.h
+++ b/commands/command_edit.h
@@ -5,7 +5,7 @@
 #define COMMAND_EDIT_H
 
 #include "command_base.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 
 #include <QVector>
 
diff --git a/commands/command_edit_trip.h b/commands/command_edit_trip.h
index ae41ca252..f1d633b4b 100644
--- a/commands/command_edit_trip.h
+++ b/commands/command_edit_trip.h
@@ -5,7 +5,7 @@
 #define COMMAND_EDIT_TRIP_H
 
 #include "command_base.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 
 #include <QVector>
 
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 80fbd326e..24df1854b 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -220,12 +220,12 @@ set(SUBSURFACE_CORE_LIB_SRCS
 	settings/qPrefUpdateManager.h
 
 	#Subsurface Qt have the Subsurface structs QObjectified for easy access via QML.
-	subsurface-qt/CylinderObjectHelper.cpp
-	subsurface-qt/CylinderObjectHelper.h
-	subsurface-qt/DiveListNotifier.cpp
-	subsurface-qt/DiveListNotifier.h
-	subsurface-qt/DiveObjectHelper.cpp
-	subsurface-qt/DiveObjectHelper.h
+	subsurface-qt/cylinderobjecthelper.cpp
+	subsurface-qt/cylinderobjecthelper.h
+	subsurface-qt/divelistnotifier.cpp
+	subsurface-qt/divelistnotifier.h
+	subsurface-qt/diveobjecthelper.cpp
+	subsurface-qt/diveobjecthelper.h
 
 	${SERIAL_FTDI}
 	${PLATFORM_SRC}
diff --git a/core/selection.cpp b/core/selection.cpp
index 7bddd86ee..4890f6422 100644
--- a/core/selection.cpp
+++ b/core/selection.cpp
@@ -4,7 +4,7 @@
 #include "selection.h"
 #include "divelist.h"
 #include "display.h" // for amount_selected
-#include "subsurface-qt/DiveListNotifier.h"
+#include "subsurface-qt/divelistnotifier.h"
 
 #include <QVector>
 
diff --git a/core/subsurface-qt/CylinderObjectHelper.cpp b/core/subsurface-qt/cylinderobjecthelper.cpp
similarity index 94%
rename from core/subsurface-qt/CylinderObjectHelper.cpp
rename to core/subsurface-qt/cylinderobjecthelper.cpp
index 28c14e10a..897746952 100644
--- a/core/subsurface-qt/CylinderObjectHelper.cpp
+++ b/core/subsurface-qt/cylinderobjecthelper.cpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
-#include "CylinderObjectHelper.h"
+#include "cylinderobjecthelper.h"
 #include "../qthelper.h"
 
 static QString EMPTY_CYLINDER_STRING = QStringLiteral("");
diff --git a/core/subsurface-qt/CylinderObjectHelper.h b/core/subsurface-qt/cylinderobjecthelper.h
similarity index 100%
rename from core/subsurface-qt/CylinderObjectHelper.h
rename to core/subsurface-qt/cylinderobjecthelper.h
diff --git a/core/subsurface-qt/DiveListNotifier.cpp b/core/subsurface-qt/divelistnotifier.cpp
similarity index 70%
rename from core/subsurface-qt/DiveListNotifier.cpp
rename to core/subsurface-qt/divelistnotifier.cpp
index 2009defcd..8753c79a4 100644
--- a/core/subsurface-qt/DiveListNotifier.cpp
+++ b/core/subsurface-qt/divelistnotifier.cpp
@@ -1,4 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0
-#include "DiveListNotifier.h"
+#include "divelistnotifier.h"
 
 DiveListNotifier diveListNotifier;
diff --git a/core/subsurface-qt/DiveListNotifier.h b/core/subsurface-qt/divelistnotifier.h
similarity index 100%
rename from core/subsurface-qt/DiveListNotifier.h
rename to core/subsurface-qt/divelistnotifier.h
diff --git a/core/subsurface-qt/DiveObjectHelper.cpp b/core/subsurface-qt/diveobjecthelper.cpp
similarity index 99%
rename from core/subsurface-qt/DiveObjectHelper.cpp
rename to core/subsurface-qt/diveobjecthelper.cpp
index 606614b05..aec5984a8 100644
--- a/core/subsurface-qt/DiveObjectHelper.cpp
+++ b/core/subsurface-qt/diveobjecthelper.cpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
-#include "DiveObjectHelper.h"
+#include "diveobjecthelper.h"
 
 #include <QDateTime>
 #include <QTextDocument>
diff --git a/core/subsurface-qt/DiveObjectHelper.h b/core/subsurface-qt/diveobjecthelper.h
similarity index 99%
rename from core/subsurface-qt/DiveObjectHelper.h
rename to core/subsurface-qt/diveobjecthelper.h
index 639dae696..7723df0f4 100644
--- a/core/subsurface-qt/DiveObjectHelper.h
+++ b/core/subsurface-qt/diveobjecthelper.h
@@ -2,7 +2,7 @@
 #ifndef DIVE_QOBJECT_H
 #define DIVE_QOBJECT_H
 
-#include "CylinderObjectHelper.h"
+#include "cylinderobjecthelper.h"
 #include <QObject>
 #include <QString>
 #include <QStringList>
diff --git a/desktop-widgets/divelistview.h b/desktop-widgets/divelistview.h
index 86be642b8..ca6c61e9e 100644
--- a/desktop-widgets/divelistview.h
+++ b/desktop-widgets/divelistview.h
@@ -16,7 +16,7 @@
 #include <QLineEdit>
 #include <QNetworkAccessManager>
 #include "qt-models/divetripmodel.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 
 class DiveListView : public QTreeView {
 	Q_OBJECT
diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp
index e97a189bd..5844d43ed 100644
--- a/desktop-widgets/locationinformation.cpp
+++ b/desktop-widgets/locationinformation.cpp
@@ -9,7 +9,7 @@
 #include "core/divefilter.h"
 #include "core/divesitehelpers.h"
 #include "desktop-widgets/modeldelegates.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 #include "core/taxonomy.h"
 #include "core/settings/qPrefUnit.h"
 #include "commands/command.h"
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index 0b7975054..b4db7028c 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -38,7 +38,7 @@
 #include "core/settings/qPrefPartialPressureGas.h"
 #include "core/settings/qPrefTechnicalDetails.h"
 
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 
 #include "desktop-widgets/about.h"
 #include "desktop-widgets/divecomputermanagementdialog.h"
diff --git a/desktop-widgets/mapwidget.h b/desktop-widgets/mapwidget.h
index f62fc524f..74ff0c8c0 100644
--- a/desktop-widgets/mapwidget.h
+++ b/desktop-widgets/mapwidget.h
@@ -3,7 +3,7 @@
 #define MAPWIDGET_H
 
 #include "core/units.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 #include <QQuickWidget>
 #include <QList>
 
diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.h b/desktop-widgets/tab-widgets/TabDiveInformation.h
index 374ad4784..882a4d1bf 100644
--- a/desktop-widgets/tab-widgets/TabDiveInformation.h
+++ b/desktop-widgets/tab-widgets/TabDiveInformation.h
@@ -3,7 +3,7 @@
 #define TAB_DIVE_INFORMATION_H
 
 #include "TabBase.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 
 namespace Ui {
 	class TabDiveInformation;
diff --git a/desktop-widgets/tab-widgets/TabDiveSite.cpp b/desktop-widgets/tab-widgets/TabDiveSite.cpp
index 9e269ee26..0059c1051 100644
--- a/desktop-widgets/tab-widgets/TabDiveSite.cpp
+++ b/desktop-widgets/tab-widgets/TabDiveSite.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "TabDiveSite.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 #include "core/divesite.h"
 #include "core/divefilter.h"
 #include "qt-models/divelocationmodel.h"
diff --git a/desktop-widgets/tab-widgets/TabDiveStatistics.h b/desktop-widgets/tab-widgets/TabDiveStatistics.h
index 2fb4ebc85..781478367 100644
--- a/desktop-widgets/tab-widgets/TabDiveStatistics.h
+++ b/desktop-widgets/tab-widgets/TabDiveStatistics.h
@@ -3,7 +3,7 @@
 #define TAB_DIVE_STATISTICS_H
 
 #include "TabBase.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 
 namespace Ui {
 	class TabDiveStatistics;
diff --git a/desktop-widgets/tab-widgets/maintab.h b/desktop-widgets/tab-widgets/maintab.h
index f4e2bd6e1..f1caf8ed1 100644
--- a/desktop-widgets/tab-widgets/maintab.h
+++ b/desktop-widgets/tab-widgets/maintab.h
@@ -17,7 +17,7 @@
 #include "qt-models/completionmodels.h"
 #include "qt-models/divelocationmodel.h"
 #include "core/dive.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 
 class ExtraDataModel;
 class DivePictureModel;
diff --git a/desktop-widgets/templatelayout.h b/desktop-widgets/templatelayout.h
index 04f7af9a5..8e17f6058 100644
--- a/desktop-widgets/templatelayout.h
+++ b/desktop-widgets/templatelayout.h
@@ -8,8 +8,8 @@
 #include "printoptions.h"
 #include "core/statistics.h"
 #include "core/qthelper.h"
-#include "core/subsurface-qt/DiveObjectHelper.h"
-#include "core/subsurface-qt/CylinderObjectHelper.h" // TODO: remove once grantlee supports Q_GADGET objects
+#include "core/subsurface-qt/diveobjecthelper.h"
+#include "core/subsurface-qt/cylinderobjecthelper.h" // TODO: remove once grantlee supports Q_GADGET objects
 
 int getTotalWork(print_options *printOptions);
 void find_all_templates();
diff --git a/map-widget/qmlmapwidgethelper.h b/map-widget/qmlmapwidgethelper.h
index f2c5eb6bb..2306ee9e8 100644
--- a/map-widget/qmlmapwidgethelper.h
+++ b/map-widget/qmlmapwidgethelper.h
@@ -3,7 +3,7 @@
 #define QMLMAPWIDGETHELPER_H
 
 #include "core/units.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 #include <QObject>
 #include <QGeoCoordinate>
 
diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro
index 60ea99f58..15ae8ff88 100644
--- a/packaging/ios/Subsurface-mobile.pro
+++ b/packaging/ios/Subsurface-mobile.pro
@@ -105,8 +105,8 @@ SOURCES += ../../subsurface-mobile-main.cpp \
 	../../core/settings/qPrefLog.cpp \
 	../../core/settings/qPrefMedia.cpp \
 	../../core/settings/qPrefUpdateManager.cpp \
-	../../core/subsurface-qt/CylinderObjectHelper.cpp \
-	../../core/subsurface-qt/DiveObjectHelper.cpp \
+	../../core/subsurface-qt/cylinderobjecthelper.cpp \
+	../../core/subsurface-qt/diveobjecthelper.cpp \
 	../../core/subsurface-qt/DiveListNotifier.cpp \
 	../../backend-shared/divesummary.cpp \
 	../../backend-shared/exportfuncs.cpp \
@@ -240,9 +240,9 @@ HEADERS += \
 	../../core/settings/qPrefLog.h \
 	../../core/settings/qPrefMedia.h \
 	../../core/settings/qPrefUpdateManager.h \
-	../../core/subsurface-qt/CylinderObjectHelper.h \
-	../../core/subsurface-qt/DiveObjectHelper.h \
-	../../core/subsurface-qt/DiveListNotifier.h \
+	../../core/subsurface-qt/cylinderobjecthelper.h \
+	../../core/subsurface-qt/diveobjecthelper.h \
+	../../core/subsurface-qt/divelistnotifier.h \
 	../../backend-shared/divesummary.h \
 	../../backend-shared/exportfuncs.h \
 	../../backend-shared/plannershared.h \
diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp
index 2ed81ab72..b1d744c27 100644
--- a/qt-models/cylindermodel.cpp
+++ b/qt-models/cylindermodel.cpp
@@ -7,7 +7,7 @@
 #include "core/color.h"
 #include "qt-models/diveplannermodel.h"
 #include "core/gettextfromc.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 
 CylindersModel::CylindersModel(QObject *parent) :
 	CleanerTableModel(parent),
diff --git a/qt-models/divelistmodel.h b/qt-models/divelistmodel.h
index 92e7a9291..e455d2ea7 100644
--- a/qt-models/divelistmodel.h
+++ b/qt-models/divelistmodel.h
@@ -5,7 +5,7 @@
 #include <QAbstractListModel>
 #include <QSortFilterProxyModel>
 
-#include "core/subsurface-qt/DiveObjectHelper.h"
+#include "core/subsurface-qt/diveobjecthelper.h"
 
 class CollapsedDiveListSortModel : public QSortFilterProxyModel
 {
diff --git a/qt-models/divelocationmodel.cpp b/qt-models/divelocationmodel.cpp
index 0be755fd2..526a196de 100644
--- a/qt-models/divelocationmodel.cpp
+++ b/qt-models/divelocationmodel.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "core/units.h"
 #include "qt-models/divelocationmodel.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 #include "core/qthelper.h"
 #include "core/divesite.h"
 #include "core/metrics.h"
diff --git a/qt-models/divetripmodel.h b/qt-models/divetripmodel.h
index a2cbf83a3..2787012c4 100644
--- a/qt-models/divetripmodel.h
+++ b/qt-models/divetripmodel.h
@@ -3,7 +3,7 @@
 #define DIVETRIPMODEL_H
 
 #include "core/dive.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 #include <QAbstractItemModel>
 
 class DiveFilter;
diff --git a/qt-models/filtermodels.cpp b/qt-models/filtermodels.cpp
index d07de02c0..4bf0efd6b 100644
--- a/qt-models/filtermodels.cpp
+++ b/qt-models/filtermodels.cpp
@@ -4,7 +4,7 @@
 #include "core/qthelper.h"
 #include "core/trip.h"
 #include "core/subsurface-string.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 #include "qt-models/divetripmodel.h"
 
 MultiFilterSortModel *MultiFilterSortModel::instance()
diff --git a/qt-models/maplocationmodel.h b/qt-models/maplocationmodel.h
index 2aef697a2..8cc5b7269 100644
--- a/qt-models/maplocationmodel.h
+++ b/qt-models/maplocationmodel.h
@@ -2,7 +2,7 @@
 #ifndef MAPLOCATIONMODEL_H
 #define MAPLOCATIONMODEL_H
 
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 #include <QObject>
 #include <QVector>
 #include <QHash>
diff --git a/qt-models/weightmodel.cpp b/qt-models/weightmodel.cpp
index 21e363592..6e56071e2 100644
--- a/qt-models/weightmodel.cpp
+++ b/qt-models/weightmodel.cpp
@@ -4,7 +4,7 @@
 #include "core/gettextfromc.h"
 #include "core/metrics.h"
 #include "core/qthelper.h"
-#include "core/subsurface-qt/DiveListNotifier.h"
+#include "core/subsurface-qt/divelistnotifier.h"
 #include "qt-models/weightsysteminfomodel.h"
 #ifndef SUBSURFACE_MOBILE
 #include "commands/command.h"