diff --git a/datasets/stops.csv b/datasets/stops.csv
index b9eeb0708..75d32845a 100644
--- a/datasets/stops.csv
+++ b/datasets/stops.csv
@@ -613,7 +613,7 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 960,50952,Eastbound E Hastings St @ Lillooet St,,49.281041,-123.038301,BUS ZN,,0,,2,
 961,50953,Eastbound E Hastings St @ Windermere St,,49.281027,-123.035464,BUS ZN,,0,,1,
 962,50954,Eastbound E Hastings St @ Cassiar St,,49.281014,-123.029969,BUS ZN,,0,,1,
-963,50955,Kootenay Loop @ Bay 5,,49.281385,-123.026363,BUS ZN,,0,,2,
+963,50955,Kootenay Loop Loop @ Bay 5,,49.281385,-123.026363,BUS ZN,,0,,2,
 965,50956,Westbound E Hastings St @ Skeena St,,49.281215,-123.028984,BUS ZN,,0,,1,
 966,50957,Westbound E Hastings St @ Cassiar St,,49.281267,-123.032823,BUS ZN,,0,,1,
 967,50958,Westbound E Hastings St @ Windermere St,,49.281219,-123.036936,BUS ZN,,0,,1,
@@ -948,7 +948,7 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 1379,51368,Southbound Macdonald St @ W 4th Ave,,49.268064,-123.168411,BUS ZN,,0,,1,
 1382,51370,Eastbound W Pender St @ Nicola St,,49.289898,-123.128771,BUS ZN,,0,,1,
 1383,51371,Eastbound W Pender St @ Broughton St,,49.289364,-123.127117,BUS ZN,,0,,1,
-1387,58143,Kootenay Loop @ Bay 8,,49.281026,-123.024952,BUS ZN,,0,,1,
+1387,58143,Kootenay Loop Loop @ Bay 8,,49.281026,-123.024952,BUS ZN,,0,,1,
 1389,51377,Eastbound Hastings St @ Ingleton Ave,,49.280991,-123.018168,BUS ZN,,0,,1,
 1390,51378,Eastbound Hastings St @ MacDonald Ave,,49.280966,-123.015771,BUS ZN,,0,,1,
 1391,58428,Eastbound Hastings St @ Gilmore Ave,,49.280953,-123.013446,BUS ZN,,0,,1,
@@ -1032,7 +1032,7 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 1479,51467,Westbound Hastings St @ Gilmore Ave,,49.281147,-123.014877,BUS ZN,,0,,1,
 1480,51468,Westbound Hastings St @ Ingleton Ave,,49.281179,-123.01911,BUS ZN,,0,,1,
 1481,51469,Westbound Hastings St @ Esmond Ave,,49.281222,-123.021845,BUS ZN,,0,,1,
-1482,51470,Kootenay Loop @ Bay 6,,49.281212,-123.026407,BUS ZN,,0,,1,
+1482,51470,Kootenay Loop Loop @ Bay 6,,49.281212,-123.026407,BUS ZN,,0,,1,
 1483,51471,Westbound W Pender St @ Thurlow St,,49.287731,-123.120865,BUS ZN,,0,,1,
 1484,51472,Westbound W Pender St @ Bute St,,49.288565,-123.123694,BUS ZN,,0,,1,
 1487,51475,Westbound W Georgia St @ Denman St,,49.292951,-123.134018,BUS ZN,,0,,1,
@@ -1076,7 +1076,7 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 1545,51533,Eastbound E 22 Ave @ Lillooet St,,49.250535,-123.038654,BUS ZN,,0,,1,
 1546,51534,Eastbound E 22 Ave @ Rupert St,,49.250529,-123.033251,BUS ZN,,0,,1,
 1547,51535,Eastbound E 22 Ave @ Cassiar St,,49.250549,-123.030417,BUS ZN,,0,,1,
-1548,51536,Eastbound E 22 Ave @ Kootenay St,,49.250584,-123.025808,BUS ZN,,0,,1,
+1548,51536,Eastbound E 22 Ave @ Kootenay Loop St,,49.250584,-123.025808,BUS ZN,,0,,1,
 1549,51537,Eastbound Kincaid St @ Boundary Rd,,49.248781,-123.023017,BUS ZN,,0,,1,
 1550,51538,Eastbound Kincaid St @ Smith Ave,,49.248763,-123.019355,BUS ZN,,0,,1,
 1551,51539,Eastbound Kincaid St @ MacDonald Ave,,49.248894,-123.014612,BUS ZN,,0,,1,
