diff --git a/l10n_br_account_payment_brcobranca/models/account_move_line.py b/l10n_br_account_payment_brcobranca/models/account_move_line.py
index 419632054c12..3d5301bfab8e 100644
--- a/l10n_br_account_payment_brcobranca/models/account_move_line.py
+++ b/l10n_br_account_payment_brcobranca/models/account_move_line.py
@@ -90,7 +90,9 @@ def send_payment(self):
             if bank_account_id.bank_id.code_bc in ("033"):
                 boleto_cnab_api_data.update(
                     {
-                        "carteira": str(move_line.payment_mode_id.boleto_wallet2),
+                        "carteira": str(
+                            move_line.payment_mode_id.boleto_wallet_to_impress
+                        ),
                     }
                 )
 
diff --git a/l10n_br_account_payment_brcobranca/models/account_payment_order.py b/l10n_br_account_payment_brcobranca/models/account_payment_order.py
index a4e40e73c766..1d394a7c9542 100644
--- a/l10n_br_account_payment_brcobranca/models/account_payment_order.py
+++ b/l10n_br_account_payment_brcobranca/models/account_payment_order.py
@@ -40,7 +40,7 @@ def _prepare_remessa_santander_400(self, remessa_values):
         remessa_values.update(
             {
                 "codigo_carteira": str(self.payment_mode_id.boleto_wallet),
-                "codigo_transmissao": self.payment_mode_id.transmission_code,
+                "codigo_transmissao": int(self.payment_mode_id.code_convetion),
                 "conta_corrente": misc.punctuation_rm(
                     self.journal_id.bank_account_id.acc_number
                 ),
diff --git a/l10n_br_account_payment_order/models/l10n_br_cnab_boleto_fields.py b/l10n_br_account_payment_order/models/l10n_br_cnab_boleto_fields.py
index 7b16f50700ec..398b5c0b3b35 100644
--- a/l10n_br_account_payment_order/models/l10n_br_cnab_boleto_fields.py
+++ b/l10n_br_account_payment_order/models/l10n_br_cnab_boleto_fields.py
@@ -21,7 +21,7 @@ class L10nBrCNABBoletoFields(models.AbstractModel):
     code_convetion = fields.Char(
         string="Código do Convênio no Banco",
         size=20,
-        help="Campo G007 do CNAB",
+        help="Codigo da Empresa/Beneficiario/Convenio/Transmissão",
         tracking=True,
     )
 
@@ -51,21 +51,6 @@ class L10nBrCNABBoletoFields(models.AbstractModel):
         tracking=True,
     )
 
-    boleto_wallet2 = fields.Char(
-        string="Carteira Boleto",
-        help="Código da carteira para ser impresso no boleto, "
-        "quando o mesmo for diferente do impresso na remessa.",
-        size=3,
-        tracking=True,
-    )
-
-    transmission_code = fields.Char(
-        string="Código de Transmissão",
-        help="Informação cedida pelo banco que identifica o arquivo remessa do cliente",
-        size=20,
-        tracking=True,
-    )
-
     boleto_modality = fields.Char(
         string="Modalidade",
         size=2,
@@ -322,3 +307,12 @@ class L10nBrCNABBoletoFields(models.AbstractModel):
         " usado pelos bancos Sicred/Unicred e Sicoob.",
         tracking=True,
     )
+
+    # Santander
+    boleto_wallet_to_impress = fields.Char(
+        string="Carteira Boleto",
+        help="Código da carteira para ser impresso no boleto, "
+        "quando o mesmo for diferente do impresso na remessa.",
+        size=3,
+        tracking=True,
+    )
diff --git a/l10n_br_account_payment_order/views/account_payment_mode.xml b/l10n_br_account_payment_order/views/account_payment_mode.xml
index 37da9a2c1ed1..e98ec44f9b76 100644
--- a/l10n_br_account_payment_order/views/account_payment_mode.xml
+++ b/l10n_br_account_payment_order/views/account_payment_mode.xml
@@ -52,10 +52,12 @@
                                     attrs="{'required': [('payment_method_code', 'in', ('240', '400', '500')), ('payment_type', '==', 'inbound')]}"
                                 />
                                 <field name="boleto_wallet" />
-                                <field name="boleto_wallet2" />
+                                <field
+                                    name="boleto_wallet_to_impress"
+                                    attrs="{'invisible': [('bank_code_bc', 'not in', ('033') )]}"
+                                />
                                 <field name="boleto_modality" />
                                 <field name="boleto_variation" />
-                                <field name="transmission_code" />
                                 <field name="boleto_accept" />
                                 <field name="boleto_species" />
                                 <field name="payment_method_code" invisible="1" />