diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index de64dfccb8c..8980a31927e 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -105,7 +105,7 @@ class account_config_settings(osv.osv_memory):
         'module_account_followup': fields.boolean('Manage customer payment follow-ups',
             help='This allows to automate letters for unpaid invoices, with multi-level recalls.\n'
                  '-This installs the module account_followup.'),
-        'module_account_product_template': fields.boolean('Send products tools and information at the invoice confirmation',
+        'module_product_email_template': fields.boolean('Send products tools and information at the invoice confirmation',
             help='With this module, link your products to a template to send complete information and tools to your customer.\n'
                  'For instance when invoicing a training, the training agenda and materials will automatically be send to your customers.'),
         'group_proforma_invoices': fields.boolean('Allow pro-forma invoices',
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 3a2c732ce06..103344daa3a 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -184,8 +184,8 @@
                                 <label for="module_account_followup"/>
                             </div>
                             <div>
-                                <field name="module_account_product_template" class="oe_inline"/>
-                                <label for="module_account_product_template"/>
+                                <field name="module_product_email_template" class="oe_inline"/>
+                                <label for="module_product_email_template"/>
                             </div>
                         </div>
                     </group>
diff --git a/addons/account_product_template/__init__.py b/addons/product_email_template/__init__.py
similarity index 100%
rename from addons/account_product_template/__init__.py
rename to addons/product_email_template/__init__.py
diff --git a/addons/account_product_template/__openerp__.py b/addons/product_email_template/__openerp__.py
similarity index 100%
rename from addons/account_product_template/__openerp__.py
rename to addons/product_email_template/__openerp__.py
diff --git a/addons/account_product_template/data/product_demo.xml b/addons/product_email_template/data/product_demo.xml
similarity index 100%
rename from addons/account_product_template/data/product_demo.xml
rename to addons/product_email_template/data/product_demo.xml
diff --git a/addons/account_product_template/models/__init__.py b/addons/product_email_template/models/__init__.py
similarity index 100%
rename from addons/account_product_template/models/__init__.py
rename to addons/product_email_template/models/__init__.py
diff --git a/addons/account_product_template/models/invoice.py b/addons/product_email_template/models/invoice.py
similarity index 100%
rename from addons/account_product_template/models/invoice.py
rename to addons/product_email_template/models/invoice.py
diff --git a/addons/account_product_template/models/product.py b/addons/product_email_template/models/product.py
similarity index 100%
rename from addons/account_product_template/models/product.py
rename to addons/product_email_template/models/product.py
diff --git a/addons/account_product_template/views/email_template_view.xml b/addons/product_email_template/views/email_template_view.xml
similarity index 100%
rename from addons/account_product_template/views/email_template_view.xml
rename to addons/product_email_template/views/email_template_view.xml
diff --git a/addons/account_product_template/views/product_view.xml b/addons/product_email_template/views/product_view.xml
similarity index 89%
rename from addons/account_product_template/views/product_view.xml
rename to addons/product_email_template/views/product_view.xml
index 7b0a8e537d8..4d036fb8de0 100644
--- a/addons/account_product_template/views/product_view.xml
+++ b/addons/product_email_template/views/product_view.xml
@@ -10,7 +10,7 @@
                     <field name="email_template_id"
                         domain="[('model','=','product.template')]"
                         context="{
-                            'form_view_ref':'account_product_template.email_template_form_simplified',
+                            'form_view_ref':'product_email_template.email_template_form_simplified',
                             'default_model': 'product.template',
                             'default_subject': name,
                             'default_name': name,