diff --git a/lib/accountify/invoice.rb b/lib/accountify/invoice.rb
index 26d6b43..5c9db0d 100644
--- a/lib/accountify/invoice.rb
+++ b/lib/accountify/invoice.rb
@@ -3,7 +3,7 @@ module Invoice
     extend self
 
     module Status
-      DRAFT = 'draft'
+      DRAFTED = 'drafted'
       ISSUED = 'issued'
       PAID = 'paid'
       VOIDED = 'voided'
@@ -33,7 +33,7 @@ def draft(user_id:, tenant_id:,
           tenant_id: tenant_id,
           organisation_id: organisation_id,
           contact_id: contact_id,
-          status: Status::DRAFT,
+          status: Status::DRAFTED,
           currency_code: currency_code,
           due_date: due_date,
           sub_total_amount: line_items.sum do |line_item|
@@ -156,7 +156,7 @@ def update(user_id:, tenant_id:, id:,
           organisation_id: organisation.id,
           updated_at: current_utc_time,
           contact_id: contact.id,
-          status: Status::DRAFT,
+          status: Status::DRAFTED,
           due_date: due_date,
           sub_total_amount: line_items.sum do |line_item|
             BigDecimal(line_item[:unit_amount][:amount]) * line_item[:quantity].to_i
diff --git a/lib/accountify/invoice_status_summary.rb b/lib/accountify/invoice_status_summary.rb
index 82ae112..905e0e8 100644
--- a/lib/accountify/invoice_status_summary.rb
+++ b/lib/accountify/invoice_status_summary.rb
@@ -15,7 +15,7 @@ def generate(tenant_id:, organisation_id:, time: ::Time)
             tenant_id: tenant_id,
             organisation_id: organisation_id,
             generated_at: current_utc_time,
-            drafted_count: grouped_invoices[Invoice::Status::DRAFT] || 0,
+            drafted_count: grouped_invoices[Invoice::Status::DRAFTED] || 0,
             issued_count: grouped_invoices[Invoice::Status::ISSUED] || 0,
             paid_count: grouped_invoices[Invoice::Status::PAID] || 0,
             voided_count: grouped_invoices[Invoice::Status::VOIDED] || 0)
@@ -42,7 +42,7 @@ def regenerate(tenant_id:, organisation_id:,
 
           summary.update!(
             generated_at: current_utc_time,
-            drafted_count: grouped_invoices[Invoice::Status::DRAFT] || 0,
+            drafted_count: grouped_invoices[Invoice::Status::DRAFTED] || 0,
             issued_count: grouped_invoices[Invoice::Status::ISSUED] || 0,
             paid_count: grouped_invoices[Invoice::Status::PAID] || 0,
             voided_count: grouped_invoices[Invoice::Status::VOIDED] || 0)
diff --git a/spec/controllers/accountify/invoice_controller/delete_spec.rb b/spec/controllers/accountify/invoice_controller/delete_spec.rb
index 6fdcd22..b6ecaaf 100644
--- a/spec/controllers/accountify/invoice_controller/delete_spec.rb
+++ b/spec/controllers/accountify/invoice_controller/delete_spec.rb
@@ -24,7 +24,7 @@ module Accountify
         organisation_id: organisation.id,
         contact_id: contact.id,
         currency_code: "AUD",
-        status: Invoice::Status::DRAFT,
+        status: Invoice::Status::DRAFTED,
         due_date: current_date + 30.days,
         sub_total_amount: BigDecimal("600.00"),
         sub_total_currency_code: "AUD",
diff --git a/spec/controllers/accountify/invoice_controller/find_by_id_spec.rb b/spec/controllers/accountify/invoice_controller/find_by_id_spec.rb
index 61c7a1f..7265ee1 100644
--- a/spec/controllers/accountify/invoice_controller/find_by_id_spec.rb
+++ b/spec/controllers/accountify/invoice_controller/find_by_id_spec.rb
@@ -29,7 +29,7 @@ module Accountify
         organisation_id: organisation.id,
         contact_id: contact.id,
         currency_code: "AUD",
-        status: Invoice::Status::DRAFT,
+        status: Invoice::Status::DRAFTED,
         due_date: current_date + 30.days,
         sub_total_amount: BigDecimal("600.00"),
         sub_total_currency_code: "AUD",
@@ -72,7 +72,7 @@ module Accountify
               "amount" => "400.0",
               "currency_code" => "AUD" } } ],
           "organisation_id" => organisation.id,
-          "status" => "draft",
+          "status" => "drafted",
           "sub_total" => {
             "amount" => "600.0",
             "currency_code" => "AUD" },
