diff --git a/addons/crm/web_planner_data.xml b/addons/crm/web_planner_data.xml
index ffdfca55855..023a32aa087 100644
--- a/addons/crm/web_planner_data.xml
+++ b/addons/crm/web_planner_data.xml
@@ -878,11 +878,11 @@
                             </div>
                             <div class="text-center mt8 col-md-6">
                                 <span class="fa fa-comments-o fa-4x"></span>
-                                <h3><strong>Live Chat</strong></h3>
+                                <h3><strong>Website Live Chat</strong></h3>
                                 <p>Engage directly with your website visitors to convert them into leads.</p>
                                 <a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'im_livechat')"
                                    class="btn odoo_purple">
-                                <span class="fa fa-arrow-circle-o-down"/> Install Live Chat</a>
+                                <span class="fa fa-arrow-circle-o-down"/> Install Website Live Chat</a>
                             </div>
                         </div><div class="row o_planner_row_apps">
                             <div class="text-center mt8 col-md-6">
diff --git a/addons/hr/README.md b/addons/hr/README.md
index a80842d296a..fa04ec476fc 100644
--- a/addons/hr/README.md
+++ b/addons/hr/README.md
@@ -36,7 +36,7 @@ Break down information silos. Share knowledge and best practices amongst all
 employees. Follow specific people or documents and join groups of interests to
 share expertise and documents.
 
-Interact with your collegues in real time with live chat.
+Interact with your collegues in real time with website live chat.
 
 Track time and attendances
 --------------------------
diff --git a/addons/hr/static/description/index.html b/addons/hr/static/description/index.html
index 3f0ca0842d1..92da2e0bc62 100644
--- a/addons/hr/static/description/index.html
+++ b/addons/hr/static/description/index.html
@@ -60,7 +60,7 @@ Save time by automating some communications with email templates. Resumes are in
 			amongst all employees. Follow specific people or documents and join
 			groups of interests to share expertise and documents. 
 			</p><p>
-            Interact with your collegues in real time with live chat.
+            Interact with your collegues in real time with website live chat.
             </p>
         </div>
         <div class="oe_span6">
