diff --git a/src/views/friend-list/views/friend-bar-item/FriendBarItemView.tsx b/src/views/friend-list/views/friend-bar-item/FriendBarItemView.tsx
index 3b19992f..b845f530 100644
--- a/src/views/friend-list/views/friend-bar-item/FriendBarItemView.tsx
+++ b/src/views/friend-list/views/friend-bar-item/FriendBarItemView.tsx
@@ -1,4 +1,4 @@
-import { FollowFriendComposer, MouseEventType, UserProfileComposer } from '@nitrots/nitro-renderer';
+import { FollowFriendMessageComposer, MouseEventType, UserProfileComposer } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useRef, useState } from 'react';
 import { LocalizeText } from '../../../../api';
 import { SendMessageHook } from '../../../../hooks/messages';
@@ -13,7 +13,7 @@ export const FriendBarItemView: FC<FriendBarItemViewProps> = props =>
 
     const followFriend = useCallback(() =>
     {
-        SendMessageHook(new FollowFriendComposer(friend.id));
+        SendMessageHook(new FollowFriendMessageComposer(friend.id));
     }, [ friend ]);
 
     const openProfile = useCallback(() =>
diff --git a/src/views/friend-list/views/friends-item/FriendListFriendsItemView.tsx b/src/views/friend-list/views/friends-item/FriendListFriendsItemView.tsx
index 23e053de..eee90ced 100644
--- a/src/views/friend-list/views/friends-item/FriendListFriendsItemView.tsx
+++ b/src/views/friend-list/views/friends-item/FriendListFriendsItemView.tsx
@@ -1,4 +1,4 @@
-import { FollowFriendComposer, SetRelationshipStatusComposer } from '@nitrots/nitro-renderer';
+import { FollowFriendMessageComposer, SetRelationshipStatusComposer } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useState } from 'react';
 import { LocalizeText } from '../../../../api';
 import { SendMessageHook } from '../../../../hooks';
@@ -16,7 +16,7 @@ export const FriendListFriendsItemView: FC<FriendListFriendsItemViewProps> = pro
     {
         if(!friend) return;
         
-        SendMessageHook(new FollowFriendComposer(friend.id));
+        SendMessageHook(new FollowFriendMessageComposer(friend.id));
     }, [ friend ]);
 
     const getCurrentRelationshipName = useCallback(() =>
diff --git a/src/views/friend-list/views/requests-item/FriendListRequestsItemView.tsx b/src/views/friend-list/views/requests-item/FriendListRequestsItemView.tsx
index 2763162f..a0f57c5c 100644
--- a/src/views/friend-list/views/requests-item/FriendListRequestsItemView.tsx
+++ b/src/views/friend-list/views/requests-item/FriendListRequestsItemView.tsx
@@ -1,4 +1,4 @@
-import { AcceptFriendComposer, DeclineFriendComposer } from '@nitrots/nitro-renderer';
+import { AcceptFriendMessageComposer, DeclineFriendMessageComposer } from '@nitrots/nitro-renderer';
 import { FC, useCallback } from 'react';
 import { SendMessageHook } from '../../../../hooks/messages/message-event';
 import { UserProfileIconView } from '../../../shared/user-profile-icon/UserProfileIconView';
@@ -12,14 +12,14 @@ export const FriendListRequestsItemView: FC<FriendListRequestsItemViewProps> = p
     {
         if(!request) return;
         
-        SendMessageHook(new AcceptFriendComposer(request.id));
+        SendMessageHook(new AcceptFriendMessageComposer(request.id));
     }, [ request ]);
 
     const decline = useCallback(() =>
     {
         if(!request) return;
         
-        SendMessageHook(new DeclineFriendComposer(false, request.id));
+        SendMessageHook(new DeclineFriendMessageComposer(false, request.id));
     }, [ request ]);
 
     if(!request) return null;
diff --git a/src/views/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.tsx b/src/views/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.tsx
index 39917913..c8b5eb0b 100644
--- a/src/views/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.tsx
+++ b/src/views/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.tsx
@@ -1,4 +1,4 @@
-import { LoveLockFurniFinishedEvent, LoveLockFurniFriendConfirmedEvent, LoveLockFurniStartEvent, LoveLockStartConfirmComposer, NitroEvent, RoomEngineTriggerWidgetEvent, RoomObjectVariable } from '@nitrots/nitro-renderer';
+import { FriendFurniConfirmLockMessageComposer, LoveLockFurniFinishedEvent, LoveLockFurniFriendConfirmedEvent, LoveLockFurniStartEvent, NitroEvent, RoomEngineTriggerWidgetEvent, RoomObjectVariable } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useState } from 'react';
 import { GetRoomEngine, GetRoomSession, LocalizeText, RoomWidgetRoomObjectUpdateEvent } from '../../../../../api';
 import { CreateEventDispatcherHook } from '../../../../../hooks/events/event-dispatcher.base';
@@ -77,10 +77,10 @@ export const FurnitureFriendFurniView: FC<{}> = props =>
                 setEngravingLockData(null);
                 return;
             case 'accept_request':
-                GetRoomSession().connection.send(new LoveLockStartConfirmComposer(engravingLockData.objectId, true));
+                GetRoomSession().connection.send(new FriendFurniConfirmLockMessageComposer(engravingLockData.objectId, true));
                 return;
             case 'reject_request':
-                GetRoomSession().connection.send(new LoveLockStartConfirmComposer(engravingLockData.objectId, false));
+                GetRoomSession().connection.send(new FriendFurniConfirmLockMessageComposer(engravingLockData.objectId, false));
                 processAction('close_request');
                 return;
             case 'close_request':