diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js
index 0d4c5cfba8c..0cb570a36e2 100644
--- a/addons/website/static/src/js/website.snippets.js
+++ b/addons/website/static/src/js/website.snippets.js
@@ -522,13 +522,13 @@
         start: function () {
         },
         /* onFocusEdit
-        *  if they are an editor for this snippet-id 
+        *  if they are an editor for this data-snippet-id 
         *  Called before onFocus of snippet editor
         */
         onFocusEdit : function () {},
 
         /* onBlurEdit
-        *  if they are an editor for this snippet-id 
+        *  if they are an editor for this data-snippet-id 
         *  Called after onBlur of snippet editor
         */
         onBlurEdit : function () {},
diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment.xml b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
index 420bed6609b..09e1ebad1ce 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
@@ -92,7 +92,7 @@
                     <div class="row">
                         <div t-if="job.website_description">
                             <div t-field="job.website_description"/>
-                            <section snippet-id="cta" class="mt16 mb16">
+                            <section data-snippet-id="cta" class="mt16 mb16">
                                 <div class="container">
                                     <div class="row">
                                     <div class="col-md-12 text-center mt16 mb16">
diff --git a/addons/website_sale/website_sale_demo.xml b/addons/website_sale/website_sale_demo.xml
index a3f7ad2820e..5aa022c8988 100644
--- a/addons/website_sale/website_sale_demo.xml
+++ b/addons/website_sale/website_sale_demo.xml
@@ -13,7 +13,7 @@
             <field name="website_sequence">5</field>
             <field name="website_style_ids" eval="[(6,0,[ref('website_sale.image_full')])]"/>
             <field name="website_description" type="html">
-                <section snippet-id="text-image" class="mt16 mb16 dark">
+                <section data-snippet-id="text-image" class="mt16 mb16 dark">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-5 col-md-offset-1 mt64">
@@ -33,7 +33,7 @@
                         </div>
                     </div>
                 </section>
-                <section snippet-id="image-text" class="mt16 mb16">
+                <section data-snippet-id="image-text" class="mt16 mb16">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-5 col-md-offset-1">
@@ -61,7 +61,7 @@
             <field name="website_size_x">2</field>
             <field name="website_style_ids" eval="[(6,0,[ref('website_sale.image_promo')])]"/>
             <field name="website_description" type="html">
-                <section snippet-id="text-image" class="mt16 mb16">
+                <section data-snippet-id="text-image" class="mt16 mb16">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-5 col-md-offset-1 mt64">
@@ -79,7 +79,7 @@
                         </div>
                     </div>
                 </section>
-                <section snippet-id="text-image" class="mt16 mb16 dark">
+                <section data-snippet-id="text-image" class="mt16 mb16 dark">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-5 col-md-offset-1">
@@ -113,7 +113,7 @@
                         </div>
                     </div>
                 </section>
-                <section snippet-id="text-image" class="mt16 mb16">
+                <section data-snippet-id="text-image" class="mt16 mb16">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-5 col-md-offset-1 mt64 mb16">
@@ -157,7 +157,7 @@ Ultrafast wireless
 iOS7
             </field>
             <field name="website_description" type="html">
-                <section snippet-id="text-image" class="mt16 mb16 dark">
+                <section data-snippet-id="text-image" class="mt16 mb16 dark">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-5 col-md-offset-1 mt64">
@@ -176,7 +176,7 @@ iOS7
                         </div>
                     </div>
                 </section>
-                <section snippet-id="image-text" class="mt16 mb16">
+                <section data-snippet-id="image-text" class="mt16 mb16">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-5 col-md-offset-1">
@@ -195,7 +195,7 @@ iOS7
                         </div>
                     </div>
                 </section>
-                <section snippet-id="text-image" class="mt16 mb16 dark">
+                <section data-snippet-id="text-image" class="mt16 mb16 dark">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-5 col-md-offset-1 mt64">
@@ -214,7 +214,7 @@ iOS7
                         </div>
                     </div>
                 </section>
-                <section snippet-id="image-text" class="mt16 mb16">
+                <section data-snippet-id="image-text" class="mt16 mb16">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-5 col-md-offset-1">
@@ -233,7 +233,7 @@ iOS7
                         </div>
                     </div>
                 </section>
-                <section snippet-id="text-image" class="mt16 mb16 dark">
+                <section data-snippet-id="text-image" class="mt16 mb16 dark">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-5 col-md-offset-1 mt64">
@@ -277,7 +277,7 @@ Connector:
 Four-conductor 3.5-mm audio jack
             </field>
             <field name="website_description" type="html">
-                <section snippet-id="text-image" class="mt16 mb16">
+                <section data-snippet-id="text-image" class="mt16 mb16">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-8 col-md-offset-2">
@@ -350,7 +350,7 @@ Four-conductor 3.5-mm audio jack
                 Intel Iris Pro graphics
             </field>
             <field name="website_description" type="html">
-                <section snippet-id="image-text" class="mt16 mb16">
+                <section data-snippet-id="image-text" class="mt16 mb16">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-5 mt32 col-md-offset-1">
@@ -366,7 +366,7 @@ Four-conductor 3.5-mm audio jack
                         </div>
                     </div>
                 </section>
-                <section snippet-id="text-image" class="mt16 mb16 dark">
+                <section data-snippet-id="text-image" class="mt16 mb16 dark">
                     <div class="container">
                         <div class="row">
                             <div class="text-center col-md-8 col-md-offset-2">
@@ -382,7 +382,7 @@ Four-conductor 3.5-mm audio jack
                         </div>
                     </div>
                 </section>
-                <section snippet-id="image-text" class="mt16 mb16">
+                <section data-snippet-id="image-text" class="mt16 mb16">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-5 col-md-offset-1 mt32">
@@ -419,7 +419,7 @@ Four-conductor 3.5-mm audio jack
             <field name="description_sale">The sleek aluminium Apple Wireless Keyboard.
             </field>
             <field name="website_description" type="html">
-                <section snippet-id="image-text" class="mt16 mb16 dark">
+                <section data-snippet-id="image-text" class="mt16 mb16 dark">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-8 col-md-offset-2 mt64 mb32">
@@ -449,7 +449,7 @@ Weight: 1.1 ounces (31 grams)1
 True volume:    0.95 cu. inch (15,537 cu. mm)
             </field>
             <field name="website_description" type="html">
-                <section snippet-id="image-text" class="mt16 mb16">
+                <section data-snippet-id="image-text" class="mt16 mb16">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-9 col-md-offset-1 mt16 mb64">
@@ -458,7 +458,7 @@ True volume:    0.95 cu. inch (15,537 cu. mm)
                         </div>
                     </div>
                 </section>
-                <section snippet-id="text-image" class="mt16 mb16 dark">
+                <section data-snippet-id="text-image" class="mt16 mb16 dark">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-5 col-md-offset-1 mt64">
@@ -478,7 +478,7 @@ True volume:    0.95 cu. inch (15,537 cu. mm)
                         </div>
                     </div>
                 </section>
-                <section snippet-id="image-text" class="mt16 mb16">
+                <section data-snippet-id="image-text" class="mt16 mb16">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-10 mt32 col-md-offset-1">
@@ -508,7 +508,7 @@ True volume:    0.95 cu. inch (15,537 cu. mm)
                         </div>
                     </div>
                 </section>
-                <section snippet-id="image-text" class="mt16 mb16 dark">
+                <section data-snippet-id="image-text" class="mt16 mb16 dark">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-10 mt32 col-md-offset-1">