diff --git a/src/views/chat-history/ChatHistoryMessageHandler.tsx b/src/views/chat-history/ChatHistoryMessageHandler.tsx
index d1165d39..a482a36a 100644
--- a/src/views/chat-history/ChatHistoryMessageHandler.tsx
+++ b/src/views/chat-history/ChatHistoryMessageHandler.tsx
@@ -1,4 +1,4 @@
-import { RoomInfoEvent, RoomSessionChatEvent, RoomSessionEvent } from '@nitrots/nitro-renderer';
+import { GetGuestRoomResultEvent, RoomSessionChatEvent, RoomSessionEvent } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useState } from 'react';
 import { GetRoomSession } from '../../api';
 import { CreateMessageHook, useRoomSessionManagerEvent } from '../../hooks';
@@ -77,7 +77,7 @@ export const ChatHistoryMessageHandler: FC<{}> = props =>
     useRoomSessionManagerEvent(RoomSessionEvent.ENDED, onRoomSessionEvent);
     useRoomSessionManagerEvent(RoomSessionEvent.STARTED, onRoomSessionEvent);
 
-    const onRoomInfoEvent = useCallback((event: RoomInfoEvent) =>
+    const onGetGuestRoomResultEvent = useCallback((event: GetGuestRoomResultEvent) =>
     {
         const parser = event.getParser();
 
@@ -101,7 +101,7 @@ export const ChatHistoryMessageHandler: FC<{}> = props =>
         }
     }, [addChatEntry, addRoomHistoryEntry, needsRoomInsert]);
 
-    CreateMessageHook(RoomInfoEvent, onRoomInfoEvent);
+    CreateMessageHook(GetGuestRoomResultEvent, onGetGuestRoomResultEvent);
     
     return null;
 }
diff --git a/src/views/groups/views/room-information/GroupRoomInformationView.tsx b/src/views/groups/views/room-information/GroupRoomInformationView.tsx
index 9b8f29b7..edbf18b4 100644
--- a/src/views/groups/views/room-information/GroupRoomInformationView.tsx
+++ b/src/views/groups/views/room-information/GroupRoomInformationView.tsx
@@ -1,4 +1,4 @@
-import { DesktopViewEvent, GroupInformationComposer, GroupInformationEvent, GroupInformationParser, GroupJoinComposer, GroupRemoveMemberComposer, RoomInfoEvent } from '@nitrots/nitro-renderer';
+import { DesktopViewEvent, GetGuestRoomResultEvent, GroupInformationComposer, GroupInformationEvent, GroupInformationParser, GroupJoinComposer, GroupRemoveMemberComposer } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useState } from 'react';
 import { GetGroupInformation, GetSessionDataManager, LocalizeText } from '../../../../api';
 import { GetGroupManager } from '../../../../api/groups/GetGroupManager';
@@ -13,7 +13,7 @@ export const GroupRoomInformationView: FC<{}> = props =>
     const [ groupInformation, setGroupInformation ] = useState<GroupInformationParser>(null);
     const [ isExpended, setIsExpended ] = useState<boolean>(true);
 
-    const onRoomInfoEvent = useCallback((event: RoomInfoEvent) =>
+    const onGetGuestRoomResultEvent = useCallback((event: GetGuestRoomResultEvent) =>
     {
         const parser = event.getParser();
         
@@ -26,7 +26,7 @@ export const GroupRoomInformationView: FC<{}> = props =>
         }
     }, []);
 
-    CreateMessageHook(RoomInfoEvent, onRoomInfoEvent);
+    CreateMessageHook(GetGuestRoomResultEvent, onGetGuestRoomResultEvent);
 
     const onGroupInformationEvent = useCallback((event: GroupInformationEvent) =>
     {
diff --git a/src/views/navigator/NavigatorMessageHandler.tsx b/src/views/navigator/NavigatorMessageHandler.tsx
index f2e4e019..3ca2dea8 100644
--- a/src/views/navigator/NavigatorMessageHandler.tsx
+++ b/src/views/navigator/NavigatorMessageHandler.tsx
@@ -1,4 +1,4 @@
-import { GenericErrorEvent, NavigatorCategoriesComposer, NavigatorCategoriesEvent, NavigatorHomeRoomEvent, NavigatorMetadataEvent, NavigatorSearchEvent, NavigatorSettingsComposer, RoomCreatedEvent, RoomDataParser, RoomDoorbellAcceptedEvent, RoomDoorbellEvent, RoomDoorbellRejectedEvent, RoomForwardEvent, RoomInfoComposer, RoomInfoEvent, RoomInfoOwnerEvent, RoomSettingsUpdatedEvent, UserInfoEvent } from '@nitrots/nitro-renderer';
+import { GenericErrorEvent, GetGuestRoomResultEvent, NavigatorCategoriesComposer, NavigatorCategoriesEvent, NavigatorHomeRoomEvent, NavigatorMetadataEvent, NavigatorSearchEvent, NavigatorSettingsComposer, RoomCreatedEvent, RoomDataParser, RoomDoorbellAcceptedEvent, RoomDoorbellEvent, RoomDoorbellRejectedEvent, RoomEntryInfoMessageEvent, RoomForwardEvent, RoomInfoComposer, RoomSettingsUpdatedEvent, UserInfoEvent } from '@nitrots/nitro-renderer';
 import { FC, useCallback } from 'react';
 import { CreateRoomSession, GetSessionDataManager } from '../../api';
 import { UpdateDoorStateEvent } from '../../events';
@@ -25,7 +25,7 @@ export const NavigatorMessageHandler: FC<NavigatorMessageHandlerProps> = props =
         SendMessageHook(new RoomInfoComposer(parser.roomId, false, true));
     }, []);
 
-    const onRoomInfoOwnerEvent = useCallback((event: RoomInfoOwnerEvent) =>
+    const onRoomEntryInfoMessageEvent = useCallback((event: RoomEntryInfoMessageEvent) =>
     {
         const parser = event.getParser();
 
@@ -43,7 +43,7 @@ export const NavigatorMessageHandler: FC<NavigatorMessageHandlerProps> = props =
         SendMessageHook(new RoomInfoComposer(parser.roomId, true, false));
     }, [ navigatorState, dispatchNavigatorState ]);
 
-    const onRoomInfoEvent = useCallback((event: RoomInfoEvent) =>
+    const onGetGuestRoomResultEvent = useCallback((event: GetGuestRoomResultEvent) =>
     {
         const parser = event.getParser();
 
@@ -196,8 +196,8 @@ export const NavigatorMessageHandler: FC<NavigatorMessageHandlerProps> = props =
 
     CreateMessageHook(UserInfoEvent, onUserInfoEvent);
     CreateMessageHook(RoomForwardEvent, onRoomForwardEvent);
-    CreateMessageHook(RoomInfoOwnerEvent, onRoomInfoOwnerEvent);
-    CreateMessageHook(RoomInfoEvent, onRoomInfoEvent);
+    CreateMessageHook(RoomEntryInfoMessageEvent, onRoomEntryInfoMessageEvent);
+    CreateMessageHook(GetGuestRoomResultEvent, onGetGuestRoomResultEvent);
     CreateMessageHook(RoomDoorbellEvent, onRoomDoorbellEvent);
     CreateMessageHook(RoomDoorbellAcceptedEvent, onRoomDoorbellAcceptedEvent);
     CreateMessageHook(RoomDoorbellRejectedEvent, onRoomDoorbellRejectedEvent);