diff --git a/frontend/src/contexts/broadcast-channel.context.tsx b/frontend/src/contexts/broadcast-channel.context.tsx
index f58fba3b..4b09c054 100644
--- a/frontend/src/contexts/broadcast-channel.context.tsx
+++ b/frontend/src/contexts/broadcast-channel.context.tsx
@@ -20,15 +20,11 @@ export enum EBCEvent {
   LOGOUT = "logout",
 }
 
-type BroadcastChannelPayload = {
+type BroadcastChannelMessage = {
   event: `${EBCEvent}`;
   data?: string | number | boolean | Record<string, unknown> | undefined | null;
 };
 
-type BroadcastChannelData = {
-  payload: BroadcastChannelPayload;
-};
-
 interface IBroadcastChannelProps {
   channelName: string;
   children: ReactNode;
@@ -37,9 +33,9 @@ interface IBroadcastChannelProps {
 interface IBroadcastChannelContext {
   subscribe: (
     event: `${EBCEvent}`,
-    callback: (message: BroadcastChannelData) => void,
+    callback: (message: BroadcastChannelMessage) => void,
   ) => void;
-  postMessage: (payload: BroadcastChannelPayload) => void;
+  postMessage: (message: BroadcastChannelMessage) => void;
 }
 
 export const BroadcastChannelContext = createContext<
@@ -61,12 +57,8 @@ export const BroadcastChannelProvider: FC<IBroadcastChannelProps> = ({
   >({});
 
   useEffect(() => {
-    const handleMessage = ({ data }: MessageEvent<BroadcastChannelData>) => {
-      const { payload } = data;
-
-      subscribersRef.current[payload.event].forEach((callback) =>
-        callback(data),
-      );
+    const handleMessage = ({ data }: MessageEvent<BroadcastChannelMessage>) => {
+      subscribersRef.current[data.event].forEach((callback) => callback(data));
     };
 
     channelRef.current.addEventListener("message", handleMessage);
@@ -92,10 +84,8 @@ export const BroadcastChannelProvider: FC<IBroadcastChannelProps> = ({
       }
     };
   };
-  const postMessage: IBroadcastChannelContext["postMessage"] = (payload) => {
-    channelRef.current.postMessage({
-      payload,
-    });
+  const postMessage: IBroadcastChannelContext["postMessage"] = (message) => {
+    channelRef.current.postMessage(message);
   };
 
   return (
diff --git a/widget/src/providers/BroadcastChannelProvider.tsx b/widget/src/providers/BroadcastChannelProvider.tsx
index 725a4d3e..d5a53be5 100644
--- a/widget/src/providers/BroadcastChannelProvider.tsx
+++ b/widget/src/providers/BroadcastChannelProvider.tsx
@@ -19,15 +19,11 @@ export enum EBCEvent {
   LOGOUT = "logout",
 }
 
-type BroadcastChannelPayload = {
+type BroadcastChannelMessage = {
   event: `${EBCEvent}`;
   data?: string | number | boolean | Record<string, unknown> | undefined | null;
 };
 
-type BroadcastChannelData = {
-  payload: BroadcastChannelPayload;
-};
-
 interface IBroadcastChannelProps {
   channelName: string;
   children: ReactNode;
@@ -36,9 +32,9 @@ interface IBroadcastChannelProps {
 interface IBroadcastChannelContext {
   subscribe: (
     event: `${EBCEvent}`,
-    callback: (message: BroadcastChannelData) => void,
+    callback: (message: BroadcastChannelMessage) => void,
   ) => void;
-  postMessage: (payload: BroadcastChannelPayload) => void;
+  postMessage: (message: BroadcastChannelMessage) => void;
 }
 
 export const BroadcastChannelContext = createContext<
@@ -60,12 +56,8 @@ export const BroadcastChannelProvider: FC<IBroadcastChannelProps> = ({
   >({});
 
   useEffect(() => {
-    const handleMessage = ({ data }: MessageEvent<BroadcastChannelData>) => {
-      const { payload } = data;
-
-      subscribersRef.current[payload.event].forEach((callback) =>
-        callback(data),
-      );
+    const handleMessage = ({ data }: MessageEvent<BroadcastChannelMessage>) => {
+      subscribersRef.current[data.event].forEach((callback) => callback(data));
     };
 
     channelRef.current.addEventListener("message", handleMessage);
@@ -92,10 +84,8 @@ export const BroadcastChannelProvider: FC<IBroadcastChannelProps> = ({
       }
     };
   };
-  const postMessage: IBroadcastChannelContext["postMessage"] = (payload) => {
-    channelRef.current.postMessage({
-      payload,
-    });
+  const postMessage: IBroadcastChannelContext["postMessage"] = (message) => {
+    channelRef.current.postMessage(message);
   };
 
   return (