diff --git a/lib/tunnelbroker/tunnelbroker-context.js b/lib/tunnelbroker/tunnelbroker-context.js
index 48889424e..f28630e78 100644
--- a/lib/tunnelbroker/tunnelbroker-context.js
+++ b/lib/tunnelbroker/tunnelbroker-context.js
@@ -1,480 +1,475 @@
 // @flow
 
 import invariant from 'invariant';
 import _isEqual from 'lodash/fp/isEqual.js';
 import * as React from 'react';
 import uuid from 'uuid';
 
 import { PeerToPeerProvider } from './peer-to-peer-context.js';
 import { PeerToPeerMessageHandler } from './peer-to-peer-message-handler.js';
 import type { SecondaryTunnelbrokerConnection } from './secondary-tunnelbroker-connection.js';
 import { tunnnelbrokerURL } from '../facts/tunnelbroker.js';
 import { IdentityClientContext } from '../shared/identity-client-context.js';
 import { tunnelbrokerHeartbeatTimeout } from '../shared/timeouts.js';
 import { isWebPlatform } from '../types/device-types.js';
 import type { MessageSentStatus } from '../types/tunnelbroker/device-to-tunnelbroker-request-status-types.js';
 import type { MessageToDeviceRequest } from '../types/tunnelbroker/message-to-device-request-types.js';
 import type { MessageToTunnelbrokerRequest } from '../types/tunnelbroker/message-to-tunnelbroker-request-types.js';
 import {
   deviceToTunnelbrokerMessageTypes,
   tunnelbrokerToDeviceMessageTypes,
   tunnelbrokerToDeviceMessageValidator,
   type TunnelbrokerToDeviceMessage,
   type DeviceToTunnelbrokerRequest,
 } from '../types/tunnelbroker/messages.js';
