diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index a595671d460..f498622b868 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -93,7 +93,7 @@ Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
             help='This adds the \'Margin\' on sales order.\n'
                  'This gives the profitability by calculating the difference between the Unit Price and Cost Price.\n'
                  '-This installs the module sale_margin.'),
-        'module_website_quotation': fields.boolean("Allow online quotations and templates",
+        'module_website_quote': fields.boolean("Allow online quotations and templates",
             help='This adds the online quotation'),
         'module_sale_journal': fields.boolean("Allow batch invoicing of delivery orders through journals",
             help='Allows you to categorize your sales and deliveries (picking lists) between different journals, '
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 34f05226a30..641b161cbda 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -80,9 +80,9 @@
                     </group>
                 </group>
                 <div name="Sale Features" position="inside">
-                    <div name="module_website_quotation">
-                        <field name="module_website_quotation" class="oe_inline"/>
-                        <label for="module_website_quotation"/>
+                    <div name="module_website_quote">
+                        <field name="module_website_quote" class="oe_inline"/>
+                        <label for="module_website_quote"/>
                     </div>
                     <div name="module_sale_margin">
                         <field name="module_sale_margin" class="oe_inline"/>
diff --git a/addons/website_quotation/controllers/main.py b/addons/website_quotation/controllers/main.py
index e1fad33e039..2176e81a3b0 100644
--- a/addons/website_quotation/controllers/main.py
+++ b/addons/website_quotation/controllers/main.py
@@ -57,7 +57,7 @@ class sale_quote(http.Controller):
             'order_valid': (not order.validity_date) or (now <= order.validity_date),
             'days_valid': max(days, 0)
         }
-        return request.website.render('website_quotation.so_quotation', values)
+        return request.website.render('website_quote.so_quotation', values)
 
     @http.route(['/quote/accept'], type='json', auth="public", website=True)
     def accept(self, order_id=None, token=None, signer=None, sign=None, **post):
@@ -133,7 +133,7 @@ class sale_quote(http.Controller):
     @http.route(["/quote/template/<model('sale.quote.template'):quote>"], type='http', auth="user", website=True)
     def template_view(self, quote, **post):
         values = { 'template': quote }
-        return request.website.render('website_quotation.so_template', values)
+        return request.website.render('website_quote.so_template', values)
 
     @http.route(["/quote/add_line/<int:option_id>/<int:order_id>/<token>"], type='http', auth="public", website=True)
     def add(self, option_id, order_id, token, **post):
diff --git a/addons/website_quotation/data/website_quotation_demo.xml b/addons/website_quotation/data/website_quotation_demo.xml
index bfec1604283..24c5f08538c 100644
--- a/addons/website_quotation/data/website_quotation_demo.xml
+++ b/addons/website_quotation/data/website_quotation_demo.xml
@@ -163,7 +163,7 @@
                             </p>
                         </div>
                         <div class="col-md-5">
-                            <img src="/website_quotation/static/src/img/partner_icon_01.png"/>
+                            <img src="/website_quote/static/src/img/partner_icon_01.png"/>
                         </div>
                     </div>
                 </section>
@@ -184,7 +184,7 @@
                             </p>
                         </div>
                         <div class="col-md-5">
-                            <img src="/website_quotation/static/src/img/openerp_gold_partner.png"/>
+                            <img src="/website_quote/static/src/img/openerp_gold_partner.png"/>
                         </div>
                     </div>
                 </section>
@@ -205,7 +205,7 @@
                             </p>
                         </div>
                         <div class="col-md-5">
-                            <img src="/website_quotation/static/src/img/partner_icon_02.png" class="img"/>
+                            <img src="/website_quote/static/src/img/partner_icon_02.png" class="img"/>
                         </div>
                     </div>
                 </section>
@@ -226,7 +226,7 @@
                     <h2>Test developments automatically</h2>
                     <div class="row">
                         <div class="col-md-5">
-                            <img src="/website_quotation/static/src/img/partner_sc_01.png" class="img shadow"/>
+                            <img src="/website_quote/static/src/img/partner_sc_01.png" class="img shadow"/>
                         </div>
                         <div class="col-md-7">
                             <p class="mt23">
diff --git a/addons/website_quotation/views/website_quotation.xml b/addons/website_quotation/views/website_quotation.xml
index 7378c7447b9..0374bfbc311 100644
--- a/addons/website_quotation/views/website_quotation.xml
+++ b/addons/website_quotation/views/website_quotation.xml
@@ -85,14 +85,14 @@
               </tbody>
           </table>
       </section>
-      <t t-call="website_quotation.quotation_toolbar"/>
+      <t t-call="website_quote.quotation_toolbar"/>
       <section id="terms" class="container" t-if="quotation.note">
           <h2 class="page-header">Terms &amp; Conditions</h2>
           <p t-field="quotation.note"/>
       </section>
   </template>
 
-  <template id="change_quantity" inherit_option_id="website_quotation.pricing" name="Change Quantity">
+  <template id="change_quantity" inherit_option_id="website_quote.pricing" name="Change Quantity">
       <xpath expr="//div[@id='quote_qty']" position="replace">
           <div class="input-group">
               <span class="input-group-addon hidden-print">
@@ -130,7 +130,7 @@
   </template>
 
   <!-- Options:Quotation Chatter: user can reply -->
-  <template id="opt_quotation_chatter_post_complete_comment" name="Allow Comments" inherit_option_id="website_quotation.chatter" inherit_id="website_quotation.chatter">
+  <template id="opt_quotation_chatter_post_complete_comment" name="Allow Comments" inherit_option_id="website_quote.chatter" inherit_id="website_quote.chatter">
       <xpath expr="//h1" position="after">
           <section class="mb32 css_editable_mode_hidden hidden-print">
               <form id="comment" t-attf-action="/quote/#{quotation.id}/#{quotation.access_token}/post" method="POST">
@@ -162,9 +162,9 @@
   <template id="so_quotation" name="Product Quotation">
       <t t-call="website.layout">
         <t t-set="head">
-            <script type="text/javascript" src="/website_quotation/static/src/js/website_quotation.js"></script>
-            <script type="text/javascript" src="/website_quotation/static/lib/jSignature/jSignature.min.js"></script>
-            <link rel='stylesheet' href='/website_quotation/static/src/css/website_quotation.css'/>
+            <script type="text/javascript" src="/website_quote/static/src/js/website_quotation.js"></script>
+            <script type="text/javascript" src="/website_quote/static/lib/jSignature/jSignature.min.js"></script>
+            <link rel='stylesheet' href='/website_quote/static/src/css/website_quotation.css'/>
             <t t-raw="head or ''"/>
         </t>
         <body data-spy="scroll" data-target=".navspy">
@@ -190,7 +190,7 @@
                               </div>
                           </div>
                           <hr class="mt0 mb0"/>
-                          <t t-call="website_quotation.navigation_menu"/>
+                          <t t-call="website_quote.navigation_menu"/>
                           <hr class="mt0 mb0"/>
                           <div t-if="order_valid" class="text-center hidden-print">
                               <input type="hidden" t-att-value="quotation.validity_date" id="validity_date"/>
@@ -365,13 +365,13 @@
                       <div class="oe_structure"/>
 
                       <a id="pricing"/>
-                      <t t-call="website_quotation.pricing"/>
+                      <t t-call="website_quote.pricing"/>
                       
                       <a id="options"/>
-                      <t t-call="website_quotation.optional_products"/>
+                      <t t-call="website_quote.optional_products"/>
 
                       <a id="discussion"/>
-                      <t t-call="website_quotation.chatter"/>
+                      <t t-call="website_quote.chatter"/>
                   </div>
               </div>
             </div>
@@ -388,7 +388,7 @@
   </template>
 
   <!-- Options:Quotation Signature -->
-  <template id="opt_quotation_signature" name="Ask Signature" inherit_option_id="website_quotation.so_quotation" inherit_id="website_quotation.so_quotation">
+  <template id="opt_quotation_signature" name="Ask Signature" inherit_option_id="website_quote.so_quotation" inherit_id="website_quote.so_quotation">
       <xpath expr="//div[@id='sign-dialog']" position="inside">
         <div class="panel panel-default mt16 mb0" id="drawsign">
             <div class="panel-heading">
@@ -458,8 +458,8 @@
   <template id="so_template" name="SO Template">
     <t t-call="website.layout">
         <t t-set="head">
-            <script type="text/javascript" src="/website_quotation/static/src/js/website_quotation.js"></script>
-            <link rel='stylesheet' href='/website_quotation/static/src/css/website_quotation.css'/>
+            <script type="text/javascript" src="/website_quote/static/src/js/website_quotation.js"></script>
+            <link rel='stylesheet' href='/website_quote/static/src/css/website_quotation.css'/>
             <t t-raw="head or ''"/>
         </t>
         <body data-spy="scroll" data-target=".navspy">