@@ -1209,9 +1209,9 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 1704,51690,Northbound Rupert St @ Parker St,,49.27613,-123.03352,BUS ZN,,0,,1,
 1705,51691,Eastbound Adanac St @ Rupert St,,49.277386,-123.03308,BUS ZN,,0,,1,
 1706,51692,Eastbound Adanac St @ Skeena St,,49.277384,-123.029097,BUS ZN,,0,,1,
-1707,51693,Eastbound Adanac St @ Kootenay St,,49.277369,-123.024867,BUS ZN,,0,,1,
+1707,51693,Eastbound Adanac St @ Kootenay Loop St,,49.277369,-123.024867,BUS ZN,,0,,1,
 1708,51694,Northbound Boundary Rd @ Georgia St,,49.278725,-123.023311,BUS ZN,,0,,1,
-1709,51695,Kootenay Loop @ Bay 3,,49.281408,-123.026254,BUS ZN,,0,,1,
+1709,51695,Kootenay Loop Loop @ Bay 3,,49.281408,-123.026254,BUS ZN,,0,,1,
 1710,51696,Southbound Boundary Rd @ E Pender St,,49.279904,-123.023768,BUS ZN,,0,,2,
 1711,51697,Southbound Boundary Rd @ E Georgia St,,49.277916,-123.023773,BUS ZN,,0,,1,
 1712,51698,Westbound Adanac St @ Skeena St,,49.277492,-123.028787,BUS ZN,,0,,2,
@@ -1915,7 +1915,7 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 2738,52713,Eastbound E Hastings St @ Main St,,49.28122,-123.098307,BUS ZN,,0,,1,
 2739,52714,Eastbound E Hastings St @ Commercial Dr,,49.281131,-123.07086,BUS ZN,,0,,1,
 2741,52716,Bus Loop @ Burnaby City Hall,,49.243262,-122.973407,BUS ZN,,0,,1,
-2742,52717,Kootenay Loop @ Bay 7,,49.281204,-123.025393,BUS ZN,,0,,1,
+2742,52717,Kootenay Loop Loop @ Bay 7,,49.281204,-123.025393,BUS ZN,,0,,1,
 2743,52718,Westbound E Hastings St @ Renfrew St,,49.281222,-123.043342,BUS ZN,,0,,1,
 2744,52719,Westbound Moscrop St @ Inman Ave,,49.243026,-123.017349,BUS ZN,,0,,1,
 2745,52720,Northbound Gilmore Way @ Sanderson Way,,49.250056,-123.010288,BUS ZN,,0,,1,
@@ -3088,10 +3088,10 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 4334,54287,Northbound Westview Dr @ W 23 St,,49.330194,-123.088076,BUS ZN,,0,,1,
 4335,54288,Northbound Westview Dr @ Hwy One,,49.333563,-123.087965,BUS ZN,,0,,1,
 4336,54289,Northbound Westview Dr @ W 28 St,,49.33553,-123.087974,BUS ZN,,0,,1,
-4337,54290,Grouse Mountain @ Skyride,,49.372151,-123.099143,BUS ZN,,0,,1,
+4337,54290,Grouse Mountain Mountain @ Skyride,,49.372151,-123.099143,BUS ZN,,0,,1,
 4338,54291,Southbound Nancy Greene Way @ N Grousewoods Dr,,49.368349,-123.100261,BUS ZN,,0,,1,
 4339,54292,Southbound Nancy Greene Way @ S Grousewoods Dr,,49.366256,-123.101931,BUS ZN,,0,,2,
-4340,54293,Southbound Nancy Greene Way @ Blue Grouse Way,,49.364049,-123.103349,BUS ZN,,0,,2,
+4340,54293,Southbound Nancy Greene Way @ Blue Grouse Mountain Way,,49.364049,-123.103349,BUS ZN,,0,,2,
 4341,58049,Southbound Capilano Rd @ Clements Ave,,49.357688,-123.106788,BUS ZN,,0,,1,
 4342,54548,Eastbound Clements Ave @ Capilano Rd,,49.35797,-123.106332,BUS ZN,,0,,2,
 4343,54295,Eastbound Clements Ave @ 1000 Block,,49.357976,-123.102923,BUS ZN,,0,,2,
