diff --git a/AVInput/CMakeLists.txt b/AVInput/CMakeLists.txt
index 7e05d89235..7f47bcf9f0 100644
--- a/AVInput/CMakeLists.txt
+++ b/AVInput/CMakeLists.txt
@@ -32,6 +32,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 target_include_directories(${MODULE_NAME} PRIVATE ../helpers)
 
 target_link_libraries(${MODULE_NAME}
diff --git a/AVInput/Module.h b/AVInput/Module.h
index f918abb82e..f4fd32cd13 100644
--- a/AVInput/Module.h
+++ b/AVInput/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME AVInput
+#define MODULE_NAME Plugin_AVInput
 #endif
 
 #include <plugins/plugins.h>
diff --git a/ActivityMonitor/Module.h b/ActivityMonitor/Module.h
index 86b2d5b1c2..8720bdac82 100644
--- a/ActivityMonitor/Module.h
+++ b/ActivityMonitor/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME CoPilot
+#define MODULE_NAME Plugin_ActivityMonitor
 #endif
 
 #include <plugins/plugins.h>
diff --git a/Bluetooth/Module.h b/Bluetooth/Module.h
index 44ee9ef394..8de67237dd 100644
--- a/Bluetooth/Module.h
+++ b/Bluetooth/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME Bluetooth
+#define MODULE_NAME Plugin_Bluetooth
 #endif
 
 #include <plugins/plugins.h>
diff --git a/CompositeInput/Module.h b/CompositeInput/Module.h
index 8fdbd5a299..094a815d6a 100644
--- a/CompositeInput/Module.h
+++ b/CompositeInput/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME CompositeInput
+#define MODULE_NAME Plugin_CompositeInput
 #endif
 
 #include <plugins/plugins.h>
diff --git a/ContinueWatching/Module.h b/ContinueWatching/Module.h
index a51f9f52ce..c46aaa30b8 100644
--- a/ContinueWatching/Module.h
+++ b/ContinueWatching/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME ContinueWatching
+#define MODULE_NAME Plugin_ContinueWatching
 #endif
 
 #include <plugins/plugins.h>
diff --git a/ControlService/Module.h b/ControlService/Module.h
index 7f9345c318..402c4df17b 100644
--- a/ControlService/Module.h
+++ b/ControlService/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME VrexManager
+#define MODULE_NAME Plugin_ControlService
 #endif
 
 #include <plugins/plugins.h>
diff --git a/DataCapture/Module.h b/DataCapture/Module.h
index 4202453605..2fb3303f76 100644
--- a/DataCapture/Module.h
+++ b/DataCapture/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME DataCapture
+#define MODULE_NAME Plugin_DataCapture
 #endif
 
 #include <plugins/plugins.h>
diff --git a/DeviceDiagnostics/Module.h b/DeviceDiagnostics/Module.h
index b981e95ef4..9df5aa4c02 100644
--- a/DeviceDiagnostics/Module.h
+++ b/DeviceDiagnostics/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME DeviceDiagnostics
+#define MODULE_NAME Plugin_DeviceDiagnostics
 #endif
 
 #include <plugins/plugins.h>
diff --git a/DisplayInfo/CMakeLists.txt b/DisplayInfo/CMakeLists.txt
index a9586dcf7c..dd1146d1c7 100644
--- a/DisplayInfo/CMakeLists.txt
+++ b/DisplayInfo/CMakeLists.txt
@@ -38,6 +38,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 target_link_libraries(${MODULE_NAME}
     PRIVATE
         CompileSettingsDebug::CompileSettingsDebug
diff --git a/DisplaySettings/CMakeLists.txt b/DisplaySettings/CMakeLists.txt
index 06fc22d2c2..7a6714ef53 100644
--- a/DisplaySettings/CMakeLists.txt
+++ b/DisplaySettings/CMakeLists.txt
@@ -30,6 +30,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 target_include_directories(${MODULE_NAME} PRIVATE ../helpers)
 
 find_package(DS)
diff --git a/DisplaySettings/Module.h b/DisplaySettings/Module.h
index 69b2e7bfe2..0e1d239bf4 100644
--- a/DisplaySettings/Module.h
+++ b/DisplaySettings/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME DisplaySettings
+#define MODULE_NAME Plugin_DisplaySettings
 #endif
 
 #include <plugins/plugins.h>
diff --git a/FrameRate/FrameRate.h b/FrameRate/FrameRate.h
index af7cfb65a7..db42375e7e 100644
--- a/FrameRate/FrameRate.h
+++ b/FrameRate/FrameRate.h
@@ -21,9 +21,8 @@
 
 #include <mutex>
 
-#include "tptimer.h"
-
 #include "Module.h"
+#include "tptimer.h"
 #include "utils.h"
 #include "AbstractPlugin.h"
 
diff --git a/FrameRate/Module.h b/FrameRate/Module.h
index 83626a1078..c7816ecaec 100644
--- a/FrameRate/Module.h
+++ b/FrameRate/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME FrameRate
+#define MODULE_NAME Plugin_FrameRate
 #endif
 
 #include <plugins/plugins.h>
diff --git a/FrontPanel/CMakeLists.txt b/FrontPanel/CMakeLists.txt
index 1ab19c444d..3e00af34b4 100644
--- a/FrontPanel/CMakeLists.txt
+++ b/FrontPanel/CMakeLists.txt
@@ -31,6 +31,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 find_package(DS)
 if (DS_FOUND)
     find_package(IARMBus)
diff --git a/FrontPanel/Module.h b/FrontPanel/Module.h
index a4e2eb022e..e6d64dbe54 100644
--- a/FrontPanel/Module.h
+++ b/FrontPanel/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME FrontPanel
+#define MODULE_NAME Plugin_FrontPanel
 #endif
 
 #include <plugins/plugins.h>
diff --git a/HdcpProfile/Module.h b/HdcpProfile/Module.h
index 37209a3b5d..2aa252e867 100644
--- a/HdcpProfile/Module.h
+++ b/HdcpProfile/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME HdcpProfile
+#define MODULE_NAME Plugin_HdcpProfile
 #endif
 
 #include <plugins/plugins.h>
diff --git a/HdmiCec/Module.h b/HdmiCec/Module.h
index e0d6532738..3c9b4d5d16 100644
--- a/HdmiCec/Module.h
+++ b/HdmiCec/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME HdmiCec
+#define MODULE_NAME Plugin_HdmiCec
 #endif
 
 #include <plugins/plugins.h>
diff --git a/HdmiCecSink/CMakeLists.txt b/HdmiCecSink/CMakeLists.txt
index 2b45dbb8f7..336778d132 100644
--- a/HdmiCecSink/CMakeLists.txt
+++ b/HdmiCecSink/CMakeLists.txt
@@ -29,6 +29,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 find_package(DS)
 find_package(IARMBus)
 find_package(CEC)
diff --git a/HdmiCecSink/Module.h b/HdmiCecSink/Module.h
index 346910bda4..6697f88806 100644
--- a/HdmiCecSink/Module.h
+++ b/HdmiCecSink/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME HdmiCecSink
+#define MODULE_NAME Plugin_HdmiCecSink
 #endif
 
 #include <plugins/plugins.h>
diff --git a/HdmiCec_2/Module.h b/HdmiCec_2/Module.h
index d2d75627fe..5409162d6a 100644
--- a/HdmiCec_2/Module.h
+++ b/HdmiCec_2/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME HdmiCec_2
+#define MODULE_NAME Plugin_HdmiCec_2
 #endif
 
 #include <plugins/plugins.h>
diff --git a/HdmiInput/Module.h b/HdmiInput/Module.h
index 1fd03e9436..54e672c373 100644
--- a/HdmiInput/Module.h
+++ b/HdmiInput/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME HdmiInput
+#define MODULE_NAME Plugin_HdmiInput
 #endif
 
 #include <plugins/plugins.h>
diff --git a/LoggingPreferences/Module.h b/LoggingPreferences/Module.h
index e75fc12fd0..6f4eb05851 100644
--- a/LoggingPreferences/Module.h
+++ b/LoggingPreferences/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME LoggingPreferences
+#define MODULE_NAME Plugin_LoggingPreferences
 #endif
 
 #include <plugins/plugins.h>
diff --git a/MaintenanceManager/CMakeLists.txt b/MaintenanceManager/CMakeLists.txt
index 5043d2caad..2524b1e777 100644
--- a/MaintenanceManager/CMakeLists.txt
+++ b/MaintenanceManager/CMakeLists.txt
@@ -33,6 +33,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 list(APPEND CMAKE_MODULE_PATH
         "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 
diff --git a/MaintenanceManager/Module.h b/MaintenanceManager/Module.h
index 1c3f48fba9..e6ca905148 100644
--- a/MaintenanceManager/Module.h
+++ b/MaintenanceManager/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME MaintenanceManager
+#define MODULE_NAME Plugin_MaintenanceManager
 #endif
 
 #include <plugins/plugins.h>
diff --git a/MotionDetection/Module.h b/MotionDetection/Module.h
index dba48dfb2e..8aa6ad0ccc 100644
--- a/MotionDetection/Module.h
+++ b/MotionDetection/Module.h
@@ -21,7 +21,7 @@
 #define __MODULE_PLUGIN_MOTION_DETECTION_MODULE_H
 
 #ifndef MODULE_NAME
-#define MODULE_NAME MotionDetection
+#define MODULE_NAME Plugin_MotionDetection
 #endif
 
 #include <plugins/plugins.h>
diff --git a/Network/Module.h b/Network/Module.h
index 1c72da95b8..522458ee8e 100644
--- a/Network/Module.h
+++ b/Network/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME Network
+#define MODULE_NAME Plugin_Network
 #endif
 
 #include <plugins/plugins.h>
diff --git a/OCIContainer/Module.h b/OCIContainer/Module.h
index 631a5ebf49..639ad60721 100644
--- a/OCIContainer/Module.h
+++ b/OCIContainer/Module.h
@@ -1,6 +1,6 @@
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME OCIContainer
+#define MODULE_NAME Plugin_OCIContainer
 #endif
 
 #include <plugins/plugins.h>
diff --git a/PersistentStore/Module.h b/PersistentStore/Module.h
index 9538f1df39..733840eddf 100644
--- a/PersistentStore/Module.h
+++ b/PersistentStore/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME PersistentStore
+#define MODULE_NAME Plugin_PersistentStore
 #endif
 
 #include <plugins/plugins.h>
diff --git a/RDKShell/CMakeLists.txt b/RDKShell/CMakeLists.txt
index 80a6a96b95..4febce4ee7 100755
--- a/RDKShell/CMakeLists.txt
+++ b/RDKShell/CMakeLists.txt
@@ -41,6 +41,8 @@ if (PLUGIN_RDKSHELL_READ_MAC_ON_STARTUP)
   set(PLUGIN_RDKSHELL_EXTRA_LIBRARIES "-lFactory-hal")
 endif (PLUGIN_RDKSHELL_READ_MAC_ON_STARTUP)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 target_include_directories(${MODULE_NAME} PRIVATE ../helpers ${IARMBUS_INCLUDE_DIRS} )
 
 set(RDKSHELL_INCLUDES $ENV{RDKSHELL_INCLUDES})
diff --git a/RDKShell/Module.h b/RDKShell/Module.h
index 155a2bb359..e9a8000d81 100755
--- a/RDKShell/Module.h
+++ b/RDKShell/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME RDKShell
+#define MODULE_NAME Plugin_RDKShell
 #endif
 
 #include <plugins/plugins.h>
diff --git a/RemoteActionMapping/CMakeLists.txt b/RemoteActionMapping/CMakeLists.txt
index cdce31e7fd..edd67467fe 100644
--- a/RemoteActionMapping/CMakeLists.txt
+++ b/RemoteActionMapping/CMakeLists.txt
@@ -32,6 +32,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 target_include_directories(${MODULE_NAME} PRIVATE ../helpers)
 
 find_package(CTRLM)
diff --git a/RemoteActionMapping/Module.h b/RemoteActionMapping/Module.h
index 5c409c6dfd..202b719b56 100644
--- a/RemoteActionMapping/Module.h
+++ b/RemoteActionMapping/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME RemoteActionMapping
+#define MODULE_NAME Plugin_RemoteActionMapping
 #endif
 
 #include <plugins/plugins.h>
diff --git a/ScreenCapture/CMakeLists.txt b/ScreenCapture/CMakeLists.txt
index e6c2dc3a82..0b63335376 100644
--- a/ScreenCapture/CMakeLists.txt
+++ b/ScreenCapture/CMakeLists.txt
@@ -29,6 +29,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 find_path(FRAMEBUFFER_API_HEADER NAMES framebuffer-api.h)
 if (NOT ${FRAMEBUFFER_API_HEADER} STREQUAL "FRAMEBUFFER_API_HEADER-NOTFOUND")
     message("Found framebuffer-api.h")
diff --git a/ScreenCapture/Module.h b/ScreenCapture/Module.h
index 6516656a65..32491196d9 100644
--- a/ScreenCapture/Module.h
+++ b/ScreenCapture/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME ScreenCapture
+#define MODULE_NAME Plugin_ScreenCapture
 #endif
 
 #include <plugins/plugins.h>
diff --git a/ScreenCapture/ScreenCapture.h b/ScreenCapture/ScreenCapture.h
index ea6617e4a6..2572951c90 100644
--- a/ScreenCapture/ScreenCapture.h
+++ b/ScreenCapture/ScreenCapture.h
@@ -22,9 +22,8 @@
 #include <mutex>
 #include <vector>
 
-#include "tptimer.h"
-
 #include "Module.h"
+#include "tptimer.h"
 #include "utils.h"
 #include "AbstractPlugin.h"
 
diff --git a/SystemServices/CMakeLists.txt b/SystemServices/CMakeLists.txt
index e564d2997c..f9cf3a9155 100644
--- a/SystemServices/CMakeLists.txt
+++ b/SystemServices/CMakeLists.txt
@@ -40,6 +40,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 list(APPEND CMAKE_MODULE_PATH
         "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 
diff --git a/SystemServices/Module.h b/SystemServices/Module.h
index d6fcdf315d..af1dcb0174 100644
--- a/SystemServices/Module.h
+++ b/SystemServices/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME SystemServices
+#define MODULE_NAME Plugin_SystemServices
 #endif
 
 #include <plugins/plugins.h>
diff --git a/Timer/CMakeLists.txt b/Timer/CMakeLists.txt
index cb68bb094d..1e6cdae44f 100644
--- a/Timer/CMakeLists.txt
+++ b/Timer/CMakeLists.txt
@@ -30,6 +30,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 list(APPEND CMAKE_MODULE_PATH
         "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 
diff --git a/Timer/Module.h b/Timer/Module.h
index f58fe7ee6a..21e421aee4 100644
--- a/Timer/Module.h
+++ b/Timer/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME Timer
+#define MODULE_NAME Plugin_Timer
 #endif
 
 #include <plugins/plugins.h>
diff --git a/UsbAccess/Module.h b/UsbAccess/Module.h
index cbd4d9fc73..7a6ac9d6b2 100644
--- a/UsbAccess/Module.h
+++ b/UsbAccess/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME UsbAccess
+#define MODULE_NAME Plugin_UsbAccess
 #endif
 
 #include <plugins/plugins.h>
diff --git a/UserPreferences/Module.h b/UserPreferences/Module.h
index d86b05f546..8c89a3fab2 100644
--- a/UserPreferences/Module.h
+++ b/UserPreferences/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME UserPreferences
+#define MODULE_NAME Plugin_UserPreferences
 #endif
 
 #include <plugins/plugins.h>
diff --git a/Warehouse/CMakeLists.txt b/Warehouse/CMakeLists.txt
index fe2f491342..ac9f16e23f 100644
--- a/Warehouse/CMakeLists.txt
+++ b/Warehouse/CMakeLists.txt
@@ -32,6 +32,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 find_package(DS)
 if (DS_FOUND)
     find_package(IARMBus)
diff --git a/Warehouse/Module.h b/Warehouse/Module.h
index 46d3ae2521..f09d0d4e7d 100644
--- a/Warehouse/Module.h
+++ b/Warehouse/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME Warehouse
+#define MODULE_NAME Plugin_Warehouse
 #endif
 
 #include <plugins/plugins.h>
diff --git a/XCast/CMakeLists.txt b/XCast/CMakeLists.txt
index 8cd4f5dc48..88a101150a 100644
--- a/XCast/CMakeLists.txt
+++ b/XCast/CMakeLists.txt
@@ -33,6 +33,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 add_definitions (-DRT_PLATFORM_LINUX)
 target_include_directories(${MODULE_NAME} PRIVATE ${IARMBUS_INCLUDE_DIRS} ../helpers)
 target_include_directories(${MODULE_NAME} PRIVATE ${RFC_INCLUDE_DIRS} ../helpers)
diff --git a/XCast/Module.h b/XCast/Module.h
index 7f0d78bb33..af6e2179d5 100644
--- a/XCast/Module.h
+++ b/XCast/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME DisplaySettings
+#define MODULE_NAME Plugin_XCast
 #endif
 
 #include <plugins/plugins.h>