diff --git a/ebill_paynet/data/ir_cron.xml b/ebill_paynet/data/ir_cron.xml
index 7df5131..9a01504 100644
--- a/ebill_paynet/data/ir_cron.xml
+++ b/ebill_paynet/data/ir_cron.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <flectra noupdate="1">
     <record model="ir.cron" id="cron_paynet_get_shipment">
-        <field name='name'>Paynet - Poll for shipments</field>
+        <field name='name'>E-Bill - Poll for shipments</field>
         <field name='interval_number'>1</field>
         <field name='interval_type'>hours</field>
         <field name="numbercall">-1</field>
diff --git a/ebill_paynet/data/mail_activity_type.xml b/ebill_paynet/data/mail_activity_type.xml
index 9d6f9c4..46df9b1 100644
--- a/ebill_paynet/data/mail_activity_type.xml
+++ b/ebill_paynet/data/mail_activity_type.xml
@@ -2,7 +2,7 @@
 <flectra>
     <data noupdate="1">
         <record id="mail_activity_dws_error" model="mail.activity.type">
-            <field name="name">Paynet System Error</field>
+            <field name="name">E-Bill System Error</field>
             <field name="icon">fa-warning</field>
             <field name="delay_count">0</field>
             <field name="sequence">99</field>
diff --git a/ebill_paynet/data/transmit.method.xml b/ebill_paynet/data/transmit.method.xml
index 13a13f0..3b490b6 100644
--- a/ebill_paynet/data/transmit.method.xml
+++ b/ebill_paynet/data/transmit.method.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <flectra>
     <record id="paynet_transmit_method" model="transmit.method">
-        <field name="name">Paynet</field>
+        <field name="name">E-Bill</field>
         <field name="code">paynet</field>
         <field name="customer_ok" eval="True" />
         <field name="supplier_ok" eval="False" />
diff --git a/ebill_paynet/messages/invoice-2013A-invocloud.xml b/ebill_paynet/messages/invoice-2013A-invocloud.xml
index 4d278da..e5c6cd6 100644
--- a/ebill_paynet/messages/invoice-2013A-invocloud.xml
+++ b/ebill_paynet/messages/invoice-2013A-invocloud.xml
@@ -17,17 +17,17 @@
       <MESSAGE-REFERENCE>
         <REFERENCE-DATE>
           <Reference-No>{{ invoice.name }}</Reference-No>
-          <Date>{{ format_date() }}</Date>
+          <Date>{{ format_date(invoice.invoice_date) }}</Date>
         </REFERENCE-DATE>
       </MESSAGE-REFERENCE>
       <PRINT-DATE>
-        <Date>{{ format_date(invoice.date_invoice) }}</Date>
+        <Date>{{ format_date(invoice.invoice_date) }}</Date>
       </PRINT-DATE>
       <REFERENCE>
         <INVOICE-REFERENCE>
           <REFERENCE-DATE>
             <Reference-No>{{ invoice.name }}</Reference-No>
-            <Date>{{ format_date(invoice.date_invoice) }}</Date>
+            <Date>{{ format_date(invoice.invoice_date) }}</Date>
           </REFERENCE-DATE>
         </INVOICE-REFERENCE>
       </REFERENCE>
@@ -121,7 +121,7 @@
     <PAYMENT-TERMS>
       <BASIC Payment-Type="{{ payment_type|upper }}" Terms-Type="5">
         <TERMS>
-          <Date>{{ format_date(invoice.date_due or invoice.date_invoice) }}</Date>
+          <Date>{{ format_date(invoice.invoice_date_due or invoice.invoice_date) }}</Date>
         </TERMS>
       </BASIC>
     </PAYMENT-TERMS>
diff --git a/ebill_paynet/models/account_invoice.py b/ebill_paynet/models/account_invoice.py
index 616a91b..e087cd4 100644
--- a/ebill_paynet/models/account_invoice.py
+++ b/ebill_paynet/models/account_invoice.py
@@ -39,6 +39,7 @@ class AccountInvoice(models.Model):
             raise UserError(_("Error generating Paynet message"))
         message.send_to_paynet()
         self.invoice_exported = True
+        self.is_move_sent = True
         return "Paynet invoice generated and in state {}".format(message.state)
 
     def create_paynet_message(self):