diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42ede762..be1c6d49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# If not stated otherwise in this file or this component's license file the
+# If not stated otherwise in this file or this component's license file the 
 # following copyright and licenses apply:
 #
 # Copyright 2020 Metrological
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.12)
 
 project(Interfaces)
 
-find_package(WPEFramework)
+find_package(Thunder)
 
 set(INTERFACES_PATTERNS "I*.h" CACHE STRING "Patterns matching files for which stubs should be generated")
 set(JSONRPC_PATTERNS "*.json" CACHE STRING "Patterns matching files for which json stubs should be generated")
diff --git a/definitions/CMakeLists.txt b/definitions/CMakeLists.txt
index 64dca123..cee33881 100644
--- a/definitions/CMakeLists.txt
+++ b/definitions/CMakeLists.txt
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.3)
 
 project(Definitions)
 
-find_package(WPEFramework)
+find_package(Thunder)
 
 project_version(1.0.0)
 
@@ -58,7 +58,7 @@ endif()
 JsonGenerator(CODE INPUT ${JSON_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} CPPIFDIR "${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/")
 JsonGenerator(CODE INPUT ${QA_JSON_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/qa_generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../jsonrpc/" CPPIFDIR "${CMAKE_CURRENT_SOURCE_DIR}/../qa_interfaces/" IFDIR "${CMAKE_CURRENT_SOURCE_DIR}/../jsonrpc/" CPP_INTERFACE_PATH "qa_interfaces" JSON_INTERFACE_PATH "qa_interfaces/json")
 JsonGenerator(CODE INPUT ${INTERFACE_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH})
-JsonGenerator(CODE NAMESPACE  WPEFramework::QualityAssurance INPUT ${QA_INTERFACE_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/qa_generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} CPP_INTERFACE_PATH "qa_interfaces" JSON_INTERFACE_PATH "qa_interfaces/json" )
+JsonGenerator(CODE NAMESPACE  Thunder::QualityAssurance INPUT ${QA_INTERFACE_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/qa_generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} CPP_INTERFACE_PATH "qa_interfaces" JSON_INTERFACE_PATH "qa_interfaces/json" )
 
 file(GLOB JSON_ENUM_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/generated/JsonEnum*.cpp")
 file(GLOB JSON_LINK_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/generated/J*.h")
diff --git a/definitions/Definitions.cpp b/definitions/Definitions.cpp
index eb225869..8a7b9329 100644
--- a/definitions/Definitions.cpp
+++ b/definitions/Definitions.cpp
@@ -98,7 +98,7 @@
 #include <qa_interfaces/ITestAutomation.h>
 #endif
 
-namespace WPEFramework {
+namespace Thunder {
 
 struct ScreenResolutionWidthHeight {
     Exchange::IDeviceVideoCapabilities::ScreenResolution resolution;
diff --git a/definitions/ValuePoint.h b/definitions/ValuePoint.h
index a82e68d6..aa8b403b 100644
--- a/definitions/ValuePoint.h
+++ b/definitions/ValuePoint.h
@@ -21,7 +21,7 @@
 #include "Module.h"
 #include <interfaces/IValuePoint.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     class ValuePoint : public IValuePoint {
diff --git a/definitions/definitions.h b/definitions/definitions.h
index 38dbc652..cf41f436 100644
--- a/definitions/definitions.h
+++ b/definitions/definitions.h
@@ -42,7 +42,7 @@
 #include <interfaces/json/ExternalMetadata.h>
 #include <interfaces/IDeviceInfo.h>
 
-namespace WPEFramework {
+namespace Thunder {
 
 	ENUM_CONVERSION_HANDLER(Exchange::IComposition::ScreenResolution)
 	ENUM_CONVERSION_HANDLER(Exchange::IStream::streamtype)
diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
index 29ac8364..2eb64197 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.3)
 
 project(Marshalling)
 
-find_package(WPEFramework)
+find_package(Thunder)
 
 project_version(1.0.0)
 
diff --git a/interfaces/IAVNClient.h b/interfaces/IAVNClient.h
index d245825e..e7082752 100644
--- a/interfaces/IAVNClient.h
+++ b/interfaces/IAVNClient.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IAVNClient : virtual public Core::IUnknown {
diff --git a/interfaces/IAVSClient.h b/interfaces/IAVSClient.h
index 992cd346..619a7786 100644
--- a/interfaces/IAVSClient.h
+++ b/interfaces/IAVSClient.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0 @uncompliant:collapsed
@@ -68,4 +68,4 @@ namespace Exchange {
     };
 
 } // Exchange
-} // WPEFramework
+} // Thunder
diff --git a/interfaces/IAmazonPrime.h b/interfaces/IAmazonPrime.h
index df24140c..473d8f2b 100644
--- a/interfaces/IAmazonPrime.h
+++ b/interfaces/IAmazonPrime.h
@@ -20,7 +20,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0 @uncompliant:collapsed
diff --git a/interfaces/IApplication.h b/interfaces/IApplication.h
index a145a758..0b49b9e7 100644
--- a/interfaces/IApplication.h
+++ b/interfaces/IApplication.h
@@ -20,7 +20,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0 @uncompliant:collapsed
diff --git a/interfaces/IBluetooth.h b/interfaces/IBluetooth.h
index 5247c469..2ea1d0dc 100644
--- a/interfaces/IBluetooth.h
+++ b/interfaces/IBluetooth.h
@@ -21,7 +21,7 @@
 #include "Module.h"
 
 
-namespace WPEFramework {
+namespace Thunder {
 
 namespace Exchange {
 
diff --git a/interfaces/IBluetoothAudio.h b/interfaces/IBluetoothAudio.h
index 423234ec..b7026270 100644
--- a/interfaces/IBluetoothAudio.h
+++ b/interfaces/IBluetoothAudio.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 
 namespace Exchange {
 
diff --git a/interfaces/IBrowser.h b/interfaces/IBrowser.h
index 9b273909..895d6a70 100644
--- a/interfaces/IBrowser.h
+++ b/interfaces/IBrowser.h
@@ -22,7 +22,7 @@
 
 // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // This interface gives direct access to a Browser to change
diff --git a/interfaces/IButler.h b/interfaces/IButler.h
index 41f20b15..c530a6e6 100644
--- a/interfaces/IButler.h
+++ b/interfaces/IButler.h
@@ -25,7 +25,7 @@
 
 // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 	namespace Exchange {
 
 		struct IValuePoint;
diff --git a/interfaces/ICapture.h b/interfaces/ICapture.h
index 4cbd3ad8..bfab2742 100644
--- a/interfaces/ICapture.h
+++ b/interfaces/ICapture.h
@@ -22,7 +22,7 @@
 
 
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @stubgen:omit
diff --git a/interfaces/ICommand.h b/interfaces/ICommand.h
index d216fcc3..a7934a04 100644
--- a/interfaces/ICommand.h
+++ b/interfaces/ICommand.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // This interface gives the possibility to create/defines commmands to be executed by
diff --git a/interfaces/IComposition.h b/interfaces/IComposition.h
index 1aaa72d2..aa8361ed 100644
--- a/interfaces/IComposition.h
+++ b/interfaces/IComposition.h
@@ -25,7 +25,7 @@
 
 // @insert "IDeviceInfo.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IComposition : virtual public Core::IUnknown {
@@ -82,7 +82,7 @@ namespace Exchange {
                 virtual uint64_t Modifier() = 0;
             };
 
-            virtual WPEFramework::Core::instance_id Native() const { return 0; };
+            virtual Thunder::Core::instance_id Native() const { return 0; };
             virtual string Name() const = 0;
             virtual void Opacity(const uint32_t value) = 0;
             virtual uint32_t Opacity() const { return 0; };
@@ -116,7 +116,7 @@ namespace Exchange {
 
             ~IDisplay() override = default;
 
-            virtual WPEFramework::Core::instance_id Native() const = 0;
+            virtual Thunder::Core::instance_id Native() const = 0;
             virtual string Port() const = 0;
 
             virtual IClient* CreateClient(const string& name, const uint32_t width, const uint32_t height) = 0;
diff --git a/interfaces/ICompositionBuffer.h b/interfaces/ICompositionBuffer.h
index d28f9bbc..9600102b 100644
--- a/interfaces/ICompositionBuffer.h
+++ b/interfaces/ICompositionBuffer.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @stubgen:omit
@@ -79,4 +79,4 @@ namespace Exchange {
 
 } // namespace Exchange
 
-} // namespace WPEFramework
+} // namespace Thunder
diff --git a/interfaces/IConfiguration.h b/interfaces/IConfiguration.h
index f82a2ad9..41b98608 100644
--- a/interfaces/IConfiguration.h
+++ b/interfaces/IConfiguration.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IConfiguration : virtual public Core::IUnknown {
diff --git a/interfaces/IContentDecryption.h b/interfaces/IContentDecryption.h
index d65848d0..2da91789 100644
--- a/interfaces/IContentDecryption.h
+++ b/interfaces/IContentDecryption.h
@@ -22,7 +22,7 @@
 #include "Module.h"
 #include "IDRM.h"
 
-namespace WPEFramework {
+namespace Thunder {
 
 namespace Exchange {
 
diff --git a/interfaces/ICryptography.h b/interfaces/ICryptography.h
index 10be9a21..f3b89bb6 100644
--- a/interfaces/ICryptography.h
+++ b/interfaces/ICryptography.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     enum CryptographyVault : uint8_t {
diff --git a/interfaces/ICustomerCareOperations.h b/interfaces/ICustomerCareOperations.h
index 1471140a..c5374dae 100644
--- a/interfaces/ICustomerCareOperations.h
+++ b/interfaces/ICustomerCareOperations.h
@@ -20,7 +20,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0
diff --git a/interfaces/IDIALServer.h b/interfaces/IDIALServer.h
index ef006c4c..a62c2ade 100644
--- a/interfaces/IDIALServer.h
+++ b/interfaces/IDIALServer.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IDIALServer : virtual public Core::IUnknown {
diff --git a/interfaces/IDNSServer.h b/interfaces/IDNSServer.h
index f59da15a..c3a74892 100644
--- a/interfaces/IDNSServer.h
+++ b/interfaces/IDNSServer.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // This interface gives access to DNS Zone information
diff --git a/interfaces/IDRM.h b/interfaces/IDRM.h
index a34454a9..c17b0ddb 100644
--- a/interfaces/IDRM.h
+++ b/interfaces/IDRM.h
@@ -154,7 +154,7 @@ class BufferReader {
     size_t pos_;
 };
 
-namespace WPEFramework
+namespace Thunder
 {
    namespace PluginHost
    {
@@ -518,8 +518,8 @@ struct ISystemFactory {
     virtual IMediaKeys* Instance() = 0;
     virtual const char* KeySystem() const = 0;
     virtual const std::vector<std::string>& MimeTypes() const = 0;
-    virtual void Initialize(const WPEFramework::PluginHost::IShell * shell, const std::string& configline) = 0;
-    virtual void Deinitialize(const WPEFramework::PluginHost::IShell * shell) = 0;
+    virtual void Initialize(const Thunder::PluginHost::IShell * shell, const std::string& configline) = 0;
+    virtual void Deinitialize(const Thunder::PluginHost::IShell * shell) = 0;
     virtual CDMi_RESULT Enable() = 0;
     virtual CDMi_RESULT Disable() = 0;
 };
@@ -553,11 +553,11 @@ class SystemFactoryType : public ISystemFactory {
         return (typeid(IMPLEMENTATION).name());
     }
 
-    void Initialize(const WPEFramework::PluginHost::IShell * shell, const std::string& configline) override
+    void Initialize(const Thunder::PluginHost::IShell * shell, const std::string& configline) override
     {
         Initialize(shell, configline, std::integral_constant<bool, HasOnShellAndSystemInitialize<IMPLEMENTATION>::Has>());
     }
-    void Deinitialize(const WPEFramework::PluginHost::IShell * shell) override
+    void Deinitialize(const Thunder::PluginHost::IShell * shell) override
     {
         Deinitialize(shell, std::integral_constant<bool, HasOnShellAndSystemDeinitialize<IMPLEMENTATION>::Has>());
     }
@@ -574,7 +574,7 @@ class SystemFactoryType : public ISystemFactory {
 private:
     template <typename T>
     struct HasOnShellAndSystemInitialize {
-        template <typename U, void (U::*)(const WPEFramework::PluginHost::IShell *, const std::string&)>
+        template <typename U, void (U::*)(const Thunder::PluginHost::IShell *, const std::string&)>
         struct SFINAE {
         };
         template <typename U>
@@ -586,7 +586,7 @@ class SystemFactoryType : public ISystemFactory {
 
     template <typename T>
     struct HasOnShellAndSystemDeinitialize {
-        template <typename U, void (U::*)(const WPEFramework::PluginHost::IShell *)>
+        template <typename U, void (U::*)(const Thunder::PluginHost::IShell *)>
         struct SFINAE {
         };
         template <typename U>
@@ -597,18 +597,18 @@ class SystemFactoryType : public ISystemFactory {
     };
 
 
-    void Initialize(const WPEFramework::PluginHost::IShell * service, const std::string& configline, std::true_type) {
+    void Initialize(const Thunder::PluginHost::IShell * service, const std::string& configline, std::true_type) {
         _instance.Initialize(service, configline);
     }
 
-    void Initialize(const WPEFramework::PluginHost::IShell *, const std::string&, std::false_type) {
+    void Initialize(const Thunder::PluginHost::IShell *, const std::string&, std::false_type) {
     }
 
-    void Deinitialize(const WPEFramework::PluginHost::IShell * service, std::true_type) {
+    void Deinitialize(const Thunder::PluginHost::IShell * service, std::true_type) {
         _instance.Deinitialize(service);
     }
 
-    void Deinitialize(const WPEFramework::PluginHost::IShell *, std::false_type) {
+    void Deinitialize(const Thunder::PluginHost::IShell *, std::false_type) {
     }
 
     template <typename T>
diff --git a/interfaces/IDeviceInfo.h b/interfaces/IDeviceInfo.h
index b6747995..8410b80e 100644
--- a/interfaces/IDeviceInfo.h
+++ b/interfaces/IDeviceInfo.h
@@ -23,7 +23,7 @@
 
 // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IDeviceInfo : virtual public Core::IUnknown {
diff --git a/interfaces/IDictionary.h b/interfaces/IDictionary.h
index 15ef9985..8d12a294 100644
--- a/interfaces/IDictionary.h
+++ b/interfaces/IDictionary.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     /* @json 1.0.0 */
diff --git a/interfaces/IDisplayInfo.h b/interfaces/IDisplayInfo.h
index 3ad2f947..02e998fa 100644
--- a/interfaces/IDisplayInfo.h
+++ b/interfaces/IDisplayInfo.h
@@ -22,7 +22,7 @@
 
 // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     /* @json 1.0.0 */
diff --git a/interfaces/IDolby.h b/interfaces/IDolby.h
index 9f824d45..fc94ea00 100644
--- a/interfaces/IDolby.h
+++ b/interfaces/IDolby.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     namespace Dolby {
diff --git a/interfaces/IDsgccClient.h b/interfaces/IDsgccClient.h
index ab0e3be4..f4c622c0 100644
--- a/interfaces/IDsgccClient.h
+++ b/interfaces/IDsgccClient.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IDsgccClient : virtual public Core::IUnknown {
diff --git a/interfaces/IExternal.h b/interfaces/IExternal.h
index d7af18fe..79bf5199 100644
--- a/interfaces/IExternal.h
+++ b/interfaces/IExternal.h
@@ -21,7 +21,7 @@
 #include "Module.h"
 #include "IValuePoint.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
     struct EXTERNAL IExternal : virtual public Core::IUnknown {
         enum { ID = ID_EXTERNAL };
diff --git a/interfaces/IExternalBase.h b/interfaces/IExternalBase.h
index 7d80d614..e278f321 100644
--- a/interfaces/IExternalBase.h
+++ b/interfaces/IExternalBase.h
@@ -22,7 +22,7 @@
 #include "Module.h"
 #include "IExternal.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @stubgen:omit
diff --git a/interfaces/IFocus.h b/interfaces/IFocus.h
index 7218e99f..77891530 100644
--- a/interfaces/IFocus.h
+++ b/interfaces/IFocus.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IFocus : virtual public Core::IUnknown {
diff --git a/interfaces/IGuide.h b/interfaces/IGuide.h
index 7ef6cc86..f84c27db 100644
--- a/interfaces/IGuide.h
+++ b/interfaces/IGuide.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // This interface gives direct access to a SIControl to change
diff --git a/interfaces/IIPNetwork.h b/interfaces/IIPNetwork.h
index 876ec974..9ae2961a 100644
--- a/interfaces/IIPNetwork.h
+++ b/interfaces/IIPNetwork.h
@@ -21,7 +21,7 @@
 #include "Module.h"
 
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @stubgen:omit
diff --git a/interfaces/IInputPin.h b/interfaces/IInputPin.h
index 25296080..8ac8d09a 100644
--- a/interfaces/IInputPin.h
+++ b/interfaces/IInputPin.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IInputPin : virtual public Core::IUnknown {
diff --git a/interfaces/IInputSwitch.h b/interfaces/IInputSwitch.h
index 17a86147..e9aa3e91 100644
--- a/interfaces/IInputSwitch.h
+++ b/interfaces/IInputSwitch.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // This interface gives direct access to a time synchronize / update
@@ -41,4 +41,4 @@ namespace Exchange {
     };
 
 } // namespace Exchange
-} // namespace WPEFramework
+} // namespace Thunder
diff --git a/interfaces/IKeyHandler.h b/interfaces/IKeyHandler.h
index 54bb619c..573d4800 100644
--- a/interfaces/IKeyHandler.h
+++ b/interfaces/IKeyHandler.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IKeyProducer;
diff --git a/interfaces/ILISA.h b/interfaces/ILISA.h
index ceaec66f..8f3a0d8f 100644
--- a/interfaces/ILISA.h
+++ b/interfaces/ILISA.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL ILISA : virtual public Core::IUnknown {
diff --git a/interfaces/ILanguageTag.h b/interfaces/ILanguageTag.h
index 45d5f330..04f74084 100644
--- a/interfaces/ILanguageTag.h
+++ b/interfaces/ILanguageTag.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0 @uncompliant:collapsed
diff --git a/interfaces/IMath.h b/interfaces/IMath.h
index 5f8acea4..45877032 100644
--- a/interfaces/IMath.h
+++ b/interfaces/IMath.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
     namespace Exchange {
 
         // This is an example to show the workings and how to develope a COMRPC/JSONRPC method/interface
diff --git a/interfaces/IMediaPlayer.h b/interfaces/IMediaPlayer.h
index 327f85ed..9686ccfa 100644
--- a/interfaces/IMediaPlayer.h
+++ b/interfaces/IMediaPlayer.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
 struct IMediaPlayer : virtual public Core::IUnknown {
diff --git a/interfaces/IMemory.h b/interfaces/IMemory.h
index 27c369fb..0a95d5e4 100644
--- a/interfaces/IMemory.h
+++ b/interfaces/IMemory.h
@@ -23,7 +23,7 @@
 //already added the below so it is not forgotten when to start generating proxy/stubs for this
 // @stubgen:include <com/IIteratorType.h>
  
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // This interface allows for retrieval of memory usage specific to the implementor
diff --git a/interfaces/IMessageControl.h b/interfaces/IMessageControl.h
index 84155252..b590279d 100644
--- a/interfaces/IMessageControl.h
+++ b/interfaces/IMessageControl.h
@@ -24,7 +24,7 @@
 // @insert <core/MessageStore.h>
 // @insert <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 
 namespace Exchange {
 
@@ -61,4 +61,4 @@ struct EXTERNAL IMessageControl : virtual public Core::IUnknown {
   };
 
 } // namespace Exchange
-} // namespace WPEFramework
+} // namespace Thunder
diff --git a/interfaces/IMessenger.h b/interfaces/IMessenger.h
index cc4db19f..22ea56e2 100644
--- a/interfaces/IMessenger.h
+++ b/interfaces/IMessenger.h
@@ -22,7 +22,7 @@
 #include "Module.h"
 // @insert <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 
 namespace Exchange {
 
diff --git a/interfaces/INetflix.h b/interfaces/INetflix.h
index e9bd953e..467d09b6 100644
--- a/interfaces/INetflix.h
+++ b/interfaces/INetflix.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // This interface gives direct access to a Netflix instance
diff --git a/interfaces/INetflixSecurity.h b/interfaces/INetflixSecurity.h
index 6d2a2768..a69a361c 100644
--- a/interfaces/INetflixSecurity.h
+++ b/interfaces/INetflixSecurity.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
 struct EXTERNAL INetflixSecurity : public Core::IUnknown
diff --git a/interfaces/INetworkControl.h b/interfaces/INetworkControl.h
index 6cf9a182..a1f8c6a6 100644
--- a/interfaces/INetworkControl.h
+++ b/interfaces/INetworkControl.h
@@ -22,7 +22,7 @@
 
 // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     /* @json 1.0.0 */
diff --git a/interfaces/INetworkTools.h b/interfaces/INetworkTools.h
index 530c3674..585e80b4 100644
--- a/interfaces/INetworkTools.h
+++ b/interfaces/INetworkTools.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0
diff --git a/interfaces/IOCDM.h b/interfaces/IOCDM.h
index 5acdc16c..05ffba05 100644
--- a/interfaces/IOCDM.h
+++ b/interfaces/IOCDM.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
 enum OCDM_RESULT : uint32_t {
@@ -392,5 +392,5 @@ class EXTERNAL KeyId {
 
 
 } //namespace Exchange
-} //namespace WPEFramework
+} //namespace Thunder
 
diff --git a/interfaces/IPackageManager.h b/interfaces/IPackageManager.h
index 3d91606b..9130fb2c 100644
--- a/interfaces/IPackageManager.h
+++ b/interfaces/IPackageManager.h
@@ -24,7 +24,7 @@
 
 // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     /* @json 1.0.0 */
diff --git a/interfaces/IPackager.h b/interfaces/IPackager.h
index 7bc5f707..532fe54d 100644
--- a/interfaces/IPackager.h
+++ b/interfaces/IPackager.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IPackager : virtual public Core::IUnknown {
diff --git a/interfaces/IPerformance.h b/interfaces/IPerformance.h
index 72cbd20c..627b7f1e 100644
--- a/interfaces/IPerformance.h
+++ b/interfaces/IPerformance.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IPerformance : virtual public Core::IUnknown {
diff --git a/interfaces/IPlayGiga.h b/interfaces/IPlayGiga.h
index 4f18ea61..86a71574 100644
--- a/interfaces/IPlayGiga.h
+++ b/interfaces/IPlayGiga.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IPlayGiga : virtual public Core::IUnknown {
diff --git a/interfaces/IPlayerInfo.h b/interfaces/IPlayerInfo.h
index 62a3f0cc..53300e89 100644
--- a/interfaces/IPlayerInfo.h
+++ b/interfaces/IPlayerInfo.h
@@ -23,7 +23,7 @@
 
 // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0
diff --git a/interfaces/IPower.h b/interfaces/IPower.h
index cc4cc433..275faaee 100644
--- a/interfaces/IPower.h
+++ b/interfaces/IPower.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IPower : virtual public Core::IUnknown {
diff --git a/interfaces/IProvisioning.h b/interfaces/IProvisioning.h
index 579ea672..fda20c40 100644
--- a/interfaces/IProvisioning.h
+++ b/interfaces/IProvisioning.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IProvisioning : virtual public Core::IUnknown {
diff --git a/interfaces/IRPCLink.h b/interfaces/IRPCLink.h
index 88f705ec..d025ec6a 100644
--- a/interfaces/IRPCLink.h
+++ b/interfaces/IRPCLink.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // This interface show the use case of communicating transparently over process boundaries
@@ -43,4 +43,4 @@ namespace Exchange {
     };
 
 } // namespace Exchange
-} // namespace WPEFramework
+} // namespace Thunder
diff --git a/interfaces/IRemoteControl.h b/interfaces/IRemoteControl.h
index ba6644f9..f5c06acf 100644
--- a/interfaces/IRemoteControl.h
+++ b/interfaces/IRemoteControl.h
@@ -22,7 +22,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IRemoteControl : virtual public Core::IUnknown {
diff --git a/interfaces/IResourceMonitor.h b/interfaces/IResourceMonitor.h
index b7177bc8..49e4c965 100644
--- a/interfaces/IResourceMonitor.h
+++ b/interfaces/IResourceMonitor.h
@@ -22,7 +22,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IResourceMonitor : virtual public Core::IUnknown {
diff --git a/interfaces/IRtspClient.h b/interfaces/IRtspClient.h
index a05f888f..20277d6f 100644
--- a/interfaces/IRtspClient.h
+++ b/interfaces/IRtspClient.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
     struct EXTERNAL IRtspClient : virtual public Core::IUnknown {
         enum { ID = ID_RTSPCLIENT };
diff --git a/interfaces/IRustBridge.h b/interfaces/IRustBridge.h
index 6edf2c6d..cea16896 100644
--- a/interfaces/IRustBridge.h
+++ b/interfaces/IRustBridge.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 
 	namespace Exchange {
 
diff --git a/interfaces/IScriptEngine.h b/interfaces/IScriptEngine.h
index ae346f0c..67faa7e9 100644
--- a/interfaces/IScriptEngine.h
+++ b/interfaces/IScriptEngine.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0
diff --git a/interfaces/ISecureShellServer.h b/interfaces/ISecureShellServer.h
index 91840cdb..ad4c5e54 100644
--- a/interfaces/ISecureShellServer.h
+++ b/interfaces/ISecureShellServer.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @stubgen:omit
diff --git a/interfaces/IStore.h b/interfaces/IStore.h
index f00f457f..c4950e85 100644
--- a/interfaces/IStore.h
+++ b/interfaces/IStore.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
 struct EXTERNAL IStore : virtual public Core::IUnknown {
@@ -43,4 +43,4 @@ struct EXTERNAL IStore : virtual public Core::IUnknown {
 };
 
 } // namespace Exchange
-} // namespace WPEFramework
+} // namespace Thunder
diff --git a/interfaces/IStore2.h b/interfaces/IStore2.h
index 6f4810ed..18c303bc 100644
--- a/interfaces/IStore2.h
+++ b/interfaces/IStore2.h
@@ -23,7 +23,7 @@
 
 // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IStore2 : virtual public Core::IUnknown {
@@ -84,4 +84,4 @@ namespace Exchange {
     };
 
 } // namespace Exchange
-} // namespace WPEFramework
+} // namespace Thunder
diff --git a/interfaces/IStoreCache.h b/interfaces/IStoreCache.h
index e58be6b9..09781433 100644
--- a/interfaces/IStoreCache.h
+++ b/interfaces/IStoreCache.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
 struct EXTERNAL IStoreCache : virtual public Core::IUnknown {
@@ -31,4 +31,4 @@ struct EXTERNAL IStoreCache : virtual public Core::IUnknown {
 };
 
 } // namespace Exchange
-} // namespace WPEFramework
+} // namespace Thunder
diff --git a/interfaces/IStream.h b/interfaces/IStream.h
index f923e08e..37df8030 100644
--- a/interfaces/IStream.h
+++ b/interfaces/IStream.h
@@ -22,7 +22,7 @@
 
 #define WPEPLAYER_PROCESS_NODE_ID "/tmp/player"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IStream : virtual public Core::IUnknown {
diff --git a/interfaces/ISwitchBoard.h b/interfaces/ISwitchBoard.h
index b5183d67..e64c3e18 100644
--- a/interfaces/ISwitchBoard.h
+++ b/interfaces/ISwitchBoard.h
@@ -21,7 +21,7 @@
 #include "Module.h"
 
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @stubgen:omit
diff --git a/interfaces/ISystemCommands.h b/interfaces/ISystemCommands.h
index 21be5760..0b39ab9f 100644
--- a/interfaces/ISystemCommands.h
+++ b/interfaces/ISystemCommands.h
@@ -21,7 +21,7 @@
 #include "Module.h"
 
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @stubgen:omit
diff --git a/interfaces/ITextToSpeech.h b/interfaces/ITextToSpeech.h
index 8f561992..3768af21 100644
--- a/interfaces/ITextToSpeech.h
+++ b/interfaces/ITextToSpeech.h
@@ -3,7 +3,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL ITextToSpeech : virtual public Core::IUnknown {
@@ -118,6 +118,6 @@ namespace Exchange {
     };
 
 } // Exchange
-} // WPEFramework
+} // Thunder
 
 #endif //__ITEXTTOSPEECH_H
diff --git a/interfaces/ITimeSync.h b/interfaces/ITimeSync.h
index 3a417c5a..3c98bae1 100644
--- a/interfaces/ITimeSync.h
+++ b/interfaces/ITimeSync.h
@@ -21,7 +21,7 @@
 #include "Module.h"
 
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @stubgen:omit
@@ -46,4 +46,4 @@ namespace Exchange {
     };
 
 } // namespace Exchange
-} // namespace WPEFramework
+} // namespace Thunder
diff --git a/interfaces/ITimeZone.h b/interfaces/ITimeZone.h
index 25d39e94..4aec548d 100644
--- a/interfaces/ITimeZone.h
+++ b/interfaces/ITimeZone.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     /* @json 1.0.0 @uncompliant:collapsed */
@@ -48,4 +48,4 @@ namespace Exchange {
     };
 
 } // namespace Exchange
-} // namespace WPEFramework
+} // namespace Thunder
diff --git a/interfaces/IValuePoint.h b/interfaces/IValuePoint.h
index 8f0519b7..1ad2ce23 100644
--- a/interfaces/IValuePoint.h
+++ b/interfaces/IValuePoint.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     /* @json 1.0.0 */
diff --git a/interfaces/IVoiceHandler.h b/interfaces/IVoiceHandler.h
index 68b17d73..a5971c93 100644
--- a/interfaces/IVoiceHandler.h
+++ b/interfaces/IVoiceHandler.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IVoiceHandler;
@@ -63,4 +63,4 @@ namespace Exchange {
     };
 
 } // Exchange
-} // WPEFramework
+} // Thunder
diff --git a/interfaces/IVolumeControl.h b/interfaces/IVolumeControl.h
index 946f01db..99182187 100644
--- a/interfaces/IVolumeControl.h
+++ b/interfaces/IVolumeControl.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0 @uncompliant:extended
diff --git a/interfaces/IWatchDog.h b/interfaces/IWatchDog.h
index 73007c1e..6e462a27 100644
--- a/interfaces/IWatchDog.h
+++ b/interfaces/IWatchDog.h
@@ -2,7 +2,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0
diff --git a/interfaces/IWebDriver.h b/interfaces/IWebDriver.h
index aa92ee56..db84c402 100644
--- a/interfaces/IWebDriver.h
+++ b/interfaces/IWebDriver.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 
 namespace PluginHost {
     struct IShell;
diff --git a/interfaces/IWebPA.h b/interfaces/IWebPA.h
index 540b5012..5d0c3773 100644
--- a/interfaces/IWebPA.h
+++ b/interfaces/IWebPA.h
@@ -22,7 +22,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IWebPA : virtual public Core::IUnknown {
diff --git a/interfaces/IWebServer.h b/interfaces/IWebServer.h
index 654b96a3..b16331c8 100644
--- a/interfaces/IWebServer.h
+++ b/interfaces/IWebServer.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // This interface gives direct access to a WebServer to change
diff --git a/interfaces/IWifiControl.h b/interfaces/IWifiControl.h
index 80868e79..ec9cfb75 100644
--- a/interfaces/IWifiControl.h
+++ b/interfaces/IWifiControl.h
@@ -22,7 +22,7 @@
 
 // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     /* @json 1.0.0 */
diff --git a/interfaces/IZigWave.h b/interfaces/IZigWave.h
index 767a151b..7d6ff251 100644
--- a/interfaces/IZigWave.h
+++ b/interfaces/IZigWave.h
@@ -23,7 +23,7 @@
 
  // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
         namespace Exchange {
 
         /* @json 1.0.0 */
diff --git a/interfaces/Ids.h b/interfaces/Ids.h
index 486933c8..e132d4fa 100644
--- a/interfaces/Ids.h
+++ b/interfaces/Ids.h
@@ -46,7 +46,7 @@
 
 // @insert <com/Ids.h>
 
-namespace WPEFramework {
+namespace Thunder {
 
 namespace Exchange {
 
diff --git a/interfaces/json/ExternalMetadata.h b/interfaces/json/ExternalMetadata.h
index 0f00a6d3..2aeb28c2 100644
--- a/interfaces/json/ExternalMetadata.h
+++ b/interfaces/json/ExternalMetadata.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "../Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
     namespace Exchange {
         namespace External {
             // This interface allows for retrieval of memory usage specific to the implementor
diff --git a/jsonrpc/Packager.json b/jsonrpc/Packager.json
index e3269a9c..ab7b9d13 100644
--- a/jsonrpc/Packager.json
+++ b/jsonrpc/Packager.json
@@ -19,7 +19,7 @@
           "package": {
             "description": "A name, an URL or a file path of the package to install",
             "type": "string",
-            "example": "wpeframework-plugin-netflix"
+            "example": "thunder-plugin-netflix"
           },
           "version": {
             "description": "Version of the package to install",
diff --git a/qa_interfaces/CMakeLists.txt b/qa_interfaces/CMakeLists.txt
index 794406e4..c195a721 100644
--- a/qa_interfaces/CMakeLists.txt
+++ b/qa_interfaces/CMakeLists.txt
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.3)
 
 project(QAMarshalling)
 
-find_package(WPEFramework)
+find_package(Thunder)
 
 project_version(1.0.0)
 
@@ -37,7 +37,7 @@ endif()
 separate_arguments(INTERFACES_PATTERNS)
 file(GLOB QA_INTERFACES_HEADERS ${INTERFACES_PATTERNS})
 
-ProxyStubGenerator(NAMESPACE "WPEFramework::QualityAssurance" INPUT "${QA_INTERFACES_HEADERS}" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/qa_generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH})
+ProxyStubGenerator(NAMESPACE "Thunder::QualityAssurance" INPUT "${QA_INTERFACES_HEADERS}" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/qa_generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH})
 
 list(APPEND QA_INTERFACES_HEADERS Module.h QAIds.h)
 
diff --git a/qa_interfaces/ITestAutomation.h b/qa_interfaces/ITestAutomation.h
index 42cc7d5e..7c47dd1d 100644
--- a/qa_interfaces/ITestAutomation.h
+++ b/qa_interfaces/ITestAutomation.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace QualityAssurance {
 
     // @json
@@ -67,4 +67,4 @@ namespace QualityAssurance {
     };
 
 }
-}
\ No newline at end of file
+}
diff --git a/qa_interfaces/ITestController.h b/qa_interfaces/ITestController.h
index fd28b15a..72797c3f 100644
--- a/qa_interfaces/ITestController.h
+++ b/qa_interfaces/ITestController.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
     namespace QualityAssurance {
 
         struct EXTERNAL ITestController : virtual public Core::IUnknown {
@@ -77,4 +77,4 @@ namespace WPEFramework {
         };
 
     } // namespace QualityAssurance
-} // namespace WPEFramework
+} // namespace Thunder
diff --git a/qa_interfaces/ITestUtility.h b/qa_interfaces/ITestUtility.h
index a699357b..c4cafbc9 100644
--- a/qa_interfaces/ITestUtility.h
+++ b/qa_interfaces/ITestUtility.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace QualityAssurance {
 
     struct EXTERNAL ITestUtility : virtual public Core::IUnknown {
@@ -61,4 +61,4 @@ namespace QualityAssurance {
     };
 
 } // namespace QualityAssurance
-} // namespace WPEFramework
+} // namespace Thunder
diff --git a/qa_interfaces/QAIds.h b/qa_interfaces/QAIds.h
index 3dcaba30..c5a771d3 100644
--- a/qa_interfaces/QAIds.h
+++ b/qa_interfaces/QAIds.h
@@ -46,7 +46,7 @@
 
 // @insert <com/Ids.h>
 
-namespace WPEFramework {
+namespace Thunder {
 
 namespace QualityAssurance {