diff --git a/app/Console/Commands/CreateSingleAccount.php b/app/Console/Commands/CreateSingleAccount.php
index ecdcc40ea558..ba83e7ecba92 100644
--- a/app/Console/Commands/CreateSingleAccount.php
+++ b/app/Console/Commands/CreateSingleAccount.php
@@ -516,8 +516,8 @@ class CreateSingleAccount extends Command
             $cg->user_id = $user->id;
             $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23';
             $cg->require_cvv = true;
-            $cg->show_billing_address = true;
-            $cg->show_shipping_address = true;
+            $cg->require_billing_address = true;
+            $cg->require_shipping_address = true;
             $cg->update_details = true;
             $cg->config = encrypt(config('ninja.testvars.stripe'));
             $cg->save();
@@ -527,8 +527,8 @@ class CreateSingleAccount extends Command
             // $cg->user_id = $user->id;
             // $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23';
             // $cg->require_cvv = true;
-            // $cg->show_billing_address = true;
-            // $cg->show_shipping_address = true;
+            // $cg->require_billing_address = true;
+            // $cg->require_shipping_address = true;
             // $cg->update_details = true;
             // $cg->config = encrypt(config('ninja.testvars.stripe'));
             // $cg->save();
@@ -540,8 +540,8 @@ class CreateSingleAccount extends Command
             $cg->user_id = $user->id;
             $cg->gateway_key = '38f2c48af60c7dd69e04248cbb24c36e';
             $cg->require_cvv = true;
-            $cg->show_billing_address = true;
-            $cg->show_shipping_address = true;
+            $cg->require_billing_address = true;
+            $cg->require_shipping_address = true;
             $cg->update_details = true;
             $cg->config = encrypt(config('ninja.testvars.paypal'));
             $cg->save();
@@ -553,8 +553,8 @@ class CreateSingleAccount extends Command
             $cg->user_id = $user->id;
             $cg->gateway_key = '3758e7f7c6f4cecf0f4f348b9a00f456';
             $cg->require_cvv = true;
-            $cg->show_billing_address = true;
-            $cg->show_shipping_address = true;
+            $cg->require_billing_address = true;
+            $cg->require_shipping_address = true;
             $cg->update_details = true;
             $cg->config = encrypt(config('ninja.testvars.checkout'));
             $cg->save();
@@ -566,8 +566,8 @@ class CreateSingleAccount extends Command
             $cg->user_id = $user->id;
             $cg->gateway_key = '3b6621f970ab18887c4f6dca78d3f8bb';
             $cg->require_cvv = true;
-            $cg->show_billing_address = true;
-            $cg->show_shipping_address = true;
+            $cg->require_billing_address = true;
+            $cg->require_shipping_address = true;
             $cg->update_details = true;
             $cg->config = encrypt(config('ninja.testvars.authorize'));
             $cg->save();
diff --git a/app/Http/Controllers/OpenAPI/CompanyGatewaySchema.php b/app/Http/Controllers/OpenAPI/CompanyGatewaySchema.php
index a5009d01b461..ed483fd0585b 100644
--- a/app/Http/Controllers/OpenAPI/CompanyGatewaySchema.php
+++ b/app/Http/Controllers/OpenAPI/CompanyGatewaySchema.php
@@ -7,8 +7,8 @@
  *       @OA\Property(property="company_id", type="string", example="2", description="______"),
  *       @OA\Property(property="gateway_key", type="string", example="2", description="______"),
  *       @OA\Property(property="accepted_credit_cards", type="integer", example="32", description="Bitmask representation of cards"),
