diff --git a/addons/product_email_template/__openerp__.py b/addons/product_email_template/__openerp__.py
index 676dcd9ce32..ad9de0b724c 100644
--- a/addons/product_email_template/__openerp__.py
+++ b/addons/product_email_template/__openerp__.py
@@ -15,8 +15,8 @@ For instance when invoicing a training, the training agenda and materials will a
         'data/product_demo.xml',
     ],
     'data': [
-        'views/product_view.xml',
-        'views/email_template_view.xml',
+        'views/product_views.xml',
+        'views/mail_template_views.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/product_email_template/data/product_demo.xml b/addons/product_email_template/data/product_demo.xml
index 565141b3ffd..205af922212 100644
--- a/addons/product_email_template/data/product_demo.xml
+++ b/addons/product_email_template/data/product_demo.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
         <record id="product_online_training_email_template" model="mail.template">
             <field name="name">Online Training</field>
             <field name="subject">Online Training</field>
@@ -626,7 +625,7 @@
             </tr>
         </table>
     </div>
-</div>
+    </div>
             ]]>
             </field>
         </record>
@@ -642,5 +641,4 @@
             <field name="email_template_id" ref="product_online_training_email_template"/>
         </record>
 
-    </data>
-</openerp>
+</odoo>
\ No newline at end of file
diff --git a/addons/product_email_template/models/__init__.py b/addons/product_email_template/models/__init__.py
index 2edb825574d..5067404a32c 100644
--- a/addons/product_email_template/models/__init__.py
+++ b/addons/product_email_template/models/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 
 import product
-import invoice
+import account_invoice
\ No newline at end of file
diff --git a/addons/product_email_template/models/invoice.py b/addons/product_email_template/models/account_invoice.py
similarity index 100%
rename from addons/product_email_template/models/invoice.py
rename to addons/product_email_template/models/account_invoice.py
diff --git a/addons/product_email_template/views/email_template_view.xml b/addons/product_email_template/views/mail_template_views.xml
similarity index 100%
rename from addons/product_email_template/views/email_template_view.xml
rename to addons/product_email_template/views/mail_template_views.xml
diff --git a/addons/product_email_template/views/product_view.xml b/addons/product_email_template/views/product_views.xml
similarity index 100%
rename from addons/product_email_template/views/product_view.xml
rename to addons/product_email_template/views/product_views.xml