diff --git a/odoo/addons/base/res/res.country.state.csv b/odoo/addons/base/res/res.country.state.csv
index de441a1ef1a..9d2ee0cef7e 100644
--- a/odoo/addons/base/res/res.country.state.csv
+++ b/odoo/addons/base/res/res.country.state.csv
@@ -414,43 +414,43 @@ state_it_vr,it,"Verona","VR"
 state_it_vv,it,"Vibo Valentia","VV"
 state_it_vi,it,"Vicenza","VI"
 state_it_vt,it,"Viterbo","VT"
-state_es_c,es,"A Coruña","C"
-state_es_vi,es,"Álava","VI"
+state_es_c,es,"A Coruña (La Coruña)","C"
+state_es_vi,es,"Araba/Álava","VI"
 state_es_ab,es,"Albacete","AB"
-state_es_a,es,"Alicante","A"
+state_es_a,es,"Alacant (Alicante)","A"
 state_es_al,es,"Almería","AL"
 state_es_o,es,"Asturias","O"
 state_es_av,es,"Ávila","AV"
 state_es_ba,es,"Badajoz","BA"
-state_es_pm,es,"Balears","PM"
+state_es_pm,es,"Illes Balears (Islas Baleares)","PM"
 state_es_b,es,"Barcelona","B"
 state_es_bu,es,"Burgos","BU"
 state_es_cc,es,"Cáceres","CC"
 state_es_ca,es,"Cádiz","CA"
 state_es_s,es,"Cantabria","S"
-state_es_cs,es,"Castellón","CS"
+state_es_cs,es,"Castelló (Castellón)","CS"
 state_es_ce,es,"Ceuta","CE"
 state_es_cr,es,"Ciudad Real","CR"
 state_es_co,es,"Córdoba","CO"
 state_es_cu,es,"Cuenca","CU"
-state_es_gi,es,"Girona","GI"
+state_es_gi,es,"Girona (Gerona)","GI"
 state_es_gr,es,"Granada","GR"
 state_es_gu,es,"Guadalajara","GU"
-state_es_ss,es,"Guipúzcoa","SS"
+state_es_ss,es,"Guipuzkoa (Guipúzcoa)","SS"
 state_es_h,es,"Huelva","H"
 state_es_hu,es,"Huesca","HU"
 state_es_j,es,"Jaén","J"
 state_es_lo,es,"La Rioja","LO"
 state_es_gc,es,"Las Palmas","GC"
 state_es_le,es,"León","LE"
-state_es_l,es,"Lleida","L"
+state_es_l,es,"Lleida (Lérida)","L"
 state_es_lu,es,"Lugo","LU"
 state_es_m,es,"Madrid","M"
 state_es_ma,es,"Málaga","MA"
-state_es_ml,es,"Melilla","ML"
+state_es_ml,es,"Melilla","ME"
 state_es_mu,es,"Murcia","MU"
-state_es_na,es,"Navarra","NA"
-state_es_or,es,"Ourense","OR"
+state_es_na,es,"Nafarroa (Navarra)","NA"
+state_es_or,es,"Ourense (Orense)","OR"
 state_es_p,es,"Palencia","P"
 state_es_po,es,"Pontevedra","PO"
 state_es_sa,es,"Salamanca","SA"
@@ -461,9 +461,9 @@ state_es_so,es,"Soria","SO"
 state_es_t,es,"Tarragona","T"
 state_es_te,es,"Teruel","TE"
 state_es_to,es,"Toledo","TO"
-state_es_v,es,"Valencia","V"
+state_es_v,es,"València (Valencia)","V"
 state_es_va,es,"Valladolid","VA"
-state_es_bi,es,"Vizcaya","BI"
+state_es_bi,es,"Bizkaia (Vizcaya)","BI"
 state_es_za,es,"Zamora","ZA"
 state_es_z,es,"Zaragoza","Z"
 state_my_jhr,my,"Johor","JHR"