diff --git a/energy_selfconsumption/wizards/contract_generation_wizard.py b/energy_selfconsumption/wizards/contract_generation_wizard.py
index 02173adbf9ffa701c4997cb05ce812add6bf62de..3a784ab8c8f1c21937bd9bd3ffec93ede1b33579 100644
--- a/energy_selfconsumption/wizards/contract_generation_wizard.py
+++ b/energy_selfconsumption/wizards/contract_generation_wizard.py
@@ -51,17 +51,16 @@ class ContractGenerationWizard(models.TransientModel):
             )
             # We use the next method from the contract model to update the contract fields with contract template
             contract._onchange_contract_template_id()
-            # Now, we need to update the name field using the code and display_name fields
-            name = _("""CUPS: %s\nOwner: %s\nInvoicing period: #START# - #END#""") % (
-                supply_point_assignation.supply_point_id.code,
-                supply_point_assignation.supply_point_id.owner_id.display_name,
-            )
-            contract.contract_line_ids.write(
-                {
-                    "name": name,
-                    "supply_point_assignation_id": supply_point_assignation.id,
-                }
-            )
+            for contract_line_id in contract.contract_line_ids:
+                contract_line_id.write(
+                    {
+                        "name": contract_line_id.name.format(
+                            code=supply_point_assignation.supply_point_id.code,
+                            owner_id=supply_point_assignation.supply_point_id.owner_id.display_name,
+                        ),
+                        "supply_point_assignation_id": supply_point_assignation.id,
+                    }
+                )
         # Update selfconsumption and distribution_table state
         self.selfconsumption_id.write({"state": "active"})
         self.selfconsumption_id.distribution_table_state("process", "active")
diff --git a/energy_selfconsumption/wizards/define_invoicing_mode_wizard.py b/energy_selfconsumption/wizards/define_invoicing_mode_wizard.py
index 5ffa60d27fea0277e60041d997d790b83950c200..955c0f31b8886826e8b0a91c2e412a602d96af3a 100644
--- a/energy_selfconsumption/wizards/define_invoicing_mode_wizard.py
+++ b/energy_selfconsumption/wizards/define_invoicing_mode_wizard.py
@@ -89,7 +89,8 @@ class ContractGenerationWizard(models.TransientModel):
             "company_id": self.env.company.id,
             "qty_type": "variable",
             "qty_formula_id": formula_contract_id.id,
-            "name": "",
+            # Values are formatted in contract_generation_wizard
+            "name": """CUPS: {code}\nOwner: {owner_id}\nInvoicing period: #START# - #END#""",
         }
 
     def save_data_to_selfconsumption(self):