rdkcentral · sebaszm · Jul 6, 2026 · Jun 25, 2026 · Jun 25, 2026 · Jun 25, 2026
diff --git a/.github/workflows/Build Thunder on Windows.yml b/.github/workflows/Build Thunder on Windows.yml
@@ -22,7 +22,7 @@ env:
   bridge: Thunder\Source\Thunder\bridge.vcxproj
   comProcess: Thunder\Source\ThunderPlugin\comprocess.vcxproj
   solution: Thunder.sln
-  warningReporting: Thunder\Source\extensions\warningreporting\warningreporting.vcxproj
+  warningReporting: Thunder\Source\addons\warningreporting\warningreporting.vcxproj
 
 jobs:
   Thunder:

diff --git a/NOTICE b/NOTICE
@@ -7,7 +7,7 @@ listed below. Your use of this material within the component is also subject to
 conditions of these licenses. The LICENSE file contains the text of all the licenses which apply
 within this component.
 
-Files under the implementations directory are:
+Files under the implementations directory (and other changes as indicated) are:
 Copyright Liberty Global B.V.
 Licensed under the Apache License, Version 2.0
 unless otherwise noted.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -78,7 +78,7 @@ if(MESSAGING)
     add_subdirectory(messaging)
 endif()
 
-add_subdirectory(extensions)
+add_subdirectory(addons)
 
 if(COM)
     add_subdirectory(com)

diff --git a/Source/Thunder/PluginServer.cpp b/Source/Thunder/PluginServer.cpp
@@ -29,7 +29,7 @@
 #endif
 
 #ifdef HIBERNATE_SUPPORT_ENABLED