- *       @OA\Property(property="show_billing_address", type="boolean", example=true, description="______"),
- *       @OA\Property(property="show_shipping_address", type="boolean", example=true, description="______"),
+ *       @OA\Property(property="require_billing_address", type="boolean", example=true, description="______"),
+ *       @OA\Property(property="require_shipping_address", type="boolean", example=true, description="______"),
  *       @OA\Property(property="config", type="string", example="dfadsfdsafsafd", description="The configuration map for the gateway"),
  *       @OA\Property(property="update_details", type="boolean", example=true, description="______"),
  *       @OA\Property(
diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php
index 381bc754dffa..54ec44405f52 100644
--- a/app/Repositories/BaseRepository.php
+++ b/app/Repositories/BaseRepository.php
@@ -270,7 +270,7 @@ class BaseRepository
         $model = $model->service()->applyNumber()->save();
 
         if ($model->company->update_products !== false) {
-            UpdateOrCreateProduct::dispatchNow($model->line_items, $model, $model->company);
+            UpdateOrCreateProduct::dispatch($model->line_items, $model, $model->company);
         }
 
         if ($class->name == Invoice::class) {
diff --git a/app/Transformers/CompanyGatewayTransformer.php b/app/Transformers/CompanyGatewayTransformer.php
index fdfde7cce99f..6cc59b8b98f1 100644
--- a/app/Transformers/CompanyGatewayTransformer.php
+++ b/app/Transformers/CompanyGatewayTransformer.php
@@ -49,6 +49,13 @@ class CompanyGatewayTransformer extends EntityTransformer
             'gateway_key' => (string) $company_gateway->gateway_key ?: '',
             'accepted_credit_cards' => (int) $company_gateway->accepted_credit_cards,
             'require_cvv' => (bool) $company_gateway->require_cvv,
+            'require_billing_address' => (bool) $company_gateway->require_billing_address,
+            'require_shipping_address' => (bool) $company_gateway->require_shipping_address,
+            'require_client_name' => (bool) $company_gateway->require_client_name,
+            'require_zip' => (bool) $company_gateway->require_zip,
+            'require_client_phone' => (bool) $company_gateway->require_client_phone,
+            'require_contact_name' => (bool) $company_gateway->require_contact_name,
+            'require_contact_email' => (bool) $company_gateway->require_contact_email,
             'show_billing_address' => (bool) $company_gateway->show_billing_address, //@deprecated
             'show_shipping_address' => (bool) $company_gateway->show_shipping_address, //@deprecated
             'update_details' => (bool) $company_gateway->update_details,
@@ -75,12 +82,3 @@ class CompanyGatewayTransformer extends EntityTransformer
         return $this->includeItem($company_gateway->gateway, $transformer, Gateway::class);
     }
 }
-
-
-            $table->renameColumn('show_billing_address', 'require_billing_address');
-            $table->renameColumn('show_shipping_address', 'require_billing_address');
-            $table->boolean('require_client_name')->default(false);
-            $table->boolean('require_zip')->default(false);
-            $table->boolean('require_client_phone')->default(false);
-            $table->boolean('require_contact_name')->default(false);
-            $table->boolean('require_contact_email')->default(false);
\ No newline at end of file
diff --git a/database/seeders/RandomDataSeeder.php b/database/seeders/RandomDataSeeder.php
index d2b75f333c52..d2e549129a2d 100644
--- a/database/seeders/RandomDataSeeder.php
+++ b/database/seeders/RandomDataSeeder.php
@@ -315,8 +315,8 @@ class RandomDataSeeder extends Seeder
             $cg->user_id = $user->id;
             $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23';
             $cg->require_cvv = true;
-            $cg->show_billing_address = true;
-            $cg->show_shipping_address = true;
+            $cg->require_billing_address = true;
+            $cg->require_shipping_address = true;
             $cg->update_details = true;
             $cg->config = encrypt(config('ninja.testvars.stripe'));
             $cg->save();
@@ -326,8 +326,8 @@ class RandomDataSeeder extends Seeder
             $cg->user_id = $user->id;
             $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23';
             $cg->require_cvv = true;
-            $cg->show_billing_address = true;
-            $cg->show_shipping_address = true;
+            $cg->require_billing_address = true;
+            $cg->require_shipping_address = true;
             $cg->update_details = true;
             $cg->config = encrypt(config('ninja.testvars.stripe'));
             $cg->save();
@@ -339,8 +339,8 @@ class RandomDataSeeder extends Seeder
             $cg->user_id = $user->id;
             $cg->gateway_key = '38f2c48af60c7dd69e04248cbb24c36e';
             $cg->require_cvv = true;
-            $cg->show_billing_address = true;
-            $cg->show_shipping_address = true;
+            $cg->require_billing_address = true;
+            $cg->require_shipping_address = true;
             $cg->update_details = true;
             $cg->config = encrypt(config('ninja.testvars.paypal'));
             $cg->save();
@@ -352,8 +352,8 @@ class RandomDataSeeder extends Seeder
             $cg->user_id = $user->id;
             $cg->gateway_key = '3758e7f7c6f4cecf0f4f348b9a00f456';
             $cg->require_cvv = true;
-            $cg->show_billing_address = true;
-            $cg->show_shipping_address = true;
+            $cg->require_billing_address = true;
+            $cg->require_shipping_address = true;
             $cg->update_details = true;
             $cg->config = encrypt(config('ninja.testvars.checkout'));
             $cg->save();
@@ -365,8 +365,8 @@ class RandomDataSeeder extends Seeder
             $cg->user_id = $user->id;
             $cg->gateway_key = '3b6621f970ab18887c4f6dca78d3f8bb';
             $cg->require_cvv = true;
-            $cg->show_billing_address = true;
-            $cg->show_shipping_address = true;
+            $cg->require_billing_address = true;
+            $cg->require_shipping_address = true;
             $cg->update_details = true;
             $cg->config = encrypt(config('ninja.testvars.authorize'));
             $cg->save();
