diff --git a/src/views/catalog/CatalogView.tsx b/src/views/catalog/CatalogView.tsx
index 2ea38f26..325adf4d 100644
--- a/src/views/catalog/CatalogView.tsx
+++ b/src/views/catalog/CatalogView.tsx
@@ -1,4 +1,4 @@
-import { CatalogModeComposer, CatalogPageComposer, CatalogRequestGiftConfigurationComposer, ICatalogPageData, ILinkEventTracker, RoomPreviewer } from '@nitrots/nitro-renderer';
+import { GetCatalogIndexComposer, GetCatalogPageComposer, GetGiftWrappingConfigurationComposer, ICatalogPageData, ILinkEventTracker, RoomPreviewer } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useReducer, useState } from 'react';
 import { AddEventLinkTracker, GetRoomEngine, LocalizeText, RemoveLinkEventTracker } from '../../api';
 import { CatalogEvent } from '../../events';
@@ -107,8 +107,8 @@ export const CatalogView: FC<CatalogViewProps> = props =>
 
         if(loadCatalog)
         {
-            SendMessageHook(new CatalogModeComposer(CatalogMode.MODE_NORMAL));
-            SendMessageHook(new CatalogRequestGiftConfigurationComposer());
+            SendMessageHook(new GetCatalogIndexComposer(CatalogMode.MODE_NORMAL));
+            SendMessageHook(new GetGiftWrappingConfigurationComposer());
 
             return;
         }
@@ -164,7 +164,7 @@ export const CatalogView: FC<CatalogViewProps> = props =>
     {
         if(!currentTab) return;
 
-        SendMessageHook(new CatalogPageComposer(currentTab.pageId, -1, CatalogMode.MODE_NORMAL));
+        SendMessageHook(new GetCatalogPageComposer(currentTab.pageId, -1, CatalogMode.MODE_NORMAL));
     }, [ currentTab ]);
 
     useEffect(() =>
diff --git a/src/views/catalog/views/navigation/item/CatalogNavigationItemView.tsx b/src/views/catalog/views/navigation/item/CatalogNavigationItemView.tsx
index 1570237e..74f42bd1 100644
--- a/src/views/catalog/views/navigation/item/CatalogNavigationItemView.tsx
+++ b/src/views/catalog/views/navigation/item/CatalogNavigationItemView.tsx
@@ -1,4 +1,4 @@
-import { CatalogPageComposer, ICatalogPageData } from '@nitrots/nitro-renderer';
+import { GetCatalogPageComposer, ICatalogPageData } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useState } from 'react';
 import { SendMessageHook } from '../../../../../hooks/messages/message-event';
 import { CatalogMode } from '../../../CatalogView.types';
