diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index 0de3bd5f226e..eae78caf1769 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -38,8 +38,12 @@ class CompanyGateway extends BaseModel
         'gateway_key',
         'accepted_credit_cards',
         'require_cvv',
-        'show_billing_address',
-        'show_shipping_address',
+        'require_billing_address',
+        'require_shipping_address',
+        'require_client_name',
+        'require_zip',
+        'require_client_phone',
+        'require_contact_name',
         'update_details',
         'config',
         'fees_and_limits',
diff --git a/app/Repositories/InvoiceRepository.php b/app/Repositories/InvoiceRepository.php
index a80e2e5e6da3..12a22121e484 100644
--- a/app/Repositories/InvoiceRepository.php
+++ b/app/Repositories/InvoiceRepository.php
@@ -76,7 +76,7 @@ class InvoiceRepository extends BaseRepository
 
         $invoice->service()->markDeleted()->handleCancellation()->save();
 
-        $invoice = parent::delete($invoice);
+        parent::delete($invoice);
 
         return $invoice;
     }
diff --git a/app/Transformers/CompanyGatewayTransformer.php b/app/Transformers/CompanyGatewayTransformer.php
index 160391b735cc..fdfde7cce99f 100644
--- a/app/Transformers/CompanyGatewayTransformer.php
+++ b/app/Transformers/CompanyGatewayTransformer.php
@@ -49,8 +49,8 @@ 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,
-            'show_billing_address' => (bool) $company_gateway->show_billing_address,
-            'show_shipping_address' => (bool) $company_gateway->show_shipping_address,
+            '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,
             'config' => (string) $company_gateway->getConfigTransformed(),
             'fees_and_limits' => $company_gateway->fees_and_limits ?: new stdClass,
@@ -75,3 +75,12 @@ 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/migrations/2020_11_03_200345_company_gateway_fields_refactor.php b/database/migrations/2020_11_03_200345_company_gateway_fields_refactor.php
new file mode 100644
index 000000000000..18ac62d41d48
--- /dev/null
+++ b/database/migrations/2020_11_03_200345_company_gateway_fields_refactor.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CompanyGatewayFieldsRefactor extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('company_gateways', function(Blueprint $table){
+            $table->renameColumn('show_billing_address', 'require_billing_address');
+            $table->renameColumn('show_shipping_address', 'require_shipping_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);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}