diff --git a/addons/gift_card/models/gift_card.py b/addons/gift_card/models/gift_card.py
index 80ed4b94bdc..8acc1763a51 100644
--- a/addons/gift_card/models/gift_card.py
+++ b/addons/gift_card/models/gift_card.py
@@ -38,10 +38,9 @@ class GiftCard(models.Model):
         ('check_amount', 'CHECK(initial_amount >= 0)', 'The initial amount must be positive.')
     ]
 
-    @api.depends("balance")
     def _compute_name(self):
         for record in self:
-            record.name = _("Gift #%s", self.id)
+            record.name = _("Gift #%s", record.id)
 
     @api.depends("initial_amount", "redeem_line_ids")
     def _compute_balance(self):
diff --git a/addons/gift_card/models/sale_order.py b/addons/gift_card/models/sale_order.py
index 53073e6d7b0..8329b6fc14a 100644
--- a/addons/gift_card/models/sale_order.py
+++ b/addons/gift_card/models/sale_order.py
@@ -22,8 +22,8 @@ class SaleOrder(models.Model):
 
         # create and send gift card when order become confirmed
         for record in self.filtered(lambda so: so.state == 'sale'):
-            for gift_card_oder_line in record.order_line.filtered(lambda ol: ol.product_id.is_gift_card):
-                gift_card_oder_line._create_gift_cards()
+            for gift_card_order_line in record.order_line.filtered(lambda ol: ol.product_id.is_gift_card):
+                gift_card_order_line._create_gift_cards()
             record.sudo()._send_gift_card_mail()
 
     def _pay_with_gift_card(self, gift_card):
@@ -83,7 +83,7 @@ class SaleOrderLine(models.Model):
     _inherit = "sale.order.line"
 
     generated_gift_card_ids = fields.One2many('gift.card', "buy_line_id", string="Bought Gift Card")
-    gift_card_id = fields.Many2one('gift.card', help="Deduced from this Gift Card", copy=False)
+    gift_card_id = fields.Many2one('gift.card', help="Deducted from this Gift Card", copy=False)
 
     def _is_not_sellable_line(self):
         return self.gift_card_id or super()._is_not_sellable_line()