@@ -4689,7 +4689,7 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 6277,56217,Northbound 130 St @ 14 Ave,,49.028099,-122.861938,BUS ZN,,0,,2,
 6278,56218,Northbound 130 St @ 15 Ave,,49.029893,-122.861923,BUS ZN,,0,,2,
 6280,56220,Southbound 128 St @ 16 Ave,,49.03091,-122.86764,BUS ZN,,0,,1,
-6281,56221,Southbound 128 St @ 14B Ave,,49.028897,-122.867618,BUS ZN,,0,,1,
+6281,56221,Southbound 128 St @ 14B Ave,,49.028467,-122.86763,BUS ZN,,0,,1,
 6282,56222,Eastbound Marine Dr @ 128A St,,49.027164,-122.865876,BUS ZN,,0,,2,
 6283,56223,Eastbound Marine Dr @ 129A St,,49.027146,-122.863722,BUS ZN,,0,,1,
 6284,56224,Eastbound Marine Dr @ 131 St,,49.026682,-122.858912,BUS ZN,,0,,2,
@@ -6066,8 +6066,8 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 8096,58020,Eastbound Scarborough Rd @ Eagle Cliff Rd (Flag),,49.39293,-123.328199,BUS ZN,,0,,2,
 8127,54666,Westbound Queens Ave @ 15 St,,49.341882,-123.157301,BUS ZN,,0,,2,
 8128,54694,Westbound Inglewood Ave @ 15 St,,49.334624,-123.157371,BUS ZN,,0,,1,
-8139,58042,Kootenay Loop @ Bay 2,,49.281495,-123.026062,BUS ZN,,0,,1,
-8140,58043,Kootenay Loop @ Bay 4,,49.281365,-123.025918,BUS ZN,,0,,1,
+8139,58042,Kootenay Loop Loop @ Bay 2,,49.281495,-123.026062,BUS ZN,,0,,1,
+8140,58043,Kootenay Loop Loop @ Bay 4,,49.281365,-123.025918,BUS ZN,,0,,1,
 8277,58044,Westbound E Broadway @ Lillooet St,,49.262004,-123.039504,BUS ZN,,0,,1,
 8280,58045,Westbound Steveston Hwy @ Seaward Gate,,49.133464,-123.100078,BUS ZN,,0,,1,
 8281,58046,Eastbound Steveston Hwy @ Seaward Gate,,49.133327,-123.100556,BUS ZN,,0,,1,
@@ -7608,8 +7608,8 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 11289,61380,Bridgeport Station @ Platform 1,,49.195514,-123.126006,ZN 2,,0,99907,1,
 11290,61381,Aberdeen Station @ Platform 2,,49.184,-123.136398,ZN 2,,0,99906,1,
 11291,61382,Aberdeen Station @ Platform 1,,49.183991,-123.13622,ZN 2,,0,99906,1,
-11292,61383,Landsdowne Station @ Platform 2,,49.174762,-123.136507,ZN 2,,0,99905,1,
-11293,61384,Landsdowne Station @ Platform 1,,49.174766,-123.136322,ZN 2,,0,99905,1,
+11292,61383,Lansdowne Station @ Platform 2,,49.174762,-123.136507,ZN 2,,0,99905,1,
+11293,61384,Lansdowne Station @ Platform 1,,49.174766,-123.136322,ZN 2,,0,99905,1,
 11294,61385,Richmond-Brighouse Station @ Canada Line,,49.168092,-123.136247,ZN 2,,0,99904,1,
 11295,61386,Richmond-Brighouse Station @ Platform 1,,49.168092,-123.136174,ZN 2,,0,99904,1,
 11296,61387,Templeton Station @ Platform 2,,49.196715,-123.146335,ZN 2,,0,99903,1,
@@ -8267,7 +8267,7 @@ stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,locatio
 12315,59874,Westbound Hwy 10 @ 168 St,,49.10442,-122.75761,BUS ZN,,0,,1,
 12316,59248,Northbound 156 St @ 108 Ave,,49.199154,-122.789701,BUS ZN,,0,,1,
 12317,59012,Southbound 157A St @ 10900 Block,,49.200597,-122.78529,BUS ZN,,0,,1,
-12318,59889,Kootenay Loop @ Bay 1,,49.281403,-123.025625,BUS ZN,,0,,1,
+12318,59889,Kootenay Loop Loop @ Bay 1,,49.281403,-123.025625,BUS ZN,,0,,1,
 12319,60105,Moody Centre Station @ West Coast Express,,49.278065,-122.845996,WCE2A,,0,,1,
 12320,60106,Moody Centre Station @ West Coast Express,,49.278062,-122.846595,WCE2A,,0,,1,
 12321,60107,Coquitlam Central Station @ West Coast Express,,49.2738,-122.800001,WCE2A,,0,,1,
