diff --git a/addons/im_livechat/views/im_livechat_channel_templates.xml b/addons/im_livechat/views/im_livechat_channel_templates.xml
index d029ae32478..90199615161 100644
--- a/addons/im_livechat/views/im_livechat_channel_templates.xml
+++ b/addons/im_livechat/views/im_livechat_channel_templates.xml
@@ -147,7 +147,7 @@
             <script type="text/javascript" src="/web/static/src/js/core/local_storage.js"></script>
             <script type="text/javascript" src="/web/static/src/js/core/ram_storage.js"></script>
             <script type="text/javascript" src="/web/static/src/js/core/abstract_storage_service.js"></script>
-            <script type="text/javascript" src="/web/static/src/js/chrome/public_root_widget.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/public/public_root_instance.js"></script>
             <script type="text/javascript" src="/web/static/src/js/services/ajax_service.js"></script>
             <script type="text/javascript" src="/web/static/src/js/services/local_storage_service.js"></script>
             <!-- Bus, Mail, Livechat -->
diff --git a/addons/survey/views/assets.xml b/addons/survey/views/assets.xml
index 4cfef754e36..90db69d356e 100644
--- a/addons/survey/views/assets.xml
+++ b/addons/survey/views/assets.xml
@@ -5,7 +5,7 @@
     <template id="survey_assets" name="Survey Results assets">
         <script src="/web/static/lib/nvd3/d3.v3.js"></script>
         <script src="/web/static/lib/nvd3/nv.d3.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/chrome/public_root_widget.js"></script>
+        <script type="text/javascript" src="/web/static/src/js/public/public_root_instance.js"></script>
         <script type="text/javascript" src="/web/static/src/js/services/session.js"></script>
         <script type="text/javascript" src="/web/static/src/js/fields/field_utils.js"></script>
 
diff --git a/addons/web/static/src/js/chrome/public_root_widget.js b/addons/web/static/src/js/public/public_root_instance.js
similarity index 100%
rename from addons/web/static/src/js/chrome/public_root_widget.js
rename to addons/web/static/src/js/public/public_root_instance.js
diff --git a/addons/web_editor/static/src/js/root_widget.js b/addons/web/static/src/js/public/public_widget.js
similarity index 100%
rename from addons/web_editor/static/src/js/root_widget.js
rename to addons/web/static/src/js/public/public_widget.js
diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml
index f67e9c4023e..f53a56f51ff 100644
--- a/addons/web/views/report_templates.xml
+++ b/addons/web/views/report_templates.xml
@@ -23,7 +23,7 @@
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/layout_boxed.scss"/>
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/layout_clean.scss"/>
 
-        <script type="text/javascript" src="/web/static/src/js/chrome/public_root_widget.js"/>
+        <script type="text/javascript" src="/web/static/src/js/public/public_root_instance.js"/>
         <script type="text/javascript" src="/web/static/src/js/services/session.js"/>
         <script type="text/javascript" src="/web/static/src/js/report/utils.js"/>
         <script type="text/javascript" src='/web/static/src/js/report/report.js' />
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 99da7f30cea..8ac3e7671fe 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -341,7 +341,8 @@
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/navbar_mobile.scss"/>
 
         <script type="text/javascript" src="/web/static/src/js/services/session.js"></script>
-        <script type="text/javascript" src="/web/static/src/js/chrome/public_root_widget.js"></script>
+        <script type="text/javascript" src="/web/static/src/js/public/public_root_instance.js"/>
+        <script type="text/javascript" src="/web/static/src/js/public/public_widget.js"/>
     </template>
 
     <template id="web.layout" name="Web layout">&lt;!DOCTYPE html&gt;
diff --git a/addons/web_editor/views/editor.xml b/addons/web_editor/views/editor.xml
index cc61084a603..6bbf98f9b30 100644
--- a/addons/web_editor/views/editor.xml
+++ b/addons/web_editor/views/editor.xml
@@ -135,9 +135,6 @@
     <xpath expr="//link[last()]" position="after">
         <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/web_editor.common.scss"/> <!-- not in common because compiled differently with context -->
     </xpath>
-    <xpath expr="//script[last()]" position="after">
-        <script type="text/javascript" src="/web_editor/static/src/js/root_widget.js"/>
-    </xpath>
 </template>
 
 <template id="qunit_suite" inherit_id="web.qunit_suite">
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 3ec2fe607ef..cf64158cb74 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -58,7 +58,7 @@
         <!-- Custom empty file for user custom rules -->
         <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/user_custom_rules.scss"/>
     </xpath>
-    <xpath expr="//script[@src='/web/static/src/js/chrome/public_root_widget.js']" position="replace">
+    <xpath expr="//script[@src='/web/static/src/js/public/public_root_instance.js']" position="replace">
         <script type="text/javascript" src="/website/static/src/js/content/website_root.js"/>
     </xpath>
     <xpath expr="//script[last()]" position="after">