-import type {
-  TunnelbrokerAPNsNotif,
-  TunnelbrokerFCMNotif,
-} from '../types/tunnelbroker/notif-types.js';
+import type { TunnelbrokerNotif } from '../types/tunnelbroker/notif-types.js';
 import type {
   AnonymousInitializationMessage,
   ConnectionInitializationMessage,
   TunnelbrokerInitializationMessage,
   TunnelbrokerDeviceTypes,
 } from '../types/tunnelbroker/session-types.js';
 import type { Heartbeat } from '../types/websocket/heartbeat-types.js';
 import { getConfig } from '../utils/config.js';
 import { getContentSigningKey } from '../utils/crypto-utils.js';
 import { useSelector } from '../utils/redux-utils.js';
 
 export type TunnelbrokerClientMessageToDevice = {
   +deviceID: string,
   +payload: string,
 };
 
 export type TunnelbrokerSocketListener = (
   message: TunnelbrokerToDeviceMessage,
 ) => mixed;
 
 type PromiseCallbacks = {
   +resolve: () => void,
   +reject: (error: string) => void,
 };
 type Promises = { [clientMessageID: string]: PromiseCallbacks };
 
 type TunnelbrokerSocketState =
   | {
       +connected: true,
       +isAuthorized: boolean,
     }
   | {
       +connected: false,
     };
 
 type TunnelbrokerContextType = {
   +sendMessageToDevice: (
     message: TunnelbrokerClientMessageToDevice,
     messageID: ?string,
   ) => Promise<void>,
-  +sendNotif: (
-    notif: TunnelbrokerAPNsNotif | TunnelbrokerFCMNotif,
-  ) => Promise<void>,
+  +sendNotif: (notif: TunnelbrokerNotif) => Promise<void>,
   +sendMessageToTunnelbroker: (payload: string) => Promise<void>,
   +addListener: (listener: TunnelbrokerSocketListener) => void,
   +removeListener: (listener: TunnelbrokerSocketListener) => void,
   +socketState: TunnelbrokerSocketState,
   +setUnauthorizedDeviceID: (unauthorizedDeviceID: ?string) => void,
 };
 
 const TunnelbrokerContext: React.Context<?TunnelbrokerContextType> =
   React.createContext<?TunnelbrokerContextType>();
 
 type Props = {
   +children: React.Node,
   +shouldBeClosed?: boolean,
   +onClose?: () => mixed,
   +secondaryTunnelbrokerConnection?: SecondaryTunnelbrokerConnection,
 };
 
 function getTunnelbrokerDeviceType(): TunnelbrokerDeviceTypes {
   return isWebPlatform(getConfig().platformDetails.platform) ? 'web' : 'mobile';
 }
 
 function createAnonymousInitMessage(
   deviceID: string,
 ): AnonymousInitializationMessage {
   return ({
     type: 'AnonymousInitializationMessage',
     deviceID,
     deviceType: getTunnelbrokerDeviceType(),
   }: AnonymousInitializationMessage);
 }
 
 function TunnelbrokerProvider(props: Props): React.Node {
   const { children, shouldBeClosed, onClose, secondaryTunnelbrokerConnection } =
     props;
 
   const accessToken = useSelector(state => state.commServicesAccessToken);
   const userID = useSelector(state => state.currentUserInfo?.id);
 
   const [unauthorizedDeviceID, setUnauthorizedDeviceID] =
     React.useState<?string>(null);
   const isAuthorized = !unauthorizedDeviceID;
 
   const createInitMessage = React.useCallback(async () => {
     if (shouldBeClosed) {
       return null;
     }
 
     if (unauthorizedDeviceID) {
       return createAnonymousInitMessage(unauthorizedDeviceID);
     }
 
     if (!accessToken || !userID) {
       return null;
     }
 
     const deviceID = await getContentSigningKey();
     if (!deviceID) {
       return null;
     }
     return ({
       type: 'ConnectionInitializationMessage',
       deviceID,
       accessToken,
       userID,
       deviceType: getTunnelbrokerDeviceType(),
     }: ConnectionInitializationMessage);
   }, [accessToken, shouldBeClosed, unauthorizedDeviceID, userID]);
 
   const previousInitMessage =
     React.useRef<?TunnelbrokerInitializationMessage>(null);
 
   const [socketState, setSocketState] = React.useState<TunnelbrokerSocketState>(
     { connected: false },
   );
   const listeners = React.useRef<Set<TunnelbrokerSocketListener>>(new Set());
   const socket = React.useRef<?WebSocket>(null);
   const socketSessionCounter = React.useRef(0);
   const promises = React.useRef<Promises>({});
   const heartbeatTimeoutID = React.useRef<?TimeoutID>();
 
   const identityContext = React.useContext(IdentityClientContext);
   invariant(identityContext, 'Identity context should be set');
   const { identityClient } = identityContext;
 
   const stopHeartbeatTimeout = React.useCallback(() => {
     if (heartbeatTimeoutID.current) {
       clearTimeout(heartbeatTimeoutID.current);
       heartbeatTimeoutID.current = null;
     }
   }, []);
 
   const resetHeartbeatTimeout = React.useCallback(() => {
     stopHeartbeatTimeout();
     heartbeatTimeoutID.current = setTimeout(() => {
       socket.current?.close();
       setSocketState({ connected: false });
     }, tunnelbrokerHeartbeatTimeout);
   }, [stopHeartbeatTimeout]);
 
   // determine if the socket is active (not closed or closing)
   const isSocketActive =
     socket.current?.readyState === WebSocket.OPEN ||
     socket.current?.readyState === WebSocket.CONNECTING;
 
   const connectionChangePromise = React.useRef<?Promise<void>>(null);
   // The Tunnelbroker connection can have 4 states:
   // - DISCONNECTED: isSocketActive = false, connected = false
   //   Should be in this state when initMessage is null
   // - CONNECTING: isSocketActive = true, connected = false
   //   This lasts until Tunnelbroker sends ConnectionInitializationResponse
   // - CONNECTED: isSocketActive = true, connected = true
   // - DISCONNECTING: isSocketActive = false, connected = true
   //   This lasts between socket.close() and socket.onclose()
   React.useEffect(() => {
     connectionChangePromise.current = (async () => {
       await connectionChangePromise.current;
       try {
         const initMessage = await createInitMessage();
         const initMessageChanged = !_isEqual(
           previousInitMessage.current,
           initMessage,
         );
         previousInitMessage.current = initMessage;
 
         // when initMessage changes, we need to close the socket
         // and open a new one
         if (
           (!initMessage || initMessageChanged) &&
           isSocketActive &&
           socket.current
         ) {
           socket.current?.close();
           return;
         }
 
         // when we're already connected (or pending disconnection),
         // or there's no init message to start with, we don't need
         // to do anything
         if (socketState.connected || !initMessage || socket.current) {
           return;
         }
 
         const tunnelbrokerSocket = new WebSocket(tunnnelbrokerURL);
 
         tunnelbrokerSocket.onopen = () => {
           tunnelbrokerSocket.send(JSON.stringify(initMessage));
         };
 
         tunnelbrokerSocket.onclose = () => {
           // this triggers the effect hook again and reconnect
           setSocketState({ connected: false });
           onClose?.();
           socket.current = null;
           console.log('Connection to Tunnelbroker closed');
         };
         tunnelbrokerSocket.onerror = e => {
           console.log('Tunnelbroker socket error:', e.message);
         };
         tunnelbrokerSocket.onmessage = (event: MessageEvent) => {
           if (typeof event.data !== 'string') {
             console.log('socket received a non-string message');
             return;
           }
           let rawMessage;
           try {
             rawMessage = JSON.parse(event.data);
           } catch (e) {
             console.log('error while parsing Tunnelbroker message:', e.message);
             return;
           }
 
           if (!tunnelbrokerToDeviceMessageValidator.is(rawMessage)) {
             console.log('invalid TunnelbrokerMessage');
             return;
           }
           const message: TunnelbrokerToDeviceMessage = rawMessage;
 
           resetHeartbeatTimeout();
 
           for (const listener of listeners.current) {
             listener(message);
           }
 
           // MESSAGE_TO_DEVICE is handled in PeerToPeerMessageHandler
           if (
             message.type ===
             tunnelbrokerToDeviceMessageTypes.CONNECTION_INITIALIZATION_RESPONSE
           ) {
             if (message.status.type === 'Success' && !socketState.connected) {
               setSocketState({ connected: true, isAuthorized });
               console.log(
                 'session with Tunnelbroker created. isAuthorized:',
                 isAuthorized,
               );
             } else if (
               message.status.type === 'Success' &&
               socketState.connected
             ) {
               console.log(
                 'received ConnectionInitializationResponse with status: Success for already connected socket',
               );
             } else {
               setSocketState({ connected: false });
               console.log(
                 'creating session with Tunnelbroker error:',
                 message.status.data,
               );
             }
           } else if (
             message.type ===
             tunnelbrokerToDeviceMessageTypes.DEVICE_TO_TUNNELBROKER_REQUEST_STATUS
           ) {
             for (const status: MessageSentStatus of message.clientMessageIDs) {
               if (status.type === 'Success') {
                 promises.current[status.data]?.resolve();
                 delete promises.current[status.data];
               } else if (status.type === 'Error') {
                 promises.current[status.data.id]?.reject(status.data.error);
                 delete promises.current[status.data.id];
               } else if (status.type === 'SerializationError') {
                 console.log('SerializationError for message: ', status.data);
               } else if (status.type === 'InvalidRequest') {
                 console.log('Tunnelbroker recorded InvalidRequest');
               }
             }
           } else if (
             message.type === tunnelbrokerToDeviceMessageTypes.HEARTBEAT
           ) {
             const heartbeat: Heartbeat = {
               type: deviceToTunnelbrokerMessageTypes.HEARTBEAT,
             };
             socket.current?.send(JSON.stringify(heartbeat));
           }
         };
 
         socket.current = tunnelbrokerSocket;
         socketSessionCounter.current = socketSessionCounter.current + 1;
       } catch (err) {
         console.log('Tunnelbroker connection error:', err);
       }
     })();
   }, [
     isSocketActive,
     isAuthorized,
     resetHeartbeatTimeout,
     stopHeartbeatTimeout,
     identityClient,
     onClose,
     createInitMessage,
     socketState.connected,
   ]);
 
   const sendMessage: (request: DeviceToTunnelbrokerRequest) => Promise<void> =
     React.useCallback(
       request => {
         return new Promise((resolve, reject) => {
           const socketActive = socketState.connected && socket.current;
           if (!shouldBeClosed && !socketActive) {
             throw new Error('Tunnelbroker not connected');
           }
           promises.current[request.clientMessageID] = {
             resolve,
             reject,
           };
           if (socketActive) {
             socket.current?.send(JSON.stringify(request));
           } else {
             secondaryTunnelbrokerConnection?.sendMessage(request);
           }
         });
       },
       [socketState, secondaryTunnelbrokerConnection, shouldBeClosed],
     );
 
   const sendMessageToDevice: (
     message: TunnelbrokerClientMessageToDevice,
     messageID: ?string,
   ) => Promise<void> = React.useCallback(
     (message: TunnelbrokerClientMessageToDevice, messageID: ?string) => {
       const clientMessageID = messageID ?? uuid.v4();
       const messageToDevice: MessageToDeviceRequest = {
         type: deviceToTunnelbrokerMessageTypes.MESSAGE_TO_DEVICE_REQUEST,
         clientMessageID,
         deviceID: message.deviceID,
         payload: message.payload,
       };
 
       return sendMessage(messageToDevice);
     },
     [sendMessage],
   );
 
   const sendMessageToTunnelbroker: (payload: string) => Promise<void> =
     React.useCallback(
       (payload: string) => {
         const clientMessageID = uuid.v4();
         const messageToTunnelbroker: MessageToTunnelbrokerRequest = {
           type: deviceToTunnelbrokerMessageTypes.MESSAGE_TO_TUNNELBROKER_REQUEST,
           clientMessageID,
           payload,
         };
         return sendMessage(messageToTunnelbroker);
       },
       [sendMessage],
     );
 
   React.useEffect(
     () =>
       secondaryTunnelbrokerConnection?.onSendMessage(message => {
         if (shouldBeClosed) {
           // We aren't supposed to be handling it
           return;
         }
 
         void (async () => {
           try {
             await sendMessage(message);
             secondaryTunnelbrokerConnection.setMessageStatus(
               message.clientMessageID,
             );
           } catch (error) {
             secondaryTunnelbrokerConnection.setMessageStatus(
               message.clientMessageID,
               error,
             );
           }
         })();
       }),
     [secondaryTunnelbrokerConnection, sendMessage, shouldBeClosed],
   );
 
   React.useEffect(
     () =>
       secondaryTunnelbrokerConnection?.onMessageStatus((messageID, error) => {
         if (error) {
           promises.current[messageID].reject(error);
         } else {
           promises.current[messageID].resolve();
         }
         delete promises.current[messageID];
       }),
     [secondaryTunnelbrokerConnection],
   );
 
   const addListener = React.useCallback(
     (listener: TunnelbrokerSocketListener) => {
       listeners.current.add(listener);
     },
     [],
   );
 
   const removeListener = React.useCallback(
     (listener: TunnelbrokerSocketListener) => {
       listeners.current.delete(listener);
     },
     [],
   );
 
   const getSessionCounter = React.useCallback(
     () => socketSessionCounter.current,
     [],
   );
 
   const doesSocketExist = React.useCallback(() => !!socket.current, []);
 
   const socketSend = React.useCallback((message: string) => {
     socket.current?.send(message);
   }, []);
 
   const value: TunnelbrokerContextType = React.useMemo(
     () => ({
       sendMessageToDevice,
       sendMessageToTunnelbroker,
       sendNotif: sendMessage,
       socketState,
       addListener,
       removeListener,
       setUnauthorizedDeviceID,
     }),
     [
       sendMessageToDevice,
       sendMessage,
       sendMessageToTunnelbroker,
       socketState,
       addListener,
       removeListener,
     ],
   );
 
   return (
     <TunnelbrokerContext.Provider value={value}>
       <PeerToPeerMessageHandler
         getSessionCounter={getSessionCounter}
         doesSocketExist={doesSocketExist}
         socketSend={socketSend}
       />
       <PeerToPeerProvider>{children}</PeerToPeerProvider>
     </TunnelbrokerContext.Provider>
   );
 }
 
 function useTunnelbroker(): TunnelbrokerContextType {
   const context = React.useContext(TunnelbrokerContext);
   invariant(context, 'TunnelbrokerContext not found');
 
   return context;
 }
 
 export { TunnelbrokerProvider, useTunnelbroker };
