diff --git a/fetchmail_notify_error_to_sender/README.rst b/fetchmail_notify_error_to_sender/README.rst
index 813be264e..2fa99caef 100644
--- a/fetchmail_notify_error_to_sender/README.rst
+++ b/fetchmail_notify_error_to_sender/README.rst
@@ -2,9 +2,9 @@
    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
    :alt: License: AGPL-3
 
-===============================
-Send notice on fetchmail errors
-===============================
+================================
+Fetchmail Notify Error to Sender
+================================
 
 If fetchmail is not able to correctly route an email, the email is
 "silently" lost (you get an error message in server log).
@@ -57,7 +57,7 @@ Contributors
 ------------
 
 * Lorenzo Battistini <lorenzo.battistini@agilebg.com>
-* Miquel Raïch <miquel.raich@eficent.com> (migration to v9)
+* Miquel Raïch <miquel.raich@eficent.com> (migration to v9 and v10)
 
 Maintainer
 ----------
diff --git a/fetchmail_notify_error_to_sender/__openerp__.py b/fetchmail_notify_error_to_sender/__manifest__.py
similarity index 89%
rename from fetchmail_notify_error_to_sender/__openerp__.py
rename to fetchmail_notify_error_to_sender/__manifest__.py
index 97d87cbd0..357519a65 100644
--- a/fetchmail_notify_error_to_sender/__openerp__.py
+++ b/fetchmail_notify_error_to_sender/__manifest__.py
@@ -4,9 +4,9 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
-    'name': 'Send notice on fetchmail errors',
+    'name': 'Fetchmail Notify Error to Sender',
     'summary': 'If fetching mails gives error, send an email to sender',
-    'version': '9.0.1.0.0',
+    'version': '10.0.1.0.0',
     'category': 'Tools',
     'author': "Agile Business Group,Eficent,Odoo Community Association (OCA)",
     'website': 'https://github.com/OCA/server-tools',
diff --git a/fetchmail_notify_error_to_sender/data/email_template_data.xml b/fetchmail_notify_error_to_sender/data/email_template_data.xml
index 3bfbb212d..6e1371509 100644
--- a/fetchmail_notify_error_to_sender/data/email_template_data.xml
+++ b/fetchmail_notify_error_to_sender/data/email_template_data.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" ?>
-<openerp>
-    <data noupdate="1">
+<odoo noupdate="1">
         <!--Email template -->
         <record id="email_template_error_notice" model="mail.template">
             <field name="name">Fetchmail - error notice</field>
@@ -22,5 +21,4 @@
 </div>
             ]]></field>
         </record>
-    </data>
-</openerp>
+</odoo>
diff --git a/fetchmail_notify_error_to_sender/models/fetchmail.py b/fetchmail_notify_error_to_sender/models/fetchmail.py
index e7be9e163..3192cba51 100644
--- a/fetchmail_notify_error_to_sender/models/fetchmail.py
+++ b/fetchmail_notify_error_to_sender/models/fetchmail.py
@@ -3,7 +3,7 @@
 # Copyright 2017 Eficent <http://www.eficent.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp import fields, models
+from odoo import fields, models
 
 
 class FetchmailServer(models.Model):
diff --git a/fetchmail_notify_error_to_sender/models/mail_thread.py b/fetchmail_notify_error_to_sender/models/mail_thread.py
index 6b3c0c7ca..bbe78b70d 100644
--- a/fetchmail_notify_error_to_sender/models/mail_thread.py
+++ b/fetchmail_notify_error_to_sender/models/mail_thread.py
@@ -3,7 +3,7 @@
 # Copyright 2017 Eficent <http://www.eficent.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp import api, models
+from odoo import api, models
 
 
 class MailThread(models.AbstractModel):
diff --git a/fetchmail_notify_error_to_sender/views/fetchmail_view.xml b/fetchmail_notify_error_to_sender/views/fetchmail_view.xml
index b3fbcd8b1..39b2023c6 100644
--- a/fetchmail_notify_error_to_sender/views/fetchmail_view.xml
+++ b/fetchmail_notify_error_to_sender/views/fetchmail_view.xml
@@ -3,7 +3,7 @@
         <record model="ir.ui.view" id="view_email_server_form">
             <field name="name">fetchmail.server.form</field>
             <field name="model">fetchmail.server</field>
-            <field name="inherit_id" ref="fetchmail.view_email_server_form"></field>
+            <field name="inherit_id" ref="fetchmail.view_email_server_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="after">
                     <field name="error_notice_template_id"/>