diff --git a/packages/Webkul/Customer/src/Database/Factories/CustomerAddressFactory.php b/packages/Webkul/Customer/src/Database/Factories/CustomerAddressFactory.php
index 369090a55..26a731c0a 100644
--- a/packages/Webkul/Customer/src/Database/Factories/CustomerAddressFactory.php
+++ b/packages/Webkul/Customer/src/Database/Factories/CustomerAddressFactory.php
@@ -14,8 +14,7 @@ $factory->define(CustomerAddress::class, function (Faker $faker) {
             return factory(Customer::class)->create()->id;
         },
         'company_name'    => $faker->company,
-        'first_name'      => $faker->firstName,
-        'last_name'       => $faker->lastName,
+        'name'            => $faker->name,
         'vat_id'          => $faker->randomNumber(9),
         'address1'        => $faker->streetAddress,
         'country'         => $faker->countryCode,
diff --git a/packages/Webkul/Customer/src/Database/Migrations/2020_01_10_151902_customer_address_improvements.php b/packages/Webkul/Customer/src/Database/Migrations/2020_01_10_151902_customer_address_improvements.php
index 61d40c832..4c08bf517 100644
--- a/packages/Webkul/Customer/src/Database/Migrations/2020_01_10_151902_customer_address_improvements.php
+++ b/packages/Webkul/Customer/src/Database/Migrations/2020_01_10_151902_customer_address_improvements.php
@@ -16,13 +16,6 @@ class CustomerAddressImprovements extends Migration
         Schema::table('customer_addresses', function (Blueprint $table) {
             $table->string('company_name')->nullable()->after('company_id');
             $table->string('vat_id')->nullable()->after('company_name');
-
-            $table->string('first_name')->after('company_name');
-            $table->string('last_name')->after('first_name');
-
-            // split 'name' column into first_name and last_name
-            $table->dropColumn('name');
-
         });
 
         Schema::table('orders', function (Blueprint $table) {
@@ -40,9 +33,6 @@ class CustomerAddressImprovements extends Migration
         Schema::table('customer_addresses', function (Blueprint $table) {
             $table->dropColumn('company_name');
             $table->dropColumn('vat_id');
-            $table->dropColumn('first_name');
-            $table->dropColumn('last_name');
-            $table->string('name');
         });
 
         Schema::table('orders', function (Blueprint $table) {
diff --git a/packages/Webkul/Customer/src/Models/CustomerAddress.php b/packages/Webkul/Customer/src/Models/CustomerAddress.php
index d571e7c89..14136f2e3 100755
--- a/packages/Webkul/Customer/src/Models/CustomerAddress.php
+++ b/packages/Webkul/Customer/src/Models/CustomerAddress.php
@@ -12,8 +12,6 @@ class CustomerAddress extends Model implements CustomerAddressContract
     protected $fillable = [
         'customer_id',
         'company_name',
-        'first_name',
-        'last_name',
         'vat_id',
         'address1',
         'address2',
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
index dc1992aca..817a68990 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
@@ -42,18 +42,6 @@
                         <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
                     </div>
 
-                    <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
-                        <label for="first_name" class="required">{{ __('shop::app.customer.account.address.edit.first_name') }}</label>
-                        <input type="text" v-validate="'required'" class="control" name="first_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.edit.first_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
-                    </div>
-
-                    <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
-                        <label for="last_name" class="required">{{ __('shop::app.customer.account.address.edit.last_name') }}</label>
-                        <input type="text" v-validate="'required'" class="control" name="last_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.edit.last_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
-                    </div>
-
                     <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
                         <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}</label>
                         <input type="text" class="control" name="vat_id" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.vat_id') }}&quot;">
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
index cf8c8253d..9a73189af 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
@@ -43,18 +43,6 @@
                         <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
                     </div>
 
-                    <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
-                        <label for="first_name" class="required">{{ __('shop::app.customer.account.address.edit.first_name') }}</label>
-                        <input type="text" value="{{ $address->first_name }}" v-validate="'required'" class="control" name="first_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.edit.first_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
-                    </div>
-
-                    <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
-                        <label for="last_name" class="required">{{ __('shop::app.customer.account.address.edit.last_name') }}</label>
-                        <input type="text" value="{{ $address->last_name }}" v-validate="'required'" class="control" name="last_name" data-vv-as="&quot;{{ __('shop::app.customer.account.address.edit.last_name') }}&quot;">
-                        <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
-                    </div>
-
                     <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
                         <label for="vat_id">{{ __('shop::app.customer.account.address.edit.vat_id') }}</label>
                         <input type="text" value="{{ $address->vat_id }}" class="control" name="vat_id" data-vv-as="&quot;{{ __('shop::app.customer.account.address.edit.vat_id') }}&quot;">
diff --git a/tests/functional/Customer/CustomerCest.php b/tests/functional/Customer/CustomerCest.php
index 42338f005..db66fa874 100644
--- a/tests/functional/Customer/CustomerCest.php
+++ b/tests/functional/Customer/CustomerCest.php
@@ -51,8 +51,6 @@ class CustomerCest
 
         $fields = [
             'company_name' => $faker->company,
-            'first_name'   => $faker->firstName,
-            'last_name'    => $faker->lastName,
             'vat_id'       => $faker->randomNumber(9),
             'address1[]'   => $faker->streetAddress,
             'country'      => $faker->countryCode,
@@ -92,8 +90,6 @@ class CustomerCest
 
         $I->seeRecord(CustomerAddress::class, [
             'company_name' => $fields['company_name'],
-            'first_name'   => $fields['first_name'],
-            'last_name'    => $fields['last_name'],
             'vat_id'       => $fields['vat_id'],
             'address1'     => $fields['address1[]'],
             'country'      => $fields['country'],