diff --git a/addons/website_google_map/__openerp__.py b/addons/website_google_map/__openerp__.py
index c6eb724b6d3..eb2458ae9af 100644
--- a/addons/website_google_map/__openerp__.py
+++ b/addons/website_google_map/__openerp__.py
@@ -10,7 +10,7 @@ OpenERP Website Google Map
         """,
     'depends': ['base_geolocalize', 'website_partner', 'crm_partner_assign'],
     'data': [
-        'views/google_map.xml',
+        'views/google_map_templates.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/website_google_map/static/src/css/google-map.css b/addons/website_google_map/static/src/css/website_google_map.css
similarity index 100%
rename from addons/website_google_map/static/src/css/google-map.css
rename to addons/website_google_map/static/src/css/website_google_map.css
diff --git a/addons/website_google_map/static/src/js/google_map.js b/addons/website_google_map/static/src/js/website_google_map.js
similarity index 100%
rename from addons/website_google_map/static/src/js/google_map.js
rename to addons/website_google_map/static/src/js/website_google_map.js
diff --git a/addons/website_google_map/static/src/js/markerclusterer.js b/addons/website_google_map/static/src/lib/markerclusterer.js
similarity index 100%
rename from addons/website_google_map/static/src/js/markerclusterer.js
rename to addons/website_google_map/static/src/lib/markerclusterer.js
diff --git a/addons/website_google_map/static/src/js/markerclusterer_compiled.js b/addons/website_google_map/static/src/lib/markerclusterer_compiled.js
similarity index 100%
rename from addons/website_google_map/static/src/js/markerclusterer_compiled.js
rename to addons/website_google_map/static/src/lib/markerclusterer_compiled.js
diff --git a/addons/website_google_map/views/google_map.xml b/addons/website_google_map/views/google_map_templates.xml
similarity index 83%
rename from addons/website_google_map/views/google_map.xml
rename to addons/website_google_map/views/google_map_templates.xml
index e68b9f9e7c1..23b7b18dfaa 100644
--- a/addons/website_google_map/views/google_map.xml
+++ b/addons/website_google_map/views/google_map_templates.xml
@@ -8,7 +8,7 @@
         <meta charset="utf-8" />
         <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
         <title>World Map</title>
-        <link rel="stylesheet" type="text/css" href="/website_google_map/static/src/css/google-map.css" />
+        <link rel="stylesheet" type="text/css" href="/website_google_map/static/src/css/website_google_map.css" />
     </head>
     <body t-att-data-partner-url="partner_url or ''">
         <script>
@@ -16,8 +16,8 @@
         </script>
         <div id="odoo-google-map"></div>
         <script src="//maps.google.com/maps/api/js?sensor=false"></script>
-        <script type="text/javascript" src="/website_google_map/static/src/js/markerclusterer_compiled.js"></script>
-        <script type="text/javascript" src="/website_google_map/static/src/js/google_map.js"></script>
+        <script type="text/javascript" src="/website_google_map/static/src/lib/markerclusterer_compiled.js"></script>
+        <script type="text/javascript" src="/website_google_map/static/src/js/website_google_map.js"></script>
     </body>
 </html>
 </template>