diff --git a/src/nitro/communication/messages/outgoing/catalog/BuildersClubPlaceRoomItemMessageComposer.ts b/src/nitro/communication/messages/outgoing/catalog/BuildersClubPlaceRoomItemMessageComposer.ts
index 30e3b6b5..4e75fd2a 100644
--- a/src/nitro/communication/messages/outgoing/catalog/BuildersClubPlaceRoomItemMessageComposer.ts
+++ b/src/nitro/communication/messages/outgoing/catalog/BuildersClubPlaceRoomItemMessageComposer.ts
@@ -4,9 +4,9 @@ export class BuildersClubPlaceRoomItemMessageComposer implements IMessageCompose
 {
     private _data: ConstructorParameters<typeof BuildersClubPlaceRoomItemMessageComposer>;
 
-    constructor(k: number, _arg_2: number, _arg_3: string, _arg_4: number, _arg_5: number, _arg_6: number)
+    constructor(pageId: number, offerId: number, extraParam: string, positionX: number, positionY: number, direction: number)
     {
-        this._data = [k, _arg_2, _arg_3, _arg_4, _arg_5, _arg_6];
+        this._data = [pageId, offerId, extraParam, positionX, positionY, direction];
     }
 
     dispose(): void
diff --git a/src/nitro/communication/messages/outgoing/catalog/BuildersClubPlaceWallItemMessageComposer.ts b/src/nitro/communication/messages/outgoing/catalog/BuildersClubPlaceWallItemMessageComposer.ts
index c78e82a9..69e60f01 100644
--- a/src/nitro/communication/messages/outgoing/catalog/BuildersClubPlaceWallItemMessageComposer.ts
+++ b/src/nitro/communication/messages/outgoing/catalog/BuildersClubPlaceWallItemMessageComposer.ts
@@ -4,9 +4,9 @@ export class BuildersClubPlaceWallItemMessageComposer implements IMessageCompose
 {
     private _data: ConstructorParameters<typeof BuildersClubPlaceWallItemMessageComposer>;
 
-    constructor(k: number, _arg_2: number, _arg_3: string, _arg_4: string)
+    constructor(pageId: number, offerId: number, extraParam: string, wallLocation: string)
     {
-        this._data = [k, _arg_2, _arg_3, _arg_4];
+        this._data = [pageId, offerId, extraParam, wallLocation];
     }
 
     dispose(): void
diff --git a/src/nitro/communication/messages/outgoing/catalog/GetIsOfferGiftableComposer.ts b/src/nitro/communication/messages/outgoing/catalog/GetIsOfferGiftableComposer.ts
index 0c89c56c..87b6e3b7 100644
--- a/src/nitro/communication/messages/outgoing/catalog/GetIsOfferGiftableComposer.ts
+++ b/src/nitro/communication/messages/outgoing/catalog/GetIsOfferGiftableComposer.ts
@@ -4,9 +4,9 @@ export class GetIsOfferGiftableComposer implements IMessageComposer<ConstructorP
 {
     private _data: ConstructorParameters<typeof GetIsOfferGiftableComposer>;
 
-    constructor(k: number)
+    constructor(offerId: number)
     {
-        this._data = [k];
+        this._data = [offerId];
     }
 
     public getMessageArray()
diff --git a/src/nitro/communication/messages/outgoing/catalog/GetNextTargetedOfferComposer.ts b/src/nitro/communication/messages/outgoing/catalog/GetNextTargetedOfferComposer.ts
index 8bcd9571..80bca6ec 100644
--- a/src/nitro/communication/messages/outgoing/catalog/GetNextTargetedOfferComposer.ts
+++ b/src/nitro/communication/messages/outgoing/catalog/GetNextTargetedOfferComposer.ts
@@ -4,9 +4,9 @@ export class GetNextTargetedOfferComposer implements IMessageComposer<Constructo
 {
     private _data: ConstructorParameters<typeof GetNextTargetedOfferComposer>;
 
-    constructor(k: number)
+    constructor(targetedOfferId: number)
     {
-        this._data = [k];
+        this._data = [targetedOfferId];
     }
 
     public getMessageArray()
diff --git a/src/nitro/communication/messages/outgoing/catalog/PurchaseBasicMembershipExtensionComposer.ts b/src/nitro/communication/messages/outgoing/catalog/PurchaseBasicMembershipExtensionComposer.ts
index 0af86b6f..cf1813cb 100644
--- a/src/nitro/communication/messages/outgoing/catalog/PurchaseBasicMembershipExtensionComposer.ts
+++ b/src/nitro/communication/messages/outgoing/catalog/PurchaseBasicMembershipExtensionComposer.ts
@@ -4,9 +4,9 @@ export class PurchaseBasicMembershipExtensionComposer implements IMessageCompose
 {
     private _data: ConstructorParameters<typeof PurchaseBasicMembershipExtensionComposer>;
 
-    constructor(k: number)
+    constructor(offerId: number)
     {
-        this._data = [k];
+        this._data = [offerId];
     }
 
     public getMessageArray()
diff --git a/src/nitro/communication/messages/outgoing/catalog/PurchaseRoomAdMessageComposer.ts b/src/nitro/communication/messages/outgoing/catalog/PurchaseRoomAdMessageComposer.ts
index fbb1ab75..aff3d3c9 100644
--- a/src/nitro/communication/messages/outgoing/catalog/PurchaseRoomAdMessageComposer.ts
+++ b/src/nitro/communication/messages/outgoing/catalog/PurchaseRoomAdMessageComposer.ts
@@ -4,9 +4,9 @@ export class PurchaseRoomAdMessageComposer implements IMessageComposer<Construct
 {
     private _data: ConstructorParameters<typeof PurchaseRoomAdMessageComposer>;
 
-    constructor(k: number, _arg_2: number, _arg_3: number, _arg_4: string, _arg_5: boolean, _arg_6: string, _arg_7: number)
+    constructor(pageId: number, offerId: number, flatId: number, name: string, extended: boolean, description: string, categoryId: number)
     {
-        this._data = [k, _arg_2, _arg_3, _arg_4, _arg_5, _arg_6, _arg_7];
+        this._data = [pageId, offerId, flatId, name, extended, description, categoryId];
     }
 
     public getMessageArray()
diff --git a/src/nitro/communication/messages/outgoing/catalog/PurchaseTargetedOfferComposer.ts b/src/nitro/communication/messages/outgoing/catalog/PurchaseTargetedOfferComposer.ts
index 1cc73259..f3de97e0 100644
--- a/src/nitro/communication/messages/outgoing/catalog/PurchaseTargetedOfferComposer.ts
+++ b/src/nitro/communication/messages/outgoing/catalog/PurchaseTargetedOfferComposer.ts
@@ -4,9 +4,9 @@ export class PurchaseTargetedOfferComposer implements IMessageComposer<Construct
 {
     private _data: ConstructorParameters<typeof PurchaseTargetedOfferComposer>;
 
-    constructor(k: number, _arg_2: number)
+    constructor(offerId: number, amount: number)
     {
-        this._data = [k, _arg_2];
+        this._data = [offerId, amount];
     }
 
     public getMessageArray()
diff --git a/src/nitro/communication/messages/outgoing/catalog/PurchaseVipMembershipExtensionComposer.ts b/src/nitro/communication/messages/outgoing/catalog/PurchaseVipMembershipExtensionComposer.ts
index 13113dd3..50bc20fe 100644
--- a/src/nitro/communication/messages/outgoing/catalog/PurchaseVipMembershipExtensionComposer.ts
+++ b/src/nitro/communication/messages/outgoing/catalog/PurchaseVipMembershipExtensionComposer.ts
@@ -4,9 +4,9 @@ export class PurchaseVipMembershipExtensionComposer implements IMessageComposer<
 {
     private _data: ConstructorParameters<typeof PurchaseVipMembershipExtensionComposer>;
 
-    constructor(k: number)
+    constructor(offerId: number)
     {
-        this._data = [k];
+        this._data = [offerId];
     }
 
     public getMessageArray()
diff --git a/src/nitro/communication/messages/outgoing/catalog/SetTargetedOfferStateComposer.ts b/src/nitro/communication/messages/outgoing/catalog/SetTargetedOfferStateComposer.ts
index 5e58a00c..672d8e6c 100644
--- a/src/nitro/communication/messages/outgoing/catalog/SetTargetedOfferStateComposer.ts
+++ b/src/nitro/communication/messages/outgoing/catalog/SetTargetedOfferStateComposer.ts
@@ -4,9 +4,9 @@ export class SetTargetedOfferStateComposer implements IMessageComposer<Construct
 {
     private _data: ConstructorParameters<typeof SetTargetedOfferStateComposer>;
 
-    constructor(k: number, _arg_2: number)
+    constructor(offerId: number, offerTracking: number)
     {
-        this._data = [k, _arg_2];
+        this._data = [offerId, offerTracking];
     }
 
     public getMessageArray()
diff --git a/src/nitro/communication/messages/outgoing/catalog/ShopTargetedOfferViewedComposer.ts b/src/nitro/communication/messages/outgoing/catalog/ShopTargetedOfferViewedComposer.ts
index 41e9758a..7fb04aba 100644
--- a/src/nitro/communication/messages/outgoing/catalog/ShopTargetedOfferViewedComposer.ts
+++ b/src/nitro/communication/messages/outgoing/catalog/ShopTargetedOfferViewedComposer.ts
@@ -4,9 +4,9 @@ export class ShopTargetedOfferViewedComposer implements IMessageComposer<Constru
 {
     private _data: ConstructorParameters<typeof ShopTargetedOfferViewedComposer>;
 
-    constructor(k: number, _arg_2: number)
+    constructor(offerId: number, offerTracking: number)
     {
-        this._data = [k, _arg_2];
+        this._data = [offerId, offerTracking];
     }
 
     public getMessageArray()
diff --git a/src/nitro/communication/messages/parser/catalog/FireworkChargeData.ts b/src/nitro/communication/messages/parser/catalog/FireworkChargeData.ts
index 4ba17b38..807d86f9 100644
--- a/src/nitro/communication/messages/parser/catalog/FireworkChargeData.ts
+++ b/src/nitro/communication/messages/parser/catalog/FireworkChargeData.ts
@@ -4,19 +4,19 @@ export class FireworkChargeData
 {
     private _stuffId: number;
     private _charges: number;
-    private _SafeStr_6935: number;
-    private _SafeStr_6936: number;
-    private _SafeStr_6518: number;
-    private _SafeStr_7875: number;
+    private _credits: number;
+    private _activityPoints: number;
+    private _creditsAndActivityPointsType: number;
+    private _pathSize: number;
 
     constructor(wrapper: IMessageDataWrapper)
     {
         this._stuffId = wrapper.readInt();
         this._charges = wrapper.readInt();
-        this._SafeStr_6935 = wrapper.readInt();
-        this._SafeStr_6936 = wrapper.readInt();
-        this._SafeStr_6518 = wrapper.readInt();
-        this._SafeStr_7875 = wrapper.readInt();
+        this._credits = wrapper.readInt();
+        this._activityPoints = wrapper.readInt();
+        this._creditsAndActivityPointsType = wrapper.readInt();
+        this._pathSize = wrapper.readInt();
     }
 
     public get stuffId(): number
@@ -29,23 +29,23 @@ export class FireworkChargeData
         return this._charges;
     }
 
-    public get _SafeStr_5946(): number
+    public get credits(): number
     {
-        return this._SafeStr_6935;
+        return this._credits;
     }
 
-    public get _SafeStr_5944(): number
+    public get activityPoints(): number
     {
-        return this._SafeStr_6936;
+        return this._activityPoints;
     }
 
-    public get _SafeStr_7876(): number
+    public get pathSize(): number
     {
-        return this._SafeStr_7875;
+        return this._pathSize;
     }
 
-    public get _SafeStr_5945(): number
+    public get creditsAndActivityPointsType(): number
     {
-        return this._SafeStr_6518;
+        return this._creditsAndActivityPointsType;
     }
 }