diff --git a/lib/types/tunnelbroker/messages.js b/lib/types/tunnelbroker/messages.js
index 21ad01477..03f6a7ce1 100644
--- a/lib/types/tunnelbroker/messages.js
+++ b/lib/types/tunnelbroker/messages.js
@@ -1,97 +1,92 @@
 // @flow
 
 import type { TUnion } from 'tcomb';
 import t from 'tcomb';
 
 import {
   messageToDeviceRequestStatusValidator,
   type DeviceToTunnelbrokerRequestStatus,
 } from './device-to-tunnelbroker-request-status-types.js';
 import { type MessageReceiveConfirmation } from './message-receive-confirmation-types.js';
 import { type MessageToDeviceRequest } from './message-to-device-request-types.js';
 import {
   type MessageToDevice,
   messageToDeviceValidator,
 } from './message-to-device-types.js';
 import { type MessageToTunnelbrokerRequest } from './message-to-tunnelbroker-request-types.js';
-import {
-  type TunnelbrokerAPNsNotif,
-  type TunnelbrokerFCMNotif,
-} from './notif-types.js';
+import { type TunnelbrokerNotif } from './notif-types.js';
 import {
   type AnonymousInitializationMessage,
   type ConnectionInitializationMessage,
 } from './session-types.js';
 import {
   type ConnectionInitializationResponse,
   connectionInitializationResponseValidator,
 } from '../websocket/connection-initialization-response-types.js';
 import {
   type Heartbeat,
   heartbeatValidator,
 } from '../websocket/heartbeat-types.js';
 
 /*
  * This file defines types and validation for messages exchanged
  * with the Tunnelbroker. The definitions in this file should remain in sync
  * with the structures defined in the corresponding
  * Rust file at `shared/tunnelbroker_messages/src/messages/mod.rs`.
  *
  * If you edit the definitions in one file,
  * please make sure to update the corresponding definitions in the other.
  *
  */
 
 // Messages sent from Device to Tunnelbroker.
 export const deviceToTunnelbrokerMessageTypes = Object.freeze({
   CONNECTION_INITIALIZATION_MESSAGE: 'ConnectionInitializationMessage',
   ANONYMOUS_INITIALIZATION_MESSAGE: 'AnonymousInitializationMessage',
   TUNNELBROKER_APNS_NOTIF: 'APNsNotif',
   TUNNELBROKER_FCM_NOTIF: 'FCMNotif',
   MESSAGE_TO_DEVICE_REQUEST: 'MessageToDeviceRequest',
   MESSAGE_RECEIVE_CONFIRMATION: 'MessageReceiveConfirmation',
   MESSAGE_TO_TUNNELBROKER_REQUEST: 'MessageToTunnelbrokerRequest',
   HEARTBEAT: 'Heartbeat',
 });
 
 export type DeviceToTunnelbrokerMessage =
   | ConnectionInitializationMessage
   | AnonymousInitializationMessage