diff --git a/spec/controllers/accountify/invoice_controller/issue_spec.rb b/spec/controllers/accountify/invoice_controller/issue_spec.rb
index ba8e3f2..131ac4a 100644
--- a/spec/controllers/accountify/invoice_controller/issue_spec.rb
+++ b/spec/controllers/accountify/invoice_controller/issue_spec.rb
@@ -24,7 +24,7 @@ module Accountify
         organisation_id: organisation.id,
         contact_id: contact.id,
         currency_code: "AUD",
-        status: Invoice::Status::DRAFT,
+        status: Invoice::Status::DRAFTED,
         due_date: current_date + 30.days,
         sub_total_amount: BigDecimal("600.00"),
         sub_total_currency_code: "AUD",
diff --git a/spec/controllers/accountify/invoice_controller/update_spec.rb b/spec/controllers/accountify/invoice_controller/update_spec.rb
index f689024..c36842a 100644
--- a/spec/controllers/accountify/invoice_controller/update_spec.rb
+++ b/spec/controllers/accountify/invoice_controller/update_spec.rb
@@ -32,7 +32,7 @@ module Accountify
         organisation_id: organisation_1.id,
         contact_id: contact_1.id,
         currency_code: "AUD",
-        status: Invoice::Status::DRAFT,
+        status: Invoice::Status::DRAFTED,
         due_date: current_date + 30.days,
         sub_total_amount: BigDecimal("600.00"),
         sub_total_currency_code: "AUD",
diff --git a/spec/controllers/accountify/invoice_controller/void_spec.rb b/spec/controllers/accountify/invoice_controller/void_spec.rb
index b720d87..ac8c1c1 100644
--- a/spec/controllers/accountify/invoice_controller/void_spec.rb
+++ b/spec/controllers/accountify/invoice_controller/void_spec.rb
@@ -25,7 +25,7 @@ module Accountify
         organisation_id: organisation.id,
         contact_id: contact.id,
         currency_code: "AUD",
-        status: Invoice::Status::DRAFT,
+        status: Invoice::Status::DRAFTED,
         due_date: current_date + 30.days,
         sub_total_amount: BigDecimal("600.00"),
         sub_total_currency_code: "AUD",
diff --git a/spec/factories/accountify_invoices.rb b/spec/factories/accountify_invoices.rb
index 4151457..bda0b17 100644
--- a/spec/factories/accountify_invoices.rb
+++ b/spec/factories/accountify_invoices.rb
@@ -6,8 +6,8 @@
     sub_total_amount { BigDecimal("100.00") }
     sub_total_currency_code { "AUD" }
 
-    trait :draft do
-      status { "draft" }
+    trait :drafted do
+      status { "drafted" }
     end
 
     trait :approved do
diff --git a/spec/lib/accountify/invoice/delete_spec.rb b/spec/lib/accountify/invoice/delete_spec.rb
index c1d518b..41445c4 100644
--- a/spec/lib/accountify/invoice/delete_spec.rb
+++ b/spec/lib/accountify/invoice/delete_spec.rb
@@ -24,7 +24,7 @@ module Accountify
         contact_id: contact.id,
         currency_code: "AUD",
         due_date: current_date + 30.days,
-        status: Invoice::Status::DRAFT,
+        status: Invoice::Status::DRAFTED,
         sub_total_amount: BigDecimal("1800.00"),
         sub_total_currency_code: "AUD"
       ).id
