diff --git a/content/cities/buffalo/buckingham-lumber-co.md b/content/cities/buffalo/buckingham-lumber-co.md
deleted file mode 100644
index 5d9b0cb5..00000000
--- a/content/cities/buffalo/buckingham-lumber-co.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Buckingham Lumber Co"
-url: /buffalo/buckingham-lumber-co/
-shop: hardware
----
\ No newline at end of file
diff --git a/content/cities/casper/albertsons-east-2nd-street.md b/content/cities/casper/albertsons-cy-avenue.md
similarity index 52%
rename from content/cities/casper/albertsons-east-2nd-street.md
rename to content/cities/casper/albertsons-cy-avenue.md
index 9cfaad2a..b4c803ec 100644
--- a/content/cities/casper/albertsons-east-2nd-street.md
+++ b/content/cities/casper/albertsons-cy-avenue.md
@@ -1,5 +1,5 @@
 ---
 title: "Albertsons"
-url: /casper/albertsons-east-2nd-street/
+url: /casper/albertsons-cy-avenue/
 shop: supermarket
 ---
\ No newline at end of file
diff --git a/content/cities/casper/walmart-supercenter-east-2nd-street.md b/content/cities/casper/walmart-supercenter-cy-avenue.md
similarity index 51%
rename from content/cities/casper/walmart-supercenter-east-2nd-street.md
rename to content/cities/casper/walmart-supercenter-cy-avenue.md
index 742e4292..213bf258 100644
--- a/content/cities/casper/walmart-supercenter-east-2nd-street.md
+++ b/content/cities/casper/walmart-supercenter-cy-avenue.md
@@ -1,5 +1,5 @@
 ---
 title: "Walmart Supercenter"
-url: /casper/walmart-supercenter-east-2nd-street/
+url: /casper/walmart-supercenter-cy-avenue/
 shop: supermarket
 ---
\ No newline at end of file
diff --git a/content/cities/cheyenne/walmart-supercenter-dell-range-boulevard.md b/content/cities/cheyenne/walmart-supercenter-dell-range-boulevard.md
deleted file mode 100644
index 8f654f67..00000000
--- a/content/cities/cheyenne/walmart-supercenter-dell-range-boulevard.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "Walmart Supercenter"
-url: /cheyenne/walmart-supercenter-dell-range-boulevard/
-shop: supermarket
----
\ No newline at end of file
diff --git a/content/cities/cheyenne/walmart-supercenter-livingston-avenue.md b/content/cities/cheyenne/walmart-supercenter-livingston-avenue.md
new file mode 100644
index 00000000..80bee869
--- /dev/null
+++ b/content/cities/cheyenne/walmart-supercenter-livingston-avenue.md
@@ -0,0 +1,5 @@
+---
+title: "Walmart Supercenter"
+url: /cheyenne/walmart-supercenter-livingston-avenue/
+shop: supermarket
+---
\ No newline at end of file
diff --git a/content/cities/thayne/_index.md b/content/cities/thayne/_index.md
index 9c78ba1b..7a1b9971 100644
--- a/content/cities/thayne/_index.md
+++ b/content/cities/thayne/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Thayne
 url: /thayne/
-latitude: 42.921
-longitude: -111.003
+latitude: 42.914
+longitude: -111
 ---
\ No newline at end of file
diff --git a/data/cities/buffalo/buckingham-lumber-co.yml b/data/cities/buffalo/buckingham-lumber-co.yml
deleted file mode 100644
index 0ea8c747..00000000
--- a/data/cities/buffalo/buckingham-lumber-co.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 1159083327
-type: way
-latitude: 44.34904
-longitude: -106.689
-postcode: "82834"
-city: Buffalo
-street: "South Bypass Road"
-housenumber: 370
-phone: ""
-opening_hours: ""
-website: ""
\ No newline at end of file
diff --git a/data/cities/casper/albertsons-cy-avenue.yml b/data/cities/casper/albertsons-cy-avenue.yml
new file mode 100644
index 00000000..8a84ae68
--- /dev/null
+++ b/data/cities/casper/albertsons-cy-avenue.yml
@@ -0,0 +1,11 @@
+id: 665948844
+type: way
+latitude: 42.83543
+longitude: -106.33933
+postcode: "82604"
+city: Casper
+street: "CY Avenue"
+housenumber: 1076
+phone: "+1 307-266-0136"
+opening_hours: ""
+website: "https://local.albertsons.com/wy/casper/1076-cy-ave.html"
\ No newline at end of file
diff --git a/data/cities/casper/albertsons-east-2nd-street.yml b/data/cities/casper/albertsons-east-2nd-street.yml
deleted file mode 100644
index 29a20b52..00000000
--- a/data/cities/casper/albertsons-east-2nd-street.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 687165822
-type: way
-latitude: 42.84811
-longitude: -106.29285
-postcode: "82609"
-city: Casper
-street: "East 2nd Street"
-housenumber: 2625
-phone: "+1 307-237-9361"
-opening_hours: ""
-website: "https://local.albertsons.com/wy/casper/2625-e-2nd-st.html"
\ No newline at end of file
diff --git a/data/cities/casper/albertsons.yml b/data/cities/casper/albertsons.yml
index 8a84ae68..29a20b52 100644
--- a/data/cities/casper/albertsons.yml
+++ b/data/cities/casper/albertsons.yml
@@ -1,11 +1,11 @@
-id: 665948844
+id: 687165822
 type: way
