diff --git a/config/omise-webhooks.php b/config/omise-webhooks.php
index 903a1f9..9c4e851 100644
--- a/config/omise-webhooks.php
+++ b/config/omise-webhooks.php
@@ -9,7 +9,7 @@
     'signing_secret' => env('OMISE_WEBHOOK_SECRET'),
 
     /*
-     * You can define a default job that should be run for all other Stripe event type
+     * You can define a default job that should be run for all other Omise event type
      * without a job defined in next configuration.
      * You may leave it empty to store the job in database but without processing it.
      */
diff --git a/src/OmiseSignatureValidation.php b/src/OmiseSignatureValidator.php
similarity index 100%
rename from src/OmiseSignatureValidation.php
rename to src/OmiseSignatureValidator.php
diff --git a/src/OmiseWebhooksController.php b/src/OmiseWebhooksController.php
index aa269fd..26a0d6e 100644
--- a/src/OmiseWebhooksController.php
+++ b/src/OmiseWebhooksController.php
@@ -6,7 +6,7 @@
 use Spatie\WebhookClient\WebhookConfig;
 use Spatie\WebhookClient\WebhookProcessor;
 
-class StripeWebhooksController
+class OmiseWebhooksController
 {
     public function __invoke(Request $request, ?string $configKey = null)
     {
@@ -19,7 +19,7 @@ public function __invoke(Request $request, ?string $configKey = null)
             'signature_validator' => OmiseSignatureValidator::class,
             'webhook_profile' => config('omise-webhooks.profile'),
             'webhook_model' => config('omise-webhooks.model'),
-            'process_webhook_job' => ProcessOmiseWebhookJob::class,
+            'process_webhook_job' => ProcessOmiseWebhooksJob::class,
         ]);
 
         return (new WebhookProcessor($request, $webhookConfig))->process();
diff --git a/src/OmiseWebhooksProfile.php b/src/OmiseWebhooksProfile.php
index 6dacfbc..3d09de7 100644
--- a/src/OmiseWebhooksProfile.php
+++ b/src/OmiseWebhooksProfile.php
@@ -6,7 +6,7 @@
 use Spatie\WebhookClient\Models\WebhookCall;
 use Spatie\WebhookClient\WebhookProfile\WebhookProfile;
 
-class OmiseWebhookProfile implements WebhookProfile
+class OmiseWebhooksProfile implements WebhookProfile
 {
     public function shouldProcess(Request $request): bool
     {
diff --git a/src/ProcessOmiseWebhooksJob.php b/src/ProcessOmiseWebhooksJob.php
index 4f929b5..b046f99 100644
--- a/src/ProcessOmiseWebhooksJob.php
+++ b/src/ProcessOmiseWebhooksJob.php
@@ -6,7 +6,7 @@
 use Spatie\WebhookClient\Jobs\ProcessWebhookJob;
 use Spatie\WebhookClient\Models\WebhookCall;
 
-class ProcessOmiseWebhookJob extends ProcessWebhookJob
+class ProcessOmiseWebhooksJob extends ProcessWebhookJob
 {
     public function __construct(WebhookCall $webhookCall)
     {