-  | TunnelbrokerAPNsNotif
-  | TunnelbrokerFCMNotif
+  | TunnelbrokerNotif
   | MessageToDeviceRequest
   | MessageReceiveConfirmation
   | MessageToTunnelbrokerRequest
   | Heartbeat;
 
 // Types having `clientMessageID` prop.
 // When using this type, it is possible to use Promise abstraction,
 // and await sending a message until Tunnelbroker responds that
 // the request was processed.
 export type DeviceToTunnelbrokerRequest =
-  | TunnelbrokerAPNsNotif
-  | TunnelbrokerFCMNotif
+  | TunnelbrokerNotif
   | MessageToDeviceRequest
   | MessageToTunnelbrokerRequest;
 
 // Messages sent from Tunnelbroker to Device.
 export const tunnelbrokerToDeviceMessageTypes = Object.freeze({
   CONNECTION_INITIALIZATION_RESPONSE: 'ConnectionInitializationResponse',
   DEVICE_TO_TUNNELBROKER_REQUEST_STATUS: 'MessageToDeviceRequestStatus',
   MESSAGE_TO_DEVICE: 'MessageToDevice',
   HEARTBEAT: 'Heartbeat',
 });
 
 export type TunnelbrokerToDeviceMessage =
   | ConnectionInitializationResponse
   | DeviceToTunnelbrokerRequestStatus
   | MessageToDevice
   | Heartbeat;
 
 export const tunnelbrokerToDeviceMessageValidator: TUnion<TunnelbrokerToDeviceMessage> =
   t.union([
     connectionInitializationResponseValidator,
     messageToDeviceRequestStatusValidator,
     messageToDeviceValidator,
     heartbeatValidator,
   ]);