diff --git a/src/pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js b/src/pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js
index e9e54add1f..8b4ca095c7 100644
--- a/src/pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js
+++ b/src/pretix/plugins/paypal2/static/pretixplugins/paypal2/pretix-paypal.js
@@ -92,7 +92,7 @@ var pretixpaypal = {
         }
 
         // We are setting the cogwheel already here, as the renderAPM() method might take some time to get loaded.
-        const apmtextselector = $("input[name=payment][value=paypal_apm]").closest("fieldset").find(".provider-name");
+        const apmtextselector = $("input[name=payment][value=paypal_apm]").closest("label").find(".accordion-label-text");
         apmtextselector.append(' <span aria-hidden="true" class="fa fa-cog fa-spin"></span>');
 
         let sdk_url = 'https://www.paypal.com/sdk/js' +
@@ -269,7 +269,7 @@ var pretixpaypal = {
     renderAPMs: function () {
         pretixpaypal.restore();
         let inputselector = $("input[name=payment][value=paypal_apm]");
-        let textselector = inputselector.closest("fieldset").find('.provider-name');
+        let textselector = inputselector.closest("label").find('.accordion-label-text');
         let eligibles = [];
 
         pretixpaypal.paypal.getFundingSources().forEach(function (fundingSource) {
diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
index 4925d42990..84d23059f3 100644
--- a/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
+++ b/src/pretix/presale/templates/pretixpresale/event/checkout_payment.html
@@ -74,7 +74,7 @@
                                            {% if selected == p.provider.identifier %}checked="checked"{% endif %}
                                            aria-controls="payment_{{ p.provider.identifier }}"
                                            data-wallets="{{ p.provider.walletqueries|join:"|" }}" />
-                                    <strong class="provider-name">{{ p.provider.public_name }}</strong>
+                                    <strong class="accordion-label-text">{{ p.provider.public_name }}</strong>
                                 </span>
                             </label>
                         </legend>
diff --git a/src/pretix/presale/templates/pretixpresale/event/order_pay_change.html b/src/pretix/presale/templates/pretixpresale/event/order_pay_change.html
index 853ad9576a..c32e568c57 100644
--- a/src/pretix/presale/templates/pretixpresale/event/order_pay_change.html
+++ b/src/pretix/presale/templates/pretixpresale/event/order_pay_change.html
@@ -39,7 +39,7 @@
                                 <input type="radio" name="payment" value="{{ p.provider.identifier }}"
                                         {% if selected == p.provider.identifier %}checked="checked"{% endif %}
                                         data-wallets="{{ p.provider.walletqueries|join:"|" }}"/>
-                                <strong class="provider-name">{{ p.provider.public_name }}</strong>
+                                <strong class="accordion-label-text">{{ p.provider.public_name }}</strong>
                             </span>
                         </label>
                     </legend>
diff --git a/src/pretix/static/pretixpresale/js/walletdetection.js b/src/pretix/static/pretixpresale/js/walletdetection.js
index 0ebd7f4d48..94e11fc7a8 100644
--- a/src/pretix/static/pretixpresale/js/walletdetection.js
+++ b/src/pretix/static/pretixpresale/js/walletdetection.js
@@ -53,7 +53,7 @@ $(function () {
         });
 
     wallets.forEach(function(wallet) {
-        const labels = $('[data-wallets*='+wallet+'] + .provider-name')
+        const labels = $('[data-wallets*='+wallet+'] + .accordion-label-text')
             .append('<span class="wallet wallet-loading" data-wallet="'+wallet+'"> <span aria-hidden="true" class="fa fa-cog fa-spin"></span></span>')
         walletdetection[wallet]()
             .then(function(result) {