diff --git a/app/Factory/ExpenseFactory.php b/app/Factory/ExpenseFactory.php
index d6bf6701d764..ddade6b1c18a 100644
--- a/app/Factory/ExpenseFactory.php
+++ b/app/Factory/ExpenseFactory.php
@@ -31,7 +31,7 @@ class ExpenseFactory
         $expense->tax_rate2 = 0;
         $expense->tax_name3 = '';
         $expense->tax_rate3 = 0;
-        $expense->expense_date = null;
+        $expense->date = null;
         $expense->payment_date = null;
 
         return $expense;
diff --git a/app/Http/Controllers/OpenAPI/ExpenseSchema.php b/app/Http/Controllers/OpenAPI/ExpenseSchema.php
index 50f8366eb902..f92d3faa546e 100644
--- a/app/Http/Controllers/OpenAPI/ExpenseSchema.php
+++ b/app/Http/Controllers/OpenAPI/ExpenseSchema.php
@@ -32,7 +32,7 @@
  *       @OA\Property(property="amount", type="number", format="float", example="10.00", description="_________"),
  *       @OA\Property(property="foreign_amount", type="number", format="float", example="10.00", description="_________"),
  *       @OA\Property(property="exchange_rate", type="number", format="float", example="0.80", description="_________"),
- *       @OA\Property(property="expense_date", type="string", example="", description="________"),
+ *       @OA\Property(property="date", type="string", example="", description="________"),
  *       @OA\Property(property="payment_date", type="string", example="", description="________"),
  *       @OA\Property(property="should_be_invoiced", type="boolean", example=true, description="_________"),
  *       @OA\Property(property="is_deleted", type="boolean", example=true, description="_________"),
diff --git a/app/Models/Expense.php b/app/Models/Expense.php
index d9550a413293..693b74c3cc3c 100644
--- a/app/Models/Expense.php
+++ b/app/Models/Expense.php
@@ -25,7 +25,7 @@ class Expense extends BaseModel
         'client_id',
         'vendor_id',
         'expense_currency_id',
-        'expense_date',
+        'date',
         'invoice_currency_id',
         'amount',
         'foreign_amount',
diff --git a/app/Transformers/ExpenseTransformer.php b/app/Transformers/ExpenseTransformer.php
index 89a00c33e3a1..f096c829e7f8 100644
--- a/app/Transformers/ExpenseTransformer.php
+++ b/app/Transformers/ExpenseTransformer.php
@@ -77,7 +77,7 @@ class ExpenseTransformer extends EntityTransformer
             'public_notes' => (string) $expense->public_notes ?: '',
             'transaction_reference' => (string) $expense->transaction_reference ?: '',
             'transaction_id' => (string) $expense->transaction_id ?: '',
-            'expense_date' => $expense->expense_date ?: '',
+            'date' => $expense->date ?: '',
             'payment_date' => $expense->payment_date ?: '',
             'custom_value1' => $expense->custom_value1 ?: '',
             'custom_value2' => $expense->custom_value2 ?: '',
diff --git a/database/factories/ExpenseFactory.php b/database/factories/ExpenseFactory.php
index 675b801328f5..ea5716ca6402 100644
--- a/database/factories/ExpenseFactory.php
+++ b/database/factories/ExpenseFactory.php
@@ -37,7 +37,7 @@ class ExpenseFactory extends Factory
             'custom_value3' => $this->faker->text(10),
             'custom_value4' => $this->faker->text(10),
             'exchange_rate' => $this->faker->randomFloat(2, 0, 1),
-            'expense_date' => $this->faker->date(),
+            'date' => $this->faker->date(),
             'is_deleted' => false,
             'public_notes' => $this->faker->text(50),
             'private_notes' => $this->faker->text(50),
diff --git a/database/migrations/2020_10_12_204517_project_number_column.php b/database/migrations/2020_10_12_204517_project_number_column.php
index 1a771af99000..9dc9740191df 100644
--- a/database/migrations/2020_10_12_204517_project_number_column.php
+++ b/database/migrations/2020_10_12_204517_project_number_column.php
@@ -20,6 +20,10 @@ class ProjectNumberColumn extends Migration
         Schema::table('expenses', function ($t){
             $t->renameColumn('expense_date', 'date');
         });
+
+        Schema::table('expense_categories', function ($t){
+            $t->boolean('is_deleted')->default(false);
+        });
     }
 
     /**
diff --git a/tests/Feature/ExpenseCategoryApiTest.php b/tests/Feature/ExpenseCategoryApiTest.php
index 1b4c28123e51..82eed58ccc29 100644
--- a/tests/Feature/ExpenseCategoryApiTest.php
+++ b/tests/Feature/ExpenseCategoryApiTest.php
@@ -54,7 +54,7 @@ class ExpenseCategoryApiTest extends TestCase
     public function testExpenseCategoryPost()
     {
         $data = [
-            'public_notes' => $this->faker->firstName,
+            'name' => $this->faker->firstName,
         ];
 
         $response = $this->withHeaders([
@@ -68,8 +68,7 @@ class ExpenseCategoryApiTest extends TestCase
     public function testExpenseCategoryPut()
     {
         $data = [
-            'public_notes' => $this->faker->firstName,
-            'id_number' => 'Coolio',
+            'name' => $this->faker->firstName,
         ];
 
         $response = $this->withHeaders([