diff --git a/tests/Feature/CompanyGatewayResolutionTest.php b/tests/Feature/CompanyGatewayResolutionTest.php
index 8de3d96a7f9c..f23aa02caa02 100644
--- a/tests/Feature/CompanyGatewayResolutionTest.php
+++ b/tests/Feature/CompanyGatewayResolutionTest.php
@@ -101,7 +101,7 @@ class CompanyGatewayResolutionTest extends TestCase
             $this->cg->user_id = $this->user->id;
             $this->cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23';
             $this->cg->require_cvv = true;
-            $this->cg->show_billing_address = true;
+            $this->cg->require_billing_address = true;
             $this->cg->show_shipping_address = true;
             $this->cg->update_details = true;
             $this->cg->config = encrypt(json_encode($json_config));
diff --git a/tests/Feature/CompanyGatewayTest.php b/tests/Feature/CompanyGatewayTest.php
index 8dc1499fc17a..5f83dc9e26fd 100644
--- a/tests/Feature/CompanyGatewayTest.php
+++ b/tests/Feature/CompanyGatewayTest.php
@@ -63,7 +63,7 @@ class CompanyGatewayTest extends TestCase
         $cg->user_id = $this->user->id;
         $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23';
         $cg->require_cvv = true;
-        $cg->show_billing_address = true;
+        $cg->require_billing_address = true;
         $cg->show_shipping_address = true;
         $cg->update_details = true;
         $cg->config = encrypt(config('ninja.testvars.stripe'));
@@ -133,7 +133,7 @@ class CompanyGatewayTest extends TestCase
         $cg->user_id = $this->user->id;
         $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23';
         $cg->require_cvv = true;
-        $cg->show_billing_address = true;
+        $cg->require_billing_address = true;
         $cg->show_shipping_address = true;
         $cg->update_details = true;
         $cg->config = encrypt(config('ninja.testvars.stripe'));
@@ -170,7 +170,7 @@ class CompanyGatewayTest extends TestCase
         $cg->user_id = $this->user->id;
         $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23';
         $cg->require_cvv = true;
-        $cg->show_billing_address = true;
+        $cg->require_billing_address = true;
         $cg->show_shipping_address = true;
         $cg->update_details = true;
         $cg->config = encrypt(config('ninja.testvars.stripe'));
diff --git a/tests/MockAccountData.php b/tests/MockAccountData.php
index 6d6461e1e7d3..5dfeae55c8cb 100644
--- a/tests/MockAccountData.php
+++ b/tests/MockAccountData.php
@@ -539,8 +539,8 @@ trait MockAccountData
             $cg->user_id = $this->user->id;
             $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23';
             $cg->require_cvv = true;
-            $cg->show_billing_address = true;
-            $cg->show_shipping_address = true;
+            $cg->require_billing_address = true;
+            $cg->require_shipping_address = true;
             $cg->update_details = true;
             $cg->config = encrypt(config('ninja.testvars.stripe'));
             $cg->fees_and_limits = $data;
@@ -551,8 +551,8 @@ trait MockAccountData
             $cg->user_id = $this->user->id;
             $cg->gateway_key = 'd14dd26a37cecc30fdd65700bfb55b23';
             $cg->require_cvv = true;
-            $cg->show_billing_address = true;
-            $cg->show_shipping_address = true;
+            $cg->require_billing_address = true;
+            $cg->require_shipping_address = true;
             $cg->update_details = true;
             $cg->fees_and_limits = $data;
             $cg->config = encrypt(config('ninja.testvars.stripe'));
diff --git a/tests/Unit/Migration/migration.json b/tests/Unit/Migration/migration.json
index 1307746a43b5..d73df558201f 100644
--- a/tests/Unit/Migration/migration.json
+++ b/tests/Unit/Migration/migration.json
@@ -65637,7 +65637,7 @@
             "gateway_key": "16dc1d3c8a865425421f64463faaf768",
             "accepted_credit_cards": 0,
             "require_cvv": 1,
-            "show_billing_address": null,
+            "require_billing_address": null,
             "show_shipping_address": 0,
             "update_details": null,
             "config": "{\"apiKey\":\"345345345\",\"publishableKey\":\"5435345\",\"plaidClientId\":\"\",\"plaidSecret\":\"\",\"plaidPublicKey\":\"\",\"enableAlipay\":false,\"enableSofort\":false,\"enableSepa\":false,\"enableBitcoin\":false,\"enableApplePay\":false,\"enableAch\":false}",
@@ -65666,7 +65666,7 @@
             "gateway_key": "16dc1d3c8a865425421f64463faaf768",
             "accepted_credit_cards": 0,
             "require_cvv": 1,
-            "show_billing_address": null,
+            "require_billing_address": null,
             "show_shipping_address": 0,
             "update_details": null,
             "config": "{\"apiKey\":\"345345345\",\"publishableKey\":\"5435345\",\"plaidClientId\":\"\",\"plaidSecret\":\"\",\"plaidPublicKey\":\"\",\"enableAlipay\":false,\"enableSofort\":false,\"enableSepa\":false,\"enableBitcoin\":false,\"enableApplePay\":false,\"enableAch\":false}",