diff --git a/odoo/addons/base/data/res_partner_demo.xml b/odoo/addons/base/data/res_partner_demo.xml
index cd600c3233c..6975f0db46b 100644
--- a/odoo/addons/base/data/res_partner_demo.xml
+++ b/odoo/addons/base/data/res_partner_demo.xml
@@ -43,10 +43,10 @@
             <field name="name">Wood Corner</field>
             <field eval="[(6, 0, [ref('res_partner_category_14'), ref('res_partner_category_12')])]" name="category_id"/>
             <field name="is_company">1</field>
-            <field name="street">1164 Cambridge Drive</field>
-            <field name="city">White Tanks</field>
-            <field name="state_id"  model="res.country.state" search="[('code','ilike','AZ')]"/>
-            <field name="zip">85340</field>
+            <field name="street">1839 Arbor Way</field>
+            <field name="city">Turlock</field>
+            <field name="state_id" ref='state_us_5'/>
+            <field name="zip">95380</field>
             <field name="country_id" ref="base.us"/>
             <field name="email">wood.corner26@example.com</field>
             <field name="phone">(623)-853-7197</field>
@@ -57,10 +57,10 @@
             <field name="name">Deco Addict</field>
             <field eval="[(6, 0, [ref('base.res_partner_category_14')])]" name="category_id"/>
             <field name="is_company">1</field>
-            <field name="street">325 Elsie Drive</field>
-            <field name="city">Franklin</field>
-            <field name="state_id"  model="res.country.state" search="[('code','ilike','WV')]"/>
-            <field name="zip">26807</field>
+            <field name="street">77 Santa Barbara Rd</field>
+            <field name="city">Pleasant Hill</field>
+            <field name="state_id" ref='state_us_5'/>
+            <field name="zip">94523</field>
             <field name="country_id" ref="base.us"/>
             <field name="email">deco.addict82@example.com</field>
             <field name="phone">(603)-996-3829</field>
@@ -71,10 +71,10 @@
             <field name="name">Gemini Furniture</field>
             <field eval="[(6, 0, [ref('res_partner_category_8'), ref('res_partner_category_14')])]" name="category_id"/>
             <field name="is_company">1</field>
-            <field name="street">1128 Lunetta Street</field>
-            <field name="city">Tampa</field>
-            <field name="state_id"  model="res.country.state" search="[('code','ilike','FL')]"/>
-            <field name="zip">33634</field>
+            <field name="street">317 Fairchild Dr</field>
+            <field name="city">Fairfield</field>
+            <field name="state_id" ref='state_us_5'/>
+            <field name="zip">94535</field>
             <field name="country_id" ref="base.us"/>
             <field name="email">gemini.furniture39@example.com</field>
             <field name="phone">(941)-284-4875</field>
@@ -86,10 +86,10 @@
             <field name="name">Ready Mat</field>
             <field eval="[(6, 0, [ref('res_partner_category_14'), ref('res_partner_category_12')])]" name="category_id"/>
             <field name="is_company">1</field>
-            <field name="street">92 Emily Drive</field>
-            <field name="city">Columbia</field>
-            <field name="state_id"  model="res.country.state" search="[('code','ilike','SC')]"/>
-            <field name="zip">29201</field>
+            <field name="street">7500 W Linne Road</field>
+            <field name="city">Tracy</field>
+            <field name="state_id" ref='state_us_5'/>
+            <field name="zip">95304</field>
             <field name="country_id" ref="base.us"/>
             <field name="email">ready.mat28@example.com</field>
             <field name="phone">(803)-873-6126</field>
@@ -100,10 +100,10 @@
         <record id="res_partner_10" model="res.partner">
             <field name="name">The Jackson Group</field>
             <field name="is_company">1</field>
-            <field name="street">823  Turkey Pen Lane</field>
-            <field name="city">Auburn</field>
-            <field name="state_id"  model="res.country.state" search="[('code','ilike','AL')]"/>
-            <field name="zip">36830</field>
+            <field name="street">1611 Peony Dr</field>
+            <field name="city">Tracy</field>
+            <field name="state_id" ref='state_us_5'/>
+            <field name="zip">95377</field>
             <field name="country_id" ref="base.us"/>
             <field name="email">jackson.group82@example.com</field>
             <field name="phone">(334)-502-1024</field>
@@ -114,10 +114,10 @@
             <field name="name">Azure Interior</field>
             <field eval="[(6, 0, [ref('res_partner_category_11')])]" name="category_id"/>
             <field name="is_company">1</field>
-            <field name="street">3404  Edgewood Road</field>
-            <field name="city">Jonesboro</field>
-            <field name="state_id" model="res.country.state" search="[('code','ilike','AR')]"/>
-            <field name="zip">72401</field>
+            <field name="street">4557 De Silva St</field>
+            <field name="city">Fremont</field>
+            <field name="state_id" ref='state_us_5'/>
+            <field name="zip">94538</field>
             <field name="phone">(870)-931-0505</field>
             <field name="country_id" ref="base.us"/>
             <field name="email">azure.Interior24@example.com</field>
@@ -128,10 +128,10 @@
         <record id="res_partner_18" model="res.partner">
             <field name="name">Lumber Inc</field>
             <field name="is_company">1</field>
-            <field name="street">3202  Hannah Street</field>
-            <field name="city">Asheville</field>
-            <field name="state_id" model="res.country.state" search="[('code','ilike','NC')]"/>
-            <field name="zip">28801</field>
+            <field name="street">1337 N San Joaquin St</field>
+            <field name="city">Stockton</field>
+            <field name="state_id" ref='state_us_5'/>
+            <field name="zip">95202</field>
             <field name="email">lumber-inv92@example.com</field>
             <field name="phone">(828)-316-0593</field>
             <field name="country_id" ref="base.us"/>