diff --git a/packages/client-graphql/docs/inbox/1.methods.md b/packages/client-graphql/docs/inbox/1.methods.md
index 01076377..4b498033 100644
--- a/packages/client-graphql/docs/inbox/1.methods.md
+++ b/packages/client-graphql/docs/inbox/1.methods.md
@@ -6,7 +6,7 @@ import { Inbox } from "@trycourier/client-graphql";
 const inboxApi = Inbox(authorization: Authorization);
 
 const getInboxCount = async (params?: {
-  accountId?: string,
+  tenantId?: string,
   status?: "read" | "unread",
   tags?: string[],
 }) => {
@@ -23,7 +23,7 @@ import { Inbox } from "@trycourier/client-graphql";
 const inboxApi = Inbox(authorization: Authorization);
 
 const getInboxMessages = async (params?: {
-  accountId?: string,
+  tenantId?: string,
   status?: "read" | "unread",
   tags?: string[],
 }) => {
diff --git a/packages/client-graphql/src/inbox/__tests__/count.spec.ts b/packages/client-graphql/src/inbox/__tests__/count.spec.ts
index 0b468393..a62b863c 100644
--- a/packages/client-graphql/src/inbox/__tests__/count.spec.ts
+++ b/packages/client-graphql/src/inbox/__tests__/count.spec.ts
@@ -21,7 +21,7 @@ describe("getInboxCount", () => {
       Array [
         "https://fxw3r7gdm9.execute-api.us-east-1.amazonaws.com/production/q",
         Object {
-          "body": "{\\"query\\":\\"query GetInboxCount($params: FilterParamsInput) {\\\\n  count(params: $params)\\\\n}\\\\n\\",\\"operationName\\":\\"GetInboxCount\\",\\"variables\\":{}}",
+          "body": "{\\"query\\":\\"query GetInboxCount($params: FilterParamsInput) {\\\\n  count(params: $params)\\\\n}\\\\n\\",\\"operationName\\":\\"GetInboxCount\\",\\"variables\\":{\\"params\\":{}}}",
           "headers": Object {
             "content-type": "application/json",
             "x-courier-client-key": "CLIENT_KEY",
diff --git a/packages/client-graphql/src/inbox/count.ts b/packages/client-graphql/src/inbox/count.ts
index dbfaddeb..9fa05359 100644
--- a/packages/client-graphql/src/inbox/count.ts
+++ b/packages/client-graphql/src/inbox/count.ts
@@ -7,7 +7,7 @@ export const GET_INBOX_COUNT = `
 `;
 
 export interface IInboxCountParams {
-  accountId?: string;
+  tenantId?: string;
   status: "read" | "unread";
   tags?: string[];
   from?: string | number;
@@ -23,9 +23,15 @@ export const getInboxCount =
       return Promise.resolve();
     }
 
+    const { tenantId, ...rest } = params || {};
+
     const results = await client
       .query(GET_INBOX_COUNT, {
-        params,
+        params: {
+          ...rest,
+          // [HACK] map tenantId to accountId in order to keep this backwards compatible
+          accountId: tenantId,
+        },
       })
       .toPromise();
     return results?.data;
diff --git a/packages/client-graphql/src/inbox/messages.ts b/packages/client-graphql/src/inbox/messages.ts
index 6c85f421..404d0d97 100644
--- a/packages/client-graphql/src/inbox/messages.ts
+++ b/packages/client-graphql/src/inbox/messages.ts
@@ -2,7 +2,7 @@ import { Client } from "urql";
 import { IActionElemental } from "./message";
 
 export interface IGetInboxMessagesParams {
-  accountId?: string;
+  tenantId?: string;
   archived?: boolean;
   from?: string | number;
   limit?: number;
@@ -100,13 +100,15 @@ export const getInboxMessages =
       return Promise.resolve(undefined);
     }
 
-    const { limit, ...restParams } = params ?? {};
+    const { limit, tenantId, ...restParams } = params ?? {};
     const results = await client
       .query(createGetInboxMessagesQuery(!after), {
         after,
         limit,
         params: {
           ...restParams,
+          // [HACK] map tenantId to accountId in order to keep this backwards compatible
+          accountId: tenantId,
           pinned: false,
         },
         pinnedParams: {
diff --git a/packages/client-graphql/src/messages.ts b/packages/client-graphql/src/messages.ts
index afed9af3..06599eab 100644
--- a/packages/client-graphql/src/messages.ts
+++ b/packages/client-graphql/src/messages.ts
@@ -9,7 +9,7 @@ export const GET_MESSAGE_COUNT = `
 `;
 
 export interface IMessageCountParams {
-  accountId?: string;
+  tenantId?: string;
   tags?: string[];
   from?: number;
   isRead?: boolean;
@@ -31,7 +31,7 @@ export const getMessageCount =
   };
 
 export interface IGetMessagesParams {
-  accountId?: string;
+  tenantId?: string;
   from?: number;
   isRead?: boolean;
   limit?: number;
@@ -136,9 +136,17 @@ export const getMessages =
       return Promise.resolve(undefined);
     }
 
-    const { limit, ...restParams } = params ?? {};
+    const { limit, tenantId, ...restParams } = params ?? {};
     const results = await client
-      .query(QUERY_MESSAGES, { after, limit, params: restParams })
+      .query(QUERY_MESSAGES, {
+        after,
+        limit,
+        params: {
+          ...restParams,
+          // [HACK] map tenantId to accountId in order to keep this backwards compatible
+          accountId: tenantId,
+        },
+      })
       .toPromise();
 
     const messages = results?.data?.messages?.nodes;
diff --git a/packages/client-graphql/src/preferences.ts b/packages/client-graphql/src/preferences.ts
index 3f8102d8..e6e13341 100644
--- a/packages/client-graphql/src/preferences.ts
+++ b/packages/client-graphql/src/preferences.ts
@@ -88,30 +88,31 @@ const DRAFT_PREFERENCE_PAGE = `
   }
 `;
 
-type GetRecipientPreferences = (accountId?: string) => Promise<any>;
+type GetRecipientPreferences = (tenantId?: string) => Promise<any>;
 export const getRecipientPreferences =
   (client: Client | undefined): GetRecipientPreferences =>
-  async (accountId?: string) => {
+  async (tenantId?: string) => {
     if (!client) {
       return;
     }
 
     const results = await client
-      .query(RECIPIENT_PREFERENCES, { accountId })
+      .query(RECIPIENT_PREFERENCES, { accountId: tenantId })
       .toPromise();
     return results.data?.recipientPreferences.nodes;
   };
 
-type GetPreferencePage = (accountId?: string) => Promise<any>;
+type GetPreferencePage = (tenantId?: string) => Promise<any>;
 export const getPreferencePage =
   (client: Client | undefined): GetPreferencePage =>
-  async (accountId?: string) => {
+  async (tenantId?: string) => {
     if (!client) {
       return;
     }
     const results = await client
       .query(PREFERENCE_PAGE, {
-        accountId: accountId,
+        // [HACK] map tenantId to accountId in order to keep this backwards compatible
+        accountId: tenantId,
       })
       .toPromise();
     return results.data?.preferencePage;
@@ -140,7 +141,7 @@ type UpdateRecipientPreferences = (payload: {
   hasCustomRouting: boolean;
   routingPreferences: Array<string>;
   digestSchedule: string;
-  accountId?: string;
+  tenantId?: string;
 }) => Promise<any>;
 export const updateRecipientPreferences =
   (client: Client | undefined): UpdateRecipientPreferences =>
@@ -158,7 +159,7 @@ export const updateRecipientPreferences =
           routingPreferences: payload.routingPreferences,
           digestSchedule: payload.digestSchedule,
         },
-        accountId: payload.accountId,
+        accountId: payload.tenantId,
       })
       .toPromise();
 
diff --git a/packages/components/src/components/PreferencePage.tsx b/packages/components/src/components/PreferencePage.tsx
index 9acedeee..a456fa10 100644
--- a/packages/components/src/components/PreferencePage.tsx
+++ b/packages/components/src/components/PreferencePage.tsx
@@ -32,16 +32,16 @@ const FooterContainer = styled.div`
 `;
 
 const PreferencePage: React.FunctionComponent<{
-  accountId?: string;
+  tenantId?: string;
   draft?: boolean;
-}> = ({ accountId, draft = false }) => {
+}> = ({ tenantId, draft = false }) => {
   return (
     <PreferencePageContainer>
       <HeaderContainer>
         <Header />
       </HeaderContainer>
       <PreferencesV4Container>
-        <PreferencesV4 accountId={accountId} draft={draft} />
+        <PreferencesV4 tenantId={tenantId} draft={draft} />
       </PreferencesV4Container>
       <FooterContainer>
         <Footer />
diff --git a/packages/components/src/components/index.tsx b/packages/components/src/components/index.tsx
index b19bf77f..77cd9038 100644
--- a/packages/components/src/components/index.tsx
+++ b/packages/components/src/components/index.tsx
@@ -21,7 +21,7 @@ const querySelector = (element: HTMLElement, selector: string) => {
 export const CourierComponents: React.FunctionComponent = () => {
   const preferencePageDraftMode =
     window.courierConfig?.preferencePageDraftMode ?? false;
-  const accountId = window.courierConfig?.accountId;
+  const tenantId = window.courierConfig?.tenantId;
   const unsubscribePageConfig = window.courierConfig?.unsubscribePage;
 
   const componentConfigs = window.courierConfig?.components;
@@ -205,7 +205,7 @@ export const CourierComponents: React.FunctionComponent = () => {
         createPortal(
           <Suspense fallback={<div />}>
             <PreferencePage
-              accountId={accountId}
+              tenantId={tenantId}
               draft={preferencePageDraftMode}
             />
           </Suspense>,
diff --git a/packages/components/src/index.tsx b/packages/components/src/index.tsx
index 6a3a7b07..f75b10da 100644
--- a/packages/components/src/index.tsx
+++ b/packages/components/src/index.tsx
@@ -38,7 +38,7 @@ declare global {
   }
 }
 interface ICourierConfig {
-  accountId?: string;
+  tenantId?: string;
   apiUrl?: string;
   authorization?: string;
   brandId?: string;
@@ -68,7 +68,7 @@ let hasInit = false;
 
 const initCourier = async (courierConfig?: ICourierConfig) => {
   const {
-    accountId,
+    tenantId,
     apiUrl,
     authorization,
     brandId,
@@ -94,7 +94,7 @@ const initCourier = async (courierConfig?: ICourierConfig) => {
 
   render(
     <CourierProvider
-      accountId={accountId}
+      tenantId={tenantId}
       apiUrl={apiUrl}
       authorization={authorization}
       brandId={brandId}
diff --git a/packages/react-hooks/src/inbox/elemental-inbox/types.ts b/packages/react-hooks/src/inbox/elemental-inbox/types.ts
index 05ed83ea..f7db7543 100644
--- a/packages/react-hooks/src/inbox/elemental-inbox/types.ts
+++ b/packages/react-hooks/src/inbox/elemental-inbox/types.ts
@@ -5,7 +5,7 @@ import {
 import { Brand } from "@trycourier/react-provider";
 
 export interface IElementalInbox {
-  accountId?: string;
+  tenantId?: string;
   brand?: Brand;
   from?: number;
   isLoading?: boolean;
diff --git a/packages/react-hooks/src/inbox/elemental-inbox/use-inbox-actions.ts b/packages/react-hooks/src/inbox/elemental-inbox/use-inbox-actions.ts
index 5ea51613..67529d15 100644
--- a/packages/react-hooks/src/inbox/elemental-inbox/use-inbox-actions.ts
+++ b/packages/react-hooks/src/inbox/elemental-inbox/use-inbox-actions.ts
@@ -57,6 +57,7 @@ interface IInboxActions {
 
 const useElementalInboxActions = (): IInboxActions => {
   const {
+    tenantId,
     apiUrl,
     authorization,
     clientSourceId,
@@ -80,6 +81,7 @@ const useElementalInboxActions = (): IInboxActions => {
     clientSourceId,
     userId,
     userSignature,
+    tenantId,
   });
 
   const inboxClient = Inbox({ client: courierClient });
@@ -101,6 +103,7 @@ const useElementalInboxActions = (): IInboxActions => {
         type: "inbox/FETCH_UNREAD_MESSAGE_COUNT",
         payload: () =>
           inboxClient.getInboxCount({
+            tenantId: inbox?.tenantId,
             status: "unread",
           }),
       });
@@ -127,7 +130,7 @@ const useElementalInboxActions = (): IInboxActions => {
         type: "inbox/FETCH_UNREAD_MESSAGE_COUNT",
         payload: () =>
           inboxClient.getInboxCount({
-            accountId: inbox?.accountId,
+            tenantId: inbox?.tenantId,
             status: "unread",
           }),
       });
diff --git a/packages/react-hooks/src/inbox/types.ts b/packages/react-hooks/src/inbox/types.ts
index 93a8790b..60b355bb 100644
--- a/packages/react-hooks/src/inbox/types.ts
+++ b/packages/react-hooks/src/inbox/types.ts
@@ -4,7 +4,7 @@ import {
   OnEvent,
 } from "@trycourier/react-provider";
 export interface IInbox<T = IInboxMessagePreview> {
-  accountId?: string;
+  tenantId?: string;
   brand?: Brand;
   from?: number;
   isLoading?: boolean;
diff --git a/packages/react-hooks/src/inbox/use-inbox-actions.ts b/packages/react-hooks/src/inbox/use-inbox-actions.ts
index 5eb1c093..16792f88 100644
--- a/packages/react-hooks/src/inbox/use-inbox-actions.ts
+++ b/packages/react-hooks/src/inbox/use-inbox-actions.ts
@@ -49,6 +49,7 @@ export interface IInboxActions {
 
 const useInboxActions = (): IInboxActions => {
   const {
+    tenantId,
     apiUrl,
     authorization,
     clientKey,
@@ -66,8 +67,9 @@ const useInboxActions = (): IInboxActions => {
   const clientParams = {
     apiUrl,
     authorization,
-    clientSourceId,
     clientKey,
+    clientSourceId,
+    tenantId,
     userId,
     userSignature,
   };
@@ -96,9 +98,9 @@ const useInboxActions = (): IInboxActions => {
       type: "inbox/FETCH_UNREAD_MESSAGE_COUNT",
       payload: () =>
         inboxClient.getInboxCount({
-          accountId: params?.accountId || inbox?.accountId,
           from: params?.from || inbox?.from,
           status: "unread",
+          tenantId: tenantId || params?.tenantId || inbox?.tenantId,
         }),
     });
   };
diff --git a/packages/react-hooks/src/inbox/use-inbox.ts b/packages/react-hooks/src/inbox/use-inbox.ts
index c4fad2af..77e784fe 100644
--- a/packages/react-hooks/src/inbox/use-inbox.ts
+++ b/packages/react-hooks/src/inbox/use-inbox.ts
@@ -11,10 +11,15 @@ import useInboxActions, { IInboxActions } from "./use-inbox-actions";
 import { IInbox } from "./types";
 
 const useInbox = (): IInbox<IInboxMessagePreview> & IInboxActions => {
-  const { dispatch, inbox, transport, brand, accountId } =
-    useCourier<{
-      inbox: IInbox;
-    }>();
+  const {
+    dispatch,
+    inbox,
+    transport,
+    brand,
+    tenantId: tenantId,
+  } = useCourier<{
+    inbox: IInbox;
+  }>();
 
   const actions = useInboxActions();
 
@@ -22,8 +27,8 @@ const useInbox = (): IInbox<IInboxMessagePreview> & IInboxActions => {
     inbox.brand = deepExtend({}, brand ?? {}, inbox.brand ?? {});
   }
 
-  if (inbox && accountId) {
-    inbox.accountId = accountId;
+  if (inbox && tenantId) {
+    inbox.tenantId = tenantId;
   }
 
   useEffect(() => {
diff --git a/packages/react-hooks/src/preferences/use-preferences-actions.ts b/packages/react-hooks/src/preferences/use-preferences-actions.ts
index accc0d8e..e7455d34 100644
--- a/packages/react-hooks/src/preferences/use-preferences-actions.ts
+++ b/packages/react-hooks/src/preferences/use-preferences-actions.ts
@@ -16,13 +16,13 @@ const usePreferencesActions = () => {
   const preferences = Preferences({ client: courierClient });
 
   return {
-    fetchRecipientPreferences: (accountId?: string) => {
+    fetchRecipientPreferences: (tenantId?: string) => {
       dispatch({
         type: "preferences/FETCH_RECIPIENT_PREFERENCES",
-        payload: () => preferences.getRecipientPreferences(accountId),
+        payload: () => preferences.getRecipientPreferences(tenantId),
       });
     },
-    fetchPreferencePage: (accountId?: string, draft = false) => {
+    fetchPreferencePage: (tenantId?: string, draft = false) => {
       if (draft) {
         dispatch({
           type: "preferences/FETCH_DRAFT_PREFERENCE_PAGE",
@@ -31,7 +31,7 @@ const usePreferencesActions = () => {
       } else {
         dispatch({
           type: "preferences/FETCH_PREFERENCE_PAGE",
-          payload: () => preferences.getPreferencePage(accountId),
+          payload: () => preferences.getPreferencePage(tenantId),
         });
       }
     },
diff --git a/packages/react-inbox/src/components/Messages2.0/index.tsx b/packages/react-inbox/src/components/Messages2.0/index.tsx
index 727be927..584ff2a1 100644
--- a/packages/react-inbox/src/components/Messages2.0/index.tsx
+++ b/packages/react-inbox/src/components/Messages2.0/index.tsx
@@ -202,7 +202,7 @@ const Messages: React.ForwardRefExoticComponent<
     const { fetchRecipientPreferences } = usePreferences();
 
     const {
-      accountId,
+      tenantId,
       brand,
       fetchMessages,
       getUnreadMessageCount,
@@ -230,10 +230,10 @@ const Messages: React.ForwardRefExoticComponent<
       fetchMessages({
         params: {
           ...currentView?.params,
-          accountId,
+          tenantId,
         },
       });
-    }, [accountId, view, currentView]);
+    }, [tenantId, view, currentView]);
 
     useOnScroll(
       messageListRef,
@@ -280,7 +280,7 @@ const Messages: React.ForwardRefExoticComponent<
     );
 
     useEffect(() => {
-      fetchRecipientPreferences(accountId);
+      fetchRecipientPreferences(tenantId);
     }, []);
 
     const handleCloseInbox = (event: React.MouseEvent) => {
diff --git a/packages/react-inbox/src/types.ts b/packages/react-inbox/src/types.ts
index f450c4bb..53735cf7 100644
--- a/packages/react-inbox/src/types.ts
+++ b/packages/react-inbox/src/types.ts
@@ -41,7 +41,7 @@ export interface InboxTheme {
 }
 
 export interface InboxProps {
-  accountId?: string;
+  tenantId?: string;
   brand?: Brand;
   className?: string;
   defaultIcon?: false | string;
diff --git a/packages/react-preferences/src/components/PreferenceList.tsx b/packages/react-preferences/src/components/PreferenceList.tsx
index 440bb7d9..9eb2f985 100644
--- a/packages/react-preferences/src/components/PreferenceList.tsx
+++ b/packages/react-preferences/src/components/PreferenceList.tsx
@@ -22,12 +22,12 @@ export const PreferenceList: React.FunctionComponent<{
   theme?: any;
   draft?: boolean;
 }> = ({ theme, draft }) => {
-  const { brand, accountId } = useCourier();
+  const { brand, tenantId } = useCourier();
   const preferences = usePreferences();
 
   useEffect(() => {
-    preferences.fetchRecipientPreferences(accountId);
-    preferences.fetchPreferencePage(accountId, draft);
+    preferences.fetchRecipientPreferences(tenantId);
+    preferences.fetchPreferencePage(tenantId, draft);
   }, []);
 
   const renderPreferences = () => {
diff --git a/packages/react-preferences/src/components/PreferencesV4.tsx b/packages/react-preferences/src/components/PreferencesV4.tsx
index 2dddace6..727c4392 100644
--- a/packages/react-preferences/src/components/PreferencesV4.tsx
+++ b/packages/react-preferences/src/components/PreferencesV4.tsx
@@ -221,7 +221,7 @@ export const PreferenceTopic: React.FunctionComponent<{
   hasCustomRouting,
   defaultHasCustomRouting,
 }) => {
-  const { accountId } = useCourier();
+  const { tenantId } = useCourier();
   const { preferencePage, updateRecipientPreferences } = usePreferences();
 
   //Temporary mapping until I update this in the backend
@@ -245,7 +245,7 @@ export const PreferenceTopic: React.FunctionComponent<{
     updateRecipientPreferences({
       templateId: topicId,
       status: newStatus,
-      accountId,
+      tenantId,
     });
 
     setStatusToggle(!statusToggle);
@@ -266,7 +266,7 @@ export const PreferenceTopic: React.FunctionComponent<{
         ],
       }),
       status: statusToggle ? "OPTED_IN" : "OPTED_OUT",
-      accountId,
+      tenantId,
     });
 
     // If Customize Delivery is turned on, set the routing preferences to the default
@@ -286,7 +286,7 @@ export const PreferenceTopic: React.FunctionComponent<{
       routingPreferences: newRouting,
       hasCustomRouting: true,
       status: statusToggle ? "OPTED_IN" : "OPTED_OUT",
-      accountId,
+      tenantId,
     });
 
     setRouting(newRouting);
@@ -428,15 +428,15 @@ const PreferenceListItem = styled.li`
 `;
 
 // Doesn't include header or footer
-export const PreferencesV4: React.FC<{ accountId?: string; draft?: boolean }> =
-  ({ accountId, draft }) => {
+export const PreferencesV4: React.FC<{ tenantId?: string; draft?: boolean }> =
+  ({ tenantId, draft }) => {
     const preferences = usePreferences();
 
     useEffect(() => {
       const pullPreferences = async () => {
         if (!preferences.preferencePage && !preferences.recipientPreferences) {
-          await preferences.fetchPreferencePage(accountId, draft);
-          await preferences.fetchRecipientPreferences(accountId);
+          await preferences.fetchPreferencePage(tenantId, draft);
+          await preferences.fetchRecipientPreferences(tenantId);
         }
       };
       pullPreferences();
diff --git a/packages/react-provider/src/hooks/use-transport.ts b/packages/react-provider/src/hooks/use-transport.ts
index 5f370641..39cf27c4 100644
--- a/packages/react-provider/src/hooks/use-transport.ts
+++ b/packages/react-provider/src/hooks/use-transport.ts
@@ -8,7 +8,7 @@ interface DecodedAuth {
 }
 
 const useTransport = ({
-  accountId,
+  tenantId,
   authorization,
   clientSourceId,
   clientKey,
@@ -16,7 +16,7 @@ const useTransport = ({
   userSignature,
   wsOptions,
 }: {
-  accountId?: string;
+  tenantId?: string;
   authorization?: string;
   clientSourceId?: string;
   clientKey?: string;
@@ -69,7 +69,7 @@ const useTransport = ({
     }
 
     const newTransport = new CourierTransport({
-      accountId,
+      tenantId,
       authorization,
       clientSourceId,
       clientKey,
@@ -85,14 +85,7 @@ const useTransport = ({
       };
     }
     return newTransport;
-  }, [
-    accountId,
-    authorization,
-    clientKey,
-    transport,
-    userSignature,
-    wsOptions,
-  ]);
+  }, [tenantId, authorization, clientKey, transport, userSignature, wsOptions]);
 };
 
 export default useTransport;
diff --git a/packages/react-provider/src/index.tsx b/packages/react-provider/src/index.tsx
index b16da3c8..b3a8d3a7 100644
--- a/packages/react-provider/src/index.tsx
+++ b/packages/react-provider/src/index.tsx
@@ -68,7 +68,7 @@ export const CourierContext =
 export const CourierProvider: React.FunctionComponent<
   PropsWithChildren<ICourierProviderProps>
 > = ({
-  accountId,
+  tenantId,
   apiUrl,
   authorization,
   brand,
@@ -117,7 +117,7 @@ export const CourierProvider: React.FunctionComponent<
     typeof window === "undefined"
       ? undefined
       : useTransport({
-          accountId,
+          tenantId: tenantId,
           authorization,
           clientSourceId,
           clientKey,
@@ -127,7 +127,7 @@ export const CourierProvider: React.FunctionComponent<
         });
 
   const [state, dispatch] = useReducer(reducer, {
-    accountId,
+    tenantId,
     apiUrl,
     authorization,
     brand,
@@ -187,7 +187,7 @@ export const CourierProvider: React.FunctionComponent<
       courierTransport.unsubscribe(userId);
       courierTransport.closeConnection();
     };
-  }, [accountId, actions, transport, userId]);
+  }, [tenantId, actions, transport, userId]);
 
   useEffect(() => {
     if (!_transport && (!clientKey || !userId)) {
@@ -210,7 +210,7 @@ export const CourierProvider: React.FunctionComponent<
     }
 
     actions.init({
-      accountId,
+      tenantId,
       apiUrl,
       authorization,
       brandId,
@@ -223,7 +223,7 @@ export const CourierProvider: React.FunctionComponent<
       ...parsedLocalStorageState,
     });
   }, [
-    accountId,
+    tenantId,
     actions,
     apiUrl,
     authorization,
diff --git a/packages/react-provider/src/transports/courier/index.ts b/packages/react-provider/src/transports/courier/index.ts
index a08f88c6..66ff2e67 100644
--- a/packages/react-provider/src/transports/courier/index.ts
+++ b/packages/react-provider/src/transports/courier/index.ts
@@ -4,7 +4,7 @@ import { Interceptor } from "../types";
 import { ITransportOptions } from "./types";
 
 export class CourierTransport extends Transport {
-  protected accountId?: string;
+  protected tenantId?: string;
   protected authorization?: string;
   protected clientSourceId: string;
   protected clientKey?: string;
@@ -25,7 +25,7 @@ export class CourierTransport extends Transport {
     this.userSignature = options.userSignature;
 
     this.ws = new WS({
-      accountId: options.accountId,
+      tenantId: options.tenantId,
       authorization: options.authorization,
       clientSourceId: options.clientSourceId,
       clientKey: options.clientKey,
diff --git a/packages/react-provider/src/transports/courier/types.ts b/packages/react-provider/src/transports/courier/types.ts
index 0705a44e..5c6dac2b 100644
--- a/packages/react-provider/src/transports/courier/types.ts
+++ b/packages/react-provider/src/transports/courier/types.ts
@@ -1,6 +1,6 @@
 import { WSOptions } from "~/types";
 export interface ITransportOptions {
-  accountId?: string;
+  tenantId?: string;
   authorization?: string;
   clientKey?: string;
   clientSourceId: string;
diff --git a/packages/react-provider/src/types.ts b/packages/react-provider/src/types.ts
index 8496fbe1..e412c08c 100644
--- a/packages/react-provider/src/types.ts
+++ b/packages/react-provider/src/types.ts
@@ -72,7 +72,7 @@ export type EventType =
   | "unpin";
 
 export interface ICourierProviderProps {
-  accountId?: string;
+  tenantId?: string;
   apiUrl?: string;
   authorization?: string;
   brand?: Brand;
diff --git a/packages/react-provider/src/ws.ts b/packages/react-provider/src/ws.ts
index 0ad6b865..8db098ff 100644
--- a/packages/react-provider/src/ws.ts
+++ b/packages/react-provider/src/ws.ts
@@ -14,7 +14,7 @@ export class WS {
     event?: string;
     callback: ICourierEventCallback;
   }>;
-  private accountId?: string;
+  private tenantId?: string;
   private clientSourceId?: string;
   private authorization?: string;
   private clientKey?: string;
@@ -32,21 +32,21 @@ export class WS {
   protected messageCallback;
 
   constructor({
-    accountId,
+    tenantId,
     authorization,
     clientKey,
     options,
     clientSourceId,
     userSignature,
   }: {
-    accountId?: string;
+    tenantId?: string;
     authorization?: string;
     clientSourceId?: string;
     clientKey?: string;
     options?: WSOptions;
     userSignature?: string;
   }) {
-    this.accountId = accountId;
+    this.tenantId = tenantId;
     this.connectionCount = 0;
     this.authorization = authorization;
     this.messageCallback = null;
@@ -124,7 +124,8 @@ export class WS {
       this.send({
         action: "subscribe",
         data: {
-          accountId: this.accountId,
+          // [HACK] map tenantId to accountId in order to keep this backwards compatible
+          accountId: this.tenantId,
           channel: sub.channel,
           clientSourceId: this.clientSourceId,
           clientKey: this.clientKey,
@@ -178,7 +179,8 @@ export class WS {
       this.send({
         action: "subscribe",
         data: {
-          accountId: this.accountId,
+          // [HACK] map tenantId to accountId in order to keep this backwards compatible
+          accountId: this.tenantId,
           channel,
           clientKey: this.clientKey,
           clientSourceId: this.clientSourceId,