diff --git a/addons/mass_mailing/static/src/js/website_mass_mailing.editor.js b/addons/mass_mailing/static/src/js/website_mass_mailing.editor.js
index 2f5a484320c..4caba1d29b5 100644
--- a/addons/mass_mailing/static/src/js/website_mass_mailing.editor.js
+++ b/addons/mass_mailing/static/src/js/website_mass_mailing.editor.js
@@ -10,7 +10,7 @@
             return website.prompt({
                 id: "editor_new_mailing_list_subscribe_button",
                 window_title: _t("Add a Newsletter Subscribe Button"),
-                select: _t("Mailing List"),
+                select: _t("Newsletter"),
                 init: function (field) {
                     return website.session.model('mail.mass_mailing.list')
                             .call('name_search', ['', []], { context: website.get_context() });
diff --git a/addons/website_mail/static/src/js/website_mail.editor.js b/addons/website_mail/static/src/js/website_mail.editor.js
index 7a26920682b..fdfb948121f 100644
--- a/addons/website_mail/static/src/js/website_mail.editor.js
+++ b/addons/website_mail/static/src/js/website_mail.editor.js
@@ -10,7 +10,7 @@
             return website.prompt({
                 id: "editor_new_subscribe_button",
                 window_title: _t("Add a Subscribe Button"),
-                select: _t("Mailing List"),
+                select: _t("Discussion List"),
                 init: function (field) {
                     return website.session.model('mail.group')
                             .call('name_search', ['', [['public','=','public']]], { context: website.get_context() });
diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 3279fa216d2..c9f76ce4273 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -516,7 +516,7 @@
                     <a href="#" class="btn btn-default js_unfollow_btn">Unsubscribe</a>
                     <a href="#" class="btn btn-primary js_follow_btn">Subscribe</a>
                 </span>
-                <div class="alert alert-success hidden">thanks for your subscription!</div>
+                <div class="alert alert-success hidden">Thanks for your subscription!</div>
             </div>
 
         </div>
@@ -529,7 +529,7 @@
             data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
            >
             <li>
-                <a href="#" class="button js_mailing_list">Change mailing list</a>
+                <a href="#" class="button js_mailing_list">Change Discussion List</a>
             </li>
         </div>
     </xpath>