diff --git a/spec/lib/accountify/invoice/draft_spec.rb b/spec/lib/accountify/invoice/draft_spec.rb
index 2d26be9..293872d 100644
--- a/spec/lib/accountify/invoice/draft_spec.rb
+++ b/spec/lib/accountify/invoice/draft_spec.rb
@@ -52,7 +52,7 @@ module Accountify
         expect(invoice_model).to have_attributes(
           organisation_id: organisation.id,
           contact_id: contact.id,
-          status: Invoice::Status::DRAFT,
+          status: Invoice::Status::DRAFTED,
           currency_code: "AUD",
           due_date: current_date + 30.days,
           line_items: match_array([
@@ -76,7 +76,7 @@ module Accountify
             'id' => invoice[:id],
             'organisation_id' => organisation.id,
             'contact_id' => contact.id,
-            'status' => Invoice::Status::DRAFT,
+            'status' => Invoice::Status::DRAFTED,
             'currency_code' => "AUD",
             'due_date' => (current_date + 30.days ).to_s,
             'line_items' => [{
diff --git a/spec/lib/accountify/invoice/find_by_id_spec.rb b/spec/lib/accountify/invoice/find_by_id_spec.rb
index c5e769e..dc012f7 100644
--- a/spec/lib/accountify/invoice/find_by_id_spec.rb
+++ b/spec/lib/accountify/invoice/find_by_id_spec.rb
@@ -24,7 +24,7 @@ module Accountify
         contact_id: contact.id,
         currency_code: "AUD",
         due_date: current_date + 30.days,
-        status: Invoice::Status::DRAFT,
+        status: Invoice::Status::DRAFTED,
         sub_total_amount: BigDecimal("1800.00"),
         sub_total_currency_code: "AUD"
       ).id
@@ -60,7 +60,7 @@ module Accountify
           id: id,
           organisation_id: organisation.id,
           contact_id: contact.id,
-          status: Invoice::Status::DRAFT,
+          status: Invoice::Status::DRAFTED,
           currency_code: "AUD",
           due_date: (current_date + 30.days).to_s,
           line_items: [{
diff --git a/spec/lib/accountify/invoice/issue_spec.rb b/spec/lib/accountify/invoice/issue_spec.rb
index 3a8a3de..0a66071 100644
--- a/spec/lib/accountify/invoice/issue_spec.rb
+++ b/spec/lib/accountify/invoice/issue_spec.rb
@@ -24,7 +24,7 @@ module Accountify
         contact_id: contact.id,
         currency_code: "AUD",
         due_date: current_date + 30.days,
-        status: Invoice::Status::DRAFT,
+        status: Invoice::Status::DRAFTED,
         sub_total_amount: BigDecimal("1800.00"),
         sub_total_currency_code: "AUD"
       ).id
diff --git a/spec/lib/accountify/invoice/update_spec.rb b/spec/lib/accountify/invoice/update_spec.rb
index 4586791..3cecaa7 100644
--- a/spec/lib/accountify/invoice/update_spec.rb
+++ b/spec/lib/accountify/invoice/update_spec.rb
@@ -32,7 +32,7 @@ module Accountify
         organisation_id: organisation_1.id,
         contact_id: contact_1.id,
         currency_code: "AUD",
-        status: Invoice::Status::DRAFT,
+        status: Invoice::Status::DRAFTED,
         due_date: current_date + 30.days,
         sub_total_amount: BigDecimal("600.00"),
         sub_total_currency_code: "AUD"
@@ -96,7 +96,7 @@ module Accountify
         expect(invoice_model).to have_attributes(
           organisation_id: organisation_2.id,
           contact_id: contact_2.id,
-          status: Invoice::Status::DRAFT,
+          status: Invoice::Status::DRAFTED,
           currency_code: "AUD",
           due_date: current_date + 14.days,
           line_items: match_array([
@@ -120,7 +120,7 @@ module Accountify
             'id' => id,
             'contact_id' => contact_2.id,
             'organisation_id' => organisation_2.id,
-            'status' => Invoice::Status::DRAFT,
+            'status' => Invoice::Status::DRAFTED,
             'currency_code' => "AUD",
             'due_date' => (current_date + 14.days).to_s,
             'line_items' => [{
diff --git a/spec/lib/accountify/invoice/void_spec.rb b/spec/lib/accountify/invoice/void_spec.rb
index 52034e0..bbc7f02 100644
--- a/spec/lib/accountify/invoice/void_spec.rb
+++ b/spec/lib/accountify/invoice/void_spec.rb
@@ -24,7 +24,7 @@ module Accountify
         contact_id: contact.id,
         currency_code: "AUD",
         due_date: current_date + 30.days,
-        status: Invoice::Status::DRAFT,
+        status: Invoice::Status::DRAFTED,
         sub_total_amount: BigDecimal("1800.00"),
         sub_total_currency_code: "AUD"
       ).id
diff --git a/spec/lib/accountify/invoice_status_summary/generate_spec.rb b/spec/lib/accountify/invoice_status_summary/generate_spec.rb
index 7b2d4ad..4563d46 100644
--- a/spec/lib/accountify/invoice_status_summary/generate_spec.rb
+++ b/spec/lib/accountify/invoice_status_summary/generate_spec.rb
@@ -21,7 +21,7 @@ module Accountify
           tenant_id: tenant_id,
           organisation_id: organisation_id,
           contact_id: contact.id,
-          status: Invoice::Status::DRAFT)
+          status: Invoice::Status::DRAFTED)
       end
 
       let!(:issued_invoice) do
diff --git a/spec/lib/accountify/invoice_status_summary/regenerate_spec.rb b/spec/lib/accountify/invoice_status_summary/regenerate_spec.rb
index f0598f7..91955ad 100644
--- a/spec/lib/accountify/invoice_status_summary/regenerate_spec.rb
+++ b/spec/lib/accountify/invoice_status_summary/regenerate_spec.rb
@@ -21,7 +21,7 @@ module Accountify
           tenant_id: tenant_id,
           organisation_id: organisation_id,
           contact_id: contact.id,
-          status: Invoice::Status::DRAFT)
+          status: Invoice::Status::DRAFTED)
       end
 
       let!(:issued_invoice) do