-latitude: 42.83543
-longitude: -106.33933
-postcode: "82604"
+latitude: 42.84811
+longitude: -106.29285
+postcode: "82609"
 city: Casper
-street: "CY Avenue"
-housenumber: 1076
-phone: "+1 307-266-0136"
+street: "East 2nd Street"
+housenumber: 2625
+phone: "+1 307-237-9361"
 opening_hours: ""
-website: "https://local.albertsons.com/wy/casper/1076-cy-ave.html"
\ No newline at end of file
+website: "https://local.albertsons.com/wy/casper/2625-e-2nd-st.html"
\ No newline at end of file
diff --git a/data/cities/casper/walmart-supercenter-cy-avenue.yml b/data/cities/casper/walmart-supercenter-cy-avenue.yml
new file mode 100644
index 00000000..5066e2a8
--- /dev/null
+++ b/data/cities/casper/walmart-supercenter-cy-avenue.yml
@@ -0,0 +1,11 @@
+id: 630669767
+type: way
+latitude: 42.81633
+longitude: -106.3751
+postcode: "82604"
+city: Casper
+street: "CY Avenue"
+housenumber: 4255
+phone: "+1-307-232-9593"
+opening_hours: "24/7"
+website: "https://www.walmart.com/store/3778/casper-wy/details"
\ No newline at end of file
diff --git a/data/cities/casper/walmart-supercenter-east-2nd-street.yml b/data/cities/casper/walmart-supercenter-east-2nd-street.yml
deleted file mode 100644
index 43a65ed3..00000000
--- a/data/cities/casper/walmart-supercenter-east-2nd-street.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 265112879
-type: way
-latitude: 42.85201
-longitude: -106.26796
-postcode: "82609"
-city: Casper
-street: "East 2nd Street"
-housenumber: 4400
-phone: "+1-307-237-0991"
-opening_hours: "24/7"
-website: "https://www.walmart.com/store/1617/casper-wy/whats-new"
\ No newline at end of file
diff --git a/data/cities/casper/walmart-supercenter.yml b/data/cities/casper/walmart-supercenter.yml
index 5066e2a8..43a65ed3 100644
--- a/data/cities/casper/walmart-supercenter.yml
+++ b/data/cities/casper/walmart-supercenter.yml
@@ -1,11 +1,11 @@
-id: 630669767
+id: 265112879
 type: way
-latitude: 42.81633
-longitude: -106.3751
-postcode: "82604"
+latitude: 42.85201
+longitude: -106.26796
+postcode: "82609"
 city: Casper
-street: "CY Avenue"
-housenumber: 4255
-phone: "+1-307-232-9593"
+street: "East 2nd Street"
+housenumber: 4400
+phone: "+1-307-237-0991"
 opening_hours: "24/7"
-website: "https://www.walmart.com/store/3778/casper-wy/details"
\ No newline at end of file
+website: "https://www.walmart.com/store/1617/casper-wy/whats-new"
\ No newline at end of file
diff --git a/data/cities/cheyenne/walmart-supercenter-dell-range-boulevard.yml b/data/cities/cheyenne/walmart-supercenter-dell-range-boulevard.yml
deleted file mode 100644
index 8b5d0900..00000000
--- a/data/cities/cheyenne/walmart-supercenter-dell-range-boulevard.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-id: 230204427
-type: way
-latitude: 41.16466
-longitude: -104.79202
-postcode: "82009"
-city: Cheyenne
-street: "Dell Range Boulevard"
-housenumber: 2032
-phone: "+1-307-632-4330"
-opening_hours: "24/7"
-website: "https://www.walmart.com/store/1315-cheyenne-wy"
\ No newline at end of file
diff --git a/data/cities/cheyenne/walmart-supercenter-livingston-avenue.yml b/data/cities/cheyenne/walmart-supercenter-livingston-avenue.yml
new file mode 100644
index 00000000..10c7ed16
--- /dev/null
+++ b/data/cities/cheyenne/walmart-supercenter-livingston-avenue.yml
@@ -0,0 +1,11 @@
+id: 547693961
+type: way
+latitude: 41.12676
+longitude: -104.76578
+postcode: "82007"
+city: Cheyenne
+street: "Livingston Avenue"
+housenumber: 580
+phone: "+1-307-823-6810"
+opening_hours: "24/7"
+website: "https://www.walmart.com/store/4653/cheyenne-wy/whats-new"
\ No newline at end of file
diff --git a/data/cities/cheyenne/walmart-supercenter.yml b/data/cities/cheyenne/walmart-supercenter.yml
index 10c7ed16..8b5d0900 100644
--- a/data/cities/cheyenne/walmart-supercenter.yml
+++ b/data/cities/cheyenne/walmart-supercenter.yml
@@ -1,11 +1,11 @@
-id: 547693961
+id: 230204427
 type: way
-latitude: 41.12676
-longitude: -104.76578
-postcode: "82007"
+latitude: 41.16466
+longitude: -104.79202
+postcode: "82009"
 city: Cheyenne
-street: "Livingston Avenue"
-housenumber: 580
-phone: "+1-307-823-6810"
+street: "Dell Range Boulevard"
+housenumber: 2032
+phone: "+1-307-632-4330"
 opening_hours: "24/7"
-website: "https://www.walmart.com/store/4653/cheyenne-wy/whats-new"
\ No newline at end of file
+website: "https://www.walmart.com/store/1315-cheyenne-wy"
\ No newline at end of file