diff --git a/abi/messages.md b/abi/messages.md
index 23698e03..d83ae520 100644
--- a/abi/messages.md
+++ b/abi/messages.md
@@ -8,6 +8,7 @@ The list below contains the supported message operations, their names and opcode
 | Name        | Message operation code |
 |-------------|------------------------|
 | AcceptStorageContract| 0x7a361688 |
+| Approve| 0x7b4b42e6 |
 | AuctionFillUp| 0x370fec51 |
 | Bounce| 0xffffffff |
 | ChallengeQuarantinedChannelState| 0x088eaa32 |
@@ -26,6 +27,7 @@ The list below contains the supported message operations, their names and opcode
 | DedustSwapPeer| 0x72aca8aa |
 | DeleteDnsRecord| 0x4eb1f0f9 |
 | DeployStorageContract| 0xe4748df1 |
+| Disapprove| 0xe8a0abfe |
 | DnsBalanceRelease| 0x4ed14b65 |
 | ElectorNewStake| 0x4e73744b |
 | ElectorNewStakeConfirmation| 0xf374484c |
@@ -90,9 +92,7 @@ The list below contains the supported message operations, their names and opcode
 | TextComment| 0x00000000 |
 | TextComment| 0x00000000 |
 | TextComment| 0x00000000 |
-| TonstakeControllerApprove| 0x7b4b42e6 |
 | TonstakeControllerCredit| 0x1690c604 |
-| TonstakeControllerDisapprove| 0xe8a0abfe |
 | TonstakeControllerNewStake| 0xe0505d0e |
 | TonstakeControllerPoolHalt| 0x139a1b4e |
 | TonstakeControllerPoolSendMessage| 0x270695fb |
@@ -103,7 +103,6 @@ The list below contains the supported message operations, their names and opcode
 | TonstakeControllerReturnAvailableFunds| 0x55c26cd5 |
 | TonstakeControllerReturnUnusedLoan| 0xed7378a6 |
 | TonstakeControllerSendRequestLoan| 0x6335b11a |
-| TonstakeControllerTopUp| 0xd372158c |
 | TonstakeControllerUpdateValidatorHash| 0xf0fd2250 |
 | TonstakeControllerValidatorWithdrawal| 0x30026327 |
 | TonstakeControllerWithdrawValidator| 0x8efed779 |
@@ -127,6 +126,7 @@ The list below contains the supported message operations, their names and opcode
 | TonstakePoolTouch| 0x4bc7c2df |
 | TonstakePoolWithdraw| 0x319b0cdc |
 | TonstakePoolWithdrawal| 0x0a77535c |
+| TopUp| 0xd372158c |
 | TopUpChannelBalance| 0x67c7d281 |
 | UpdatePubkey| 0x53f34cd6 |
 | UpdateStorageParams| 0x54cbf19b |
