diff --git a/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/esb-config-entry-stream_1.0.0.json b/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/org.wso2.esb.analytics.stream.ConfigEntry_1.0.0.json
similarity index 71%
rename from modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/esb-config-entry-stream_1.0.0.json
rename to modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/org.wso2.esb.analytics.stream.ConfigEntry_1.0.0.json
index ac5ba7626..12fc7e55f 100644
--- a/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/esb-config-entry-stream_1.0.0.json
+++ b/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/org.wso2.esb.analytics.stream.ConfigEntry_1.0.0.json
@@ -1,8 +1,14 @@
 {
-  "name": "esb-config-entry-stream",
+  "name": "org.wso2.esb.analytics.stream.ConfigEntry",
   "version": "1.0.0",
   "nickName": "",
   "description": "This stream is use by WSO2 ESB to publish component schemas",
+  "metaData": [
+    {
+      "name": "tenantId",
+      "type": "INT"
+    }
+  ],
   "payloadData": [
     {
       "name": "hashcode",
diff --git a/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/esb-flow-entry-stream_1.0.0.json b/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/org.wso2.esb.analytics.stream.FlowEntry_1.0.0.json
similarity index 58%
rename from modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/esb-flow-entry-stream_1.0.0.json
rename to modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/org.wso2.esb.analytics.stream.FlowEntry_1.0.0.json
index f2dddc408..9ddb101db 100644
--- a/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/esb-flow-entry-stream_1.0.0.json
+++ b/modules/integration/tests-integration/tests-other/src/test/resources/artifacts/ESB/Wso2EventTestCase/org.wso2.esb.analytics.stream.FlowEntry_1.0.0.json
@@ -1,12 +1,16 @@
 {
-  "name": "esb-flow-entry-stream",
+  "name": "org.wso2.esb.analytics.stream.FlowEntry",
   "version": "1.0.0",
   "nickName": "",
-  "description": "",
+  "description": "This stream is use by WSO2 ESB to publish statistical data",
   "metaData": [
     {
       "name": "compressed",
       "type": "BOOL"
+    },
+    {
+      "name": "tenantId",
+      "type": "INT"
     }
   ],
   "payloadData": [
@@ -19,4 +23,4 @@
       "type": "STRING"
     }
   ]
-}
+}
\ No newline at end of file