diff --git a/addons/portal_sale/portal_sale.py b/addons/portal_sale/portal_sale.py
index 0d8a1004081..c422c7ac57e 100644
--- a/addons/portal_sale/portal_sale.py
+++ b/addons/portal_sale/portal_sale.py
@@ -22,14 +22,14 @@ class sale_order(osv.Model):
             pass
         return action_dict
 
-    def action_button_confirm(self, cr, uid, ids, context=None):
+    def action_confirm(self, cr, uid, ids, context=None):
         # fetch the partner's id and subscribe the partner to the sale order
         assert len(ids) == 1
         document = self.browse(cr, uid, ids[0], context=context)
         partner = document.partner_id
         if partner not in document.message_partner_ids:
             self.message_subscribe(cr, uid, ids, [partner.id], context=context)
-        return super(sale_order, self).action_button_confirm(cr, uid, ids, context=context)
+        return super(sale_order, self).action_confirm(cr, uid, ids, context=context)
 
     def get_signup_url(self, cr, uid, ids, context=None):
         assert len(ids) == 1
diff --git a/addons/website_event_sale/controllers/main.py b/addons/website_event_sale/controllers/main.py
index 457ed29b719..99681dcb4a5 100644
--- a/addons/website_event_sale/controllers/main.py
+++ b/addons/website_event_sale/controllers/main.py
@@ -47,7 +47,7 @@ class website_event(website_event):
 
         # free tickets -> order with amount = 0: auto-confirm, no checkout
         if not order.amount_total:
-            order.action_button_confirm()  # tde notsure: email sending ?
+            order.action_confirm()  # tde notsure: email sending ?
             attendees = request.registry['event.registration'].browse(cr, uid, list(attendee_ids), context=context)
             # clean context and session, then redirect to the confirmation page
             request.website.sale_reset(context=context)
diff --git a/addons/website_portal_sale/views/templates.xml b/addons/website_portal_sale/views/templates.xml
index 915eaf78e43..2ce9f008c24 100644
--- a/addons/website_portal_sale/views/templates.xml
+++ b/addons/website_portal_sale/views/templates.xml
@@ -132,7 +132,7 @@
                             </t>
                         </td>
                         <td>
-                          <a t-if="invoice.state == 'open'" t-attf-href="/website_payment/pay?reference=#{invoice.number}&amp;amount=#{invoice.amount_total}&amp;currency_id=#{invoice.currency_id.id}&amp;partner_id=#{invoice.partner_id.id}&amp;country_id=#{invoice.partner_id.country_id.id}" alt="Pay Now" class="btn btn-xs btn-primary"><i class="fa fa-arrow-circle-right"/> Pay Now</a>
+                          <a t-if="invoice.state == 'open'" t-attf-href="/website_payment/pay?reference=#{invoice.number}&amp;amount=#{invoice.amount_total}&amp;currency_id=#{invoice.currency_id.id}&amp;country_id=#{invoice.partner_id.country_id.id}" alt="Pay Now" class="btn btn-xs btn-primary"><i class="fa fa-arrow-circle-right"/> Pay Now</a>
                         </td>
                         <td><span t-esc="invoice.amount_total" t-esc-options='{"widget": "monetary", "display_currency": "invoice.currency_id"}'/></td>
                     </tr>
diff --git a/addons/website_quote/controllers/main.py b/addons/website_quote/controllers/main.py
index 173045a9484..cfb6babb65a 100644
--- a/addons/website_quote/controllers/main.py
+++ b/addons/website_quote/controllers/main.py
@@ -196,6 +196,6 @@ class sale_quote(http.Controller):
 
         # confirm the quotation
         if tx.acquirer_id.auto_confirm == 'at_pay_now':
-            request.registry['sale.order'].action_button_confirm(cr, SUPERUSER_ID, [order.id], context=request.context)
+            request.registry['sale.order'].action_confirm(cr, SUPERUSER_ID, [order.id], context=request.context)
 
         return tx_id
diff --git a/addons/website_quote/models/payment.py b/addons/website_quote/models/payment.py
index 991decaa3cb..5bdd75cc3dd 100644
--- a/addons/website_quote/models/payment.py
+++ b/addons/website_quote/models/payment.py
@@ -23,6 +23,6 @@ class PaymentTransaction(orm.Model):
         if hasattr(self, tx_find_method_name):
             tx = getattr(self, tx_find_method_name)(cr, uid, data, context=context)
         if tx and tx.state == 'done' and tx.acquirer_id.auto_confirm == 'at_pay_confirm' and tx.sale_order_id and tx.sale_order_id.state in ['draft', 'sent']:
-            self.pool['sale.order'].action_button_confirm(cr, SUPERUSER_ID, [tx.sale_order_id.id], context=context)
+            self.pool['sale.order'].action_confirm(cr, SUPERUSER_ID, [tx.sale_order_id.id], context=context)
 
         return res
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 38559086c4c..f39333ab892 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -800,7 +800,7 @@ class website_sale(http.Controller):
 
         # confirm the quotation
         if tx.acquirer_id.auto_confirm == 'at_pay_now':
-            request.registry['sale.order'].action_button_confirm(cr, SUPERUSER_ID, [order.id], context=request.context)
+            request.registry['sale.order'].action_confirm(cr, SUPERUSER_ID, [order.id], context=request.context)
 
         return tx_id
 
@@ -868,7 +868,7 @@ class website_sale(http.Controller):
             if (not order.amount_total and not tx):
                 # Orders are confirmed by payment transactions, but there is none for free orders,
                 # (e.g. free events), so confirm immediately
-                order.with_context(dict(context, send_email=True)).action_button_confirm()
+                order.with_context(dict(context, send_email=True)).action_confirm()
         elif tx and tx.state == 'cancel':
             # cancel the quotation
             sale_order_obj.action_cancel(cr, SUPERUSER_ID, [order.id], context=request.context)
diff --git a/addons/website_sale/models/payment.py b/addons/website_sale/models/payment.py
index e72b609cbd3..563a8597a20 100644
--- a/addons/website_sale/models/payment.py
+++ b/addons/website_sale/models/payment.py
@@ -23,7 +23,7 @@ class PaymentTransaction(orm.Model):
         if hasattr(self, tx_find_method_name):
             tx = getattr(self, tx_find_method_name)(cr, uid, data, context=context)
         if tx and tx.state == 'done' and tx.acquirer_id.auto_confirm == 'at_pay_confirm' and tx.sale_order_id and tx.sale_order_id.state in ['draft', 'sent']:
-            self.pool['sale.order'].action_button_confirm(cr, SUPERUSER_ID, [tx.sale_order_id.id], context=dict(context, send_email=True))
+            self.pool['sale.order'].action_confirm(cr, SUPERUSER_ID, [tx.sale_order_id.id], context=dict(context, send_email=True))
         elif tx and tx.state not in ['cancel'] and tx.sale_order_id and tx.sale_order_id.state in ['draft']:
             self.pool['sale.order'].force_quotation_send(cr, SUPERUSER_ID, [tx.sale_order_id.id], context=context)