diff --git a/addons/payment/data/onboarding_data.xml b/addons/payment/data/onboarding_data.xml
index ffe9c0588a3..7669fad2ed1 100644
--- a/addons/payment/data/onboarding_data.xml
+++ b/addons/payment/data/onboarding_data.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-<data noupdate="1">
-    <!-- ONBOARDING STEPS (WITHOUT PANEL)-->
+<odoo noupdate="1">
+
+    <!-- ONBOARDING STEPS (WITHOUT PANEL) -->
     <record id="onboarding_onboarding_step_payment_provider" model="onboarding.onboarding.step">
         <field name="title">Online Payments</field>
         <field name="sequence">99</field>
     </record>
-</data>
+
 </odoo>
diff --git a/addons/payment/models/__init__.py b/addons/payment/models/__init__.py
index b91b37f64ae..f4fd11e322d 100644
--- a/addons/payment/models/__init__.py
+++ b/addons/payment/models/__init__.py
@@ -1,10 +1,10 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import ir_http
+from . import onboarding_step
 from . import payment_method
 from . import payment_provider
 from . import payment_token
 from . import payment_transaction
-from . import onboarding_onboarding_step
 from . import res_company
 from . import res_partner
diff --git a/addons/payment/models/onboarding_onboarding_step.py b/addons/payment/models/onboarding_step.py
similarity index 60%
rename from addons/payment/models/onboarding_onboarding_step.py
rename to addons/payment/models/onboarding_step.py
index 242e00d8082..75d9e0bdc51 100644
--- a/addons/payment/models/onboarding_onboarding_step.py
+++ b/addons/payment/models/onboarding_step.py
@@ -8,5 +8,5 @@ class OnboardingStep(models.Model):
 
     @api.model
     def action_validate_step_payment_provider(self):
-        """Override to validate other steps as well."""
-        return self.action_validate_step("payment.onboarding_onboarding_step_payment_provider")
+        """ Override of `onboarding` to validate other steps as well. """
+        return self.action_validate_step('payment.onboarding_onboarding_step_payment_provider')
diff --git a/addons/payment_stripe/controllers/onboarding.py b/addons/payment_stripe/controllers/onboarding.py
index 8c9dda8091d..00cee246612 100644
--- a/addons/payment_stripe/controllers/onboarding.py
+++ b/addons/payment_stripe/controllers/onboarding.py
@@ -12,7 +12,7 @@ class OnboardingController(http.Controller):
 
     @http.route(_onboarding_return_url, type='http', methods=['GET'], auth='user')
     def stripe_return_from_onboarding(self, provider_id, menu_id):
-        """Redirect the user to the provider form of the onboarded Stripe account.
+        """ Redirect the user to the provider form of the onboarded Stripe account.
 
         The user is redirected to this route by Stripe after or during (if the user clicks on a
         dedicated button) the onboarding.
diff --git a/addons/payment_stripe/models/payment_provider.py b/addons/payment_stripe/models/payment_provider.py
index 0cac7956a71..0e7a803b87c 100644
--- a/addons/payment_stripe/models/payment_provider.py
+++ b/addons/payment_stripe/models/payment_provider.py
@@ -134,7 +134,7 @@ class PaymentProvider(models.Model):
         self.ensure_one()
 
         if self.state == 'enabled':
-            self.env["onboarding.onboarding.step"].action_validate_step_payment_provider()
+            self.env['onboarding.onboarding.step'].action_validate_step_payment_provider()
             action = {'type': 'ir.actions.act_window_close'}
         else:
             # Account creation