diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 984f6ef..af33d9a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,4 +16,4 @@ endif()
 add_subdirectory(platf)
 
 # This is the main library
-add_subdirectory(displaydevice)
+add_subdirectory(display_device)
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 2bf3c54..9177bbb 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -2,8 +2,8 @@
 set(MODULE libcommon)
 
 # Globing headers (so that they appear in some IDEs) and sources
-file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
-file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/detail/*.h")
+file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
+file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/detail/*.h")
 file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")
 
 # Automatic library - will be static or dynamic based on user setting
diff --git a/src/common/file_settings_persistence.cpp b/src/common/file_settings_persistence.cpp
index 5c59c80..d28fd13 100644
--- a/src/common/file_settings_persistence.cpp
+++ b/src/common/file_settings_persistence.cpp
@@ -1,5 +1,5 @@
 // class header include
-#include "displaydevice/file_settings_persistence.h"
+#include "display_device/file_settings_persistence.h"
 
 // system includes
 #include <algorithm>
@@ -7,7 +7,7 @@
 #include <iterator>
 
 // local includes
-#include "displaydevice/logging.h"
+#include "display_device/logging.h"
 
 namespace display_device {
   FileSettingsPersistence::FileSettingsPersistence(std::filesystem::path filepath):
diff --git a/src/common/include/displaydevice/audio_context_interface.h b/src/common/include/display_device/audio_context_interface.h
similarity index 100%
rename from src/common/include/displaydevice/audio_context_interface.h
rename to src/common/include/display_device/audio_context_interface.h
diff --git a/src/common/include/displaydevice/detail/json_converter.h b/src/common/include/display_device/detail/json_converter.h
similarity index 100%
rename from src/common/include/displaydevice/detail/json_converter.h
rename to src/common/include/display_device/detail/json_converter.h
diff --git a/src/common/include/displaydevice/detail/json_serializer.h b/src/common/include/display_device/detail/json_serializer.h
similarity index 100%
rename from src/common/include/displaydevice/detail/json_serializer.h
rename to src/common/include/display_device/detail/json_serializer.h
diff --git a/src/common/include/displaydevice/detail/json_serializer_details.h b/src/common/include/display_device/detail/json_serializer_details.h
similarity index 100%
rename from src/common/include/displaydevice/detail/json_serializer_details.h
rename to src/common/include/display_device/detail/json_serializer_details.h
diff --git a/src/common/include/displaydevice/file_settings_persistence.h b/src/common/include/display_device/file_settings_persistence.h
similarity index 100%
rename from src/common/include/displaydevice/file_settings_persistence.h
rename to src/common/include/display_device/file_settings_persistence.h
diff --git a/src/common/include/displaydevice/json.h b/src/common/include/display_device/json.h
similarity index 100%
rename from src/common/include/displaydevice/json.h
rename to src/common/include/display_device/json.h
diff --git a/src/common/include/displaydevice/logging.h b/src/common/include/display_device/logging.h
similarity index 100%
rename from src/common/include/displaydevice/logging.h
rename to src/common/include/display_device/logging.h
diff --git a/src/common/include/displaydevice/noop_audio_context.h b/src/common/include/display_device/noop_audio_context.h
similarity index 100%
rename from src/common/include/displaydevice/noop_audio_context.h
rename to src/common/include/display_device/noop_audio_context.h
diff --git a/src/common/include/displaydevice/noop_settings_persistence.h b/src/common/include/display_device/noop_settings_persistence.h
similarity index 100%
rename from src/common/include/displaydevice/noop_settings_persistence.h
rename to src/common/include/display_device/noop_settings_persistence.h
diff --git a/src/common/include/displaydevice/retry_scheduler.h b/src/common/include/display_device/retry_scheduler.h
similarity index 100%
rename from src/common/include/displaydevice/retry_scheduler.h
rename to src/common/include/display_device/retry_scheduler.h
diff --git a/src/common/include/displaydevice/settings_manager_interface.h b/src/common/include/display_device/settings_manager_interface.h
similarity index 100%
rename from src/common/include/displaydevice/settings_manager_interface.h
rename to src/common/include/display_device/settings_manager_interface.h
diff --git a/src/common/include/displaydevice/settings_persistence_interface.h b/src/common/include/display_device/settings_persistence_interface.h
similarity index 100%
rename from src/common/include/displaydevice/settings_persistence_interface.h
rename to src/common/include/display_device/settings_persistence_interface.h
diff --git a/src/common/include/displaydevice/types.h b/src/common/include/display_device/types.h
similarity index 100%
rename from src/common/include/displaydevice/types.h
rename to src/common/include/display_device/types.h
diff --git a/src/common/json.cpp b/src/common/json.cpp
index 3fb8a57..6cd82c0 100644
--- a/src/common/json.cpp
+++ b/src/common/json.cpp
@@ -1,11 +1,11 @@
 // header include
-#include "displaydevice/json.h"
+#include "display_device/json.h"
 
 // special ordered include of details
 #define DD_JSON_DETAIL
 // clang-format off
-#include "displaydevice/detail/json_serializer.h"
-#include "displaydevice/detail/json_converter.h"
+#include "display_device/detail/json_serializer.h"
+#include "display_device/detail/json_converter.h"
 // clang-format on
 
 namespace display_device {
diff --git a/src/common/json_serializer.cpp b/src/common/json_serializer.cpp
index d8367d3..38849b8 100644
--- a/src/common/json_serializer.cpp
+++ b/src/common/json_serializer.cpp
@@ -1,8 +1,8 @@
 // special ordered include of details
 #define DD_JSON_DETAIL
 // clang-format off
-#include "displaydevice/types.h"
-#include "displaydevice/detail/json_serializer.h"
+#include "display_device/types.h"
+#include "display_device/detail/json_serializer.h"
 // clang-format on
 
 namespace display_device {
diff --git a/src/common/logging.cpp b/src/common/logging.cpp
index 6bee411..6c5f8fd 100644
--- a/src/common/logging.cpp
+++ b/src/common/logging.cpp
@@ -1,5 +1,5 @@
 // class header include
-#include "displaydevice/logging.h"
+#include "display_device/logging.h"
 
 // system includes
 #include <chrono>
diff --git a/src/common/noop_audio_context.cpp b/src/common/noop_audio_context.cpp
index 36d4415..847799e 100644
--- a/src/common/noop_audio_context.cpp
+++ b/src/common/noop_audio_context.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/noop_audio_context.h"
+#include "display_device/noop_audio_context.h"
 
 namespace display_device {
   bool
diff --git a/src/common/noop_settings_persistence.cpp b/src/common/noop_settings_persistence.cpp
index 4551884..ef48454 100644
--- a/src/common/noop_settings_persistence.cpp
+++ b/src/common/noop_settings_persistence.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/noop_settings_persistence.h"
+#include "display_device/noop_settings_persistence.h"
 
 namespace display_device {
   bool
diff --git a/src/common/retry_scheduler.cpp b/src/common/retry_scheduler.cpp
index 89e0c60..1bda8ab 100644
--- a/src/common/retry_scheduler.cpp
+++ b/src/common/retry_scheduler.cpp
@@ -1,5 +1,5 @@
 // header include
-#include "displaydevice/retry_scheduler.h"
+#include "display_device/retry_scheduler.h"
 
 namespace display_device {
   SchedulerStopToken::SchedulerStopToken(std::function<void()> cleanup):
diff --git a/src/common/types.cpp b/src/common/types.cpp
index 1ea065a..e9c8a6f 100644
--- a/src/common/types.cpp
+++ b/src/common/types.cpp
@@ -1,5 +1,5 @@
 // header include
-#include "displaydevice/types.h"
+#include "display_device/types.h"
 
 namespace {
   bool
diff --git a/src/displaydevice/CMakeLists.txt b/src/display_device/CMakeLists.txt
similarity index 87%
rename from src/displaydevice/CMakeLists.txt
rename to src/display_device/CMakeLists.txt
index 223d660..3ae6b4b 100644
--- a/src/displaydevice/CMakeLists.txt
+++ b/src/display_device/CMakeLists.txt
@@ -2,7 +2,7 @@
 set(MODULE libdisplaydevice)
 
 # Globing headers (so that they appear in some IDEs) and sources
-file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
+file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
 file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")
 
 # Automatic library - will be static or dynamic based on user setting
diff --git a/src/displaydevice/include/displaydevice/libddplaceholder.h b/src/display_device/include/display_device/libddplaceholder.h
similarity index 100%
rename from src/displaydevice/include/displaydevice/libddplaceholder.h
rename to src/display_device/include/display_device/libddplaceholder.h
diff --git a/src/display_device/libddplaceholder.cpp b/src/display_device/libddplaceholder.cpp
new file mode 100644
index 0000000..b85491c
--- /dev/null
+++ b/src/display_device/libddplaceholder.cpp
@@ -0,0 +1,6 @@
+#include "display_device/libddplaceholder.h"
+
+int
+ddplaceholder() {
+  return 0;
+}
diff --git a/src/displaydevice/libddplaceholder.cpp b/src/displaydevice/libddplaceholder.cpp
deleted file mode 100644
index d1f244d..0000000
--- a/src/displaydevice/libddplaceholder.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "displaydevice/libddplaceholder.h"
-
-int
-ddplaceholder() {
-  return 0;
-}
diff --git a/src/platf/CMakeLists.txt b/src/platf/CMakeLists.txt
index be702ce..892064e 100644
--- a/src/platf/CMakeLists.txt
+++ b/src/platf/CMakeLists.txt
@@ -2,7 +2,7 @@
 set(MODULE libplatf)
 
 # Globing headers (so that they appear in some IDEs) and sources
-file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/*.h")
+file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/*.h")
 file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")
 
 # Automatic library - will be static or dynamic based on user setting
diff --git a/src/platf/include/displaydevice/libplatfplaceholder.h b/src/platf/include/display_device/libplatfplaceholder.h
similarity index 100%
rename from src/platf/include/displaydevice/libplatfplaceholder.h
rename to src/platf/include/display_device/libplatfplaceholder.h
diff --git a/src/platf/libplatfplaceholder.cpp b/src/platf/libplatfplaceholder.cpp
index 8754fc4..0e70e5d 100644
--- a/src/platf/libplatfplaceholder.cpp
+++ b/src/platf/libplatfplaceholder.cpp
@@ -1,4 +1,4 @@
-#include "displaydevice/libplatfplaceholder.h"
+#include "display_device/libplatfplaceholder.h"
 
 int
 plaftplaceholder() {
diff --git a/src/windows/CMakeLists.txt b/src/windows/CMakeLists.txt
index 8e56f93..b483f6d 100644
--- a/src/windows/CMakeLists.txt
+++ b/src/windows/CMakeLists.txt
@@ -2,8 +2,8 @@
 set(MODULE libwindows)
 
 # Globing headers (so that they appear in some IDEs) and sources
-file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/*.h")
-file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/displaydevice/windows/detail/*.h")
+file(GLOB HEADER_LIST CONFIGURE_DEPENDS "include/display_device/windows/*.h")
+file(GLOB HEADER_DETAIL_LIST CONFIGURE_DEPENDS "include/display_device/windows/detail/*.h")
 file(GLOB SOURCE_LIST CONFIGURE_DEPENDS "*.cpp")
 
 # Automatic library - will be static or dynamic based on user setting
diff --git a/src/windows/include/displaydevice/windows/detail/json_serializer.h b/src/windows/include/display_device/windows/detail/json_serializer.h
similarity index 88%
rename from src/windows/include/displaydevice/windows/detail/json_serializer.h
rename to src/windows/include/display_device/windows/detail/json_serializer.h
index 2a6ba5e..2f26ebe 100644
--- a/src/windows/include/displaydevice/windows/detail/json_serializer.h
+++ b/src/windows/include/display_device/windows/detail/json_serializer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 // local includes
-#include "displaydevice/detail/json_serializer.h"
+#include "display_device/detail/json_serializer.h"
 
 #ifdef DD_JSON_DETAIL
 namespace display_device {
diff --git a/src/windows/include/displaydevice/windows/json.h b/src/windows/include/display_device/windows/json.h
similarity index 91%
rename from src/windows/include/displaydevice/windows/json.h
rename to src/windows/include/display_device/windows/json.h
index 2a48ecd..fac992b 100644
--- a/src/windows/include/displaydevice/windows/json.h
+++ b/src/windows/include/display_device/windows/json.h
@@ -1,7 +1,7 @@
 #pragma once
 
 // local includes
-#include "displaydevice/json.h"
+#include "display_device/json.h"
 #include "types.h"
 
 // Windows' converters (add as needed)
diff --git a/src/windows/include/displaydevice/windows/persistent_state.h b/src/windows/include/display_device/windows/persistent_state.h
similarity index 92%
rename from src/windows/include/displaydevice/windows/persistent_state.h
rename to src/windows/include/display_device/windows/persistent_state.h
index c1524f5..0b213b8 100644
--- a/src/windows/include/displaydevice/windows/persistent_state.h
+++ b/src/windows/include/display_device/windows/persistent_state.h
@@ -4,8 +4,8 @@
 #include <memory>
 
 // local includes
-#include "displaydevice/settings_persistence_interface.h"
-#include "displaydevice/windows/win_display_device_interface.h"
+#include "display_device/settings_persistence_interface.h"
+#include "display_device/windows/win_display_device_interface.h"
 
 namespace display_device {
   /**
diff --git a/src/windows/include/displaydevice/windows/settings_manager.h b/src/windows/include/display_device/windows/settings_manager.h
similarity index 97%
rename from src/windows/include/displaydevice/windows/settings_manager.h
rename to src/windows/include/display_device/windows/settings_manager.h
index bc19d4d..e729e10 100644
--- a/src/windows/include/displaydevice/windows/settings_manager.h
+++ b/src/windows/include/display_device/windows/settings_manager.h
@@ -5,9 +5,9 @@
 #include <memory>
 
 // local includes
-#include "displaydevice/audio_context_interface.h"
-#include "displaydevice/settings_manager_interface.h"
-#include "displaydevice/windows/win_display_device_interface.h"
+#include "display_device/audio_context_interface.h"
+#include "display_device/settings_manager_interface.h"
+#include "display_device/windows/win_display_device_interface.h"
 #include "persistent_state.h"
 
 namespace display_device {
diff --git a/src/windows/include/displaydevice/windows/settings_utils.h b/src/windows/include/display_device/windows/settings_utils.h
similarity index 100%
rename from src/windows/include/displaydevice/windows/settings_utils.h
rename to src/windows/include/display_device/windows/settings_utils.h
diff --git a/src/windows/include/displaydevice/windows/types.h b/src/windows/include/display_device/windows/types.h
similarity index 99%
rename from src/windows/include/displaydevice/windows/types.h
rename to src/windows/include/display_device/windows/types.h
index ee6ea78..0d2ad32 100644
--- a/src/windows/include/displaydevice/windows/types.h
+++ b/src/windows/include/display_device/windows/types.h
@@ -9,7 +9,7 @@
 #include <set>
 
 // local includes
-#include "displaydevice/types.h"
+#include "display_device/types.h"
 
 namespace display_device {
   /**
diff --git a/src/windows/include/displaydevice/windows/win_api_layer.h b/src/windows/include/display_device/windows/win_api_layer.h
similarity index 100%
rename from src/windows/include/displaydevice/windows/win_api_layer.h
rename to src/windows/include/display_device/windows/win_api_layer.h
diff --git a/src/windows/include/displaydevice/windows/win_api_layer_interface.h b/src/windows/include/display_device/windows/win_api_layer_interface.h
similarity index 100%
rename from src/windows/include/displaydevice/windows/win_api_layer_interface.h
rename to src/windows/include/display_device/windows/win_api_layer_interface.h
diff --git a/src/windows/include/displaydevice/windows/win_api_utils.h b/src/windows/include/display_device/windows/win_api_utils.h
similarity index 100%
rename from src/windows/include/displaydevice/windows/win_api_utils.h
rename to src/windows/include/display_device/windows/win_api_utils.h
diff --git a/src/windows/include/displaydevice/windows/win_display_device.h b/src/windows/include/display_device/windows/win_display_device.h
similarity index 100%
rename from src/windows/include/displaydevice/windows/win_display_device.h
rename to src/windows/include/display_device/windows/win_display_device.h
diff --git a/src/windows/include/displaydevice/windows/win_display_device_interface.h b/src/windows/include/display_device/windows/win_display_device_interface.h
similarity index 99%
rename from src/windows/include/displaydevice/windows/win_display_device_interface.h
rename to src/windows/include/display_device/windows/win_display_device_interface.h
index 8b06dc1..e61caf2 100644
--- a/src/windows/include/displaydevice/windows/win_display_device_interface.h
+++ b/src/windows/include/display_device/windows/win_display_device_interface.h
@@ -4,7 +4,7 @@
 #include <set>
 
 // local includes
-#include "displaydevice/windows/types.h"
+#include "display_device/windows/types.h"
 
 namespace display_device {
   /**
diff --git a/src/windows/json.cpp b/src/windows/json.cpp
index c230bf4..602d7d1 100644
--- a/src/windows/json.cpp
+++ b/src/windows/json.cpp
@@ -1,11 +1,11 @@
 // header include
-#include "displaydevice/windows/json.h"
+#include "display_device/windows/json.h"
 
 // special ordered include of details
 #define DD_JSON_DETAIL
 // clang-format off
-#include "displaydevice/windows/detail/json_serializer.h"
-#include "displaydevice/detail/json_converter.h"
+#include "display_device/windows/detail/json_serializer.h"
+#include "display_device/detail/json_converter.h"
 // clang-format on
 
 namespace display_device {
diff --git a/src/windows/json_serializer.cpp b/src/windows/json_serializer.cpp
index 180b948..5146ffc 100644
--- a/src/windows/json_serializer.cpp
+++ b/src/windows/json_serializer.cpp
@@ -1,8 +1,8 @@
 // special ordered include of details
 #define DD_JSON_DETAIL
 // clang-format off
-#include "displaydevice/windows/types.h"
-#include "displaydevice/windows/detail/json_serializer.h"
+#include "display_device/windows/types.h"
+#include "display_device/windows/detail/json_serializer.h"
 // clang-format on
 
 namespace display_device {
diff --git a/src/windows/persistent_state.cpp b/src/windows/persistent_state.cpp
index 28ed267..02e8f69 100644
--- a/src/windows/persistent_state.cpp
+++ b/src/windows/persistent_state.cpp
@@ -1,10 +1,10 @@
 // class header include
-#include "displaydevice/windows/persistent_state.h"
+#include "display_device/windows/persistent_state.h"
 
 // local includes
-#include "displaydevice/logging.h"
-#include "displaydevice/noop_settings_persistence.h"
-#include "displaydevice/windows/json.h"
+#include "display_device/logging.h"
+#include "display_device/noop_settings_persistence.h"
+#include "display_device/windows/json.h"
 
 namespace display_device {
   PersistentState::PersistentState(std::shared_ptr<SettingsPersistenceInterface> settings_persistence_api, const std::optional<SingleDisplayConfigState> &fallback_state):
diff --git a/src/windows/settings_manager_apply.cpp b/src/windows/settings_manager_apply.cpp
index 9f897da..30b5a41 100644
--- a/src/windows/settings_manager_apply.cpp
+++ b/src/windows/settings_manager_apply.cpp
@@ -1,14 +1,14 @@
 // class header include
-#include "displaydevice/windows/settings_manager.h"
+#include "display_device/windows/settings_manager.h"
 
 // system includes
 #include <algorithm>
 #include <boost/scope/scope_exit.hpp>
 
 // local includes
-#include "displaydevice/logging.h"
-#include "displaydevice/windows/json.h"
-#include "displaydevice/windows/settings_utils.h"
+#include "display_device/logging.h"
+#include "display_device/windows/json.h"
+#include "display_device/windows/settings_utils.h"
 
 namespace display_device {
   namespace {
diff --git a/src/windows/settings_manager_general.cpp b/src/windows/settings_manager_general.cpp
index e6e8798..800d972 100644
--- a/src/windows/settings_manager_general.cpp
+++ b/src/windows/settings_manager_general.cpp
@@ -1,9 +1,9 @@
 // class header include
-#include "displaydevice/windows/settings_manager.h"
+#include "display_device/windows/settings_manager.h"
 
 // local includes
-#include "displaydevice/logging.h"
-#include "displaydevice/noop_audio_context.h"
+#include "display_device/logging.h"
+#include "display_device/noop_audio_context.h"
 
 namespace display_device {
   SettingsManager::SettingsManager(
diff --git a/src/windows/settings_manager_revert.cpp b/src/windows/settings_manager_revert.cpp
index 746dda6..61dce97 100644
--- a/src/windows/settings_manager_revert.cpp
+++ b/src/windows/settings_manager_revert.cpp
@@ -1,13 +1,13 @@
 // class header include
-#include "displaydevice/windows/settings_manager.h"
+#include "display_device/windows/settings_manager.h"
 
 // system includes
 #include <boost/scope/scope_exit.hpp>
 
 // local includes
-#include "displaydevice/logging.h"
-#include "displaydevice/windows/json.h"
-#include "displaydevice/windows/settings_utils.h"
+#include "display_device/logging.h"
+#include "display_device/windows/json.h"
+#include "display_device/windows/settings_utils.h"
 
 namespace display_device {
   namespace {
diff --git a/src/windows/settings_utils.cpp b/src/windows/settings_utils.cpp
index cd86dd8..287656e 100644
--- a/src/windows/settings_utils.cpp
+++ b/src/windows/settings_utils.cpp
@@ -1,5 +1,5 @@
 // header include
-#include "displaydevice/windows/settings_utils.h"
+#include "display_device/windows/settings_utils.h"
 
 // system includes
 #include <algorithm>
@@ -7,8 +7,8 @@
 #include <thread>
 
 // local includes
-#include "displaydevice/logging.h"
-#include "displaydevice/windows/json.h"
+#include "display_device/logging.h"
+#include "display_device/windows/json.h"
 
 namespace display_device::win_utils {
   namespace {
diff --git a/src/windows/types.cpp b/src/windows/types.cpp
index 7ed9808..64b6dda 100644
--- a/src/windows/types.cpp
+++ b/src/windows/types.cpp
@@ -1,5 +1,5 @@
 // header include
-#include "displaydevice/windows/types.h"
+#include "display_device/windows/types.h"
 
 namespace display_device {
   bool
diff --git a/src/windows/win_api_layer.cpp b/src/windows/win_api_layer.cpp
index cdedbe3..5124866 100644
--- a/src/windows/win_api_layer.cpp
+++ b/src/windows/win_api_layer.cpp
@@ -1,5 +1,5 @@
 // class header include
-#include "displaydevice/windows/win_api_layer.h"
+#include "display_device/windows/win_api_layer.h"
 
 // system includes
 #include <boost/algorithm/string.hpp>
@@ -12,7 +12,7 @@
 #include <iomanip>
 
 // local includes
-#include "displaydevice/logging.h"
+#include "display_device/logging.h"
 
 // Windows includes after "windows.h"
 #include <SetupApi.h>
diff --git a/src/windows/win_api_utils.cpp b/src/windows/win_api_utils.cpp
index 36af52c..158e148 100644
--- a/src/windows/win_api_utils.cpp
+++ b/src/windows/win_api_utils.cpp
@@ -1,11 +1,11 @@
 // header include
-#include "displaydevice/windows/win_api_utils.h"
+#include "display_device/windows/win_api_utils.h"
 
 // system includes
 #include <unordered_set>
 
 // local includes
-#include "displaydevice/logging.h"
+#include "display_device/logging.h"
 
 namespace {
   /**
diff --git a/src/windows/win_display_device_general.cpp b/src/windows/win_display_device_general.cpp
index 40db35b..db91c51 100644
--- a/src/windows/win_display_device_general.cpp
+++ b/src/windows/win_display_device_general.cpp
@@ -1,9 +1,9 @@
 // class header include
-#include "displaydevice/windows/win_display_device.h"
+#include "display_device/windows/win_display_device.h"
 
 // local includes
-#include "displaydevice/logging.h"
-#include "displaydevice/windows/win_api_utils.h"
+#include "display_device/logging.h"
+#include "display_device/windows/win_api_utils.h"
 
 namespace display_device {
   WinDisplayDevice::WinDisplayDevice(std::shared_ptr<WinApiLayerInterface> w_api):
diff --git a/src/windows/win_display_device_hdr.cpp b/src/windows/win_display_device_hdr.cpp
index 2f702ad..ac97588 100644
--- a/src/windows/win_display_device_hdr.cpp
+++ b/src/windows/win_display_device_hdr.cpp
@@ -1,12 +1,12 @@
 // class header include
-#include "displaydevice/windows/win_display_device.h"
+#include "display_device/windows/win_display_device.h"
 
 // system includes
 #include <ranges>
 
 // local includes
-#include "displaydevice/logging.h"
-#include "displaydevice/windows/win_api_utils.h"
+#include "display_device/logging.h"
+#include "display_device/windows/win_api_utils.h"
 
 namespace display_device {
   namespace {
diff --git a/src/windows/win_display_device_modes.cpp b/src/windows/win_display_device_modes.cpp
index 01c2c5f..8ec5fcb 100644
--- a/src/windows/win_display_device_modes.cpp
+++ b/src/windows/win_display_device_modes.cpp
@@ -1,12 +1,12 @@
 // class header include
-#include "displaydevice/windows/win_display_device.h"
+#include "display_device/windows/win_display_device.h"
 
 // system includes
 #include <ranges>
 
 // local includes
-#include "displaydevice/logging.h"
-#include "displaydevice/windows/win_api_utils.h"
+#include "display_device/logging.h"
+#include "display_device/windows/win_api_utils.h"
 
 namespace display_device {
   namespace {
diff --git a/src/windows/win_display_device_primary.cpp b/src/windows/win_display_device_primary.cpp
index c009cdb..9a46d5f 100644
--- a/src/windows/win_display_device_primary.cpp
+++ b/src/windows/win_display_device_primary.cpp
@@ -1,9 +1,9 @@
 // class header include
-#include "displaydevice/windows/win_display_device.h"
+#include "display_device/windows/win_display_device.h"
 
 // local includes
-#include "displaydevice/logging.h"
-#include "displaydevice/windows/win_api_utils.h"
+#include "display_device/logging.h"
+#include "display_device/windows/win_api_utils.h"
 
 namespace display_device {
   bool
diff --git a/src/windows/win_display_device_topology.cpp b/src/windows/win_display_device_topology.cpp
index 767c717..7c01363 100644
--- a/src/windows/win_display_device_topology.cpp
+++ b/src/windows/win_display_device_topology.cpp
@@ -1,13 +1,13 @@
 // class header include
-#include "displaydevice/windows/win_display_device.h"
+#include "display_device/windows/win_display_device.h"
 
 // system includes
 #include <algorithm>
 #include <unordered_set>
 
 // local includes
-#include "displaydevice/logging.h"
-#include "displaydevice/windows/win_api_utils.h"
+#include "display_device/logging.h"
+#include "display_device/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 1f987ba..8992a9c 100644
--- a/tests/fixtures/include/fixtures/fixtures.h
+++ b/tests/fixtures/include/fixtures/fixtures.h
@@ -9,7 +9,7 @@
 #include <gtest/gtest.h>
 
 // local includes
-#include "displaydevice/logging.h"
+#include "display_device/logging.h"
 #include "test_utils.h"
 
 // Undefine the original TEST macro
diff --git a/tests/fixtures/include/fixtures/json_converter_test.h b/tests/fixtures/include/fixtures/json_converter_test.h
index e528781..683df88 100644
--- a/tests/fixtures/include/fixtures/json_converter_test.h
+++ b/tests/fixtures/include/fixtures/json_converter_test.h
@@ -1,7 +1,7 @@
 #pragma once
 
 // local includes
-#include "displaydevice/json.h"
+#include "display_device/json.h"
 #include "fixtures.h"
 
 class JsonConverterTest: public BaseTest {
diff --git a/tests/fixtures/include/fixtures/mock_audio_context.h b/tests/fixtures/include/fixtures/mock_audio_context.h
index 018cf40..2aaa5bf 100644
--- a/tests/fixtures/include/fixtures/mock_audio_context.h
+++ b/tests/fixtures/include/fixtures/mock_audio_context.h
@@ -4,7 +4,7 @@
 #include <gmock/gmock.h>
 
 // local includes
-#include "displaydevice/audio_context_interface.h"
+#include "display_device/audio_context_interface.h"
 
 namespace display_device {
   class MockAudioContext: public AudioContextInterface {
diff --git a/tests/fixtures/include/fixtures/mock_settings_persistence.h b/tests/fixtures/include/fixtures/mock_settings_persistence.h
index 5f58347..9efb97b 100644
--- a/tests/fixtures/include/fixtures/mock_settings_persistence.h
+++ b/tests/fixtures/include/fixtures/mock_settings_persistence.h
@@ -4,7 +4,7 @@
 #include <gmock/gmock.h>
 
 // local includes
-#include "displaydevice/settings_persistence_interface.h"
+#include "display_device/settings_persistence_interface.h"
 
 namespace display_device {
   class MockSettingsPersistence: public SettingsPersistenceInterface {
diff --git a/tests/unit/general/test_comparison.cpp b/tests/unit/general/test_comparison.cpp
index 62d6ea7..68fcce4 100644
--- a/tests/unit/general/test_comparison.cpp
+++ b/tests/unit/general/test_comparison.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/types.h"
+#include "display_device/types.h"
 #include "fixtures/fixtures.h"
 
 namespace {
diff --git a/tests/unit/general/test_file_settings_persistence.cpp b/tests/unit/general/test_file_settings_persistence.cpp
index c7d2ec1..cb9589e 100644
--- a/tests/unit/general/test_file_settings_persistence.cpp
+++ b/tests/unit/general/test_file_settings_persistence.cpp
@@ -3,7 +3,7 @@
 #include <gmock/gmock.h>
 
 // local includes
-#include "displaydevice/file_settings_persistence.h"
+#include "display_device/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 0ed837e..bc27668 100644
--- a/tests/unit/general/test_json.cpp
+++ b/tests/unit/general/test_json.cpp
@@ -1,9 +1,9 @@
 // special ordered include of details
 #define DD_JSON_DETAIL
 // clang-format off
-#include "displaydevice/json.h"
-#include "displaydevice/detail/json_serializer.h"
-#include "displaydevice/detail/json_converter.h"
+#include "display_device/json.h"
+#include "display_device/detail/json_serializer.h"
+#include "display_device/detail/json_converter.h"
 // clang-format on
 
 // local includes
diff --git a/tests/unit/general/test_logging.cpp b/tests/unit/general/test_logging.cpp
index 2ffb283..9da596f 100644
--- a/tests/unit/general/test_logging.cpp
+++ b/tests/unit/general/test_logging.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/logging.h"
+#include "display_device/logging.h"
 #include "fixtures/fixtures.h"
 
 namespace {
diff --git a/tests/unit/general/test_noop_audio_context.cpp b/tests/unit/general/test_noop_audio_context.cpp
index 28421f4..cebf79e 100644
--- a/tests/unit/general/test_noop_audio_context.cpp
+++ b/tests/unit/general/test_noop_audio_context.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/noop_audio_context.h"
+#include "display_device/noop_audio_context.h"
 #include "fixtures/fixtures.h"
 
 namespace {
diff --git a/tests/unit/general/test_noop_settings_persistence.cpp b/tests/unit/general/test_noop_settings_persistence.cpp
index bb95b4b..a33ba76 100644
--- a/tests/unit/general/test_noop_settings_persistence.cpp
+++ b/tests/unit/general/test_noop_settings_persistence.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/noop_settings_persistence.h"
+#include "display_device/noop_settings_persistence.h"
 #include "fixtures/fixtures.h"
 
 namespace {
diff --git a/tests/unit/general/test_retry_scheduler.cpp b/tests/unit/general/test_retry_scheduler.cpp
index 3109f4a..5f5fea0 100644
--- a/tests/unit/general/test_retry_scheduler.cpp
+++ b/tests/unit/general/test_retry_scheduler.cpp
@@ -2,7 +2,7 @@
 #include <gmock/gmock.h>
 
 // local includes
-#include "displaydevice/retry_scheduler.h"
+#include "display_device/retry_scheduler.h"
 #include "fixtures/fixtures.h"
 
 namespace {
diff --git a/tests/unit/windows/test_comparison.cpp b/tests/unit/windows/test_comparison.cpp
index 0cdea8f..8e384e3 100644
--- a/tests/unit/windows/test_comparison.cpp
+++ b/tests/unit/windows/test_comparison.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/windows/types.h"
+#include "display_device/windows/types.h"
 #include "fixtures/fixtures.h"
 
 namespace {
diff --git a/tests/unit/windows/test_json_converter.cpp b/tests/unit/windows/test_json_converter.cpp
index a42a0b0..e5bf280 100644
--- a/tests/unit/windows/test_json_converter.cpp
+++ b/tests/unit/windows/test_json_converter.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/windows/json.h"
+#include "display_device/windows/json.h"
 #include "fixtures/json_converter_test.h"
 #include "utils/comparison.h"
 
diff --git a/tests/unit/windows/test_persistent_state.cpp b/tests/unit/windows/test_persistent_state.cpp
index 81a9030..9e31ce9 100644
--- a/tests/unit/windows/test_persistent_state.cpp
+++ b/tests/unit/windows/test_persistent_state.cpp
@@ -1,6 +1,6 @@
 // local includes
-#include "displaydevice/noop_settings_persistence.h"
-#include "displaydevice/windows/settings_manager.h"
+#include "display_device/noop_settings_persistence.h"
+#include "display_device/windows/settings_manager.h"
 #include "fixtures/fixtures.h"
 #include "fixtures/mock_settings_persistence.h"
 #include "utils/comparison.h"
diff --git a/tests/unit/windows/test_settings_manager_apply.cpp b/tests/unit/windows/test_settings_manager_apply.cpp
index 89c5b6f..5caf34f 100644
--- a/tests/unit/windows/test_settings_manager_apply.cpp
+++ b/tests/unit/windows/test_settings_manager_apply.cpp
@@ -1,6 +1,6 @@
 // local includes
-#include "displaydevice/windows/settings_manager.h"
-#include "displaydevice/windows/settings_utils.h"
+#include "display_device/windows/settings_manager.h"
+#include "display_device/windows/settings_utils.h"
 #include "fixtures/fixtures.h"
 #include "fixtures/mock_audio_context.h"
 #include "fixtures/mock_settings_persistence.h"
diff --git a/tests/unit/windows/test_settings_manager_general.cpp b/tests/unit/windows/test_settings_manager_general.cpp
index 1a782e5..79ed5ad 100644
--- a/tests/unit/windows/test_settings_manager_general.cpp
+++ b/tests/unit/windows/test_settings_manager_general.cpp
@@ -1,7 +1,7 @@
 // local includes
-#include "displaydevice/noop_audio_context.h"
-#include "displaydevice/noop_settings_persistence.h"
-#include "displaydevice/windows/settings_manager.h"
+#include "display_device/noop_audio_context.h"
+#include "display_device/noop_settings_persistence.h"
+#include "display_device/windows/settings_manager.h"
 #include "fixtures/fixtures.h"
 #include "fixtures/mock_audio_context.h"
 #include "fixtures/mock_settings_persistence.h"
diff --git a/tests/unit/windows/test_settings_manager_revert.cpp b/tests/unit/windows/test_settings_manager_revert.cpp
index a6697f3..37e7713 100644
--- a/tests/unit/windows/test_settings_manager_revert.cpp
+++ b/tests/unit/windows/test_settings_manager_revert.cpp
@@ -1,6 +1,6 @@
 // local includes
-#include "displaydevice/windows/settings_manager.h"
-#include "displaydevice/windows/settings_utils.h"
+#include "display_device/windows/settings_manager.h"
+#include "display_device/windows/settings_utils.h"
 #include "fixtures/fixtures.h"
 #include "fixtures/mock_audio_context.h"
 #include "fixtures/mock_settings_persistence.h"
diff --git a/tests/unit/windows/test_settings_utils.cpp b/tests/unit/windows/test_settings_utils.cpp
index d33dbe9..06464c3 100644
--- a/tests/unit/windows/test_settings_utils.cpp
+++ b/tests/unit/windows/test_settings_utils.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/windows/settings_utils.h"
+#include "display_device/windows/settings_utils.h"
 #include "fixtures/fixtures.h"
 #include "utils/comparison.h"
 #include "utils/mock_win_display_device.h"
diff --git a/tests/unit/windows/test_win_api_layer.cpp b/tests/unit/windows/test_win_api_layer.cpp
index 4a72090..3a2537e 100644
--- a/tests/unit/windows/test_win_api_layer.cpp
+++ b/tests/unit/windows/test_win_api_layer.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/windows/win_api_layer.h"
+#include "display_device/windows/win_api_layer.h"
 #include "fixtures/fixtures.h"
 
 namespace {
diff --git a/tests/unit/windows/test_win_api_utils.cpp b/tests/unit/windows/test_win_api_utils.cpp
index 3f22d64..efa690c 100644
--- a/tests/unit/windows/test_win_api_utils.cpp
+++ b/tests/unit/windows/test_win_api_utils.cpp
@@ -1,5 +1,5 @@
 // local includes
-#include "displaydevice/windows/win_api_utils.h"
+#include "display_device/windows/win_api_utils.h"
 #include "fixtures/fixtures.h"
 #include "utils/comparison.h"
 #include "utils/mock_win_api_layer.h"
diff --git a/tests/unit/windows/test_win_display_device_general.cpp b/tests/unit/windows/test_win_display_device_general.cpp
index c0cf46b..45f94c5 100644
--- a/tests/unit/windows/test_win_display_device_general.cpp
+++ b/tests/unit/windows/test_win_display_device_general.cpp
@@ -1,8 +1,8 @@
 // local includes
-#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 "display_device/windows/settings_utils.h"
+#include "display_device/windows/win_api_layer.h"
+#include "display_device/windows/win_api_utils.h"
+#include "display_device/windows/win_display_device.h"
 #include "fixtures/fixtures.h"
 #include "utils/comparison.h"
 #include "utils/helpers.h"
diff --git a/tests/unit/windows/test_win_display_device_hdr.cpp b/tests/unit/windows/test_win_display_device_hdr.cpp
index a84feaa..f8dabec 100644
--- a/tests/unit/windows/test_win_display_device_hdr.cpp
+++ b/tests/unit/windows/test_win_display_device_hdr.cpp
@@ -1,7 +1,7 @@
 // local includes
-#include "displaydevice/windows/settings_utils.h"
-#include "displaydevice/windows/win_api_layer.h"
-#include "displaydevice/windows/win_display_device.h"
+#include "display_device/windows/settings_utils.h"
+#include "display_device/windows/win_api_layer.h"
+#include "display_device/windows/win_display_device.h"
 #include "fixtures/fixtures.h"
 #include "utils/comparison.h"
 #include "utils/guards.h"
diff --git a/tests/unit/windows/test_win_display_device_modes.cpp b/tests/unit/windows/test_win_display_device_modes.cpp
index b91dd74..db35952 100644
--- a/tests/unit/windows/test_win_display_device_modes.cpp
+++ b/tests/unit/windows/test_win_display_device_modes.cpp
@@ -2,10 +2,10 @@
 #include <ranges>
 
 // local includes
-#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 "display_device/windows/settings_utils.h"
+#include "display_device/windows/win_api_layer.h"
+#include "display_device/windows/win_api_utils.h"
+#include "display_device/windows/win_display_device.h"
 #include "fixtures/fixtures.h"
 #include "utils/comparison.h"
 #include "utils/guards.h"
diff --git a/tests/unit/windows/test_win_display_device_primary.cpp b/tests/unit/windows/test_win_display_device_primary.cpp
index 3033654..9fb1659 100644
--- a/tests/unit/windows/test_win_display_device_primary.cpp
+++ b/tests/unit/windows/test_win_display_device_primary.cpp
@@ -1,8 +1,8 @@
 // local includes
-#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 "display_device/windows/settings_utils.h"
+#include "display_device/windows/win_api_layer.h"
+#include "display_device/windows/win_api_utils.h"
+#include "display_device/windows/win_display_device.h"
 #include "fixtures/fixtures.h"
 #include "utils/comparison.h"
 #include "utils/guards.h"
diff --git a/tests/unit/windows/test_win_display_device_topology.cpp b/tests/unit/windows/test_win_display_device_topology.cpp
index 077a3d4..b756fae 100644
--- a/tests/unit/windows/test_win_display_device_topology.cpp
+++ b/tests/unit/windows/test_win_display_device_topology.cpp
@@ -1,8 +1,8 @@
 // local includes
-#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 "display_device/windows/settings_utils.h"
+#include "display_device/windows/win_api_layer.h"
+#include "display_device/windows/win_api_utils.h"
+#include "display_device/windows/win_display_device.h"
 #include "fixtures/fixtures.h"
 #include "utils/comparison.h"
 #include "utils/guards.h"
diff --git a/tests/unit/windows/test_win_playground.cpp b/tests/unit/windows/test_win_playground.cpp
index 76cb01b..7fa1b0c 100644
--- a/tests/unit/windows/test_win_playground.cpp
+++ b/tests/unit/windows/test_win_playground.cpp
@@ -1,8 +1,8 @@
 // local includes
-#include "displaydevice/windows/json.h"
-#include "displaydevice/windows/settings_manager.h"
-#include "displaydevice/windows/win_api_layer.h"
-#include "displaydevice/windows/win_display_device.h"
+#include "display_device/windows/json.h"
+#include "display_device/windows/settings_manager.h"
+#include "display_device/windows/win_api_layer.h"
+#include "display_device/windows/win_display_device.h"
 #include "fixtures/fixtures.h"
 #include "utils/guards.h"
 
diff --git a/tests/unit/windows/utils/comparison.h b/tests/unit/windows/utils/comparison.h
index fd8c9a8..4119bb9 100644
--- a/tests/unit/windows/utils/comparison.h
+++ b/tests/unit/windows/utils/comparison.h
@@ -1,7 +1,7 @@
 #pragma once
 
 // local includes
-#include "displaydevice/windows/types.h"
+#include "display_device/windows/types.h"
 
 // Helper comparison operators
 bool
diff --git a/tests/unit/windows/utils/guards.cpp b/tests/unit/windows/utils/guards.cpp
index c96e306..da48c3a 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/settings_utils.h"
+#include "display_device/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 4e93fb4..3be687c 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/win_display_device_interface.h"
+#include "display_device/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.cpp b/tests/unit/windows/utils/helpers.cpp
index d27692a..3d8d718 100644
--- a/tests/unit/windows/utils/helpers.cpp
+++ b/tests/unit/windows/utils/helpers.cpp
@@ -1,6 +1,6 @@
 // local includes
 #include "helpers.h"
-#include "displaydevice/windows/json.h"
+#include "display_device/windows/json.h"
 
 std::optional<std::vector<std::string>>
 getAvailableDevices(display_device::WinApiLayer &layer, const bool only_valid_output) {
diff --git a/tests/unit/windows/utils/helpers.h b/tests/unit/windows/utils/helpers.h
index 3f3c84f..67d5954 100644
--- a/tests/unit/windows/utils/helpers.h
+++ b/tests/unit/windows/utils/helpers.h
@@ -4,8 +4,8 @@
 #include <cstdint>
 
 // local includes
-#include "displaydevice/windows/types.h"
-#include "displaydevice/windows/win_api_layer.h"
+#include "display_device/windows/types.h"
+#include "display_device/windows/win_api_layer.h"
 
 // Generic helper functions
 std::optional<std::vector<std::string>>
diff --git a/tests/unit/windows/utils/mock_win_api_layer.h b/tests/unit/windows/utils/mock_win_api_layer.h
index 6bfe72c..3dd7dfb 100644
--- a/tests/unit/windows/utils/mock_win_api_layer.h
+++ b/tests/unit/windows/utils/mock_win_api_layer.h
@@ -4,7 +4,7 @@
 #include <gmock/gmock.h>
 
 // local includes
-#include "displaydevice/windows/win_api_layer_interface.h"
+#include "display_device/windows/win_api_layer_interface.h"
 
 namespace display_device {
   class MockWinApiLayer: public WinApiLayerInterface {
diff --git a/tests/unit/windows/utils/mock_win_display_device.h b/tests/unit/windows/utils/mock_win_display_device.h
index c159b7f..0fc92fa 100644
--- a/tests/unit/windows/utils/mock_win_display_device.h
+++ b/tests/unit/windows/utils/mock_win_display_device.h
@@ -4,7 +4,7 @@
 #include <gmock/gmock.h>
 
 // local includes
-#include "displaydevice/windows/win_display_device.h"
+#include "display_device/windows/win_display_device.h"
 
 namespace display_device {
   class MockWinDisplayDevice: public WinDisplayDeviceInterface {