-#include "../extensions/hibernate/hibernate.h"
+#include "../addons/hibernate/hibernate.h"
 #endif
 
 namespace Thunder {

diff --git a/Source/Thunder/bridge.vcxproj b/Source/Thunder/bridge.vcxproj
@@ -122,7 +122,7 @@
       <PreprocessorDefinitions>APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -146,7 +146,7 @@
       <PreprocessorDefinitions>APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -168,7 +168,7 @@
       <PreprocessorDefinitions>APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -192,7 +192,7 @@
       <PreprocessorDefinitions>APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>

diff --git a/Source/ThunderPlugin/comprocess.vcxproj b/Source/ThunderPlugin/comprocess.vcxproj
@@ -110,7 +110,7 @@
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -131,7 +131,7 @@
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -150,7 +150,7 @@
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -171,7 +171,7 @@
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>

diff --git a/Source/extensions/CMakeLists.txt → Source/addons/CMakeLists.txt b/Source/extensions/CMakeLists.txt → Source/addons/CMakeLists.txt
diff --git a/Source/extensions/hibernate/CMakeLists.txt → Source/addons/hibernate/CMakeLists.txt b/Source/extensions/hibernate/CMakeLists.txt → Source/addons/hibernate/CMakeLists.txt
diff --git a/...s/hibernate/checkpointlib/CheckpointLib.c → ...s/hibernate/checkpointlib/CheckpointLib.c b/...s/hibernate/checkpointlib/CheckpointLib.c → ...s/hibernate/checkpointlib/CheckpointLib.c
diff --git a/...rnate/checkpointserver/CheckpointServer.c → ...rnate/checkpointserver/CheckpointServer.c b/...rnate/checkpointserver/CheckpointServer.c → ...rnate/checkpointserver/CheckpointServer.c
diff --git a/Source/extensions/hibernate/common/Log.h → Source/addons/hibernate/common/Log.h b/Source/extensions/hibernate/common/Log.h → Source/addons/hibernate/common/Log.h
diff --git a/Source/extensions/hibernate/hibernate.h → Source/addons/hibernate/hibernate.h b/Source/extensions/hibernate/hibernate.h → Source/addons/hibernate/hibernate.h
diff --git a/Source/extensions/localtracer/CMakeLists.txt → Source/addons/localtracer/CMakeLists.txt b/Source/extensions/localtracer/CMakeLists.txt → Source/addons/localtracer/CMakeLists.txt
diff --git a/...nsions/localtracer/example/CMakeLists.txt → ...addons/localtracer/example/CMakeLists.txt b/...nsions/localtracer/example/CMakeLists.txt → ...addons/localtracer/example/CMakeLists.txt
diff --git a/...e/extensions/localtracer/example/main.cpp → Source/addons/localtracer/example/main.cpp b/...e/extensions/localtracer/example/main.cpp → Source/addons/localtracer/example/main.cpp
diff --git a/...ltracer/include/localtracer/localtracer.h → ...ltracer/include/localtracer/localtracer.h b/...ltracer/include/localtracer/localtracer.h → ...ltracer/include/localtracer/localtracer.h
diff --git a/...tensions/privilegedrequest/CMakeLists.txt → ...e/addons/privilegedrequest/CMakeLists.txt b/...tensions/privilegedrequest/CMakeLists.txt → ...e/addons/privilegedrequest/CMakeLists.txt
diff --git a/.../privilegedrequest/example/CMakeLists.txt → .../privilegedrequest/example/CMakeLists.txt b/.../privilegedrequest/example/CMakeLists.txt → .../privilegedrequest/example/CMakeLists.txt
diff --git a/...nsions/privilegedrequest/example/main.cpp → ...addons/privilegedrequest/example/main.cpp b/...nsions/privilegedrequest/example/main.cpp → ...addons/privilegedrequest/example/main.cpp
diff --git a/...ude/privilegedrequest/PrivilegedRequest.h → ...ude/privilegedrequest/PrivilegedRequest.h b/...ude/privilegedrequest/PrivilegedRequest.h → ...ude/privilegedrequest/PrivilegedRequest.h
diff --git a/...tensions/processcontainers/CMakeLists.txt → ...e/addons/processcontainers/CMakeLists.txt b/...tensions/processcontainers/CMakeLists.txt → ...e/addons/processcontainers/CMakeLists.txt
diff --git a/...cesscontainers/ContainerAdministrator.cpp → ...cesscontainers/ContainerAdministrator.cpp b/...cesscontainers/ContainerAdministrator.cpp → ...cesscontainers/ContainerAdministrator.cpp
diff --git a/...rocesscontainers/ContainerAdministrator.h → ...rocesscontainers/ContainerAdministrator.h b/...rocesscontainers/ContainerAdministrator.h → ...rocesscontainers/ContainerAdministrator.h
diff --git a/...ons/processcontainers/ContainerProducer.h → ...ons/processcontainers/ContainerProducer.h b/...ons/processcontainers/ContainerProducer.h → ...ons/processcontainers/ContainerProducer.h
diff --git a/...ns/processcontainers/IProcessContainers.h → ...ns/processcontainers/IProcessContainers.h b/...ns/processcontainers/IProcessContainers.h → ...ns/processcontainers/IProcessContainers.h
diff --git a/.../extensions/processcontainers/Messaging.h → Source/addons/processcontainers/Messaging.h b/.../extensions/processcontainers/Messaging.h → Source/addons/processcontainers/Messaging.h
diff --git a/...e/extensions/processcontainers/Module.cpp → Source/addons/processcontainers/Module.cpp b/...e/extensions/processcontainers/Module.cpp → Source/addons/processcontainers/Module.cpp
diff --git a/Source/extensions/processcontainers/Module.h → Source/addons/processcontainers/Module.h b/Source/extensions/processcontainers/Module.h → Source/addons/processcontainers/Module.h
diff --git a/...containers/common/BaseContainerIterator.h → ...containers/common/BaseContainerIterator.h b/...containers/common/BaseContainerIterator.h → ...containers/common/BaseContainerIterator.h
diff --git a/...s/processcontainers/common/BaseRefCount.h → ...s/processcontainers/common/BaseRefCount.h b/...s/processcontainers/common/BaseRefCount.h → ...s/processcontainers/common/BaseRefCount.h
diff --git a/...sscontainers/common/CGroupContainerInfo.h → ...sscontainers/common/CGroupContainerInfo.h b/...sscontainers/common/CGroupContainerInfo.h → ...sscontainers/common/CGroupContainerInfo.h
diff --git a/...implementations/AWCImplementation/AWC.cpp → ...implementations/AWCImplementation/AWC.cpp b/...implementations/AWCImplementation/AWC.cpp → ...implementations/AWCImplementation/AWC.cpp
diff --git a/...s/implementations/AWCImplementation/AWC.h → ...s/implementations/AWCImplementation/AWC.h b/...s/implementations/AWCImplementation/AWC.h → ...s/implementations/AWCImplementation/AWC.h
diff --git a/...lementation/AWCContainerAdministrator.cpp → ...lementation/AWCContainerAdministrator.cpp b/...lementation/AWCContainerAdministrator.cpp → ...lementation/AWCContainerAdministrator.cpp
diff --git a/...mplementation/AWCContainerAdministrator.h → ...mplementation/AWCContainerAdministrator.h b/...mplementation/AWCContainerAdministrator.h → ...mplementation/AWCContainerAdministrator.h
diff --git a/...ns/AWCImplementation/AWCContainerBase.cpp → ...ns/AWCImplementation/AWCContainerBase.cpp b/...ns/AWCImplementation/AWCContainerBase.cpp → ...ns/AWCImplementation/AWCContainerBase.cpp
diff --git a/...ions/AWCImplementation/AWCContainerBase.h → ...ions/AWCImplementation/AWCContainerBase.h b/...ions/AWCImplementation/AWCContainerBase.h → ...ions/AWCImplementation/AWCContainerBase.h
diff --git a/...s/AWCImplementation/AWCImplementation.cpp → ...s/AWCImplementation/AWCImplementation.cpp b/...s/AWCImplementation/AWCImplementation.cpp → ...s/AWCImplementation/AWCImplementation.cpp
diff --git a/...ons/AWCImplementation/AWCImplementation.h → ...ons/AWCImplementation/AWCImplementation.h b/...ons/AWCImplementation/AWCImplementation.h → ...ons/AWCImplementation/AWCImplementation.h
diff --git a/...s/AWCImplementation/AWCProxyContainer.cpp → ...s/AWCImplementation/AWCProxyContainer.cpp b/...s/AWCImplementation/AWCProxyContainer.cpp → ...s/AWCImplementation/AWCProxyContainer.cpp
diff --git a/...ons/AWCImplementation/AWCProxyContainer.h → ...ons/AWCImplementation/AWCProxyContainer.h b/...ons/AWCImplementation/AWCProxyContainer.h → ...ons/AWCImplementation/AWCProxyContainer.h
diff --git a/...ntations/AWCImplementation/CMakeLists.txt → ...ntations/AWCImplementation/CMakeLists.txt b/...ntations/AWCImplementation/CMakeLists.txt → ...ntations/AWCImplementation/CMakeLists.txt
diff --git a/...tations/AWCImplementation/dbus/Client.cpp → ...tations/AWCImplementation/dbus/Client.cpp b/...tations/AWCImplementation/dbus/Client.cpp → ...tations/AWCImplementation/dbus/Client.cpp
diff --git a/...entations/AWCImplementation/dbus/Client.h → ...entations/AWCImplementation/dbus/Client.h b/...entations/AWCImplementation/dbus/Client.h → ...entations/AWCImplementation/dbus/Client.h
diff --git a/...mentations/AWCImplementation/dbus/api.xml → ...mentations/AWCImplementation/dbus/api.xml b/...mentations/AWCImplementation/dbus/api.xml → ...mentations/AWCImplementation/dbus/api.xml
diff --git a/...tations/CRunImplementation/CMakeLists.txt → ...tations/CRunImplementation/CMakeLists.txt b/...tations/CRunImplementation/CMakeLists.txt → ...tations/CRunImplementation/CMakeLists.txt
diff --git a/...CRunImplementation/CRunImplementation.cpp → ...CRunImplementation/CRunImplementation.cpp b/...CRunImplementation/CRunImplementation.cpp → ...CRunImplementation/CRunImplementation.cpp
diff --git a/...s/CRunImplementation/CRunImplementation.h → ...s/CRunImplementation/CRunImplementation.h b/...s/CRunImplementation/CRunImplementation.h → ...s/CRunImplementation/CRunImplementation.h
diff --git a/...ations/DobbyImplementation/CMakeLists.txt → ...ations/DobbyImplementation/CMakeLists.txt b/...ations/DobbyImplementation/CMakeLists.txt → ...ations/DobbyImplementation/CMakeLists.txt
diff --git a/...bbyImplementation/DobbyImplementation.cpp → ...bbyImplementation/DobbyImplementation.cpp b/...bbyImplementation/DobbyImplementation.cpp → ...bbyImplementation/DobbyImplementation.cpp
diff --git a/...DobbyImplementation/DobbyImplementation.h → ...DobbyImplementation/DobbyImplementation.h b/...DobbyImplementation/DobbyImplementation.h → ...DobbyImplementation/DobbyImplementation.h
diff --git a/...ntations/LXCImplementation/CMakeLists.txt → ...ntations/LXCImplementation/CMakeLists.txt b/...ntations/LXCImplementation/CMakeLists.txt → ...ntations/LXCImplementation/CMakeLists.txt
diff --git a/...s/LXCImplementation/LXCImplementation.cpp → ...s/LXCImplementation/LXCImplementation.cpp b/...s/LXCImplementation/LXCImplementation.cpp → ...s/LXCImplementation/LXCImplementation.cpp
diff --git a/...ons/LXCImplementation/LXCImplementation.h → ...ons/LXCImplementation/LXCImplementation.h b/...ons/LXCImplementation/LXCImplementation.h → ...ons/LXCImplementation/LXCImplementation.h
diff --git a/...tations/RunCImplementation/CMakeLists.txt → ...tations/RunCImplementation/CMakeLists.txt b/...tations/RunCImplementation/CMakeLists.txt → ...tations/RunCImplementation/CMakeLists.txt
diff --git a/...RunCImplementation/RunCImplementation.cpp → ...RunCImplementation/RunCImplementation.cpp b/...RunCImplementation/RunCImplementation.cpp → ...RunCImplementation/RunCImplementation.cpp
diff --git a/...s/RunCImplementation/RunCImplementation.h → ...s/RunCImplementation/RunCImplementation.h b/...s/RunCImplementation/RunCImplementation.h → ...s/RunCImplementation/RunCImplementation.h
diff --git a/...ons/processcontainers/processcontainers.h → ...ons/processcontainers/processcontainers.h b/...ons/processcontainers/processcontainers.h → ...ons/processcontainers/processcontainers.h
diff --git a/...xtensions/warningreporting/CMakeLists.txt → ...ce/addons/warningreporting/CMakeLists.txt b/...xtensions/warningreporting/CMakeLists.txt → ...ce/addons/warningreporting/CMakeLists.txt
diff --git a/...warningreporting/IWarningReportingMedia.h → ...warningreporting/IWarningReportingMedia.h b/...warningreporting/IWarningReportingMedia.h → ...warningreporting/IWarningReportingMedia.h
diff --git a/...ce/extensions/warningreporting/Module.cpp → Source/addons/warningreporting/Module.cpp b/...ce/extensions/warningreporting/Module.cpp → Source/addons/warningreporting/Module.cpp
diff --git a/Source/extensions/warningreporting/Module.h → Source/addons/warningreporting/Module.h b/Source/extensions/warningreporting/Module.h → Source/addons/warningreporting/Module.h
diff --git a/...warningreporting/WarningReportingUnit.cpp → ...warningreporting/WarningReportingUnit.cpp b/...warningreporting/WarningReportingUnit.cpp → ...warningreporting/WarningReportingUnit.cpp
diff --git a/...s/warningreporting/WarningReportingUnit.h → ...s/warningreporting/WarningReportingUnit.h b/...s/warningreporting/WarningReportingUnit.h → ...s/warningreporting/WarningReportingUnit.h
diff --git a/...sions/warningreporting/warningreporting.h → ...ddons/warningreporting/warningreporting.h b/...sions/warningreporting/warningreporting.h → ...ddons/warningreporting/warningreporting.h
diff --git a/...warningreporting/warningreporting.vcxproj → ...warningreporting/warningreporting.vcxproj b/...warningreporting/warningreporting.vcxproj → ...warningreporting/warningreporting.vcxproj
@@ -186,4 +186,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/...eporting/warningreporting.vcxproj.filters → ...eporting/warningreporting.vcxproj.filters b/...eporting/warningreporting.vcxproj.filters → ...eporting/warningreporting.vcxproj.filters
diff --git a/Source/com/com.vcxproj b/Source/com/com.vcxproj
@@ -126,7 +126,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -149,7 +149,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -170,7 +170,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -193,7 +193,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>

diff --git a/Source/common/common.vcxproj b/Source/common/common.vcxproj
@@ -130,7 +130,7 @@
 			<SDLCheck>true</SDLCheck>
 			<PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;NDEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
-			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
 			<UseStandardPreprocessor>true</UseStandardPreprocessor>
 		</ClCompile>
 		<Link>
@@ -151,7 +151,7 @@
 			<SDLCheck>true</SDLCheck>
 			<PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
-			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
 			<UseStandardPreprocessor>true</UseStandardPreprocessor>
 		</ClCompile>
 		<Link>
@@ -170,7 +170,7 @@
 			<SDLCheck>true</SDLCheck>
 			<PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_DEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
-			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
 			<UseStandardPreprocessor>true</UseStandardPreprocessor>
 		</ClCompile>
 		<Link>
@@ -191,7 +191,7 @@
 			<SDLCheck>true</SDLCheck>
 			<PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<ConformanceMode>true</ConformanceMode>
-			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>.;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
 			<UseStandardPreprocessor>true</UseStandardPreprocessor>
 		</ClCompile>
 		<Link>

diff --git a/Source/plugins/plugins.vcxproj b/Source/plugins/plugins.vcxproj
@@ -157,7 +157,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -198,7 +198,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -237,7 +237,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>
@@ -278,7 +278,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Link>

diff --git a/Source/plugins/proxystubs.vcxproj b/Source/plugins/proxystubs.vcxproj
@@ -116,7 +116,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
       <AdditionalOptions>/wd4996 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -142,7 +142,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
       <AdditionalOptions>/wd4996 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -166,7 +166,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
       <AdditionalOptions>/wd4996 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -192,7 +192,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons</AdditionalIncludeDirectories>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
       <AdditionalOptions>/wd4996 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>

diff --git a/Tests/unit/core/CMakeLists.txt b/Tests/unit/core/CMakeLists.txt
@@ -98,7 +98,7 @@ add_executable(${TEST_RUNNER_NAME}
    test_jwt.cpp
 )
 
-target_include_directories(${TEST_RUNNER_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/Source/extensions)
+target_include_directories(${TEST_RUNNER_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/Source/addons)
 target_include_directories(${TEST_RUNNER_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/Source/Thunder)
 
 #[[

diff --git a/Tests/unit/core/test_extensions.cpp b/Tests/unit/core/test_extensions.cpp
@@ -33,14 +33,14 @@
 #include <core/WarningReportingCategories.h>
 
 // Pull in the process-container helper headers (header-only, no backend needed)
-// Note: CMakeLists adds Source/extensions to the include path so that
+// Note: CMakeLists adds Source/addons to the include path so that
 // BaseContainerIterator.h's #include "processcontainers/IProcessContainers.h" resolves.
 #include <processcontainers/IProcessContainers.h>
 #include <processcontainers/common/BaseRefCount.h>
 #include <processcontainers/common/BaseContainerIterator.h>
 
 // Hibernate C API header (for error constant validation)
-#include <extensions/hibernate/hibernate.h>
+#include <addons/hibernate/hibernate.h>
 
 // If the proxy was not compiled into the library (WARNING_REPORTING=OFF),
 // pull in the implementation so the linker can find it.

diff --git a/docs/plugin/messaging.md b/docs/plugin/messaging.md
@@ -173,7 +173,7 @@ Below is an example of the messaging section in the config:
 Warning Reporting enables various runtime checks for potentially erroneous conditions and can be enabled on a per-category basis. These are typically time-based - i.e. a warning will be reported if something exceeded an allowable time. Each category can also have its own configuration to tune the thresholds for triggering the warning.
 
 !!! warning
-	Warning Reporting is only available if Thunder is compiled with the `WARNING_REPORTING` option, which can be found [here](https://github.com/rdkcentral/Thunder/blob/76e08e2e5eafa12272b9080d2680091824124d9c/Source/extensions/CMakeLists.txt#L26), and is disabled by default. Note that it should not be enabled in Production, since it not only leads to a higher CPU and memory usage, but also it does not add any value to have it turned on in Production.
+	Warning Reporting is only available if Thunder is compiled with the `WARNING_REPORTING` option, which can be found [here](../../Source/addons/CMakeLists.txt), and is disabled by default. Note that it should not be enabled in Production, since it not only leads to a higher CPU and memory usage, but also it does not add any value to have it turned on in Production.
 
 ### Runtime