diff --git a/abi/messages_generated.go b/abi/messages_generated.go
index 488bf624..422ae1ad 100644
--- a/abi/messages_generated.go
+++ b/abi/messages_generated.go
@@ -156,7 +156,7 @@ var (
 	// 0x7a361688
 	decodeFuncAcceptStorageContractMsgBody = decodeMsg(tlb.Tag{Val: 0x7a361688, Len: 32}, AcceptStorageContractMsgOp, AcceptStorageContractMsgBody{})
 	// 0x7b4b42e6
-	decodeFuncTonstakeControllerApproveMsgBody = decodeMsg(tlb.Tag{Val: 0x7b4b42e6, Len: 32}, TonstakeControllerApproveMsgOp, TonstakeControllerApproveMsgBody{})
+	decodeFuncApproveMsgBody = decodeMsg(tlb.Tag{Val: 0x7b4b42e6, Len: 32}, ApproveMsgOp, ApproveMsgBody{})
 	// 0x7bcd1fef
 	decodeFuncWhalesNominatorsDepositMsgBody = decodeMsg(tlb.Tag{Val: 0x7bcd1fef, Len: 32}, WhalesNominatorsDepositMsgOp, WhalesNominatorsDepositMsgBody{})
 	// 0x7bdd97de
@@ -202,7 +202,7 @@ var (
 	// 0xd0c3bfea
 	decodeFuncSbtRequestOwnerMsgBody = decodeMsg(tlb.Tag{Val: 0xd0c3bfea, Len: 32}, SbtRequestOwnerMsgOp, SbtRequestOwnerMsgBody{})
 	// 0xd372158c
-	decodeFuncTonstakeControllerTopUpMsgBody = decodeMsg(tlb.Tag{Val: 0xd372158c, Len: 32}, TonstakeControllerTopUpMsgOp, TonstakeControllerTopUpMsgBody{})
+	decodeFuncTopUpMsgBody = decodeMsg(tlb.Tag{Val: 0xd372158c, Len: 32}, TopUpMsgOp, TopUpMsgBody{})
 	// 0xd4caedcd
 	decodeFuncStorageContractConfirmedMsgBody = decodeMsg(tlb.Tag{Val: 0xd4caedcd, Len: 32}, StorageContractConfirmedMsgOp, StorageContractConfirmedMsgBody{})
 	// 0xd53276db
@@ -224,7 +224,7 @@ var (
 	// 0xe642c965
 	decodeFuncTonstakePoolRequestLoanMsgBody = decodeMsg(tlb.Tag{Val: 0xe642c965, Len: 32}, TonstakePoolRequestLoanMsgOp, TonstakePoolRequestLoanMsgBody{})
 	// 0xe8a0abfe
-	decodeFuncTonstakeControllerDisapproveMsgBody = decodeMsg(tlb.Tag{Val: 0xe8a0abfe, Len: 32}, TonstakeControllerDisapproveMsgOp, TonstakeControllerDisapproveMsgBody{})
+	decodeFuncDisapproveMsgBody = decodeMsg(tlb.Tag{Val: 0xe8a0abfe, Len: 32}, DisapproveMsgOp, DisapproveMsgBody{})
 	// 0xea06185d
 	decodeFuncDedustSwapMsgBody = decodeMsg(tlb.Tag{Val: 0xea06185d, Len: 32}, DedustSwapMsgOp, DedustSwapMsgBody{})
 	// 0xeb373a05
@@ -475,7 +475,7 @@ var opcodedMsgInDecodeFunctions = map[uint32]msgDecoderFunc{
 	AcceptStorageContractMsgOpCode: decodeFuncAcceptStorageContractMsgBody,
 
 	// 0x7b4b42e6
-	TonstakeControllerApproveMsgOpCode: decodeFuncTonstakeControllerApproveMsgBody,
+	ApproveMsgOpCode: decodeFuncApproveMsgBody,
 
 	// 0x7bcd1fef
 	WhalesNominatorsDepositMsgOpCode: decodeFuncWhalesNominatorsDepositMsgBody,
@@ -544,7 +544,7 @@ var opcodedMsgInDecodeFunctions = map[uint32]msgDecoderFunc{
 	SbtRequestOwnerMsgOpCode: decodeFuncSbtRequestOwnerMsgBody,
 
 	// 0xd372158c
-	TonstakeControllerTopUpMsgOpCode: decodeFuncTonstakeControllerTopUpMsgBody,
+	TopUpMsgOpCode: decodeFuncTopUpMsgBody,
 
 	// 0xd4caedcd
 	StorageContractConfirmedMsgOpCode: decodeFuncStorageContractConfirmedMsgBody,
@@ -577,7 +577,7 @@ var opcodedMsgInDecodeFunctions = map[uint32]msgDecoderFunc{
 	TonstakePoolRequestLoanMsgOpCode: decodeFuncTonstakePoolRequestLoanMsgBody,
 
 	// 0xe8a0abfe
-	TonstakeControllerDisapproveMsgOpCode: decodeFuncTonstakeControllerDisapproveMsgBody,
+	DisapproveMsgOpCode: decodeFuncDisapproveMsgBody,
 
 	// 0xea06185d
 	DedustSwapMsgOpCode: decodeFuncDedustSwapMsgBody,
@@ -688,7 +688,7 @@ const (
 	TonstakeControllerPoolSetSudoerMsgOp         MsgOpName = "TonstakeControllerPoolSetSudoer"
 	CloseStorageContractMsgOp                    MsgOpName = "CloseStorageContract"
 	AcceptStorageContractMsgOp                   MsgOpName = "AcceptStorageContract"
-	TonstakeControllerApproveMsgOp               MsgOpName = "TonstakeControllerApprove"
+	ApproveMsgOp                                 MsgOpName = "Approve"
 	WhalesNominatorsDepositMsgOp                 MsgOpName = "WhalesNominatorsDeposit"
 	JettonBurnNotificationMsgOp                  MsgOpName = "JettonBurnNotification"
 	ReportStaticDataMsgOp                        MsgOpName = "ReportStaticData"
@@ -711,7 +711,7 @@ const (
 	TonstakeImanagerStatsMsgOp                   MsgOpName = "TonstakeImanagerStats"
 	TonstakeImanagerSetInterestMsgOp             MsgOpName = "TonstakeImanagerSetInterest"
 	SbtRequestOwnerMsgOp                         MsgOpName = "SbtRequestOwner"
-	TonstakeControllerTopUpMsgOp                 MsgOpName = "TonstakeControllerTopUp"
+	TopUpMsgOp                                   MsgOpName = "TopUp"
 	StorageContractConfirmedMsgOp                MsgOpName = "StorageContractConfirmed"
 	ExcessMsgOp                                  MsgOpName = "Excess"
 	WhalesNominatorsWithdrawMsgOp                MsgOpName = "WhalesNominatorsWithdraw"
@@ -722,7 +722,7 @@ const (
 	WalletPluginDestructResponseMsgOp            MsgOpName = "WalletPluginDestructResponse"
 	DeployStorageContractMsgOp                   MsgOpName = "DeployStorageContract"
 	TonstakePoolRequestLoanMsgOp                 MsgOpName = "TonstakePoolRequestLoan"
-	TonstakeControllerDisapproveMsgOp            MsgOpName = "TonstakeControllerDisapprove"
+	DisapproveMsgOp                              MsgOpName = "Disapprove"
 	DedustSwapMsgOp                              MsgOpName = "DedustSwap"
 	TonstakeControllerRecoverStakeMsgOp          MsgOpName = "TonstakeControllerRecoverStake"
 	TonstakeNftBurnNotificationMsgOp             MsgOpName = "TonstakeNftBurnNotification"
@@ -811,7 +811,7 @@ const (
 	TonstakeControllerPoolSetSudoerMsgOpCode         MsgOpCode = 0x79e7c016
 	CloseStorageContractMsgOpCode                    MsgOpCode = 0x79f937ea
 	AcceptStorageContractMsgOpCode                   MsgOpCode = 0x7a361688
-	TonstakeControllerApproveMsgOpCode               MsgOpCode = 0x7b4b42e6
+	ApproveMsgOpCode                                 MsgOpCode = 0x7b4b42e6
 	WhalesNominatorsDepositMsgOpCode                 MsgOpCode = 0x7bcd1fef
 	JettonBurnNotificationMsgOpCode                  MsgOpCode = 0x7bdd97de
 	ReportStaticDataMsgOpCode                        MsgOpCode = 0x8b771735
@@ -834,7 +834,7 @@ const (
 	TonstakeImanagerStatsMsgOpCode                   MsgOpCode = 0xc1344900
 	TonstakeImanagerSetInterestMsgOpCode             MsgOpCode = 0xc9f04485
 	SbtRequestOwnerMsgOpCode                         MsgOpCode = 0xd0c3bfea
-	TonstakeControllerTopUpMsgOpCode                 MsgOpCode = 0xd372158c
+	TopUpMsgOpCode                                   MsgOpCode = 0xd372158c
 	StorageContractConfirmedMsgOpCode                MsgOpCode = 0xd4caedcd
 	ExcessMsgOpCode                                  MsgOpCode = 0xd53276db
 	WhalesNominatorsWithdrawMsgOpCode                MsgOpCode = 0xda803efd
@@ -845,7 +845,7 @@ const (
 	WalletPluginDestructResponseMsgOpCode            MsgOpCode = 0xe4737472
 	DeployStorageContractMsgOpCode                   MsgOpCode = 0xe4748df1
 	TonstakePoolRequestLoanMsgOpCode                 MsgOpCode = 0xe642c965
-	TonstakeControllerDisapproveMsgOpCode            MsgOpCode = 0xe8a0abfe
+	DisapproveMsgOpCode                              MsgOpCode = 0xe8a0abfe
 	DedustSwapMsgOpCode                              MsgOpCode = 0xea06185d
 	TonstakeControllerRecoverStakeMsgOpCode          MsgOpCode = 0xeb373a05
 	TonstakeNftBurnNotificationMsgOpCode             MsgOpCode = 0xed58b0b2
@@ -1292,7 +1292,7 @@ type AcceptStorageContractMsgBody struct {
 	QueryId uint64
 }
 
-type TonstakeControllerApproveMsgBody struct {
+type ApproveMsgBody struct {
 	QueryId uint64
 }
 
@@ -1439,7 +1439,7 @@ type SbtRequestOwnerMsgBody struct {
 	WithContent    bool
 }
 
-type TonstakeControllerTopUpMsgBody struct {
+type TopUpMsgBody struct {
 	QueryId uint64
 }
 
@@ -1498,7 +1498,7 @@ type TonstakePoolRequestLoanMsgBody struct {
 	ControllerData TonstakersControllerData `tlb:"^"`
 }
 
-type TonstakeControllerDisapproveMsgBody struct {
+type DisapproveMsgBody struct {
 	QueryId uint64
 }
 
@@ -1628,7 +1628,7 @@ var KnownMsgInTypes = map[string]any{
 	TonstakeControllerPoolSetSudoerMsgOp:         TonstakeControllerPoolSetSudoerMsgBody{},
 	CloseStorageContractMsgOp:                    CloseStorageContractMsgBody{},
 	AcceptStorageContractMsgOp:                   AcceptStorageContractMsgBody{},
-	TonstakeControllerApproveMsgOp:               TonstakeControllerApproveMsgBody{},
+	ApproveMsgOp:                                 ApproveMsgBody{},
 	WhalesNominatorsDepositMsgOp:                 WhalesNominatorsDepositMsgBody{},
 	JettonBurnNotificationMsgOp:                  JettonBurnNotificationMsgBody{},
 	ReportStaticDataMsgOp:                        ReportStaticDataMsgBody{},
@@ -1651,7 +1651,7 @@ var KnownMsgInTypes = map[string]any{
 	TonstakeImanagerStatsMsgOp:                   TonstakeImanagerStatsMsgBody{},
 	TonstakeImanagerSetInterestMsgOp:             TonstakeImanagerSetInterestMsgBody{},
 	SbtRequestOwnerMsgOp:                         SbtRequestOwnerMsgBody{},
-	TonstakeControllerTopUpMsgOp:                 TonstakeControllerTopUpMsgBody{},
+	TopUpMsgOp:                                   TopUpMsgBody{},
 	StorageContractConfirmedMsgOp:                StorageContractConfirmedMsgBody{},
 	ExcessMsgOp:                                  ExcessMsgBody{},
 	WhalesNominatorsWithdrawMsgOp:                WhalesNominatorsWithdrawMsgBody{},
@@ -1662,7 +1662,7 @@ var KnownMsgInTypes = map[string]any{
 	WalletPluginDestructResponseMsgOp:            WalletPluginDestructResponseMsgBody{},
 	DeployStorageContractMsgOp:                   DeployStorageContractMsgBody{},
 	TonstakePoolRequestLoanMsgOp:                 TonstakePoolRequestLoanMsgBody{},
-	TonstakeControllerDisapproveMsgOp:            TonstakeControllerDisapproveMsgBody{},
+	DisapproveMsgOp:                              DisapproveMsgBody{},
 	DedustSwapMsgOp:                              DedustSwapMsgBody{},
 	TonstakeControllerRecoverStakeMsgOp:          TonstakeControllerRecoverStakeMsgBody{},
 	TonstakeNftBurnNotificationMsgOp:             TonstakeNftBurnNotificationMsgBody{},
diff --git a/abi/schemas/liquid_stacking.xml b/abi/schemas/liquid_stacking.xml
index fda2d31f..6c86dec6 100644
--- a/abi/schemas/liquid_stacking.xml
+++ b/abi/schemas/liquid_stacking.xml
@@ -88,25 +88,25 @@
     </get_method>
 
     <!-- TonStake messages to controller -->
-    <internal name="tonstake_controller_credit">
+    <internal name="credit" fixed_length="true">
         credit#1690c604 query_id:uint64 amount:Coins = InternalMsgBody;
     </internal>
-    <internal name="tonstake_controller_approve">
+    <internal name="approve" fixed_length="true">
         approve#7b4b42e6 query_id:uint64 = InternalMsgBody;
     </internal>
-    <internal name="tonstake_controller_disapprove">
+    <internal name="disapprove" fixed_length="true">
         disapprove#e8a0abfe query_id:uint64 = InternalMsgBody;
     </internal>
-    <internal name="tonstake_controller_recover_stake">
+    <internal name="tonstake_controller_recover_stake"  fixed_length="true">
         recover_stake#eb373a05 query_id:uint64 = InternalMsgBody;
     </internal>
-    <internal name="tonstake_controller_update_validator_hash">
+    <internal name="tonstake_controller_update_validator_hash"  fixed_length="true">
         update_validator_hash#f0fd2250 query_id:uint64 = InternalMsgBody;
     </internal>
-    <internal name="tonstake_controller_withdraw_validator">
+    <internal name="tonstake_controller_withdraw_validator" fixed_length="true">
         withdraw_validator#8efed779 query_id:uint64 value:Coins = InternalMsgBody;
     </internal>
-    <internal name="tonstake_controller_validator_withdrawal">
+    <internal name="tonstake_controller_validator_withdrawal"  fixed_length="true">
         validator_withdrawal#30026327 query_id:uint64 amount:Coins = InternalMsgBody;
     </internal>
     <internal name="tonstake_controller_new_stake">
@@ -116,7 +116,7 @@
     <internal name="tonstake_controller_send_request_loan">
         send_request_loan#6335b11a query_id:uint64 min_loan:Coins max_loan:Coins max_interst:uint24 = InternalMsgBody;
     </internal>
-    <internal name="tonstake_controller_return_unused_loan">
+    <internal name="tonstake_controller_return_unused_loan" fixed_length="true">
         return_unused_loan#ed7378a6 query_id:uint64 = InternalMsgBody;
     </internal>
     <internal name="tonstake_controller_return_available_funds">
@@ -127,13 +127,13 @@
     <internal name="tonstake_pool_request_loan">
         request_loan#e642c965 query_id:uint64 min_loan:Coins max_loan:Coins max_interest:uint24 controller_data:^TonstakersControllerData= InternalMsgBody;
     </internal>
-    <internal name="tonstake_pool_loan_repayment">
+    <internal name="tonstake_pool_loan_repayment" fixed_length="true">
         loan_repayment#dfdca27b query_id:uint64 = InternalMsgBody;
     </internal>
     <internal name="tonstake_pool_deposit">
         deposit#47d54391 query_id:uint64 referral:Cell = InternalMsgBody;
     </internal>
-    <internal name="tonstake_pool_touch">
+    <internal name="tonstake_pool_touch" fixed_length="true">
         touch#4bc7c2df query_id:uint64 = InternalMsgBody;
     </internal>
     <internal name="tonstake_pool_set_governance_fee">
@@ -143,7 +143,7 @@
         withdraw#319b0cdc query_id:uint64 jetton_amount:Coins from_address:MsgAddress response_address:MsgAddress =
         InternalMsgBody;
     </internal>
-    <internal name="tonstake_pool_withdrawal">
+    <internal name="tonstake_pool_withdrawal" fixed_length="true">
         withdrawal#0a77535c query_id:uint64 = InternalMsgBody;
     </internal>
     <internal name="tonstake_pool_set_roles">
@@ -161,30 +161,30 @@
 
 
     <!-- TonStake messages to pool and controller -->
-    <internal name="tonstake_controller_pool_send_message">
+    <internal name="tonstake_controller_pool_send_message" fixed_length="true">
         send_message#270695fb query_id:uint64 mode:uint8 msg:^Cell = InternalMsgBody;
     </internal>
-    <internal name="tonstake_controller_pool_upgrade" >
+    <internal name="tonstake_controller_pool_upgrade"  fixed_length="true">
         upgrade#96e7f528 query_id:uint64 data:(Maybe ^Cell) code:(Maybe ^Cell) after_upgrade:(Maybe ^Cell) =
         InternalMsgBody;
     </internal>
-    <internal name="tonstake_controller_pool_set_sudoer">
+    <internal name="tonstake_controller_pool_set_sudoer" fixed_length="true">
         set_sudoer#79e7c016 query_id:uint64 sudoer:MsgAddress = InternalMsgBody;
     </internal>
-    <internal name="tonstake_controller_pool_unhalt">
+    <internal name="tonstake_controller_pool_unhalt" fixed_length="true">
         unhalt#7247e7a5 query_id:uint64 = InternalMsgBody;
     </internal>
-    <internal name="tonstake_controller_pool_halt">
+    <internal name="tonstake_controller_pool_halt" fixed_length="true">
         halt#139a1b4e query_id:uint64 = InternalMsgBody;
     </internal>
-    <internal name="tonstake_controller_top_up">
+    <internal name="top_up" fixed_length="true">
         top_up#d372158c query_id:uint64 = InternalMsgBody;
     </internal>
 
-    <internal name="tonstake_imanager_set_interest" >
+    <internal name="tonstake_imanager_set_interest"  fixed_length="true">
         set_interest#c9f04485 query_id:uint64 interest_rate:uint16 = InternalMsgBody;
     </internal>
-    <internal name="tonstake_imanager_operation_fee" >
+    <internal name="tonstake_imanager_operation_fee"  fixed_length="true">
         operation_fee#54d37487 query_id:uint64 = InternalMsgBody;
     </internal>
     <internal name="tonstake_imanager_request_notification" >
@@ -195,7 +195,7 @@
     </internal>
     
     
-    <internal name="tonstake_nft_burn">
+    <internal name="tonstake_nft_burn" fixed_length="true">
         burn#f127fe4e query_id:uint64 = InternalMsgBody;
     </internal>
     <internal name="tonstake_nft_burn_notification">
@@ -204,7 +204,7 @@
     <internal name="tonstake_nft_init">
         init_nft#132f9a45 query_id:uint64 owner:MsgAddress amount:Coins prev:MsgAddress next:MsgAddress = InternalMsgBody;
     </internal>
-    <internal name="tonstake_nft_payout">
+    <internal name="tonstake_nft_payout" fixed_length="true">
         tonstake_nft_payout#db3b8abd query_id:uint64 = InternalMsgBody;
     </internal>