diff --git a/modules/OfflinePayment/Listeners/OfflinePaymentAdminMenu.php b/modules/OfflinePayment/Listeners/AdminMenu.php
similarity index 90%
rename from modules/OfflinePayment/Listeners/OfflinePaymentAdminMenu.php
rename to modules/OfflinePayment/Listeners/AdminMenu.php
index 2aa3bcb6b..69b049221 100644
--- a/modules/OfflinePayment/Listeners/OfflinePaymentAdminMenu.php
+++ b/modules/OfflinePayment/Listeners/AdminMenu.php
@@ -2,10 +2,9 @@
 
 namespace Modules\OfflinePayment\Listeners;
 
-use Auth;
 use App\Events\AdminMenuCreated;
 
-class OfflinePaymentAdminMenu
+class AdminMenu
 {
 
     /**
@@ -16,7 +15,7 @@ class OfflinePaymentAdminMenu
      */
     public function handle(AdminMenuCreated $event)
     {
-        $user = Auth::user();
+        $user = auth()->user();
 
         // Settings
         if ($user->can(['read-settings-settings', 'read-settings-categories', 'read-settings-currencies', 'read-settings-taxes'])) {
diff --git a/modules/OfflinePayment/Listeners/OfflinePaymentGateway.php b/modules/OfflinePayment/Listeners/Gateway.php
similarity index 92%
rename from modules/OfflinePayment/Listeners/OfflinePaymentGateway.php
rename to modules/OfflinePayment/Listeners/Gateway.php
index 2e03b8c46..4c0b51511 100644
--- a/modules/OfflinePayment/Listeners/OfflinePaymentGateway.php
+++ b/modules/OfflinePayment/Listeners/Gateway.php
@@ -4,7 +4,7 @@ namespace Modules\OfflinePayment\Listeners;
 
 use App\Events\PaymentGatewayListing;
 
-class OfflinePaymentGateway
+class Gateway
 {
     /**
      * Handle the event.
diff --git a/modules/OfflinePayment/Providers/OfflinePaymentServiceProvider.php b/modules/OfflinePayment/Providers/OfflinePaymentServiceProvider.php
index a6824bfb2..0e521f81c 100644
--- a/modules/OfflinePayment/Providers/OfflinePaymentServiceProvider.php
+++ b/modules/OfflinePayment/Providers/OfflinePaymentServiceProvider.php
@@ -2,13 +2,11 @@
 
 namespace Modules\OfflinePayment\Providers;
 
-use Illuminate\Support\ServiceProvider;
-
 use App\Events\AdminMenuCreated;
-use Modules\OfflinePayment\Listeners\OfflinePaymentAdminMenu;
-
 use App\Events\PaymentGatewayListing;
-use Modules\OfflinePayment\Listeners\OfflinePaymentGateway;
+use Illuminate\Support\ServiceProvider;
+use Modules\OfflinePayment\Listeners\AdminMenu;
+use Modules\OfflinePayment\Listeners\Gateway;
 
 class OfflinePaymentServiceProvider extends ServiceProvider
 {
@@ -29,7 +27,6 @@ class OfflinePaymentServiceProvider extends ServiceProvider
         $this->registerTranslations();
         $this->registerViews();
         $this->registerMigrations();
-
         $this->registerEvents();
     }
 
@@ -86,8 +83,8 @@ class OfflinePaymentServiceProvider extends ServiceProvider
 
     public function registerEvents()
     {
-        $this->app['events']->listen(AdminMenuCreated::class, OfflinePaymentAdminMenu::class);
-        $this->app['events']->listen(PaymentGatewayListing::class, OfflinePaymentGateway::class);
+        $this->app['events']->listen(AdminMenuCreated::class, AdminMenu::class);
+        $this->app['events']->listen(PaymentGatewayListing::class, Gateway::class);
     }
 
     /**
diff --git a/modules/PaypalStandard/Listeners/PaypalStandardGateway.php b/modules/PaypalStandard/Listeners/Gateway.php
similarity index 81%
rename from modules/PaypalStandard/Listeners/PaypalStandardGateway.php
rename to modules/PaypalStandard/Listeners/Gateway.php
index e6001a9ea..12f4d41e3 100644
--- a/modules/PaypalStandard/Listeners/PaypalStandardGateway.php
+++ b/modules/PaypalStandard/Listeners/Gateway.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Modules\PaypalStandard\Events\Handlers;
+namespace Modules\PaypalStandard\Listeners;
 
 use App\Events\PaymentGatewayListing;
 
-class PaypalStandardGateway
+class Gateway
 {
     /**
      * Handle the event.
diff --git a/modules/PaypalStandard/Providers/PaypalStandardServiceProvider.php b/modules/PaypalStandard/Providers/PaypalStandardServiceProvider.php
index 6d02cff49..b67a3b7ea 100644
--- a/modules/PaypalStandard/Providers/PaypalStandardServiceProvider.php
+++ b/modules/PaypalStandard/Providers/PaypalStandardServiceProvider.php
@@ -2,10 +2,9 @@
 
 namespace Modules\PaypalStandard\Providers;
 
-use Illuminate\Support\ServiceProvider;
-
 use App\Events\PaymentGatewayListing;
-use Modules\PaypalStandard\Listeners\PaypalStandardGateway;
+use Illuminate\Support\ServiceProvider;
+use Modules\PaypalStandard\Listeners\Gateway;
 
 class PaypalStandardServiceProvider extends ServiceProvider
 {
@@ -25,8 +24,6 @@ class PaypalStandardServiceProvider extends ServiceProvider
     {
         $this->registerTranslations();
         $this->registerViews();
-        $this->registerMigrations();
-
         $this->registerEvents();
     }
 
@@ -76,14 +73,9 @@ class PaypalStandardServiceProvider extends ServiceProvider
         }
     }
 
-    public function registerMigrations()
-    {
-        $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations');
-    }
-
     public function registerEvents()
     {
-        $this->app['events']->listen(PaymentGatewayListing::class, PaypalStandardGateway::class);
+        $this->app['events']->listen(PaymentGatewayListing::class, Gateway::class);
     }
 
     /**