diff --git a/app/models/directo.rb b/app/models/directo.rb
index 73574441e..62cf43804 100644
--- a/app/models/directo.rb
+++ b/app/models/directo.rb
@@ -29,7 +29,7 @@ class Directo < ActiveRecord::Base
                 "InvoiceDate" => invoice.created_at.strftime("%Y-%m-%dT%H:%M:%S"),
                 "PaymentTerm" => Setting.directo_receipt_payment_term,
                 "Currency"    => invoice.currency,
-                "CustomerCode"=> invoice.buyer.try(:directo_handle)
+                "CustomerCode"=> invoice.buyer.accounting_customer_code
             ){
               xml.line(
                   "ProductID"      => Setting.directo_receipt_product_name,
@@ -150,7 +150,7 @@ class Directo < ActiveRecord::Base
             xml.invoice("Number"      =>directo_next,
                         "InvoiceDate" =>invoices_until.strftime(date_format),
                         "PaymentTerm" =>Setting.directo_receipt_payment_term,
-                        "CustomerCode"=>registrar.directo_handle,
+                        "CustomerCode"=>registrar.accounting_customer_code,
                         "Language"    =>"",
                         "Currency"    =>registrar_activities.first.currency,
                         "SalesAgent"  =>Setting.directo_sales_agent){
diff --git a/db/migrate/20171025113808_rename_registrar_directo_handle_to_accounting_customer_code.rb b/db/migrate/20171025113808_rename_registrar_directo_handle_to_accounting_customer_code.rb
new file mode 100644
index 000000000..f834e14c1
--- /dev/null
+++ b/db/migrate/20171025113808_rename_registrar_directo_handle_to_accounting_customer_code.rb
@@ -0,0 +1,5 @@
+class RenameRegistrarDirectoHandleToAccountingCustomerCode < ActiveRecord::Migration
+  def change
+    rename_column :registrars, :directo_handle, :accounting_customer_code
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 7e4a669f2..07b93417b 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -2473,7 +2473,7 @@ CREATE TABLE registrars (
     zip character varying,
     code character varying,
     website character varying,
-    directo_handle character varying,
+    accounting_customer_code character varying,
     vat boolean,
     legacy_id integer,
     reference_no character varying,
@@ -5053,3 +5053,5 @@ INSERT INTO schema_migrations (version) VALUES ('20171009082321');
 
 INSERT INTO schema_migrations (version) VALUES ('20171025110933');
 
+INSERT INTO schema_migrations (version) VALUES ('20171025113808');
+
diff --git a/doc/models_complete.svg b/doc/models_complete.svg
index 58b86b986..3c64e4a34 100644
--- a/doc/models_complete.svg
+++ b/doc/models_complete.svg
@@ -1581,7 +1581,6 @@
 <text text-anchor="start" x="1600.5" y="-2399.3" font-family="Times,serif" font-size="14.00">zip :string</text>
 <text text-anchor="start" x="1600.5" y="-2384.3" font-family="Times,serif" font-size="14.00">code :string</text>
 <text text-anchor="start" x="1600.5" y="-2369.3" font-family="Times,serif" font-size="14.00">url :string</text>
-<text text-anchor="start" x="1600.5" y="-2354.3" font-family="Times,serif" font-size="14.00">directo_handle :string</text>
 <text text-anchor="start" x="1600.5" y="-2339.3" font-family="Times,serif" font-size="14.00">vat :boolean</text>
 <text text-anchor="start" x="1600.5" y="-2324.3" font-family="Times,serif" font-size="14.00">legacy_id :integer</text>
 <text text-anchor="start" x="1600.5" y="-2309.3" font-family="Times,serif" font-size="14.00">reference_no :string</text>
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index cb37c0f1d..042515f33 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -87,7 +87,7 @@ namespace :import do
         street: x.street1.try(:strip),
         zip: x.postalcode.try(:strip),
         url: x.url.try(:strip),
-        directo_handle: x.directo_handle.try(:strip),
+        accounting_customer_code: x.directo_handle.try(:strip),
         vat: x.vat,
         legacy_id: x.id,
         creator_str: user,