diff --git a/Source/WPEFramework/GenericConfig.cmake b/Source/WPEFramework/GenericConfig.cmake
index c21e31523..711f5f104 100644
--- a/Source/WPEFramework/GenericConfig.cmake
+++ b/Source/WPEFramework/GenericConfig.cmake
@@ -228,35 +228,43 @@ ans(MESSAGING_REPORTING_SETTINGS)
 
 if(MESSAGING)
     map()
-        kv(category "Notification")
+        kv(category "AnyCategory")
         kv(enabled false)
     end()
-    ans(PLUGIN_NOTIFICATION_LOGGING)
+    ans(PLUGIN_ANY_CATEGORY_LOGGING)
 
     map()
-        kv(category "Fatal")
+        kv(category "AnyCategory")
         kv(enabled true)
     end()
-    ans(PLUGIN_FATAL_TRACING)
+    ans(PLUGIN_ANY_CATEGORY_TRACING)
 
     map()
-        kv(category "TooLongWaitingForLock")
+        kv(module "Plugin_AnyPlugin")
         kv(enabled true)
     end()
-    ans(PLUGIN_TOOLONGWAIT_REPORTING)
+    ans(PLUGIN_ANY_PLUGIN_TRACING)
+
+    map()
+        kv(category "AnyCategory")
+        kv(enabled false)
+    end()
+    ans(PLUGIN_ANY_CATEGORY_REPORTING)
+
+    map_append(${MESSAGING_SETTINGS} logging ${MESSAGING_LOGGING_SETTINGS})
+    map_append(${MESSAGING_LOGGING_SETTINGS} settings ___array___)
+    map_append(${MESSAGING_LOGGING_SETTINGS} settings ${PLUGIN_ANY_CATEGORY_LOGGING})
 
     map_append(${CONFIG} messaging ${MESSAGING_SETTINGS})
     map_append(${MESSAGING_SETTINGS} tracing ${MESSAGING_TRACING_SETTINGS})
     map_append(${MESSAGING_TRACING_SETTINGS} settings ___array___)
-    map_append(${MESSAGING_TRACING_SETTINGS} settings ${PLUGIN_FATAL_TRACING})
+    map_append(${MESSAGING_TRACING_SETTINGS} settings ${PLUGIN_ANY_CATEGORY_TRACING})
+    map_append(${MESSAGING_TRACING_SETTINGS} settings ${PLUGIN_ANY_PLUGIN_TRACING})
 
-    map_append(${MESSAGING_SETTINGS} logging ${MESSAGING_LOGGING_SETTINGS})
-    map_append(${MESSAGING_LOGGING_SETTINGS} settings ___array___)
-    map_append(${MESSAGING_LOGGING_SETTINGS} settings ${PLUGIN_NOTIFICATION_LOGGING})
 
     map_append(${MESSAGING_SETTINGS} reporting ${MESSAGING_REPORTING_SETTINGS})
     map_append(${MESSAGING_REPORTING_SETTINGS} settings ___array___)
-    map_append(${MESSAGING_REPORTING_SETTINGS} settings ${PLUGIN_TOOLONGWAIT_REPORTING})
+    map_append(${MESSAGING_REPORTING_SETTINGS} settings ${PLUGIN_ANY_CATEGORY_REPORTING})
 endif()
 
 map_append(${PLUGIN_CONTROLLER} configuration ${PLUGIN_CONTROLLER_CONFIGURATION})
diff --git a/Source/core/MessageStore.cpp b/Source/core/MessageStore.cpp
index 2f331c223..c2299af79 100644
--- a/Source/core/MessageStore.cpp
+++ b/Source/core/MessageStore.cpp
@@ -162,8 +162,8 @@ namespace Core {
                 length = (static_cast<uint16_t>(sizeof(_type) + (static_cast<uint16_t>(_category.size()) + 1)));
 
                 if (_type == TRACING) {
-                    length += (static_cast<uint16_t>(_module.size()) + 1);
                     _module = frameReader.NullTerminatedText();
+                    length += (static_cast<uint16_t>(_module.size()) + 1);
                 }
                 else if (_type == LOGGING) {
                     _module = MODULE_LOGGING;