@@ -20,7 +20,7 @@ export const CatalogNavigationItemView: FC<CatalogNavigationItemViewProps> = pro
             {
                 if(prevValue === selectPage)
                 {
-                    if(selectPage.pageId > -1) SendMessageHook(new CatalogPageComposer(selectPage.pageId, -1, CatalogMode.MODE_NORMAL));
+                    if(selectPage.pageId > -1) SendMessageHook(new GetCatalogPageComposer(selectPage.pageId, -1, CatalogMode.MODE_NORMAL));
                 }
                 
                 return selectPage;
@@ -59,7 +59,7 @@ export const CatalogNavigationItemView: FC<CatalogNavigationItemViewProps> = pro
 
         setIsExpanded(true);
 
-        if(page.pageId > -1) SendMessageHook(new CatalogPageComposer(page.pageId, -1, CatalogMode.MODE_NORMAL));
+        if(page.pageId > -1) SendMessageHook(new GetCatalogPageComposer(page.pageId, -1, CatalogMode.MODE_NORMAL));
 
         const index = (ACTIVE_PAGES.push(page) - 1);
 
diff --git a/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx b/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx
index 07774165..f70afb5d 100644
--- a/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx
+++ b/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx
@@ -1,4 +1,4 @@
-import { CatalogRequestPetBreedsComposer, ColorConverter, SellablePetPaletteData } from '@nitrots/nitro-renderer';
+import { ColorConverter, GetSellablePetPalettesComposer, SellablePetPaletteData } from '@nitrots/nitro-renderer';
 import { FC, useEffect, useMemo, useState } from 'react';
 import { GetProductDataForLocalization, LocalizeText } from '../../../../../../api';
 import { SendMessageHook } from '../../../../../../hooks/messages/message-event';
@@ -69,7 +69,7 @@ export const CatalogLayoutPetView: FC<CatalogLayoutPetViewProps> = props =>
         setSelectedPaletteIndex(-1);
         setSellablePalettes([]);
 
-        SendMessageHook(new CatalogRequestPetBreedsComposer(productData.type));
+        SendMessageHook(new GetSellablePetPalettesComposer(productData.type));
     }, [ activeOffer, petPalettes ]);
 
     useEffect(() =>
diff --git a/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx b/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx
index d7e2bbc6..1806fcce 100644
--- a/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx
+++ b/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx
@@ -1,4 +1,4 @@
-import { CatalogPurchaseComposer, CatalogRequestVipOffersComposer, ClubOfferData } from '@nitrots/nitro-renderer';
+import { ClubOfferData, GetClubOffersMessageComposer, PurchaseFromCatalogComposer } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { Button } from 'react-bootstrap';
 import { LocalizeText } from '../../../../../../api';
@@ -76,14 +76,14 @@ export const CatalogLayoutVipBuyView: FC<CatalogLayoutVipBuyViewProps> = props =
     {
         if(!pendingOffer) return;
 
-        SendMessageHook(new CatalogPurchaseComposer(pageParser.pageId, pendingOffer.offerId, null, 1));
+        SendMessageHook(new PurchaseFromCatalogComposer(pageParser.pageId, pendingOffer.offerId, null, 1));
     }, [ pendingOffer, pageParser ])
 
     useEffect(() =>
     {
         if(clubOffers === null)
         {
-            SendMessageHook(new CatalogRequestVipOffersComposer(1));
+            SendMessageHook(new GetClubOffersMessageComposer(1));
 
             return;
         }
diff --git a/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.tsx b/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.tsx
index 3f750ad9..c2a2d004 100644
--- a/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.tsx
+++ b/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.tsx
@@ -1,4 +1,4 @@
-import { CatalogPurchaseComposer } from '@nitrots/nitro-renderer';
+import { PurchaseFromCatalogComposer } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useState } from 'react';
 import { LocalizeText } from '../../../../../../api';
 import { CatalogEvent } from '../../../../../../events';
@@ -32,7 +32,7 @@ export const CatalogPurchaseButtonView: FC<CatalogPurchaseButtonViewProps> = pro
 
     const purchase = useCallback(() =>
     {
-        SendMessageHook(new CatalogPurchaseComposer(pageId, offer.offerId, extra, quantity));
+        SendMessageHook(new PurchaseFromCatalogComposer(pageId, offer.offerId, extra, quantity));
     }, [ pageId, offer, extra, quantity ]);
 
     const attemptPurchase = useCallback(() =>
diff --git a/src/views/catalog/views/page/search-result/offer/CatalogSearchResultOfferView.tsx b/src/views/catalog/views/page/search-result/offer/CatalogSearchResultOfferView.tsx
index 29020561..aa192180 100644
--- a/src/views/catalog/views/page/search-result/offer/CatalogSearchResultOfferView.tsx
+++ b/src/views/catalog/views/page/search-result/offer/CatalogSearchResultOfferView.tsx
@@ -1,4 +1,4 @@
-import { CatalogSearchComposer, FurnitureType, MouseEventType } from '@nitrots/nitro-renderer';
+import { FurnitureType, GetProductOfferComposer, MouseEventType } from '@nitrots/nitro-renderer';
 import { FC, MouseEvent, useCallback } from 'react';
 import { GetConfiguration, GetRoomEngine, GetSessionDataManager } from '../../../../../../api';
 import { SendMessageHook } from '../../../../../../hooks/messages/message-event';
@@ -13,7 +13,7 @@ export const CatalogSearchResultOfferView: FC<CatalogSearchResultOfferViewProps>
         switch(event.type)
         {
             case MouseEventType.MOUSE_DOWN:
-                SendMessageHook(new CatalogSearchComposer(offer.purchaseOfferId));
+                SendMessageHook(new GetProductOfferComposer(offer.purchaseOfferId));
                 return;
             case MouseEventType.MOUSE_UP:
                 return;
diff --git a/src/views/catalog/views/page/search-result/offers/CatalogSearchResultOffersView.tsx b/src/views/catalog/views/page/search-result/offers/CatalogSearchResultOffersView.tsx
index 04bc09a2..ae260892 100644
--- a/src/views/catalog/views/page/search-result/offers/CatalogSearchResultOffersView.tsx
+++ b/src/views/catalog/views/page/search-result/offers/CatalogSearchResultOffersView.tsx
@@ -1,4 +1,4 @@
-import { CatalogSearchComposer } from '@nitrots/nitro-renderer';
+import { GetProductOfferComposer } from '@nitrots/nitro-renderer';
 import { FC, useEffect } from 'react';
 import { SendMessageHook } from '../../../../../../hooks/messages/message-event';
 import { useCatalogContext } from '../../../../context/CatalogContext';
@@ -15,7 +15,7 @@ export const CatalogSearchResultOffersView: FC<CatalogSearchResultOffersViewProp
     {
         if(!offers || !offers.length) return;
 
-        SendMessageHook(new CatalogSearchComposer(offers[0].purchaseOfferId));
+        SendMessageHook(new GetProductOfferComposer(offers[0].purchaseOfferId));
     }, [ offers ]);
 
     return (