diff --git a/index.js b/index.js
index 449c140..cc737ab 100644
--- a/index.js
+++ b/index.js
@@ -516,8 +516,8 @@ xmpp.on("stanza", (stanza) => {
 								connection.ws.send(JSON.stringify({
 									"type": "iem-message",
 									"data": {
-										"channel": getWFOByRoom(fromChannel),
-										"fromChannel": fromChannel,
+										"channel": fromChannel,
+										"wfo": getWFOByRoom(fromChannel),
 										"event": evt,
 										"body": bodyData,
 										"timestamp": product_id.timestamp,
@@ -545,8 +545,8 @@ xmpp.on("stanza", (stanza) => {
 									connection.ws.send(JSON.stringify({
 										"type": "iem-message",
 										"data": {
-											"channel": getWFOByRoom(fromChannel),
-											"fromChannel": fromChannel,
+											"channel": fromChannel,
+											"wfo": getWFOByRoom(fromChannel),
 											"event": evt,
 											"body": bodyData.string,
 											"timestamp": product_id.timestamp,
@@ -573,8 +573,8 @@ xmpp.on("stanza", (stanza) => {
 				evt, stanza, product_id, product_id_raw, bodyData, body, sentData: {
 					"type": "iem-message",
 					"data": {
-						"channel": getWFOByRoom(fromChannel),
-						"fromChannel": fromChannel,
+						"channel": fromChannel,
+						"wfo": getWFOByRoom(fromChannel),
 						"event": evt,
 						"body": bodyData,
 						"timestamp": product_id.timestamp,