diff --git a/src/common/filesettingspersistence.cpp b/src/common/file_settings_persistence.cpp
similarity index 97%
rename from src/common/filesettingspersistence.cpp
rename to src/common/file_settings_persistence.cpp
index d9fb40ac..5c59c80a 100644
--- a/src/common/filesettingspersistence.cpp
+++ b/src/common/file_settings_persistence.cpp
@@ -1,5 +1,5 @@
 // class header include
-#include "displaydevice/filesettingspersistence.h"
+#include "displaydevice/file_settings_persistence.h"
 
 // system includes
 #include <algorithm>
diff --git a/src/common/include/displaydevice/audiocontextinterface.h b/src/common/include/displaydevice/audio_context_interface.h
similarity index 100%
rename from src/common/include/displaydevice/audiocontextinterface.h
rename to src/common/include/displaydevice/audio_context_interface.h
diff --git a/src/common/include/displaydevice/detail/jsonconverter.h b/src/common/include/displaydevice/detail/json_converter.h
similarity index 100%
rename from src/common/include/displaydevice/detail/jsonconverter.h
rename to src/common/include/displaydevice/detail/json_converter.h
diff --git a/src/common/include/displaydevice/detail/jsonserializer.h b/src/common/include/displaydevice/detail/json_serializer.h
similarity index 93%
rename from src/common/include/displaydevice/detail/jsonserializer.h
rename to src/common/include/displaydevice/detail/json_serializer.h
index 0db59f07..6a303b38 100644
--- a/src/common/include/displaydevice/detail/jsonserializer.h
+++ b/src/common/include/displaydevice/detail/json_serializer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 // local includes
-#include "jsonserializerdetails.h"
+#include "json_serializer_details.h"
 
 #ifdef DD_JSON_DETAIL
 namespace display_device {
diff --git a/src/common/include/displaydevice/detail/jsonserializerdetails.h b/src/common/include/displaydevice/detail/json_serializer_details.h
similarity index 100%
rename from src/common/include/displaydevice/detail/jsonserializerdetails.h
rename to src/common/include/displaydevice/detail/json_serializer_details.h
diff --git a/src/common/include/displaydevice/filesettingspersistence.h b/src/common/include/displaydevice/file_settings_persistence.h
similarity index 97%
rename from src/common/include/displaydevice/filesettingspersistence.h
rename to src/common/include/displaydevice/file_settings_persistence.h
index f78b0a92..7a3e9c55 100644
--- a/src/common/include/displaydevice/filesettingspersistence.h
+++ b/src/common/include/displaydevice/file_settings_persistence.h
@@ -4,7 +4,7 @@
 #include <filesystem>
 
 // local includes
-#include "settingspersistenceinterface.h"
+#include "settings_persistence_interface.h"
 
 namespace display_device {
   /**
diff --git a/src/common/include/displaydevice/noopaudiocontext.h b/src/common/include/displaydevice/noop_audio_context.h
similarity index 93%
rename from src/common/include/displaydevice/noopaudiocontext.h
rename to src/common/include/displaydevice/noop_audio_context.h
index b9357a02..cd9a501d 100644
--- a/src/common/include/displaydevice/noopaudiocontext.h
+++ b/src/common/include/displaydevice/noop_audio_context.h
@@ -1,7 +1,7 @@
 #pragma once
 
 // local includes
-#include "audiocontextinterface.h"
+#include "audio_context_interface.h"
 
 namespace display_device {
   /**
diff --git a/src/common/include/displaydevice/noopsettingspersistence.h b/src/common/include/displaydevice/noop_settings_persistence.h
similarity index 92%
rename from src/common/include/displaydevice/noopsettingspersistence.h
rename to src/common/include/displaydevice/noop_settings_persistence.h
index 9f796106..7f2a0df9 100644
--- a/src/common/include/displaydevice/noopsettingspersistence.h
+++ b/src/common/include/displaydevice/noop_settings_persistence.h
@@ -1,7 +1,7 @@
 #pragma once
 
 // local includes
-#include "settingspersistenceinterface.h"
+#include "settings_persistence_interface.h"
 
 namespace display_device {
   /**
diff --git a/src/common/include/displaydevice/retryscheduler.h b/src/common/include/displaydevice/retry_scheduler.h
similarity index 100%
rename from src/common/include/displaydevice/retryscheduler.h
rename to src/common/include/displaydevice/retry_scheduler.h
diff --git a/src/common/include/displaydevice/settingsmanagerinterface.h b/src/common/include/displaydevice/settings_manager_interface.h
similarity index 100%
rename from src/common/include/displaydevice/settingsmanagerinterface.h
rename to src/common/include/displaydevice/settings_manager_interface.h
diff --git a/src/common/include/displaydevice/settingspersistenceinterface.h b/src/common/include/displaydevice/settings_persistence_interface.h
similarity index 100%
rename from src/common/include/displaydevice/settingspersistenceinterface.h
rename to src/common/include/displaydevice/settings_persistence_interface.h
diff --git a/src/common/json.cpp b/src/common/json.cpp
index 42dd907d..3fb8a576 100644
--- a/src/common/json.cpp
+++ b/src/common/json.cpp
@@ -4,8 +4,8 @@
 // special ordered include of details
 #define DD_JSON_DETAIL
 // clang-format off
-#include "displaydevice/detail/jsonserializer.h"
-#include "displaydevice/detail/jsonconverter.h"
+#include "displaydevice/detail/json_serializer.h"
+#include "displaydevice/detail/json_converter.h"
 // clang-format on
 
 namespace display_device {
diff --git a/src/common/jsonserializer.cpp b/src/common/json_serializer.cpp
similarity index 97%
rename from src/common/jsonserializer.cpp
rename to src/common/json_serializer.cpp
index 424d2c5c..d8367d35 100644
--- a/src/common/jsonserializer.cpp
+++ b/src/common/json_serializer.cpp
@@ -2,7 +2,7 @@
 #define DD_JSON_DETAIL
 // clang-format off
 #include "displaydevice/types.h"
-#include "displaydevice/detail/jsonserializer.h"
+#include "displaydevice/detail/json_serializer.h"
 // clang-format on
 
 namespace display_device {
diff --git a/src/common/noopaudiocontext.cpp b/src/common/noop_audio_context.cpp
similarity index 87%
rename from src/common/noopaudiocontext.cpp
rename to src/common/noop_audio_context.cpp
index 30b7c7ff..36d44156 100644
--- a/src/common/noopaudiocontext.cpp
+++ b/src/common/noop_audio_context.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/noopaudiocontext.h"
+#include "displaydevice/noop_audio_context.h"
 
 namespace display_device {
   bool
diff --git a/src/common/noopsettingspersistence.cpp b/src/common/noop_settings_persistence.cpp
similarity index 87%
rename from src/common/noopsettingspersistence.cpp
rename to src/common/noop_settings_persistence.cpp
index b07c9d5d..4551884c 100644
--- a/src/common/noopsettingspersistence.cpp
+++ b/src/common/noop_settings_persistence.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/noopsettingspersistence.h"
+#include "displaydevice/noop_settings_persistence.h"
 
 namespace display_device {
   bool
diff --git a/src/common/retryscheduler.cpp b/src/common/retry_scheduler.cpp
similarity index 91%
rename from src/common/retryscheduler.cpp
rename to src/common/retry_scheduler.cpp
index 473f70a2..89e0c60a 100644
--- a/src/common/retryscheduler.cpp
+++ b/src/common/retry_scheduler.cpp
@@ -1,5 +1,5 @@
 // header include
-#include "displaydevice/retryscheduler.h"
+#include "displaydevice/retry_scheduler.h"
 
 namespace display_device {
   SchedulerStopToken::SchedulerStopToken(std::function<void()> cleanup):
diff --git a/src/windows/include/displaydevice/windows/detail/jsonserializer.h b/src/windows/include/displaydevice/windows/detail/json_serializer.h
similarity index 88%
rename from src/windows/include/displaydevice/windows/detail/jsonserializer.h
rename to src/windows/include/displaydevice/windows/detail/json_serializer.h
index 407f92e2..2a6ba5e7 100644
--- a/src/windows/include/displaydevice/windows/detail/jsonserializer.h
+++ b/src/windows/include/displaydevice/windows/detail/json_serializer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 // local includes
-#include "displaydevice/detail/jsonserializer.h"
+#include "displaydevice/detail/json_serializer.h"
 
 #ifdef DD_JSON_DETAIL
 namespace display_device {
diff --git a/src/windows/include/displaydevice/windows/persistentstate.h b/src/windows/include/displaydevice/windows/persistent_state.h
similarity index 92%
rename from src/windows/include/displaydevice/windows/persistentstate.h
rename to src/windows/include/displaydevice/windows/persistent_state.h
index 479e37ac..c1524f5a 100644
--- a/src/windows/include/displaydevice/windows/persistentstate.h
+++ b/src/windows/include/displaydevice/windows/persistent_state.h
@@ -4,8 +4,8 @@
 #include <memory>
 
 // local includes
-#include "displaydevice/settingspersistenceinterface.h"
-#include "displaydevice/windows/windisplaydeviceinterface.h"
+#include "displaydevice/settings_persistence_interface.h"
+#include "displaydevice/windows/win_display_device_interface.h"
 
 namespace display_device {
   /**
diff --git a/src/windows/include/displaydevice/windows/settingsmanager.h b/src/windows/include/displaydevice/windows/settings_manager.h
similarity index 96%
rename from src/windows/include/displaydevice/windows/settingsmanager.h
rename to src/windows/include/displaydevice/windows/settings_manager.h
index f4893e0a..bc19d4df 100644
--- a/src/windows/include/displaydevice/windows/settingsmanager.h
+++ b/src/windows/include/displaydevice/windows/settings_manager.h
@@ -5,10 +5,10 @@
 #include <memory>
 
 // local includes
-#include "displaydevice/audiocontextinterface.h"
-#include "displaydevice/settingsmanagerinterface.h"
-#include "displaydevice/windows/windisplaydeviceinterface.h"
-#include "persistentstate.h"
+#include "displaydevice/audio_context_interface.h"
+#include "displaydevice/settings_manager_interface.h"
+#include "displaydevice/windows/win_display_device_interface.h"
+#include "persistent_state.h"
 
 namespace display_device {
   /**
diff --git a/src/windows/include/displaydevice/windows/settingsutils.h b/src/windows/include/displaydevice/windows/settings_utils.h
similarity index 99%
rename from src/windows/include/displaydevice/windows/settingsutils.h
rename to src/windows/include/displaydevice/windows/settings_utils.h
index 8fef529d..f77aba59 100644
--- a/src/windows/include/displaydevice/windows/settingsutils.h
+++ b/src/windows/include/displaydevice/windows/settings_utils.h
@@ -6,7 +6,7 @@
 
 // local includes
 #include "types.h"
-#include "windisplaydeviceinterface.h"
+#include "win_display_device_interface.h"
 
 /**
  * @brief Shared "utility-level" code for Settings.
diff --git a/src/windows/include/displaydevice/windows/winapilayer.h b/src/windows/include/displaydevice/windows/win_api_layer.h
similarity index 98%
rename from src/windows/include/displaydevice/windows/winapilayer.h
rename to src/windows/include/displaydevice/windows/win_api_layer.h
index 1cfa6266..b8bd4cbd 100644
--- a/src/windows/include/displaydevice/windows/winapilayer.h
+++ b/src/windows/include/displaydevice/windows/win_api_layer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 // local includes
-#include "winapilayerinterface.h"
+#include "win_api_layer_interface.h"
 
 namespace display_device {
   /**
diff --git a/src/windows/include/displaydevice/windows/winapilayerinterface.h b/src/windows/include/displaydevice/windows/win_api_layer_interface.h
similarity index 100%
rename from src/windows/include/displaydevice/windows/winapilayerinterface.h
rename to src/windows/include/displaydevice/windows/win_api_layer_interface.h
diff --git a/src/windows/include/displaydevice/windows/winapiutils.h b/src/windows/include/displaydevice/windows/win_api_utils.h
similarity index 99%
rename from src/windows/include/displaydevice/windows/winapiutils.h
rename to src/windows/include/displaydevice/windows/win_api_utils.h
index b848e870..c37b13ea 100644
--- a/src/windows/include/displaydevice/windows/winapiutils.h
+++ b/src/windows/include/displaydevice/windows/win_api_utils.h
@@ -4,7 +4,7 @@
 #include <set>
 
 // local includes
-#include "winapilayerinterface.h"
+#include "win_api_layer_interface.h"
 
 /**
  * @brief Shared "utility-level" code for Windows.
diff --git a/src/windows/include/displaydevice/windows/windisplaydevice.h b/src/windows/include/displaydevice/windows/win_display_device.h
similarity index 97%
rename from src/windows/include/displaydevice/windows/windisplaydevice.h
rename to src/windows/include/displaydevice/windows/win_display_device.h
index 88b15ac6..c6db6081 100644
--- a/src/windows/include/displaydevice/windows/windisplaydevice.h
+++ b/src/windows/include/displaydevice/windows/win_display_device.h
@@ -4,8 +4,8 @@
 #include <memory>
 
 // local includes
-#include "winapilayerinterface.h"
-#include "windisplaydeviceinterface.h"
+#include "win_api_layer_interface.h"
+#include "win_display_device_interface.h"
 
 namespace display_device {
   /**
diff --git a/src/windows/include/displaydevice/windows/windisplaydeviceinterface.h b/src/windows/include/displaydevice/windows/win_display_device_interface.h
similarity index 100%
rename from src/windows/include/displaydevice/windows/windisplaydeviceinterface.h
rename to src/windows/include/displaydevice/windows/win_display_device_interface.h
diff --git a/src/windows/json.cpp b/src/windows/json.cpp
index bd5bbdd5..c230bf46 100644
--- a/src/windows/json.cpp
+++ b/src/windows/json.cpp
@@ -4,8 +4,8 @@
 // special ordered include of details
 #define DD_JSON_DETAIL
 // clang-format off
-#include "displaydevice/windows/detail/jsonserializer.h"
-#include "displaydevice/detail/jsonconverter.h"
+#include "displaydevice/windows/detail/json_serializer.h"
+#include "displaydevice/detail/json_converter.h"
 // clang-format on
 
 namespace display_device {
diff --git a/src/windows/jsonserializer.cpp b/src/windows/json_serializer.cpp
similarity index 91%
rename from src/windows/jsonserializer.cpp
rename to src/windows/json_serializer.cpp
index 019eaa80..180b948c 100644
--- a/src/windows/jsonserializer.cpp
+++ b/src/windows/json_serializer.cpp
@@ -2,7 +2,7 @@
 #define DD_JSON_DETAIL
 // clang-format off
 #include "displaydevice/windows/types.h"
-#include "displaydevice/windows/detail/jsonserializer.h"
+#include "displaydevice/windows/detail/json_serializer.h"
 // clang-format on
 
 namespace display_device {
diff --git a/src/windows/persistentstate.cpp b/src/windows/persistent_state.cpp
similarity index 95%
rename from src/windows/persistentstate.cpp
rename to src/windows/persistent_state.cpp
index b135dc03..28ed2679 100644
--- a/src/windows/persistentstate.cpp
+++ b/src/windows/persistent_state.cpp
@@ -1,9 +1,9 @@
 // class header include
-#include "displaydevice/windows/persistentstate.h"
+#include "displaydevice/windows/persistent_state.h"
 
 // local includes
 #include "displaydevice/logging.h"
-#include "displaydevice/noopsettingspersistence.h"
+#include "displaydevice/noop_settings_persistence.h"
 #include "displaydevice/windows/json.h"
 
 namespace display_device {
diff --git a/src/windows/settingsmanagerapply.cpp b/src/windows/settings_manager_apply.cpp
similarity index 99%
rename from src/windows/settingsmanagerapply.cpp
rename to src/windows/settings_manager_apply.cpp
index 2ea9e71f..9f897dad 100644
--- a/src/windows/settingsmanagerapply.cpp
+++ b/src/windows/settings_manager_apply.cpp
@@ -1,5 +1,5 @@
 // class header include
-#include "displaydevice/windows/settingsmanager.h"
+#include "displaydevice/windows/settings_manager.h"
 
 // system includes
 #include <algorithm>
@@ -8,7 +8,7 @@
 // local includes
 #include "displaydevice/logging.h"
 #include "displaydevice/windows/json.h"
-#include "displaydevice/windows/settingsutils.h"
+#include "displaydevice/windows/settings_utils.h"
 
 namespace display_device {
   namespace {
diff --git a/src/windows/settingsmanagergeneral.cpp b/src/windows/settings_manager_general.cpp
similarity index 94%
rename from src/windows/settingsmanagergeneral.cpp
rename to src/windows/settings_manager_general.cpp
index 49be0ba5..e6e87983 100644
--- a/src/windows/settingsmanagergeneral.cpp
+++ b/src/windows/settings_manager_general.cpp
@@ -1,9 +1,9 @@
 // class header include
-#include "displaydevice/windows/settingsmanager.h"
+#include "displaydevice/windows/settings_manager.h"
 
 // local includes
 #include "displaydevice/logging.h"
-#include "displaydevice/noopaudiocontext.h"
+#include "displaydevice/noop_audio_context.h"
 
 namespace display_device {
   SettingsManager::SettingsManager(
diff --git a/src/windows/settingsmanagerrevert.cpp b/src/windows/settings_manager_revert.cpp
similarity index 98%
rename from src/windows/settingsmanagerrevert.cpp
rename to src/windows/settings_manager_revert.cpp
index 2b42b950..746dda61 100644
--- a/src/windows/settingsmanagerrevert.cpp
+++ b/src/windows/settings_manager_revert.cpp
@@ -1,5 +1,5 @@
 // class header include
-#include "displaydevice/windows/settingsmanager.h"
+#include "displaydevice/windows/settings_manager.h"
 
 // system includes
 #include <boost/scope/scope_exit.hpp>
@@ -7,7 +7,7 @@
 // local includes
 #include "displaydevice/logging.h"
 #include "displaydevice/windows/json.h"
-#include "displaydevice/windows/settingsutils.h"
+#include "displaydevice/windows/settings_utils.h"
 
 namespace display_device {
   namespace {
diff --git a/src/windows/settingsutils.cpp b/src/windows/settings_utils.cpp
similarity index 99%
rename from src/windows/settingsutils.cpp
rename to src/windows/settings_utils.cpp
index cbd6c884..cd86dd8b 100644
--- a/src/windows/settingsutils.cpp
+++ b/src/windows/settings_utils.cpp
@@ -1,5 +1,5 @@
 // header include
-#include "displaydevice/windows/settingsutils.h"
+#include "displaydevice/windows/settings_utils.h"
 
 // system includes
 #include <algorithm>
diff --git a/src/windows/winapilayer.cpp b/src/windows/win_api_layer.cpp
similarity index 99%
rename from src/windows/winapilayer.cpp
rename to src/windows/win_api_layer.cpp
index fcadf795..cdedbe39 100644
--- a/src/windows/winapilayer.cpp
+++ b/src/windows/win_api_layer.cpp
@@ -1,5 +1,5 @@
 // class header include
-#include "displaydevice/windows/winapilayer.h"
+#include "displaydevice/windows/win_api_layer.h"
 
 // system includes
 #include <boost/algorithm/string.hpp>
diff --git a/src/windows/winapiutils.cpp b/src/windows/win_api_utils.cpp
similarity index 99%
rename from src/windows/winapiutils.cpp
rename to src/windows/win_api_utils.cpp
index b749593a..36af52c9 100644
--- a/src/windows/winapiutils.cpp
+++ b/src/windows/win_api_utils.cpp
@@ -1,5 +1,5 @@
 // header include
-#include "displaydevice/windows/winapiutils.h"
+#include "displaydevice/windows/win_api_utils.h"
 
 // system includes
 #include <unordered_set>
diff --git a/src/windows/windisplaydevicegeneral.cpp b/src/windows/win_display_device_general.cpp
similarity index 97%
rename from src/windows/windisplaydevicegeneral.cpp
rename to src/windows/win_display_device_general.cpp
index 8b28c70b..40db35bc 100644
--- a/src/windows/windisplaydevicegeneral.cpp
+++ b/src/windows/win_display_device_general.cpp
@@ -1,9 +1,9 @@
 // class header include
-#include "displaydevice/windows/windisplaydevice.h"
+#include "displaydevice/windows/win_display_device.h"
 
 // local includes
 #include "displaydevice/logging.h"
-#include "displaydevice/windows/winapiutils.h"
+#include "displaydevice/windows/win_api_utils.h"
 
 namespace display_device {
   WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
diff --git a/src/windows/windisplaydevicehdr.cpp b/src/windows/win_display_device_hdr.cpp
similarity index 97%
rename from src/windows/windisplaydevicehdr.cpp
rename to src/windows/win_display_device_hdr.cpp
index 482fc068..2f702ad2 100644
--- a/src/windows/windisplaydevicehdr.cpp
+++ b/src/windows/win_display_device_hdr.cpp
@@ -1,12 +1,12 @@
 // class header include
-#include "displaydevice/windows/windisplaydevice.h"
+#include "displaydevice/windows/win_display_device.h"
 
 // system includes
 #include <ranges>
 
 // local includes
 #include "displaydevice/logging.h"
-#include "displaydevice/windows/winapiutils.h"
+#include "displaydevice/windows/win_api_utils.h"
 
 namespace display_device {
   namespace {
diff --git a/src/windows/windisplaydevicemodes.cpp b/src/windows/win_display_device_modes.cpp
similarity index 98%
rename from src/windows/windisplaydevicemodes.cpp
rename to src/windows/win_display_device_modes.cpp
index 41a41648..01c2c5f3 100644
--- a/src/windows/windisplaydevicemodes.cpp
+++ b/src/windows/win_display_device_modes.cpp
@@ -1,12 +1,12 @@
 // class header include
-#include "displaydevice/windows/windisplaydevice.h"
+#include "displaydevice/windows/win_display_device.h"
 
 // system includes
 #include <ranges>
 
 // local includes
 #include "displaydevice/logging.h"
-#include "displaydevice/windows/winapiutils.h"
+#include "displaydevice/windows/win_api_utils.h"
 
 namespace display_device {
   namespace {
diff --git a/src/windows/windisplaydeviceprimary.cpp b/src/windows/win_display_device_primary.cpp
similarity index 97%
rename from src/windows/windisplaydeviceprimary.cpp
rename to src/windows/win_display_device_primary.cpp
index f1468315..c009cdbd 100644
--- a/src/windows/windisplaydeviceprimary.cpp
+++ b/src/windows/win_display_device_primary.cpp
@@ -1,9 +1,9 @@
 // class header include
-#include "displaydevice/windows/windisplaydevice.h"
+#include "displaydevice/windows/win_display_device.h"
 
 // local includes
 #include "displaydevice/logging.h"
-#include "displaydevice/windows/winapiutils.h"
+#include "displaydevice/windows/win_api_utils.h"
 
 namespace display_device {
   bool
diff --git a/src/windows/windisplaydevicetopology.cpp b/src/windows/win_display_device_topology.cpp
similarity index 98%
rename from src/windows/windisplaydevicetopology.cpp
rename to src/windows/win_display_device_topology.cpp
index 418bff60..767c7175 100644
--- a/src/windows/windisplaydevicetopology.cpp
+++ b/src/windows/win_display_device_topology.cpp
@@ -1,5 +1,5 @@
 // class header include
-#include "displaydevice/windows/windisplaydevice.h"
+#include "displaydevice/windows/win_display_device.h"
 
 // system includes
 #include <algorithm>
@@ -7,7 +7,7 @@
 
 // local includes
 #include "displaydevice/logging.h"
-#include "displaydevice/windows/winapiutils.h"
+#include "displaydevice/windows/win_api_utils.h"
 
 namespace display_device {
   namespace {
diff --git a/tests/fixtures/include/fixtures/fixtures.h b/tests/fixtures/include/fixtures/fixtures.h
index 6012b2fb..1f987bae 100644
--- a/tests/fixtures/include/fixtures/fixtures.h
+++ b/tests/fixtures/include/fixtures/fixtures.h
@@ -10,7 +10,7 @@
 
 // local includes
 #include "displaydevice/logging.h"
-#include "testutils.h"
+#include "test_utils.h"
 
 // Undefine the original TEST macro
 #undef TEST
diff --git a/tests/fixtures/include/fixtures/jsonconvertertest.h b/tests/fixtures/include/fixtures/json_converter_test.h
similarity index 100%
rename from tests/fixtures/include/fixtures/jsonconvertertest.h
rename to tests/fixtures/include/fixtures/json_converter_test.h
diff --git a/tests/fixtures/include/fixtures/mockaudiocontext.h b/tests/fixtures/include/fixtures/mock_audio_context.h
similarity index 87%
rename from tests/fixtures/include/fixtures/mockaudiocontext.h
rename to tests/fixtures/include/fixtures/mock_audio_context.h
index d958f1a0..018cf40b 100644
--- a/tests/fixtures/include/fixtures/mockaudiocontext.h
+++ b/tests/fixtures/include/fixtures/mock_audio_context.h
@@ -4,7 +4,7 @@
 #include <gmock/gmock.h>
 
 // local includes
-#include "displaydevice/audiocontextinterface.h"
+#include "displaydevice/audio_context_interface.h"
 
 namespace display_device {
   class MockAudioContext: public AudioContextInterface {
diff --git a/tests/fixtures/include/fixtures/mocksettingspersistence.h b/tests/fixtures/include/fixtures/mock_settings_persistence.h
similarity index 88%
rename from tests/fixtures/include/fixtures/mocksettingspersistence.h
rename to tests/fixtures/include/fixtures/mock_settings_persistence.h
index 50f3e490..5f583477 100644
--- a/tests/fixtures/include/fixtures/mocksettingspersistence.h
+++ b/tests/fixtures/include/fixtures/mock_settings_persistence.h
@@ -4,7 +4,7 @@
 #include <gmock/gmock.h>
 
 // local includes
-#include "displaydevice/settingspersistenceinterface.h"
+#include "displaydevice/settings_persistence_interface.h"
 
 namespace display_device {
   class MockSettingsPersistence: public SettingsPersistenceInterface {
diff --git a/tests/fixtures/include/fixtures/testutils.h b/tests/fixtures/include/fixtures/test_utils.h
similarity index 100%
rename from tests/fixtures/include/fixtures/testutils.h
rename to tests/fixtures/include/fixtures/test_utils.h
diff --git a/tests/fixtures/testutils.cpp b/tests/fixtures/test_utils.cpp
similarity index 96%
rename from tests/fixtures/testutils.cpp
rename to tests/fixtures/test_utils.cpp
index 5fd0c493..c3b3f2b1 100644
--- a/tests/fixtures/testutils.cpp
+++ b/tests/fixtures/test_utils.cpp
@@ -1,5 +1,5 @@
 // header include
-#include "fixtures/testutils.h"
+#include "fixtures/test_utils.h"
 
 // system includes
 #include <cstdlib>
diff --git a/tests/unit/general/test_filesettingspersistence.cpp b/tests/unit/general/test_file_settings_persistence.cpp
similarity index 98%
rename from tests/unit/general/test_filesettingspersistence.cpp
rename to tests/unit/general/test_file_settings_persistence.cpp
index 581bbbfb..c7d2ec12 100644
--- a/tests/unit/general/test_filesettingspersistence.cpp
+++ b/tests/unit/general/test_file_settings_persistence.cpp
@@ -3,7 +3,7 @@
 #include <gmock/gmock.h>
 
 // local includes
-#include "displaydevice/filesettingspersistence.h"
+#include "displaydevice/file_settings_persistence.h"
 #include "fixtures/fixtures.h"
 
 namespace {
diff --git a/tests/unit/general/test_json.cpp b/tests/unit/general/test_json.cpp
index ce4706d4..0ed837ef 100644
--- a/tests/unit/general/test_json.cpp
+++ b/tests/unit/general/test_json.cpp
@@ -2,8 +2,8 @@
 #define DD_JSON_DETAIL
 // clang-format off
 #include "displaydevice/json.h"
-#include "displaydevice/detail/jsonserializer.h"
-#include "displaydevice/detail/jsonconverter.h"
+#include "displaydevice/detail/json_serializer.h"
+#include "displaydevice/detail/json_converter.h"
 // clang-format on
 
 // local includes
diff --git a/tests/unit/general/test_jsonconverter.cpp b/tests/unit/general/test_json_converter.cpp
similarity index 98%
rename from tests/unit/general/test_jsonconverter.cpp
rename to tests/unit/general/test_json_converter.cpp
index d1a975c3..b4f0f723 100644
--- a/tests/unit/general/test_jsonconverter.cpp
+++ b/tests/unit/general/test_json_converter.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "fixtures/jsonconvertertest.h"
+#include "fixtures/json_converter_test.h"
 
 namespace {
   // Specialized TEST macro(s) for this test file
diff --git a/tests/unit/general/test_noopaudiocontext.cpp b/tests/unit/general/test_noop_audio_context.cpp
similarity index 94%
rename from tests/unit/general/test_noopaudiocontext.cpp
rename to tests/unit/general/test_noop_audio_context.cpp
index 5d91dd28..28421f4c 100644
--- a/tests/unit/general/test_noopaudiocontext.cpp
+++ b/tests/unit/general/test_noop_audio_context.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/noopaudiocontext.h"
+#include "displaydevice/noop_audio_context.h"
 #include "fixtures/fixtures.h"
 
 namespace {
diff --git a/tests/unit/general/test_noopsettingspersistence.cpp b/tests/unit/general/test_noop_settings_persistence.cpp
similarity index 91%
rename from tests/unit/general/test_noopsettingspersistence.cpp
rename to tests/unit/general/test_noop_settings_persistence.cpp
index 815fe10a..bb95b4b3 100644
--- a/tests/unit/general/test_noopsettingspersistence.cpp
+++ b/tests/unit/general/test_noop_settings_persistence.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/noopsettingspersistence.h"
+#include "displaydevice/noop_settings_persistence.h"
 #include "fixtures/fixtures.h"
 
 namespace {
diff --git a/tests/unit/general/test_retryscheduler.cpp b/tests/unit/general/test_retry_scheduler.cpp
similarity index 99%
rename from tests/unit/general/test_retryscheduler.cpp
rename to tests/unit/general/test_retry_scheduler.cpp
index ca965ff9..3109f4a0 100644
--- a/tests/unit/general/test_retryscheduler.cpp
+++ b/tests/unit/general/test_retry_scheduler.cpp
@@ -2,7 +2,7 @@
 #include <gmock/gmock.h>
 
 // local includes
-#include "displaydevice/retryscheduler.h"
+#include "displaydevice/retry_scheduler.h"
 #include "fixtures/fixtures.h"
 
 namespace {
diff --git a/tests/unit/windows/test_jsonconverter.cpp b/tests/unit/windows/test_json_converter.cpp
similarity index 98%
rename from tests/unit/windows/test_jsonconverter.cpp
rename to tests/unit/windows/test_json_converter.cpp
index 3ce9ca27..a42a0b06 100644
--- a/tests/unit/windows/test_jsonconverter.cpp
+++ b/tests/unit/windows/test_json_converter.cpp
@@ -1,6 +1,6 @@
 // local includes
 #include "displaydevice/windows/json.h"
-#include "fixtures/jsonconvertertest.h"
+#include "fixtures/json_converter_test.h"
 #include "utils/comparison.h"
 
 namespace {
diff --git a/tests/unit/windows/test_persistentstate.cpp b/tests/unit/windows/test_persistent_state.cpp
similarity index 97%
rename from tests/unit/windows/test_persistentstate.cpp
rename to tests/unit/windows/test_persistent_state.cpp
index 0e4a96e5..81a90305 100644
--- a/tests/unit/windows/test_persistentstate.cpp
+++ b/tests/unit/windows/test_persistent_state.cpp
@@ -1,11 +1,11 @@
 // local includes
-#include "displaydevice/noopsettingspersistence.h"
-#include "displaydevice/windows/settingsmanager.h"
+#include "displaydevice/noop_settings_persistence.h"
+#include "displaydevice/windows/settings_manager.h"
 #include "fixtures/fixtures.h"
-#include "fixtures/mocksettingspersistence.h"
+#include "fixtures/mock_settings_persistence.h"
 #include "utils/comparison.h"
 #include "utils/helpers.h"
-#include "utils/mockwindisplaydevice.h"
+#include "utils/mock_win_display_device.h"
 
 namespace {
   // Convenience keywords for GMock
diff --git a/tests/unit/windows/test_settingsmanagerapply.cpp b/tests/unit/windows/test_settings_manager_apply.cpp
similarity index 99%
rename from tests/unit/windows/test_settingsmanagerapply.cpp
rename to tests/unit/windows/test_settings_manager_apply.cpp
index b7cfd815..89c5b6fc 100644
--- a/tests/unit/windows/test_settingsmanagerapply.cpp
+++ b/tests/unit/windows/test_settings_manager_apply.cpp
@@ -1,11 +1,11 @@
 // local includes
-#include "displaydevice/windows/settingsmanager.h"
-#include "displaydevice/windows/settingsutils.h"
+#include "displaydevice/windows/settings_manager.h"
+#include "displaydevice/windows/settings_utils.h"
 #include "fixtures/fixtures.h"
-#include "fixtures/mockaudiocontext.h"
-#include "fixtures/mocksettingspersistence.h"
+#include "fixtures/mock_audio_context.h"
+#include "fixtures/mock_settings_persistence.h"
 #include "utils/helpers.h"
-#include "utils/mockwindisplaydevice.h"
+#include "utils/mock_win_display_device.h"
 
 namespace {
   // Convenience keywords for GMock
diff --git a/tests/unit/windows/test_settingsmanagergeneral.cpp b/tests/unit/windows/test_settings_manager_general.cpp
similarity index 94%
rename from tests/unit/windows/test_settingsmanagergeneral.cpp
rename to tests/unit/windows/test_settings_manager_general.cpp
index aad70ab7..1a782e51 100644
--- a/tests/unit/windows/test_settingsmanagergeneral.cpp
+++ b/tests/unit/windows/test_settings_manager_general.cpp
@@ -1,13 +1,13 @@
 // local includes
-#include "displaydevice/noopaudiocontext.h"
-#include "displaydevice/noopsettingspersistence.h"
-#include "displaydevice/windows/settingsmanager.h"
+#include "displaydevice/noop_audio_context.h"
+#include "displaydevice/noop_settings_persistence.h"
+#include "displaydevice/windows/settings_manager.h"
 #include "fixtures/fixtures.h"
-#include "fixtures/mockaudiocontext.h"
-#include "fixtures/mocksettingspersistence.h"
+#include "fixtures/mock_audio_context.h"
+#include "fixtures/mock_settings_persistence.h"
 #include "utils/comparison.h"
 #include "utils/helpers.h"
-#include "utils/mockwindisplaydevice.h"
+#include "utils/mock_win_display_device.h"
 
 namespace {
   // Convenience keywords for GMock
diff --git a/tests/unit/windows/test_settingsmanagerrevert.cpp b/tests/unit/windows/test_settings_manager_revert.cpp
similarity index 98%
rename from tests/unit/windows/test_settingsmanagerrevert.cpp
rename to tests/unit/windows/test_settings_manager_revert.cpp
index 299601df..a6697f3e 100644
--- a/tests/unit/windows/test_settingsmanagerrevert.cpp
+++ b/tests/unit/windows/test_settings_manager_revert.cpp
@@ -1,12 +1,12 @@
 // local includes
-#include "displaydevice/windows/settingsmanager.h"
-#include "displaydevice/windows/settingsutils.h"
+#include "displaydevice/windows/settings_manager.h"
+#include "displaydevice/windows/settings_utils.h"
 #include "fixtures/fixtures.h"
-#include "fixtures/mockaudiocontext.h"
-#include "fixtures/mocksettingspersistence.h"
+#include "fixtures/mock_audio_context.h"
+#include "fixtures/mock_settings_persistence.h"
 #include "utils/comparison.h"
 #include "utils/helpers.h"
-#include "utils/mockwindisplaydevice.h"
+#include "utils/mock_win_display_device.h"
 
 namespace {
   // Convenience keywords for GMock
diff --git a/tests/unit/windows/test_settingsutils.cpp b/tests/unit/windows/test_settings_utils.cpp
similarity index 99%
rename from tests/unit/windows/test_settingsutils.cpp
rename to tests/unit/windows/test_settings_utils.cpp
index 83966de4..d33dbe90 100644
--- a/tests/unit/windows/test_settingsutils.cpp
+++ b/tests/unit/windows/test_settings_utils.cpp
@@ -1,8 +1,8 @@
 // local includes
-#include "displaydevice/windows/settingsutils.h"
+#include "displaydevice/windows/settings_utils.h"
 #include "fixtures/fixtures.h"
 #include "utils/comparison.h"
-#include "utils/mockwindisplaydevice.h"
+#include "utils/mock_win_display_device.h"
 
 namespace {
   // Convenience keywords for GMock
diff --git a/tests/unit/windows/test_winapilayer.cpp b/tests/unit/windows/test_win_api_layer.cpp
similarity index 99%
rename from tests/unit/windows/test_winapilayer.cpp
rename to tests/unit/windows/test_win_api_layer.cpp
index dae1f8fd..4a720902 100644
--- a/tests/unit/windows/test_winapilayer.cpp
+++ b/tests/unit/windows/test_win_api_layer.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/windows/winapilayer.h"
+#include "displaydevice/windows/win_api_layer.h"
 #include "fixtures/fixtures.h"
 
 namespace {
diff --git a/tests/unit/windows/test_winapiutils.cpp b/tests/unit/windows/test_win_api_utils.cpp
similarity index 99%
rename from tests/unit/windows/test_winapiutils.cpp
rename to tests/unit/windows/test_win_api_utils.cpp
index 829370df..3f22d64b 100644
--- a/tests/unit/windows/test_winapiutils.cpp
+++ b/tests/unit/windows/test_win_api_utils.cpp
@@ -1,8 +1,8 @@
 // local includes
-#include "displaydevice/windows/winapiutils.h"
+#include "displaydevice/windows/win_api_utils.h"
 #include "fixtures/fixtures.h"
 #include "utils/comparison.h"
-#include "utils/mockwinapilayer.h"
+#include "utils/mock_win_api_layer.h"
 
 namespace {
   // Convenience keywords for GMock
diff --git a/tests/unit/windows/test_windisplaydevicegeneral.cpp b/tests/unit/windows/test_win_display_device_general.cpp
similarity index 97%
rename from tests/unit/windows/test_windisplaydevicegeneral.cpp
rename to tests/unit/windows/test_win_display_device_general.cpp
index 20bec15a..c0cf46bd 100644
--- a/tests/unit/windows/test_windisplaydevicegeneral.cpp
+++ b/tests/unit/windows/test_win_display_device_general.cpp
@@ -1,12 +1,12 @@
 // local includes
-#include "displaydevice/windows/settingsutils.h"
-#include "displaydevice/windows/winapilayer.h"
-#include "displaydevice/windows/winapiutils.h"
-#include "displaydevice/windows/windisplaydevice.h"
+#include "displaydevice/windows/settings_utils.h"
+#include "displaydevice/windows/win_api_layer.h"
+#include "displaydevice/windows/win_api_utils.h"
+#include "displaydevice/windows/win_display_device.h"
 #include "fixtures/fixtures.h"
 #include "utils/comparison.h"
 #include "utils/helpers.h"
-#include "utils/mockwinapilayer.h"
+#include "utils/mock_win_api_layer.h"
 
 namespace {
   // Convenience keywords for GMock
diff --git a/tests/unit/windows/test_windisplaydevicehdr.cpp b/tests/unit/windows/test_win_display_device_hdr.cpp
similarity index 98%
rename from tests/unit/windows/test_windisplaydevicehdr.cpp
rename to tests/unit/windows/test_win_display_device_hdr.cpp
index 283fc0ca..a84feaac 100644
--- a/tests/unit/windows/test_windisplaydevicehdr.cpp
+++ b/tests/unit/windows/test_win_display_device_hdr.cpp
@@ -1,11 +1,11 @@
 // local includes
-#include "displaydevice/windows/settingsutils.h"
-#include "displaydevice/windows/winapilayer.h"
-#include "displaydevice/windows/windisplaydevice.h"
+#include "displaydevice/windows/settings_utils.h"
+#include "displaydevice/windows/win_api_layer.h"
+#include "displaydevice/windows/win_display_device.h"
 #include "fixtures/fixtures.h"
 #include "utils/comparison.h"
 #include "utils/guards.h"
-#include "utils/mockwinapilayer.h"
+#include "utils/mock_win_api_layer.h"
 
 namespace {
   // Convenience keywords for GMock
diff --git a/tests/unit/windows/test_windisplaydevicemodes.cpp b/tests/unit/windows/test_win_display_device_modes.cpp
similarity index 99%
rename from tests/unit/windows/test_windisplaydevicemodes.cpp
rename to tests/unit/windows/test_win_display_device_modes.cpp
index 8a792547..b91dd749 100644
--- a/tests/unit/windows/test_windisplaydevicemodes.cpp
+++ b/tests/unit/windows/test_win_display_device_modes.cpp
@@ -2,14 +2,14 @@
 #include <ranges>
 
 // local includes
-#include "displaydevice/windows/settingsutils.h"
-#include "displaydevice/windows/winapilayer.h"
-#include "displaydevice/windows/winapiutils.h"
-#include "displaydevice/windows/windisplaydevice.h"
+#include "displaydevice/windows/settings_utils.h"
+#include "displaydevice/windows/win_api_layer.h"
+#include "displaydevice/windows/win_api_utils.h"
+#include "displaydevice/windows/win_display_device.h"
 #include "fixtures/fixtures.h"
 #include "utils/comparison.h"
 #include "utils/guards.h"
-#include "utils/mockwinapilayer.h"
+#include "utils/mock_win_api_layer.h"
 
 namespace {
   // Convenience keywords for GMock
diff --git a/tests/unit/windows/test_windisplaydeviceprimary.cpp b/tests/unit/windows/test_win_display_device_primary.cpp
similarity index 98%
rename from tests/unit/windows/test_windisplaydeviceprimary.cpp
rename to tests/unit/windows/test_win_display_device_primary.cpp
index 65437e2b..3033654e 100644
--- a/tests/unit/windows/test_windisplaydeviceprimary.cpp
+++ b/tests/unit/windows/test_win_display_device_primary.cpp
@@ -1,12 +1,12 @@
 // local includes
-#include "displaydevice/windows/settingsutils.h"
-#include "displaydevice/windows/winapilayer.h"
-#include "displaydevice/windows/winapiutils.h"
-#include "displaydevice/windows/windisplaydevice.h"
+#include "displaydevice/windows/settings_utils.h"
+#include "displaydevice/windows/win_api_layer.h"
+#include "displaydevice/windows/win_api_utils.h"
+#include "displaydevice/windows/win_display_device.h"
 #include "fixtures/fixtures.h"
 #include "utils/comparison.h"
 #include "utils/guards.h"
-#include "utils/mockwinapilayer.h"
+#include "utils/mock_win_api_layer.h"
 
 namespace {
   // Convenience keywords for GMock
diff --git a/tests/unit/windows/test_windisplaydevicetopology.cpp b/tests/unit/windows/test_win_display_device_topology.cpp
similarity index 98%
rename from tests/unit/windows/test_windisplaydevicetopology.cpp
rename to tests/unit/windows/test_win_display_device_topology.cpp
index 29645384..077a3d45 100644
--- a/tests/unit/windows/test_windisplaydevicetopology.cpp
+++ b/tests/unit/windows/test_win_display_device_topology.cpp
@@ -1,12 +1,12 @@
 // local includes
-#include "displaydevice/windows/settingsutils.h"
-#include "displaydevice/windows/winapilayer.h"
-#include "displaydevice/windows/winapiutils.h"
-#include "displaydevice/windows/windisplaydevice.h"
+#include "displaydevice/windows/settings_utils.h"
+#include "displaydevice/windows/win_api_layer.h"
+#include "displaydevice/windows/win_api_utils.h"
+#include "displaydevice/windows/win_display_device.h"
 #include "fixtures/fixtures.h"
 #include "utils/comparison.h"
 #include "utils/guards.h"
-#include "utils/mockwinapilayer.h"
+#include "utils/mock_win_api_layer.h"
 
 namespace {
   // Convenience keywords for GMock
diff --git a/tests/unit/windows/test_winplayground.cpp b/tests/unit/windows/test_win_playground.cpp
similarity index 94%
rename from tests/unit/windows/test_winplayground.cpp
rename to tests/unit/windows/test_win_playground.cpp
index f15ea33d..76cb01b4 100644
--- a/tests/unit/windows/test_winplayground.cpp
+++ b/tests/unit/windows/test_win_playground.cpp
@@ -1,8 +1,8 @@
 // local includes
 #include "displaydevice/windows/json.h"
-#include "displaydevice/windows/settingsmanager.h"
-#include "displaydevice/windows/winapilayer.h"
-#include "displaydevice/windows/windisplaydevice.h"
+#include "displaydevice/windows/settings_manager.h"
+#include "displaydevice/windows/win_api_layer.h"
+#include "displaydevice/windows/win_display_device.h"
 #include "fixtures/fixtures.h"
 #include "utils/guards.h"
 
diff --git a/tests/unit/windows/utils/guards.cpp b/tests/unit/windows/utils/guards.cpp
index b4b16e10..c96e3063 100644
--- a/tests/unit/windows/utils/guards.cpp
+++ b/tests/unit/windows/utils/guards.cpp
@@ -2,7 +2,7 @@
 #include "guards.h"
 
 // local includes
-#include "displaydevice/windows/settingsutils.h"
+#include "displaydevice/windows/settings_utils.h"
 
 boost::scope::scope_exit<display_device::DdGuardFn>
 makeTopologyGuard(display_device::WinDisplayDeviceInterface &win_dd) {
diff --git a/tests/unit/windows/utils/guards.h b/tests/unit/windows/utils/guards.h
index db329f8a..4e93fb43 100644
--- a/tests/unit/windows/utils/guards.h
+++ b/tests/unit/windows/utils/guards.h
@@ -4,7 +4,7 @@
 #include <boost/scope/scope_exit.hpp>
 
 // local includes
-#include "displaydevice/windows/windisplaydeviceinterface.h"
+#include "displaydevice/windows/win_display_device_interface.h"
 #include "helpers.h"
 
 // Helper functions to make guards for restoring previous state
diff --git a/tests/unit/windows/utils/helpers.h b/tests/unit/windows/utils/helpers.h
index 164f9d11..3f3c84fb 100644
--- a/tests/unit/windows/utils/helpers.h
+++ b/tests/unit/windows/utils/helpers.h
@@ -5,7 +5,7 @@
 
 // local includes
 #include "displaydevice/windows/types.h"
-#include "displaydevice/windows/winapilayer.h"
+#include "displaydevice/windows/win_api_layer.h"
 
 // Generic helper functions
 std::optional<std::vector<std::string>>
diff --git a/tests/unit/windows/utils/mockwinapilayer.cpp b/tests/unit/windows/utils/mock_win_api_layer.cpp
similarity index 99%
rename from tests/unit/windows/utils/mockwinapilayer.cpp
rename to tests/unit/windows/utils/mock_win_api_layer.cpp
index 9f9198e2..5fc04bb1 100644
--- a/tests/unit/windows/utils/mockwinapilayer.cpp
+++ b/tests/unit/windows/utils/mock_win_api_layer.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "mockwinapilayer.h"
+#include "mock_win_api_layer.h"
 
 namespace {
   display_device::PathAndModeData
diff --git a/tests/unit/windows/utils/mockwinapilayer.h b/tests/unit/windows/utils/mock_win_api_layer.h
similarity index 96%
rename from tests/unit/windows/utils/mockwinapilayer.h
rename to tests/unit/windows/utils/mock_win_api_layer.h
index 979861a2..6bfe72ce 100644
--- a/tests/unit/windows/utils/mockwinapilayer.h
+++ b/tests/unit/windows/utils/mock_win_api_layer.h
@@ -4,7 +4,7 @@
 #include <gmock/gmock.h>
 
 // local includes
-#include "displaydevice/windows/winapilayerinterface.h"
+#include "displaydevice/windows/win_api_layer_interface.h"
 
 namespace display_device {
   class MockWinApiLayer: public WinApiLayerInterface {
diff --git a/tests/unit/windows/utils/mockwindisplaydevice.cpp b/tests/unit/windows/utils/mock_win_display_device.cpp
similarity index 97%
rename from tests/unit/windows/utils/mockwindisplaydevice.cpp
rename to tests/unit/windows/utils/mock_win_display_device.cpp
index 16adba87..0e4435ec 100644
--- a/tests/unit/windows/utils/mockwindisplaydevice.cpp
+++ b/tests/unit/windows/utils/mock_win_display_device.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "mockwindisplaydevice.h"
+#include "mock_win_display_device.h"
 #include "helpers.h"
 
 namespace ut_consts {
diff --git a/tests/unit/windows/utils/mockwindisplaydevice.h b/tests/unit/windows/utils/mock_win_display_device.h
similarity index 97%
rename from tests/unit/windows/utils/mockwindisplaydevice.h
rename to tests/unit/windows/utils/mock_win_display_device.h
index 7be8f77f..c159b7f5 100644
--- a/tests/unit/windows/utils/mockwindisplaydevice.h
+++ b/tests/unit/windows/utils/mock_win_display_device.h
@@ -4,7 +4,7 @@
 #include <gmock/gmock.h>
 
 // local includes
-#include "displaydevice/windows/windisplaydevice.h"
+#include "displaydevice/windows/win_display_device.h"
 
 namespace display_device {
   class MockWinDisplayDevice: public WinDisplayDeviceInterface {