diff --git a/app/Console/Stubs/Modules/listeners/install.stub b/app/Console/Stubs/Modules/listeners/install.stub
index a7276dd59..a762c4e8f 100644
--- a/app/Console/Stubs/Modules/listeners/install.stub
+++ b/app/Console/Stubs/Modules/listeners/install.stub
@@ -5,7 +5,7 @@ namespace $MODULE_NAMESPACE$\$STUDLY_NAME$\Listeners;
 use App\Events\Module\Installed as Event;
 use App\Traits\Permissions;
 
-class InstallModule
+class FinishInstallation
 {
     use Permissions;
 
diff --git a/modules/OfflinePayments/Listeners/InstallModule.php b/modules/OfflinePayments/Listeners/FinishInstallation.php
similarity index 96%
rename from modules/OfflinePayments/Listeners/InstallModule.php
rename to modules/OfflinePayments/Listeners/FinishInstallation.php
index 2308f0b4d..89a7804ef 100644
--- a/modules/OfflinePayments/Listeners/InstallModule.php
+++ b/modules/OfflinePayments/Listeners/FinishInstallation.php
@@ -5,7 +5,7 @@ namespace Modules\OfflinePayments\Listeners;
 use App\Events\Module\Installed as Event;
 use App\Traits\Permissions;
 
-class InstallModule
+class FinishInstallation
 {
     use Permissions;
 
diff --git a/modules/OfflinePayments/Listeners/ShowPaymentMethod.php b/modules/OfflinePayments/Listeners/ShowAsPaymentMethod.php
similarity index 94%
rename from modules/OfflinePayments/Listeners/ShowPaymentMethod.php
rename to modules/OfflinePayments/Listeners/ShowAsPaymentMethod.php
index ea7e776a7..66fa8f26d 100644
--- a/modules/OfflinePayments/Listeners/ShowPaymentMethod.php
+++ b/modules/OfflinePayments/Listeners/ShowAsPaymentMethod.php
@@ -4,7 +4,7 @@ namespace Modules\OfflinePayments\Listeners;
 
 use App\Events\Module\PaymentMethodShowing as Event;
 
-class ShowPaymentMethod
+class ShowAsPaymentMethod
 {
     /**
      * Handle the event.
diff --git a/modules/OfflinePayments/Listeners/ShowSetting.php b/modules/OfflinePayments/Listeners/ShowInSettingsPage.php
similarity index 95%
rename from modules/OfflinePayments/Listeners/ShowSetting.php
rename to modules/OfflinePayments/Listeners/ShowInSettingsPage.php
index 7e8c06138..a69afc123 100644
--- a/modules/OfflinePayments/Listeners/ShowSetting.php
+++ b/modules/OfflinePayments/Listeners/ShowInSettingsPage.php
@@ -4,7 +4,7 @@ namespace Modules\OfflinePayments\Listeners;
 
 use App\Events\Module\SettingShowing as Event;
 
-class ShowSetting
+class ShowInSettingsPage
 {
     /**
      * Handle the event.
diff --git a/modules/OfflinePayments/Providers/Event.php b/modules/OfflinePayments/Providers/Event.php
index 81c49182b..a83f4d980 100644
--- a/modules/OfflinePayments/Providers/Event.php
+++ b/modules/OfflinePayments/Providers/Event.php
@@ -3,9 +3,9 @@
 namespace Modules\OfflinePayments\Providers;
 
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as Provider;
-use Modules\OfflinePayments\Listeners\InstallModule;
-use Modules\OfflinePayments\Listeners\ShowPaymentMethod;
-use Modules\OfflinePayments\Listeners\ShowSetting;
+use Modules\OfflinePayments\Listeners\FinishInstallation;
+use Modules\OfflinePayments\Listeners\ShowAsPaymentMethod;
+use Modules\OfflinePayments\Listeners\ShowInSettingsPage;
 
 class Event extends Provider
 {
@@ -16,13 +16,13 @@ class Event extends Provider
      */
     protected $listen = [
         \App\Events\Module\Installed::class => [
-            InstallModule::class,
+            FinishInstallation::class,
         ],
         \App\Events\Module\PaymentMethodShowing::class => [
-            ShowPaymentMethod::class,
+            ShowAsPaymentMethod::class,
         ],
         \App\Events\Module\SettingShowing::class => [
-            ShowSetting::class,
+            ShowInSettingsPage::class,
         ],
     ];
 }
diff --git a/modules/PaypalStandard/Listeners/ShowPaymentMethod.php b/modules/PaypalStandard/Listeners/ShowAsPaymentMethod.php
similarity index 93%
rename from modules/PaypalStandard/Listeners/ShowPaymentMethod.php
rename to modules/PaypalStandard/Listeners/ShowAsPaymentMethod.php
index 9d11bb115..76fc7e445 100644
--- a/modules/PaypalStandard/Listeners/ShowPaymentMethod.php
+++ b/modules/PaypalStandard/Listeners/ShowAsPaymentMethod.php
@@ -4,7 +4,7 @@ namespace Modules\PaypalStandard\Listeners;
 
 use App\Events\Module\PaymentMethodShowing as Event;
 
-class ShowPaymentMethod
+class ShowAsPaymentMethod
 {
     /**
      * Handle the event.
diff --git a/modules/PaypalStandard/Providers/Event.php b/modules/PaypalStandard/Providers/Event.php
new file mode 100644
index 000000000..ee4fa3008
--- /dev/null
+++ b/modules/PaypalStandard/Providers/Event.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Modules\PaypalStandard\Providers;
+
+use Illuminate\Foundation\Support\Providers\EventServiceProvider as Provider;
+use Modules\PaypalStandard\Listeners\ShowAsPaymentMethod;
+
+class Event extends Provider
+{
+    /**
+     * The event listener mappings for the module.
+     *
+     * @var array
+     */
+    protected $listen = [
+        \App\Events\Module\PaymentMethodShowing::class => [
+            ShowAsPaymentMethod::class,
+        ],
+    ];
+}
diff --git a/modules/PaypalStandard/Providers/Main.php b/modules/PaypalStandard/Providers/Main.php
index e98704dab..e046d9eca 100644
--- a/modules/PaypalStandard/Providers/Main.php
+++ b/modules/PaypalStandard/Providers/Main.php
@@ -3,7 +3,6 @@
 namespace Modules\PaypalStandard\Providers;
 
 use Illuminate\Support\ServiceProvider as Provider;
-use Modules\PaypalStandard\Listeners\ShowPaymentMethod;
 
 class Main extends Provider
 {
@@ -16,7 +15,6 @@ class Main extends Provider
     {
         $this->loadTranslations();
         $this->loadViews();
-        $this->loadEvents();
     }
 
     /**
@@ -49,16 +47,6 @@ class Main extends Provider
         $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'paypal-standard');
     }
 
-    /**
-     * Load events.
-     *
-     * @return void
-     */
-    public function loadEvents()
-    {
-        $this->app['events']->listen(\App\Events\Module\PaymentMethodShowing::class, ShowPaymentMethod::class);
-    }
-
     /**
      * Load routes.
      *
diff --git a/modules/PaypalStandard/module.json b/modules/PaypalStandard/module.json
index fc7ed3410..a4a262a9e 100644
--- a/modules/PaypalStandard/module.json
+++ b/modules/PaypalStandard/module.json
@@ -5,6 +5,7 @@
     "category": "payment-method",
     "active": 1,
     "providers": [
+        "Modules\\PaypalStandard\\Providers\\Event",
         "Modules\\PaypalStandard\\Providers\\Main"
     ],
     "aliases": {},