diff --git a/addons/fleet/data/fleet_cars_data.xml b/addons/fleet/data/fleet_cars_data.xml
index 34412ec64c2..c2f4c011ddc 100644
--- a/addons/fleet/data/fleet_cars_data.xml
+++ b/addons/fleet/data/fleet_cars_data.xml
@@ -56,7 +56,7 @@
       	<field name="name">Citroen</field>
       	<field name="image" type="base64" file="fleet/static/img/brand_citroen-image.png"/>
       </record>
-      <record id="brand_corre la licorne" model="fleet.vehicle.model.brand">
+      <record id="brand_corre_la_licorne" model="fleet.vehicle.model.brand">
       	<field name="name">Corre La Licorne</field>
       	<field name="image" type="base64" file="fleet/static/img/brand_corre-la-licorne-image.png"/>
       </record>
@@ -128,7 +128,7 @@
       	<field name="name">Lancia</field>
       	<field name="image" type="base64" file="fleet/static/img/brand_lancia-image.png"/>
       </record>
-      <record id="brand_land rover" model="fleet.vehicle.model.brand">
+      <record id="brand_land_rover" model="fleet.vehicle.model.brand">
       	<field name="name">Land Rover</field>
       	<field name="image" type="base64" file="fleet/static/img/brand_land-rover-image.png"/>
       </record>
@@ -236,7 +236,7 @@
       	<field name="name">Subaru</field>
       	<field name="image" type="base64" file="fleet/static/img/brand_subaru-image.png"/>
       </record>
-      <record id="brand_tesla motors" model="fleet.vehicle.model.brand">
+      <record id="brand_tesla_motors" model="fleet.vehicle.model.brand">
       	<field name="name">Tesla Motors</field>
       	<field name="image" type="base64" file="fleet/static/img/brand_tesla-motors-image.png"/>
       </record>
diff --git a/addons/website_sale/i18n/website_sale.pot b/addons/website_sale/i18n/website_sale.pot
index ff700b10b6c..ed359bf1a12 100644
--- a/addons/website_sale/i18n/website_sale.pot
+++ b/addons/website_sale/i18n/website_sale.pot
@@ -2655,7 +2655,7 @@ msgid "eCommerce Shipping Costs"
 msgstr ""
 
 #. module: website_sale
-#: model_terms:ir.ui.view,arch_db:website_sale.search count
+#: model_terms:ir.ui.view,arch_db:website_sale.search_count_box
 msgid "found)"
 msgstr ""
 
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index cff60a50803..c4c9c001343 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -109,7 +109,7 @@
         </t>
     </template>
 
-    <template id="search count" inherit_id="website.website_search_box" active="False" customize_show="True" name="Show # found">
+    <template id="search_count_box" inherit_id="website.website_search_box" active="False" customize_show="True" name="Show # found">
         <xpath expr="//button[hasclass('oe_search_button')]" position="inside">
             <span t-if='search' class='oe_search_found'> <small>(<t t-esc="search_count"/> found)</small></span>
         </xpath>
diff --git a/addons/website_sale_coupon/tests/test_shop_sale_coupon.py b/addons/website_sale_coupon/tests/test_shop_sale_coupon.py
index 24061326689..e34b6904638 100644
--- a/addons/website_sale_coupon/tests/test_shop_sale_coupon.py
+++ b/addons/website_sale_coupon/tests/test_shop_sale_coupon.py
@@ -11,5 +11,5 @@ class TestUi(HttpCase):
 
     def test_01_admin_shop_sale_coupon_tour(self):
         # pre enable "Show # found" option to avoid race condition...
-        self.env.ref("website_sale.search count").write({"active": True})
+        self.env.ref("website_sale.search_count_box").write({"active": True})
         self.start_tour("/", 'shop_sale_coupon', login="admin")
diff --git a/odoo/addons/base/data/res.country.state.csv b/odoo/addons/base/data/res.country.state.csv
index 32d84c78980..9a5535bf462 100644
--- a/odoo/addons/base/data/res.country.state.csv
+++ b/odoo/addons/base/data/res.country.state.csv
@@ -504,7 +504,7 @@ state_mx_nay,mx,"Nayarit","NAY"
 state_mx_nl,mx,"Nuevo León","NLE"
 state_mx_oax,mx,"Oaxaca","OAX"
 state_mx_pue,mx,"Puebla","PUE"
-state_mx_q roo,mx,"Quintana Roo","ROO"
+state_mx_q_roo,mx,"Quintana Roo","ROO"
 state_mx_qro,mx,"Querétaro","QUE"
 state_mx_sin,mx,"Sinaloa","SIN"
 state_mx_slp,mx,"San Luis Potosí","SLP"