diff --git a/addons/im_livechat/__openerp__.py b/addons/im_livechat/__openerp__.py
index da672662eca..030230dcc95 100644
--- a/addons/im_livechat/__openerp__.py
+++ b/addons/im_livechat/__openerp__.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 {
-    'name' : 'Live Chat',
+    'name' : 'Website Live Chat',
     'version': '1.0',
     'sequence': 170,
-    'summary': 'Live Chat with Visitors/Customers',
+    'summary': 'Website Live Chat with Visitors/Customers',
     'category': 'Tools',
     'complexity': 'easy',
     'website': 'https://www.odoo.com/page/live-chat',
     'description':
         """
-Live Chat Support
-=================
+Website Live Chat Support
+==========================
 
 Allow to drop instant messaging widgets on any web page that will communicate
 with the current server and dispatch visitors request amongst several live
diff --git a/addons/im_livechat/views/im_livechat_channel_templates.xml b/addons/im_livechat/views/im_livechat_channel_templates.xml
index ddd92458417..ba2facdd817 100644
--- a/addons/im_livechat/views/im_livechat_channel_templates.xml
+++ b/addons/im_livechat/views/im_livechat_channel_templates.xml
@@ -76,7 +76,7 @@
                 <body>
                      <div class="main" style="opacity: 1;">
                         <h1 class="channel_name"><t t-esc="channel.name"/></h1>
-                        <div>Live Chat Powered by <strong>Odoo</strong>.</div>
+                        <div>Website Live Chat Powered by <strong>Odoo</strong>.</div>
                     </div>
                 </body>
             </html>
diff --git a/addons/im_livechat/views/im_livechat_channel_views.xml b/addons/im_livechat/views/im_livechat_channel_views.xml
index 9a49b91580a..12ae74c9155 100644
--- a/addons/im_livechat/views/im_livechat_channel_views.xml
+++ b/addons/im_livechat/views/im_livechat_channel_views.xml
@@ -3,15 +3,15 @@
     <data>
 
         <record id="im_livechat_channel_action" model="ir.actions.act_window">
-            <field name="name">Live Chat Channels</field>
+            <field name="name">Website Live Chat Channels</field>
             <field name="res_model">im_livechat.channel</field>
             <field name="view_mode">kanban,form</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to define a new live chat channel.
+                Click to define a new website live chat channel.
               </p><p>
                 You can create channels for each website on which you want
-                to integrate the live chat widget, allowing you website
+                to integrate the website live chat widget, allowing you website
                 visitors to talk in real time with your operators.
               </p><p>
                 Each channel has it's own URL that you can send by email to
@@ -113,7 +113,7 @@
                     </group>
 
                     <div attrs='{"invisible": [["web_page", "=", False]]}'>
-                        <separator string="How to use the Live Chat widget?"/>
+                        <separator string="How to use the Website Live Chat widget?"/>
                         <p>
                             Copy and paste this code into your website, within the &amp;lt;head&amp;gt; tag:
                         </p>
@@ -122,7 +122,7 @@
                             or copy this url and send it by email to your customers or suppliers:
                         </p>
                         <field name="web_page" readonly="1" class="badge" widget="url"/>
-                        <p>For website built with Odoo CMS, please install the website_livechat module. Then go to Settings > Website Settings and select the Live Chat Channel you want to add on your website.</p>
+                        <p>For website built with Odoo CMS, please install the website_livechat module. Then go to Settings > Website Settings and select the Website Live Chat Channel you want to add on your website.</p>
                     </div>
 
                     <group string="Channel Rules">
@@ -175,7 +175,7 @@
         <!-- Menu items -->
         <menuitem
             id="menu_livechat_root"
-            name="Live Chat"
+            name="Website Live Chat"
             web_icon="im_livechat,static/description/icon.png"
             groups="im_livechat_group_user"
             sequence="205"/>
diff --git a/addons/project/README.md b/addons/project/README.md
index dad46790c7d..b5d98c45b76 100644
--- a/addons/project/README.md
+++ b/addons/project/README.md
@@ -32,7 +32,7 @@ Use open chatter to communicate with your team or customers and share comments
 and documents on tasks and issues. Integrate discussion fast with the email
 integration.
 
-Talk to others users or customers with the live chat feature.
+Talk to others users or customers with the website live chat feature.
 
 Collaborative Writing
 ---------------------
diff --git a/addons/project/static/description/index.html b/addons/project/static/description/index.html
index b325726c861..f7d6c533742 100644
--- a/addons/project/static/description/index.html
+++ b/addons/project/static/description/index.html
@@ -70,7 +70,7 @@ Use open chatter to communicate with your team or customers and share comments
 and documents on tasks and issues. Integrate discussion fast with the email
 integration.
             </p><p>
-Talk to others users or customers with the live chat feature.
+Talk to others users or customers with the website live chat feature.
             </p>
         </div>
         <div class="oe_span6">
diff --git a/addons/project/web_planner_data.xml b/addons/project/web_planner_data.xml
index 9ed6c494418..f81df6b9742 100644
--- a/addons/project/web_planner_data.xml
+++ b/addons/project/web_planner_data.xml
@@ -244,7 +244,7 @@
 
                     <div class="well well-lg">
                         <strong>Need help with defining your Projects? Contact us now.</strong><br/>
-                        <a href="https://www.odoo.com/page/live-chat" target="_blank" style="margin-right:10px"><span class="fa fa-comment-o"/> Live Chat on</a>
+                        <a href="https://www.odoo.com/page/live-chat" target="_blank" style="margin-right:10px"><span class="fa fa-comment-o"/> Website Live Chat on</a>
                         <a href="mailto:info@odoo.com?subject=Project%20Planner"><span class="fa fa-envelope-o"/> Email Our Project Expert</a>
                     </div>
                 </t>
@@ -327,7 +327,7 @@
                         <div class="col-md-6 col-xs-12">
                             <div class="well well-lg">
                                 <strong>Need help to structure your projects ?</strong><br/>
-                                <a href="https://www.odoo.com/page/live-chat" target="_blank" style="margin-right:10px"><span class="fa fa-comment-o"/> Live Chat on</a><br/>
+                                <a href="https://www.odoo.com/page/live-chat" target="_blank" style="margin-right:10px"><span class="fa fa-comment-o"/> Website Live Chat on</a><br/>
                                 <a href="mailto:info@odoo.com?subject=Project%20Planner"><span class="fa fa-envelope-o"/> Email Our Project Expert</a>
                             </div>
                         </div>
@@ -534,7 +534,7 @@
                         <div class="well well-lg">
                             <strong>Need help with Timesheets management? Contact us now:</strong><br/>
                             <a href="https://www.odoo.com/page/live-chat" target="_blank" style="margin-right:10px">
-                                <span class="fa fa-comment-o"/> Live Chat on
+                                <span class="fa fa-comment-o"/> Website Live Chat on
                             </a>
                             <a href="mailto:info@odoo.com?subject=Project%20Planner">
                                 <span class="fa fa-envelope-o"/> Email Our Project Expert
@@ -616,7 +616,7 @@
                             <div class="col-md-4 col-xs-12">
                                 <div class="well well-lg">
                                     <strong>Contact us now:</strong><br/>
-                                    <a href="https://www.odoo.com/page/live-chat" target="_blank" style="margin-right:10px"><span class="fa fa-comment-o"/> Live Chat on</a><br/>
+                                    <a href="https://www.odoo.com/page/live-chat" target="_blank" style="margin-right:10px"><span class="fa fa-comment-o"/> Website Live Chat on</a><br/>
                                     <a href="mailto:info@odoo.com?subject=Project%20Planner"><span class="fa fa-envelope-o"/> Email Our Project Expert</a>
                                 </div>
                             </div>
@@ -1011,7 +1011,7 @@
                             <div class="col-md-4 col-xs-12">
                                 <div class="well well-lg">
                                     <strong>Contact us now:</strong><br/>
-                                    <a href="https://www.odoo.com/page/live-chat" target="_blank" style="margin-right:10px"><span class="fa fa-comment-o"/> Live Chat on</a><br/>
+                                    <a href="https://www.odoo.com/page/live-chat" target="_blank" style="margin-right:10px"><span class="fa fa-comment-o"/> Website Live Chat on</a><br/>
                                     <a href="mailto:info@odoo.com?subject=Project%20Planner"><span class="fa fa-envelope-o"/> Email Our Project Expert</a>
                                 </div>
                             </div>
diff --git a/addons/website/data/web_planner_data.xml b/addons/website/data/web_planner_data.xml
index 679955d29a7..edcbed8a3e1 100644
--- a/addons/website/data/web_planner_data.xml
+++ b/addons/website/data/web_planner_data.xml
@@ -190,7 +190,7 @@
                             <div class="col-md-5 col-xs-12">
                                 <div class="well well-lg">
                                     <strong>Contact us now:</strong><br/>
-                                    <a href="#" target="_blank" style="margin-right:10px"><span class="fa fa-comment-o"/> Live Chat on</a><br/>
+                                    <a href="#" target="_blank" style="margin-right:10px"><span class="fa fa-comment-o"/> Website Live Chat on</a><br/>
                                     <a href="mailto:info@odoo.com?subject=Website%20Planner" target="_blank"><span class="fa fa-envelope-o"/> Email Our Website Expert</a>
                                 </div>
                             </div>
diff --git a/addons/website_blog/README.md b/addons/website_blog/README.md
index 9baa0274761..a5e6c9b7a09 100644
--- a/addons/website_blog/README.md
+++ b/addons/website_blog/README.md
@@ -33,7 +33,7 @@ Translated versions are updated automatically once translated by professionals
 Engage With Your Visitors
 -------------------------
 
-The integrated live chat feature allows you to start chatting in real time with
+The integrated website live chat feature allows you to start chatting in real time with
 your visitors to get feedback on your recent posts or get ideas to write new
 posts.
 
diff --git a/addons/website_blog/static/description/index.html b/addons/website_blog/static/description/index.html
index 4b099ebf316..0d209931cb9 100644
--- a/addons/website_blog/static/description/index.html
+++ b/addons/website_blog/static/description/index.html
@@ -75,7 +75,7 @@
         <h3 class="oe_slogan">Live chat with your visitors in one click</h3>
         <div class="oe_span6">
           <p class='oe_mt32'>
-              The integrated live chat feature allows you to start chatting in
+              The integrated website live chat feature allows you to start chatting in
               real time with your visitors to get feedback on your recent posts
               or get ideas to write new posts.
           </p><p>
diff --git a/addons/website_event_track/data/website_event_track_demo.xml b/addons/website_event_track/data/website_event_track_demo.xml
index 711c7c40359..b68856c95db 100644
--- a/addons/website_event_track/data/website_event_track_demo.xml
+++ b/addons/website_event_track/data/website_event_track_demo.xml
@@ -42,7 +42,7 @@
         <field name="state">confirmed</field>
     </record>
     <record id="event_track3" model="event.track">
-        <field name="name">How to develop real time apps, the live chat module explained.</field>
+        <field name="name">How to develop real time apps, the website live chat module explained.</field>
         <field name="website_published" eval="True"/>
         <field name="event_id" ref="event.event_0"/>
         <field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 10:30:00')"></field>
diff --git a/addons/website_livechat/models/website.py b/addons/website_livechat/models/website.py
index 5ed8d0882c8..2b557236b76 100644
--- a/addons/website_livechat/models/website.py
+++ b/addons/website_livechat/models/website.py
@@ -7,11 +7,11 @@ class Website(models.Model):
 
     _inherit = "website"
 
-    channel_id = fields.Many2one('im_livechat.channel', string='Live Chat Channel')
+    channel_id = fields.Many2one('im_livechat.channel', string='Website Live Chat Channel')
 
 
 class WebsiteConfigSettings(models.TransientModel):
 
     _inherit = 'website.config.settings'
 
-    channel_id = fields.Many2one('im_livechat.channel', string='Live Chat Channel', related='website_id.channel_id')
+    channel_id = fields.Many2one('im_livechat.channel', string='Website Live Chat Channel', related='website_id.channel_id')
diff --git a/addons/website_sale/README.md b/addons/website_sale/README.md
index be25d7ad970..5ce2d491fea 100644
--- a/addons/website_sale/README.md
+++ b/addons/website_sale/README.md
@@ -124,7 +124,7 @@ And much more...
 ### Customer Service
 
 -   Customer Portal to track orders
--   Assisted shopping with live chats
+-   Assisted shopping with website live chats
 -   Returns management
 -   Advanced shipping rules
 -   Coupons or gift certificates
diff --git a/addons/website_sale/data/web_planner_data.xml b/addons/website_sale/data/web_planner_data.xml
index 6c3c78b43d9..492f7c442ab 100644
--- a/addons/website_sale/data/web_planner_data.xml
+++ b/addons/website_sale/data/web_planner_data.xml
@@ -88,7 +88,7 @@
                         <div class="col-md-5 col-xs-12">
                             <div class="well well-lg">
                                 <strong>Contact us now:</strong><br/>
-                                <a href="#" target="_blank" ><i class="fa fa-comment-o"/> Live Chat on</a><br/>
+                                <a href="#" target="_blank" ><i class="fa fa-comment-o"/> Website Live Chat on</a><br/>
                                 <a href="mailto:info@odoo.com?subject=Website%20Planner" target="_blank"><i class="fa fa-envelope-o"/> Email Our Website Expert</a>
                             </div>
                         </div>
@@ -138,7 +138,7 @@
                             <div class="col-md-5 col-xs-12">
                                 <div class="well well-lg">
                                     <strong>Contact us now:</strong><br/>
-                                    <a href="#" target="_blank" style="margin-right:10px"><span class="fa fa-comment-o"/> Live Chat on</a><br/>
+                                    <a href="#" target="_blank" style="margin-right:10px"><span class="fa fa-comment-o"/> Website Live Chat on</a><br/>
                                     <a href="mailto:info@odoo.com?subject=Website%20Planner" target="_blank"><span class="fa fa-envelope-o"/> Email Our Website Expert</a>
                                 </div>
                             </div>
diff --git a/addons/website_sale/static/description/index.html b/addons/website_sale/static/description/index.html
index e86260cd9a0..372f5202c20 100644
--- a/addons/website_sale/static/description/index.html
+++ b/addons/website_sale/static/description/index.html
@@ -274,7 +274,7 @@
             <h3 class="oe_slogan">Customer Service</h3>
             <ul>
                 <li>Customer Portal to track orders</li>
-                <li>Assisted shopping with live chats</li>
+                <li>Assisted shopping with website live chats</li>
                 <li>Returns management</li>
                 <li>Advanced shipping rules</li>
                 <li>Coupons or gift certificates</li>
diff --git a/openerp/addons/base/tests/test_mail_examples.py b/openerp/addons/base/tests/test_mail_examples.py
index 27ec3ee3e10..97a34c45e55 100644
--- a/openerp/addons/base/tests/test_mail_examples.py
+++ b/openerp/addons/base/tests/test_mail_examples.py
@@ -78,7 +78,7 @@ OERP_WEBSITE_HTML_1 = """
                 <img class="img-rounded img-responsive" src="/website/static/src/img/desert_thumb.jpg">
                 <h4 class="mt16">Enterprise Social Network</h4>
                 <p>Break down information silos. Share knowledge and best practices amongst all employees. Follow specific people or documents and join groups of interests to share expertise and documents.</p>
-                <p>Interact with your collegues in real time with live chat.</p>
+                <p>Interact with your collegues in real time with website live chat.</p>
             </div>
             <div class="col-md-4">
                 <img class="img-rounded img-responsive" src="/website/static/src/img/deers_thumb.jpg">