diff --git a/datasets/stops.geojson b/datasets/stops.geojson
index a38106626..155803e88 100644
--- a/datasets/stops.geojson
+++ b/datasets/stops.geojson
@@ -11679,7 +11679,7 @@
     "code": "50955",
     "desc": "",
     "id": "963",
-    "name": "Kootenay Loop @ Bay 5",
+    "name": "Kootenay Loop Loop @ Bay 5",
     "wheelchair_boarding": "2",
     "zone": "BUS ZN"
    },
@@ -18044,7 +18044,7 @@
     "code": "58143",
     "desc": "",
     "id": "1387",
-    "name": "Kootenay Loop @ Bay 8",
+    "name": "Kootenay Loop Loop @ Bay 8",
     "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },
@@ -19640,7 +19640,7 @@
     "code": "51470",
     "desc": "",
     "id": "1482",
-    "name": "Kootenay Loop @ Bay 6",
+    "name": "Kootenay Loop Loop @ Bay 6",
     "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },
@@ -20476,7 +20476,7 @@
     "code": "51536",
     "desc": "",
     "id": "1548",
-    "name": "Eastbound E 22 Ave @ Kootenay St",
+    "name": "Eastbound E 22 Ave @ Kootenay Loop St",
     "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },
@@ -23003,7 +23003,7 @@
     "code": "51693",
     "desc": "",
     "id": "1707",
-    "name": "Eastbound Adanac St @ Kootenay St",
+    "name": "Eastbound Adanac St @ Kootenay Loop St",
     "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },
@@ -23041,7 +23041,7 @@
     "code": "51695",
     "desc": "",
     "id": "1709",
-    "name": "Kootenay Loop @ Bay 3",
+    "name": "Kootenay Loop Loop @ Bay 3",
     "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },
@@ -36417,7 +36417,7 @@
     "code": "52717",
     "desc": "",
     "id": "2742",
-    "name": "Kootenay Loop @ Bay 7",
+    "name": "Kootenay Loop Loop @ Bay 7",
     "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },
@@ -58704,7 +58704,7 @@
     "code": "54290",
     "desc": "",
     "id": "4337",
-    "name": "Grouse Mountain @ Skyride",
+    "name": "Grouse Mountain Mountain @ Skyride",
     "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },
@@ -58761,7 +58761,7 @@
     "code": "54293",
     "desc": "",
     "id": "4340",
-    "name": "Southbound Nancy Greene Way @ Blue Grouse Way",
+    "name": "Southbound Nancy Greene Way @ Blue Grouse Mountain Way",
     "wheelchair_boarding": "2",
     "zone": "BUS ZN"
    },
@@ -89113,8 +89113,8 @@
   {
    "geometry": {
     "coordinates": [
-     -122.867618,
-     49.028897
+     -122.86763,
+     49.028467
     ],
     "type": "Point"
    },
@@ -115286,7 +115286,7 @@
     "code": "58042",
     "desc": "",
     "id": "8139",
-    "name": "Kootenay Loop @ Bay 2",
+    "name": "Kootenay Loop Loop @ Bay 2",
     "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },
@@ -115305,7 +115305,7 @@
     "code": "58043",
     "desc": "",
     "id": "8140",
-    "name": "Kootenay Loop @ Bay 4",
+    "name": "Kootenay Loop Loop @ Bay 4",
     "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },
@@ -144584,7 +144584,7 @@
     "code": "61383",
     "desc": "",
     "id": "11292",
-    "name": "Landsdowne Station @ Platform 2",
+    "name": "Lansdowne Station @ Platform 2",
     "wheelchair_boarding": "1",
     "zone": "ZN 2"
    },
@@ -144603,7 +144603,7 @@
     "code": "61384",
     "desc": "",
     "id": "11293",
-    "name": "Landsdowne Station @ Platform 1",
+    "name": "Lansdowne Station @ Platform 1",
     "wheelchair_boarding": "1",
     "zone": "ZN 2"
    },
@@ -157105,7 +157105,7 @@
     "code": "59889",
     "desc": "",
     "id": "12318",
-    "name": "Kootenay Loop @ Bay 1",
+    "name": "Kootenay Loop Loop @ Bay 1",
     "wheelchair_boarding": "1",
     "zone": "BUS ZN"
    },