diff --git a/js/gratipay/payments.js b/js/gratipay/payments.js
index 813760e6c3..af2dd869b9 100644
--- a/js/gratipay/payments.js
+++ b/js/gratipay/payments.js
@@ -76,7 +76,7 @@ Gratipay.payments.ba = {};
 
 Gratipay.payments.ba.init = function(participantId) {
     Gratipay.payments.init(participantId);
-    $('#payout').submit(Gratipay.payments.ba.submit);
+    $('form#bank-account').submit(Gratipay.payments.ba.submit);
 };
 
 Gratipay.payments.ba.submit = function (e) {
@@ -203,7 +203,7 @@ Gratipay.payments.cc = {};
 
 Gratipay.payments.cc.init = function(participantId) {
     Gratipay.payments.init(participantId);
-    $('form#payment').submit(Gratipay.payments.cc.submit);
+    $('form#credit-card').submit(Gratipay.payments.cc.submit);
     Gratipay.payments.cc.formatInputs(
         $('#card_number'),
         $('#expiration_month'),
@@ -346,7 +346,7 @@ Gratipay.payments.cc.submit = function(e) {
     // Adapt our form lingo to balanced nomenclature.
 
     function val(field) {
-        return $('form#payment input[id="' + field + '"]').val();
+        return $('form#credit-card input[id="' + field + '"]').val();
     }
 
     var credit_card = {};   // holds CC info
diff --git a/www/bank-account.html.spt b/www/bank-account.html.spt
index d5b92844df..301b26cd3b 100644
--- a/www/bank-account.html.spt
+++ b/www/bank-account.html.spt
@@ -76,7 +76,7 @@ title = _("Bank Account")
         {% endif %}
     </style>
     <div class="cc-ba">
-        <form id="payout" autocomplete="off">
+        <form id="bank-account" autocomplete="off">
             <div class="constrain-width clearfix">
 
                 {% if account and 'merchant' in account.roles %}
diff --git a/www/credit-card.html.spt b/www/credit-card.html.spt
index ef5565b894..d1d3fd5875 100644
--- a/www/credit-card.html.spt
+++ b/www/credit-card.html.spt
@@ -78,7 +78,7 @@ title = _("Credit Card")
         {% endif %}
     </style>
     <div class="cc-ba">
-        <form id="payment" autocomplete="off">
+        <form id="credit-card" autocomplete="off">
             <div class="constrain-width clearfix">
 
                 <h2>{{ _("Required") }}</h2>