From b9455e1c36ceb699a9f43eb3b73539b46af198d8 Mon Sep 17 00:00:00 2001
From: Franzz <francois@lutran.fr>
Date: Thu, 26 Mar 2020 17:54:09 +0100
Subject: [PATCH] Update PCT track

---
 geo/pct.gpx | 4367 ++++++++++++++++++++++++++-------------------------
 1 file changed, 2238 insertions(+), 2129 deletions(-)

diff --git a/geo/pct.gpx b/geo/pct.gpx
index 340c281..946998e 100644
--- a/geo/pct.gpx
+++ b/geo/pct.gpx
@@ -25,7 +25,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section A</desc><cmt/><trkseg>
       <trkpt lat="32.589741" lon="-116.466981"><ele>889.15</ele></trkpt>
       <trkpt lat="32.589935" lon="-116.467028"><ele>886.93</ele></trkpt>
       <trkpt lat="32.590052" lon="-116.467185"><ele>883.79</ele></trkpt>
@@ -3672,7 +3672,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section A. Off-Track: 3rd Gate Trail</desc><cmt/><trkseg>
       <trkpt lat="33.167010" lon="-116.543437"><ele>1082.50</ele></trkpt>
       <trkpt lat="33.167241" lon="-116.543222"><ele>1081.28</ele></trkpt>
       <trkpt lat="33.167557" lon="-116.543096"><ele>1075.75</ele></trkpt>
@@ -3698,7 +3698,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section A. Off-Track: CRHT Trail</desc><cmt/><trkseg>
       <trkpt lat="33.010595" lon="-116.538972"><ele>1430.89</ele></trkpt>
       <trkpt lat="33.009458" lon="-116.539877"><ele>1425.93</ele></trkpt>
       <trkpt lat="33.009122" lon="-116.539931"><ele>1426.51</ele></trkpt>
@@ -3733,7 +3733,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section A. Off-Track: Chariot Canyon Road</desc><cmt/><trkseg>
       <trkpt lat="33.013397" lon="-116.527265"><ele>1176.25</ele></trkpt>
       <trkpt lat="33.013713" lon="-116.527129"><ele>1176.62</ele></trkpt>
       <trkpt lat="33.014076" lon="-116.526666"><ele>1170.08</ele></trkpt>
@@ -3790,7 +3790,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section A. Off-Track: Kitchen Creek Falls Trail</desc><cmt/><trkseg>
       <trkpt lat="32.740895" lon="-116.465356"><ele>1159.58</ele></trkpt>
       <trkpt lat="32.741031" lon="-116.465339"><ele>1160.35</ele></trkpt>
       <trkpt lat="32.741470" lon="-116.465559"><ele>1151.06</ele></trkpt>
@@ -3811,7 +3811,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section A. Off-Track: Rodriguez Spring Road</desc><cmt/><trkseg>
       <trkpt lat="33.050460" lon="-116.523941"><ele>1112.07</ele></trkpt>
       <trkpt lat="33.050515" lon="-116.524326"><ele>1109.23</ele></trkpt>
       <trkpt lat="33.050725" lon="-116.524446"><ele>1106.79</ele></trkpt>
@@ -3863,7 +3863,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section A. Off-Track: Sunrise Trailhead Trail</desc><cmt/><trkseg>
       <trkpt lat="32.980348" lon="-116.522256"><ele>1522.92</ele></trkpt>
       <trkpt lat="32.980381" lon="-116.522400"><ele>1522.79</ele></trkpt>
       <trkpt lat="32.980308" lon="-116.522505"><ele>1524.81</ele></trkpt>
@@ -3893,17 +3893,17 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="32.603062" lon="-116.470132">
     <ele>800.2</ele>
-    <name>WR001</name>
+    <name>Water (reported) - 1</name>
     <desc><![CDATA[Juvenile Ranch facility, faucet behind sign.<br/>---<br/>WATER ALERT: Next northbound water after the Juvenile Ranch may be the Lake Morena Campground in 18.7 miles. Check the pctwater.com for current water information.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="32.603185" lon="-116.470325">
     <ele>800.1</ele>
-    <name>RD0001</name>
+    <name>Road Crossing - 1</name>
     <desc><![CDATA[PCT joins paved Forest Gate Road for 2/10 mile.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="32.605325" lon="-116.471378">
     <ele>788.3</ele>
-    <name>RD0001B</name>
+    <name>Road Crossing - 1</name>
     <desc><![CDATA[PCT departs paved Forrest Gate Road on a trail.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="32.607373" lon="-116.470798">
@@ -3918,94 +3918,94 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="32.605528" lon="-116.483197">
     <ele>752.9</ele>
-    <name>Hwy94</name>
+    <name>Highway 94</name>
     <desc><![CDATA[Highway 94]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="32.607188" lon="-116.489084">
     <ele>751.0</ele>
-    <name>RR0003</name>
+    <name>Railroad - 3</name>
     <desc><![CDATA[Railroad tracks]]></desc>
     <sym>Flag, Red</sym>
   </wpt><wpt lat="32.608000" lon="-116.498991">
     <ele>723.7</ele>
-    <name>WR004</name>
+    <name>Water (reported) - 4</name>
     <desc><![CDATA[Creeklet]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="32.607284" lon="-116.501337">
     <ele>724.8</ele>
-    <name>CS0005</name>
+    <name>Campsite - 5</name>
     <desc><![CDATA[Campsite in a dry meadow]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="32.607768" lon="-116.502488">
     <ele>735.6</ele>
-    <name>GT0005</name>
+    <name>Gate - 5</name>
     <desc><![CDATA[Pipe gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="32.623760" lon="-116.518248">
     <ele>1022.7</ele>
-    <name>GT0009</name>
+    <name>Gate - 9</name>
     <desc><![CDATA[Pipe gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="32.623311" lon="-116.518694">
     <ele>1018.2</ele>
-    <name>RD0009</name>
+    <name>Road Crossing - 9</name>
     <desc><![CDATA[Unpaved jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="32.623571" lon="-116.519354">
     <ele>1024.6</ele>
-    <name>GT0009B</name>
+    <name>Gate - 9</name>
     <desc><![CDATA[Pipe gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="32.624799" lon="-116.520392">
     <ele>1018.9</ele>
-    <name>RD0009B</name>
+    <name>Road Crossing - 9</name>
     <desc><![CDATA[Unpaved jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="32.643349" lon="-116.524187">
     <ele>1026.9</ele>
-    <name>RD0011</name>
+    <name>Road Crossing - 11</name>
     <desc><![CDATA[Unpaved jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="32.648740" lon="-116.528003">
     <ele>1003.5</ele>
-    <name>GT0012</name>
+    <name>Gate - 12</name>
     <desc><![CDATA[Pipe gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="32.651215" lon="-116.533831">
     <ele>957.5</ele>
-    <name>GT0012B</name>
+    <name>Gate - 12</name>
     <desc><![CDATA[Pipe gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="32.658181" lon="-116.548866">
     <ele>908.4</ele>
-    <name>PL0014</name>
+    <name>Powerline - 14</name>
     <desc><![CDATA[Powerline]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="32.660050" lon="-116.550710">
     <ele>895.9</ele>
-    <name>RD0014</name>
+    <name>Road Crossing - 14</name>
     <desc><![CDATA[PCT joins unpaved South Boundary Rd for 3/10 mile. Pass an unpaved and unsigned road on your left. Do not take this dead-end road. Continue another 3/10 mile to where the PCT departs South Boundary Rd on a trail with a PCT sign, near a yellow sign in Spanish cautioning travelers. ]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="32.658186" lon="-116.547955">
     <ele>887.4</ele>
-    <name>PL0014B</name>
+    <name>Powerline - 14</name>
     <desc><![CDATA[Powerline]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="32.654718" lon="-116.542627">
     <ele>862.8</ele>
-    <name>RD0015</name>
+    <name>Road Crossing - 15</name>
     <desc><![CDATA[PCT departs unpaved South Boundary Rd.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="32.661418" lon="-116.545505">
     <ele>706.2</ele>
-    <name>WRCS015</name>
+    <name>Campsite &amp; Water (reported) - 15</name>
     <desc><![CDATA[Hauser Creek, often dry, several campsites W of trail. Nearby unpaved Hauser Creek road is blocked to vehicle traffic. ]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="32.672542" lon="-116.567716">
     <ele>556.2</ele>
-    <name>WACS016</name>
+    <name>Campsite &amp; Water - 16</name>
     <desc><![CDATA[Cottonwood Creek below Lake Morena, follow dirt road 1.6 miles W of PCT.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="32.682523" lon="-116.517143">
     <ele>937.0</ele>
     <name>LakeMorenaCG</name>
@@ -4018,22 +4018,22 @@
     <sym>Shopping Center</sym>
   </wpt><wpt lat="32.684919" lon="-116.516647">
     <ele>931.1</ele>
-    <name>RD0020</name>
+    <name>Road Crossing - 20</name>
     <desc><![CDATA[PCT departs paved Lake Shore Drive on a trail.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="32.689530" lon="-116.514037">
     <ele>929.5</ele>
-    <name>GT0021</name>
+    <name>Gate - 21</name>
     <desc><![CDATA[Pipe gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="32.715239" lon="-116.499008">
     <ele>934.3</ele>
-    <name>WR024</name>
+    <name>Water (reported) - 24</name>
     <desc><![CDATA[Cottonwood Creek Bridge, usually dry.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="32.729263" lon="-116.490416">
     <ele>947.0</ele>
-    <name>WR026</name>
+    <name>Water (reported) - 26</name>
     <desc><![CDATA[Cottonwood Creek bed]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="32.729016" lon="-116.483168">
@@ -4043,7 +4043,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="32.734293" lon="-116.480025">
     <ele>958.7</ele>
-    <name>Hwy8</name>
+    <name>Highway 8</name>
     <desc><![CDATA[Interstate Highway 8]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="32.742984" lon="-116.464639">
@@ -4053,22 +4053,22 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="32.749634" lon="-116.455646">
     <ele>1191.8</ele>
-    <name>GT0030</name>
+    <name>Gate - 30</name>
     <desc><![CDATA[Pipe gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="32.747545" lon="-116.451340">
     <ele>1217.7</ele>
-    <name>RD0030</name>
+    <name>Road Crossing - 30</name>
     <desc><![CDATA[Kitchen Creek Rd, paved, pipe gate E of road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="32.752986" lon="-116.451728">
     <ele>1171.0</ele>
-    <name>WRCS030</name>
+    <name>Campsite &amp; Water (reported) - 30</name>
     <desc><![CDATA[Seasonal Yellow Rose Spring, 4/10 mile N on Kitchen Creek Rd, often has water early in the hiking season, good camping if you don't mind the nearby (but seldom used) road.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="32.764221" lon="-116.439089">
     <ele>1283.3</ele>
-    <name>WRCS032</name>
+    <name>Campsite &amp; Water (reported) - 32</name>
     <desc><![CDATA[Fred Canyon, usually dry, campsite W of trail.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="32.777702" lon="-116.445420">
@@ -4078,42 +4078,42 @@
     <sym>Campground</sym>
   </wpt><wpt lat="32.771631" lon="-116.439064">
     <ele>1343.8</ele>
-    <name>RD0033</name>
+    <name>Road Crossing - 33</name>
     <desc><![CDATA[Unpaved Fred Canyon Rd, access to Cibbets Flat Campground.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="32.801679" lon="-116.421052">
     <ele>1613.1</ele>
-    <name>CS0036</name>
+    <name>Campsite - 36</name>
     <desc><![CDATA[Campsite by large oak tree.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="32.811006" lon="-116.422472">
     <ele>1583.4</ele>
-    <name>WR037</name>
+    <name>Water (reported) - 37</name>
     <desc><![CDATA[Long Canyon]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="32.812993" lon="-116.419706">
     <ele>1599.3</ele>
-    <name>CS0037</name>
+    <name>Campsite - 37</name>
     <desc><![CDATA[Campsite near Long Creek.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="32.817914" lon="-116.414662">
     <ele>1657.2</ele>
-    <name>CS0038</name>
+    <name>Campsite - 38</name>
     <desc><![CDATA[Campsite among the dead trees.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="32.819298" lon="-116.414038">
     <ele>1658.6</ele>
-    <name>WR038</name>
+    <name>Water (reported) - 38</name>
     <desc><![CDATA[Long Canyon Creek ford]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="32.828343" lon="-116.417805">
     <ele>1795.0</ele>
-    <name>TR0039</name>
+    <name>Trail Junction - 39</name>
     <desc><![CDATA[Trail junction to Lower Morris Meadow Spring]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="32.829787" lon="-116.420397">
     <ele>1776.6</ele>
-    <name>WRCS039</name>
+    <name>Campsite &amp; Water (reported) - 39</name>
     <desc><![CDATA[Lower Morris Meadow, spring, campsite, 3/10 mile NW of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="32.857325" lon="-116.423376">
@@ -4123,7 +4123,7 @@
     <sym>Lodging</sym>
   </wpt><wpt lat="32.858333" lon="-116.415658">
     <ele>1815.1</ele>
-    <name>TR0041</name>
+    <name>Trail Junction - 41</name>
     <desc><![CDATA[Trail junction to Burnt Ranchera Campground and the community of Mount Laguna.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="32.858580" lon="-116.416588">
@@ -4138,22 +4138,22 @@
     <sym>Post Office</sym>
   </wpt><wpt lat="32.864153" lon="-116.412530">
     <ele>1819.9</ele>
-    <name>WR042</name>
+    <name>Water (reported) - 42</name>
     <desc><![CDATA[Burnt Rancheria CG drinking fountain.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="32.869326" lon="-116.414239">
     <ele>1815.2</ele>
-    <name>WR043</name>
+    <name>Water (reported) - 43</name>
     <desc><![CDATA[Desert View Picnic Area, outhouse, water, picnic table.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="32.871281" lon="-116.415258">
     <ele>1822.9</ele>
-    <name>RD0043</name>
+    <name>Road Crossing - 43</name>
     <desc><![CDATA[Cross a paved road, just N of WR043.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="32.877734" lon="-116.420081">
     <ele>1803.0</ele>
-    <name>RD0043b</name>
+    <name>Road Crossing - 43</name>
     <desc><![CDATA[Cross another paved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="32.888128" lon="-116.425853">
@@ -4183,7 +4183,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="32.905774" lon="-116.458263">
     <ele>1655.4</ele>
-    <name>WR049</name>
+    <name>Water (reported) - 49</name>
     <desc><![CDATA[GART faucet, 1/10 mile W of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="32.919770" lon="-116.460738">
@@ -4193,12 +4193,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="32.925106" lon="-116.482388">
     <ele>1607.6</ele>
-    <name>WR053</name>
+    <name>Water (reported) - 53</name>
     <desc><![CDATA[Pioneer Mail Picnic Area, outhouse.<br/>---<br/>"Remote Camping" not allowed in the Laguna Mountain Recreation Area.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="32.953650" lon="-116.500407">
     <ele>1585.4</ele>
-    <name>CS0056</name>
+    <name>Campsite - 56</name>
     <desc><![CDATA[Campsite in boulder field.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="32.980363" lon="-116.522236">
@@ -4208,12 +4208,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="32.977881" lon="-116.526924">
     <ele>1522.7</ele>
-    <name>WRCS059</name>
+    <name>Campsite &amp; Water (reported) - 59</name>
     <desc><![CDATA[Sunrise Trailhead, outhouse, camping in the open field, water 5/10 mile W of PCT mile 59.5. Can be very windy camping at this location.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.010341" lon="-116.537514">
     <ele>1431.8</ele>
-    <name>WR062</name>
+    <name>Water (reported) - 62</name>
     <desc><![CDATA[Mason Valley fire tank, 75 yards E of PCT [usually dry].]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="32.994335" lon="-116.542371">
@@ -4223,212 +4223,212 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.010642" lon="-116.538753">
     <ele>1430.7</ele>
-    <name>RD0062</name>
+    <name>Road Crossing - 62</name>
     <desc><![CDATA[Mason Valley Truck Trail.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="33.012883" lon="-116.527305">
     <ele>1177.8</ele>
-    <name>CS0064</name>
+    <name>Campsite - 64</name>
     <desc><![CDATA[Campsite near dry creekbed just S of Chariot Cyn Rd.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.023269" lon="-116.529643">
     <ele>1115.9</ele>
-    <name>WR064A</name>
+    <name>Water (reported) - 64</name>
     <desc><![CDATA[Seasonal creek crossing Chariot Canyon Rd, shade, 8/10 mile N of PCT mile 63.7 [2/10 mile N of the State Park boundary sign].]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.029059" lon="-116.531354">
     <ele>1100.6</ele>
-    <name>WR064B</name>
+    <name>Water (reported) - 64</name>
     <desc><![CDATA[Chariot Canyon Fire Tank, 1.2 miles N of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.035761" lon="-116.536292">
     <ele>1064.0</ele>
-    <name>WR064C</name>
+    <name>Water (reported) - 64</name>
     <desc><![CDATA[Seasonal Chariot Canyon Spring, 1.4 miles N of PCT, spring is on the W side of the road hidden from view by several large oak trees.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.013361" lon="-116.527222">
     <ele>1175.6</ele>
-    <name>RD0064</name>
+    <name>Road Crossing - 64</name>
     <desc><![CDATA[PCT joins Chariot Canyon Rd.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="33.011152" lon="-116.523325">
     <ele>1244.7</ele>
-    <name>RD0064b</name>
+    <name>Road Crossing - 64</name>
     <desc><![CDATA[PCT departs Chariot Canyon Rd.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="33.050469" lon="-116.523844">
     <ele>1112.0</ele>
-    <name>GT0068</name>
+    <name>Gate - 68</name>
     <desc><![CDATA[Pipe gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="33.056431" lon="-116.531988">
     <ele>1009.7</ele>
-    <name>WR068B</name>
+    <name>Water (reported) - 68</name>
     <desc><![CDATA[Spring on Rodriguez Spur Truck Trail, 1.1 miles NW of PCT, 50 feet uphill from the large rust colored water tank.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.050184" lon="-116.524317">
     <ele>1113.3</ele>
-    <name>WRCS068</name>
+    <name>Campsite &amp; Water (reported) - 68</name>
     <desc><![CDATA[Rodriguez Spur fire tank, campsite.<br/>---<br/>WATER ALERT: Next northbound water after the Rodriguez Spur fire tank may be Barrel Spring in 32.7 miles. This water source was once reliable, but has gone dry sometimes in 2016 & 2017, check the pctwater.com for current water information.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.067895" lon="-116.477950">
     <ele>954.6</ele>
-    <name>CS0073</name>
+    <name>Campsite - 73</name>
     <desc><![CDATA[Small campsite N of trail.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.085514" lon="-116.470021">
     <ele>722.5</ele>
-    <name>GT0076</name>
+    <name>Gate - 76</name>
     <desc><![CDATA[Pipe gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="33.095834" lon="-116.472512">
     <ele>694.3</ele>
-    <name>WRCS077</name>
+    <name>Campsite &amp; Water (reported) - 77</name>
     <desc><![CDATA[Scissors Crossing, junction of Hwy 78 and S-2. ]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.099146" lon="-116.469501">
     <ele>2537.7</ele>
-    <name>Hwy78</name>
+    <name>Highway 78</name>
     <desc><![CDATA[Highway 78, near Scissors Crossing. Julian is 12 miles W on Highway 78, the Stagecoach Trails RV Park is 4 miles SE of the PCT on S2.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="33.110121" lon="-116.475133">
     <ele>906.4</ele>
-    <name>CS0079</name>
+    <name>Campsite - 79</name>
     <desc><![CDATA[Campsite in sandy dry creek bed]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.108915" lon="-116.478384">
     <ele>902.9</ele>
-    <name>BV0080</name>
+    <name>Bivy - 80</name>
     <desc><![CDATA[Small bivy campsite, view.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.110116" lon="-116.480659">
     <ele>914.4</ele>
-    <name>BV0080B</name>
+    <name>Bivy - 80</name>
     <desc><![CDATA[Bivy campsite in a wash.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.113776" lon="-116.481149">
     <ele>934.6</ele>
-    <name>CS0080C</name>
+    <name>Campsite - 80</name>
     <desc><![CDATA[Small sandy campsite under dry waterfall, another campsite in the wash below.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.120230" lon="-116.484457">
     <ele>937.1</ele>
-    <name>CS0082</name>
+    <name>Campsite - 82</name>
     <desc><![CDATA[Several small campsites in wash below the trail.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.123716" lon="-116.487269">
     <ele>965.0</ele>
-    <name>CS0082B</name>
+    <name>Campsite - 82</name>
     <desc><![CDATA[Small campsite next to trail, view.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.136113" lon="-116.495156">
     <ele>1008.7</ele>
-    <name>BV0085</name>
+    <name>Bivy - 85</name>
     <desc><![CDATA[Small bivy campsite in a gully.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.136838" lon="-116.497559">
     <ele>1001.7</ele>
-    <name>CS0085B</name>
+    <name>Campsite - 85</name>
     <desc><![CDATA[Small campsite next to trail.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.138323" lon="-116.503054">
     <ele>1002.6</ele>
-    <name>CS0085C</name>
+    <name>Campsite - 85</name>
     <desc><![CDATA[Large campsite, better than campsites in the burn area 200 feet before.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.140506" lon="-116.507511">
     <ele>1025.1</ele>
-    <name>CS0086</name>
+    <name>Campsite - 86</name>
     <desc><![CDATA[Several campsites on saddle of ridge.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.140784" lon="-116.507763">
     <ele>1025.4</ele>
-    <name>GT0086</name>
+    <name>Gate - 86</name>
     <desc><![CDATA[Pipe gate, 1st gate N of Hwy 78.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="33.145238" lon="-116.507822">
     <ele>986.7</ele>
-    <name>CS0087</name>
+    <name>Campsite - 87</name>
     <desc><![CDATA[Many campsites along wide dry creekbed.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.148103" lon="-116.517794">
     <ele>1098.7</ele>
-    <name>GT0088</name>
+    <name>Gate - 88</name>
     <desc><![CDATA[Pipe gate, 2nd gate N of Highway 78.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="33.147816" lon="-116.517922">
     <ele>1096.1</ele>
-    <name>CS0088</name>
+    <name>Campsite - 88</name>
     <desc><![CDATA[Several small campsites, view.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.150717" lon="-116.520775">
     <ele>1099.8</ele>
-    <name>BV0089</name>
+    <name>Bivy - 89</name>
     <desc><![CDATA[Small bivy campsite.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.149376" lon="-116.523046">
     <ele>1087.6</ele>
-    <name>BV0089B</name>
+    <name>Bivy - 89</name>
     <desc><![CDATA[Small bivy campsite, view.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.155044" lon="-116.530938">
     <ele>1054.3</ele>
-    <name>BV0090</name>
+    <name>Bivy - 90</name>
     <desc><![CDATA[Small trailside bivy campsite.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.159569" lon="-116.538206">
     <ele>1055.3</ele>
-    <name>RD0090</name>
+    <name>Road Crossing - 90</name>
     <desc><![CDATA[Abandoned jeep road, cleared and used as a firebreak in 2012.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="33.166741" lon="-116.543546">
     <ele>1084.8</ele>
-    <name>GT0091</name>
+    <name>Gate - 91</name>
     <desc><![CDATA[Pipe gate, 3rd gate N of Hwy 78.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="33.168451" lon="-116.540106">
     <ele>1042.8</ele>
-    <name>WR091</name>
+    <name>Water (reported) - 91</name>
     <desc><![CDATA[3rd gate water cache location, 3/10 mile E of PCT mile 91.2.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.171674" lon="-116.538184">
     <ele>1021.9</ele>
-    <name>WR091B</name>
+    <name>Water (reported) - 91</name>
     <desc><![CDATA[Underground cistern, 6/10 mile E of PCT mile 91.2.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.167005" lon="-116.543478">
     <ele>1082.1</ele>
-    <name>CS091</name>
+    <name>Campsite - 91</name>
     <desc><![CDATA[Several small campsites 100 ft N of the 3rd gate, possible shade from bushes, junction with trail to water cache and underground water cistern E of the PCT.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.173164" lon="-116.549837">
     <ele>1169.8</ele>
-    <name>BV0092</name>
+    <name>Bivy - 92</name>
     <desc><![CDATA[Small bivy campsite.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.180503" lon="-116.549393">
     <ele>1230.1</ele>
-    <name>CS0093</name>
+    <name>Campsite - 93</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.175964" lon="-116.551645">
     <ele>1262.1</ele>
-    <name>GT0094</name>
+    <name>Gate - 94</name>
     <desc><![CDATA[Pipe gate, 4th gate N of Highway 78.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="33.180832" lon="-116.558186">
     <ele>1309.5</ele>
-    <name>CS0094</name>
+    <name>Campsite - 94</name>
     <desc><![CDATA[Several small campsites on small ridge, may be hidden from trail by brush.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.186098" lon="-116.562480">
     <ele>1300.9</ele>
-    <name>BV0095</name>
+    <name>Bivy - 95</name>
     <desc><![CDATA[Small bivy campsite.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.193713" lon="-116.565387">
     <ele>1341.4</ele>
-    <name>BV0096</name>
+    <name>Bivy - 96</name>
     <desc><![CDATA[Small bivy campsite.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.194405" lon="-116.563323">
@@ -4443,47 +4443,47 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="33.211540" lon="-116.581909">
     <ele>1117.8</ele>
-    <name>GT0101</name>
+    <name>Gate - 101</name>
     <desc><![CDATA[Pipe gate, 5th gate N of Hwy 78.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="33.211605" lon="-116.582558">
     <ele>1117.0</ele>
-    <name>GT0101B</name>
+    <name>Gate - 101</name>
     <desc><![CDATA[Pipe gate, 6th gate N of Hwy 78.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="33.211582" lon="-116.582782">
     <ele>1109.5</ele>
-    <name>GT0101C</name>
+    <name>Gate - 101</name>
     <desc><![CDATA[Pipe gate, 7th gate N of Highway 78.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="33.215517" lon="-116.588104">
     <ele>1061.2</ele>
-    <name>WRCS101</name>
+    <name>Campsite &amp; Water (reported) - 101</name>
     <desc><![CDATA[Barrel Spring, trough, shade, and campsites. Watch for Poison Oak.<br/>---<br/>WATER ALERT: Next southbound water after Barrel Spring may be the Rodriguez fire tank in 32.7 miles. Check the pctwater.com for current information.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.216818" lon="-116.587944">
     <ele>1052.6</ele>
-    <name>RD0101</name>
+    <name>Road Crossing - 101</name>
     <desc><![CDATA[Road S22, Montezuma Valley Rd, paved.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="33.236036" lon="-116.596607">
     <ele>1033.4</ele>
-    <name>WR104</name>
+    <name>Water (reported) - 104</name>
     <desc><![CDATA[Spring-fed cattle trough, 2/10 mile E of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.241161" lon="-116.603103">
     <ele>1003.6</ele>
-    <name>WR105</name>
+    <name>Water (reported) - 105</name>
     <desc><![CDATA[Round concrete trough, 2/10 mile W of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.248098" lon="-116.600006">
     <ele>1022.4</ele>
-    <name>WRCS105B</name>
+    <name>Campsite &amp; Water (reported) - 105</name>
     <desc><![CDATA[San Ysidro Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.251003" lon="-116.612268">
     <ele>1034.1</ele>
-    <name>WR106B</name>
+    <name>Water (reported) - 106</name>
     <desc><![CDATA[Large metal water tank, two cattle troughs, 2/10 mi S of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.254761" lon="-116.611588">
@@ -4493,34 +4493,38 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="33.258414" lon="-116.612280">
     <ele>1075.9</ele>
-    <name>WR106</name>
+    <name>Water (reported) - 106</name>
     <desc><![CDATA[Spring-fed metal trough, 3/10 mile N of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.266300" lon="-116.626003">
     <ele>1016.4</ele>
-    <name>WR108</name>
+    <name>Water (reported) - 108</name>
     <desc><![CDATA[Canada Verde]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.269300" lon="-116.640857">
     <ele>939.8</ele>
-    <name>CS0109</name>
+    <name>Campsite - 109</name>
     <desc><![CDATA[Large beach-like campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="33.270496" lon="-116.641684">
     <ele>937.9</ele>
-    <name>GT0109</name>
+    <name>Gate - 109</name>
     <desc><![CDATA[Pipe gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="33.271267" lon="-116.642863">
     <ele>933.9</ele>
-    <name>GT0109B</name>
+    <name>Gate - 109</name>
     <desc><![CDATA[Pipe gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="33.273455" lon="-116.644986">
     <ele>928.2</ele>
-    <name>Hwy79</name>
+    <name>Highway 79</name>
     <desc><![CDATA[Highway 79, first crossing, small community of Warner Springs 1.2 miles NE.]]></desc>
     <sym>Car</sym>
+  </wpt><wpt lat="33.208290" lon="-116.578046">
+    <ele>1157.9</ele>
+    <name>0100</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>CA Sec B</name>
     <extensions>
@@ -4528,7 +4532,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B</desc><cmt/><trkseg>
       <trkpt lat="33.273512" lon="-116.644957"><ele>928.27</ele></trkpt>
       <trkpt lat="33.273565" lon="-116.644977"><ele>928.20</ele></trkpt>
       <trkpt lat="33.273543" lon="-116.645126"><ele>927.89</ele></trkpt>
@@ -7999,7 +8003,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Apache Springs Trail</desc><cmt/><trkseg>
       <trkpt lat="33.716687" lon="-116.624487"><ele>2240.71</ele></trkpt>
       <trkpt lat="33.717099" lon="-116.624172"><ele>2229.50</ele></trkpt>
       <trkpt lat="33.717191" lon="-116.623864"><ele>2225.41</ele></trkpt>
@@ -8033,7 +8037,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Black Mtn Road Alternate</desc><cmt/><trkseg>
       <trkpt lat="33.745859" lon="-116.714665"><ele>1632.85</ele></trkpt>
       <trkpt lat="33.746386" lon="-116.714893"><ele>1633.25</ele></trkpt>
       <trkpt lat="33.746782" lon="-116.714960"><ele>1634.63</ele></trkpt>
@@ -8391,7 +8395,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Cedar Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="33.666269" lon="-116.575308"><ele>2065.14</ele></trkpt>
       <trkpt lat="33.666610" lon="-116.575460"><ele>2065.91</ele></trkpt>
       <trkpt lat="33.666977" lon="-116.575301"><ele>2055.28</ele></trkpt>
@@ -8422,7 +8426,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Deer Springs Trail</desc><cmt/><trkseg>
       <trkpt lat="33.782890" lon="-116.704191"><ele>2452.25</ele></trkpt>
       <trkpt lat="33.782681" lon="-116.704206"><ele>2448.42</ele></trkpt>
       <trkpt lat="33.782415" lon="-116.703946"><ele>2447.68</ele></trkpt>
@@ -8599,7 +8603,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Devils Slide Trail</desc><cmt/><trkseg>
       <trkpt lat="33.774266" lon="-116.673080"><ele>2473.12</ele></trkpt>
       <trkpt lat="33.774218" lon="-116.673595"><ele>2474.22</ele></trkpt>
       <trkpt lat="33.773939" lon="-116.674811"><ele>2461.01</ele></trkpt>
@@ -8679,7 +8683,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Eagle Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="33.672344" lon="-116.582062"><ele>2116.30</ele></trkpt>
       <trkpt lat="33.672234" lon="-116.582275"><ele>2117.45</ele></trkpt>
       <trkpt lat="33.671959" lon="-116.582176"><ele>2114.25</ele></trkpt>
@@ -8703,7 +8707,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Ernie Maxwell Trail</desc><cmt/><trkseg>
       <trkpt lat="33.764700" lon="-116.687198"><ele>1956.88</ele></trkpt>
       <trkpt lat="33.764591" lon="-116.687528"><ele>1949.76</ele></trkpt>
       <trkpt lat="33.764112" lon="-116.687059"><ele>1946.52</ele></trkpt>
@@ -8838,7 +8842,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Live Oak Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="33.623125" lon="-116.563956"><ele>1813.45</ele></trkpt>
       <trkpt lat="33.624011" lon="-116.563077"><ele>1799.77</ele></trkpt>
       <trkpt lat="33.624283" lon="-116.562543"><ele>1794.71</ele></trkpt>
@@ -8877,7 +8881,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Lost Valley Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="33.343018" lon="-116.638740"><ele>1361.24</ele></trkpt>
       <trkpt lat="33.343229" lon="-116.638579"><ele>1360.17</ele></trkpt>
       <trkpt lat="33.343870" lon="-116.638531"><ele>1341.18</ele></trkpt>
@@ -8893,7 +8897,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Marion Mtn Trail</desc><cmt/><trkseg>
       <trkpt lat="33.800758" lon="-116.705166"><ele>2652.25</ele></trkpt>
       <trkpt lat="33.800740" lon="-116.705381"><ele>2647.36</ele></trkpt>
       <trkpt lat="33.800806" lon="-116.705482"><ele>2643.23</ele></trkpt>
@@ -9033,7 +9037,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Mike Herrera Road</desc><cmt/><trkseg>
       <trkpt lat="33.381514" lon="-116.595064"><ele>1540.15</ele></trkpt>
       <trkpt lat="33.381703" lon="-116.593973"><ele>1542.29</ele></trkpt>
       <trkpt lat="33.381493" lon="-116.593499"><ele>1548.37</ele></trkpt>
@@ -9058,7 +9062,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Mt San Jacinto Alternate</desc><cmt/><trkseg>
       <trkpt lat="33.788590" lon="-116.677301"><ele>2740.10</ele></trkpt>
       <trkpt lat="33.788810" lon="-116.677289"><ele>2739.76</ele></trkpt>
       <trkpt lat="33.788946" lon="-116.677561"><ele>2746.16</ele></trkpt>
@@ -9279,7 +9283,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Mt San Jacinto Spur Trail</desc><cmt/><trkseg>
       <trkpt lat="33.812076" lon="-116.679038"><ele>3224.66</ele></trkpt>
       <trkpt lat="33.812281" lon="-116.678865"><ele>3226.22</ele></trkpt>
       <trkpt lat="33.812363" lon="-116.678604"><ele>3225.31</ele></trkpt>
@@ -9305,7 +9309,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Palm Springs Tram Trail</desc><cmt/><trkseg>
       <trkpt lat="33.774289" lon="-116.673005"><ele>2472.82</ele></trkpt>
       <trkpt lat="33.774233" lon="-116.672475"><ele>2468.87</ele></trkpt>
       <trkpt lat="33.774291" lon="-116.672050"><ele>2463.62</ele></trkpt>
@@ -9504,7 +9508,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Paradise Cafe Trail</desc><cmt/><trkseg>
       <trkpt lat="33.562707" lon="-116.577272"><ele>1501.73</ele></trkpt>
       <trkpt lat="33.562843" lon="-116.578922"><ele>1497.66</ele></trkpt>
       <trkpt lat="33.563739" lon="-116.580589"><ele>1490.47</ele></trkpt>
@@ -9529,7 +9533,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Round Valley Alternate</desc><cmt/><trkseg>
       <trkpt lat="33.799226" lon="-116.674330"><ele>2958.53</ele></trkpt>
       <trkpt lat="33.799311" lon="-116.674271"><ele>2958.63</ele></trkpt>
       <trkpt lat="33.799302" lon="-116.674131"><ele>2957.05</ele></trkpt>
@@ -9638,7 +9642,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Snow Creek Trail</desc><cmt/><trkseg>
       <trkpt lat="33.855134" lon="-116.722676"><ele>1948.43</ele></trkpt>
       <trkpt lat="33.854779" lon="-116.722730"><ele>1949.11</ele></trkpt>
       <trkpt lat="33.854234" lon="-116.722447"><ele>1948.35</ele></trkpt>
@@ -9651,7 +9655,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Spitler to Idyllwild Alternate</desc><cmt/><trkseg>
       <trkpt lat="33.709931" lon="-116.622586"><ele>2135.61</ele></trkpt>
       <trkpt lat="33.709723" lon="-116.622592"><ele>2130.63</ele></trkpt>
       <trkpt lat="33.710759" lon="-116.623756"><ele>2115.24</ele></trkpt>
@@ -10025,7 +10029,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Spur118 Trail</desc><cmt/><trkseg>
       <trkpt lat="33.326786" lon="-116.635864"><ele>1242.38</ele></trkpt>
       <trkpt lat="33.326286" lon="-116.635910"><ele>1231.76</ele></trkpt>
       <trkpt lat="33.326149" lon="-116.636024"><ele>1228.04</ele></trkpt>
@@ -10038,7 +10042,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Suicide Rock Trail</desc><cmt/><trkseg>
       <trkpt lat="33.768301" lon="-116.709584"><ele>2106.19</ele></trkpt>
       <trkpt lat="33.768559" lon="-116.709253"><ele>2104.01</ele></trkpt>
       <trkpt lat="33.768846" lon="-116.709136"><ele>2110.01</ele></trkpt>
@@ -10094,7 +10098,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Tahquitz Meadow Alternate</desc><cmt/><trkseg>
       <trkpt lat="33.760782" lon="-116.665519"><ele>2475.17</ele></trkpt>
       <trkpt lat="33.760780" lon="-116.665396"><ele>2472.16</ele></trkpt>
       <trkpt lat="33.760933" lon="-116.665274"><ele>2468.55</ele></trkpt>
@@ -10152,7 +10156,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Tahquitz Peak Trail</desc><cmt/><trkseg>
       <trkpt lat="33.757439" lon="-116.671628"><ele>2628.32</ele></trkpt>
       <trkpt lat="33.757080" lon="-116.672414"><ele>2631.23</ele></trkpt>
       <trkpt lat="33.756826" lon="-116.673451"><ele>2623.86</ele></trkpt>
@@ -10178,7 +10182,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Tule Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="33.460176" lon="-116.599939"><ele>1103.09</ele></trkpt>
       <trkpt lat="33.459993" lon="-116.599858"><ele>1101.53</ele></trkpt>
       <trkpt lat="33.459837" lon="-116.599654"><ele>1100.05</ele></trkpt>
@@ -10198,7 +10202,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section B. Off-Track: Tunnel Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="33.623081" lon="-116.564058"><ele>1814.56</ele></trkpt>
       <trkpt lat="33.622429" lon="-116.564818"><ele>1803.42</ele></trkpt>
       <trkpt lat="33.622383" lon="-116.564959"><ele>1799.41</ele></trkpt>
@@ -10212,7 +10216,16 @@
       <trkpt lat="33.621420" lon="-116.567298"><ele>1730.18</ele></trkpt>
       <trkpt lat="33.622217" lon="-116.567214"><ele>1734.04</ele></trkpt>
     </trkseg>
-  </trk><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.802023958414793" lon="-116.69879503548145">
+  </trk><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.866776004433632" lon="-116.69628096744418">
+    <ele>1166.3</ele>
+    <name>0200</name>
+    <sym>Flag, Green</sym>
+    <extensions>
+      <gpxx:WaypointExtension xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
+        <gpxx:DisplayMode>SymbolAndName</gpxx:DisplayMode>
+      </gpxx:WaypointExtension>
+    </extensions>
+  </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.802023958414793" lon="-116.69879503548145">
     <ele>2727.4000000000001</ele>
     <name>2SJTrail</name>
     <cmt>Trail from San Jacinto Peak via Little Round Valley rejoins PCT, in 2011 the only trail sign here was one pointing to Fuller Ridge.</cmt>
@@ -10335,7 +10348,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.311007963493466" lon="-116.62758096121252">
     <ele>986.10000000000002</ele>
-    <name>CS0115</name>
+    <name>Campsite - 115</name>
     <cmt>Campsite on E side of Agua Caliente Creek</cmt>
     <desc>Campsite on E side of Agua Caliente Creek</desc>
     <sym>Campground</sym>
@@ -10346,7 +10359,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.352985959500074" lon="-116.60927698016167">
     <ele>1530.0999999999999</ele>
-    <name>CS0124</name>
+    <name>Campsite - 124</name>
     <cmt>Several small campsites among the boulders.</cmt>
     <desc>Several small campsites among the boulders.</desc>
     <sym>Campground</sym>
@@ -10357,7 +10370,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.396417964249849" lon="-116.60135599784553">
     <ele>1704.3</ele>
-    <name>CS0129</name>
+    <name>Campsite - 129</name>
     <cmt>Several campsites on the high ridge near Combs Peak.</cmt>
     <desc>Several campsites on the high ridge near Combs Peak.</desc>
     <sym>Campground</sym>
@@ -10368,7 +10381,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.505687974393368" lon="-116.57699198462069">
     <ele>1314.2</ele>
-    <name>CS0144</name>
+    <name>Campsite - 144</name>
     <cmt>Several campsites among huge boulders.</cmt>
     <desc>Several campsites among huge boulders.</desc>
     <sym>Campground</sym>
@@ -10379,7 +10392,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.595619006082416" lon="-116.57135297544301">
     <ele>1579.4000000000001</ele>
-    <name>CS0156</name>
+    <name>Campsite - 156</name>
     <cmt>Shady campsite</cmt>
     <desc>Shady campsite</desc>
     <sym>Campground</sym>
@@ -10390,7 +10403,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.611976038664579" lon="-116.56426498666406">
     <ele>1728.5999999999999</ele>
-    <name>CS0157</name>
+    <name>Campsite - 157</name>
     <cmt>Campsite</cmt>
     <desc>Campsite</desc>
     <sym>Campground</sym>
@@ -10401,7 +10414,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.636671975255013" lon="-116.56919999979436">
     <ele>1924.7</ele>
-    <name>CS0160</name>
+    <name>Campsite - 160</name>
     <cmt>Small campsite</cmt>
     <desc>Small campsite</desc>
     <sym>Campground</sym>
@@ -10412,7 +10425,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.64835299551487" lon="-116.56678601168096">
     <ele>2078.6999999999998</ele>
-    <name>CS0161</name>
+    <name>Campsite - 161</name>
     <cmt>Small shady campsites</cmt>
     <desc>Small shady campsites</desc>
     <sym>Campground</sym>
@@ -10423,7 +10436,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.727728025987744" lon="-116.63280003704131">
     <ele>2103.9000000000001</ele>
-    <name>CS0171</name>
+    <name>Campsite - 171</name>
     <cmt>Campsite</cmt>
     <desc>Campsite</desc>
     <sym>Campground</sym>
@@ -10434,7 +10447,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.736171033233404" lon="-116.64374403655529">
     <ele>2190.0999999999999</ele>
-    <name>CS0172</name>
+    <name>Campsite - 172</name>
     <cmt>Several small campsites</cmt>
     <desc>Several small campsites</desc>
     <sym>Campground</sym>
@@ -10445,7 +10458,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.760836040601134" lon="-116.64442095905542">
     <ele>2509</ele>
-    <name>CS0175</name>
+    <name>Campsite - 175</name>
     <cmt>Several large campsites</cmt>
     <desc>Several large campsites</desc>
     <sym>Campground</sym>
@@ -10456,7 +10469,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.775715008378029" lon="-116.67416699230671">
     <ele>2489.9000000000001</ele>
-    <name>CS0180</name>
+    <name>Campsite - 180</name>
     <cmt>Campsite</cmt>
     <desc>Campsite</desc>
     <sym>Campground</sym>
@@ -10467,7 +10480,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.784092972055078" lon="-116.67501700110734">
     <ele>2750.6999999999998</ele>
-    <name>CS0181</name>
+    <name>Campsite - 181</name>
     <cmt>Campsite</cmt>
     <desc>Campsite</desc>
     <sym>Campground</sym>
@@ -10478,7 +10491,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.78760096617043" lon="-116.67846598662436">
     <ele>2763.4000000000001</ele>
-    <name>CS0181B</name>
+    <name>Campsite - 181</name>
     <cmt>Several campsites</cmt>
     <desc>Several campsites</desc>
     <sym>Campground</sym>
@@ -10489,7 +10502,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.780199997127056" lon="-116.69520003721118">
     <ele>2558.5999999999999</ele>
-    <name>CS0183</name>
+    <name>Campsite - 183</name>
     <cmt>Several campsites</cmt>
     <desc>Several campsites</desc>
     <sym>Campground</sym>
@@ -10500,7 +10513,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.782606022432446" lon="-116.70266303233802">
     <ele>2471.0999999999999</ele>
-    <name>CS0183B</name>
+    <name>Campsite - 183</name>
     <cmt>Strawberry Trail Camp, outhouse.</cmt>
     <desc>Strawberry Trail Camp, outhouse.</desc>
     <sym>Campground</sym>
@@ -10511,7 +10524,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.839831035584211" lon="-116.73667000606656">
     <ele>2349.9000000000001</ele>
-    <name>CS0191</name>
+    <name>Campsite - 191</name>
     <cmt>Campsite</cmt>
     <desc>Campsite</desc>
     <sym>Campground</sym>
@@ -10522,7 +10535,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.846156019717455" lon="-116.73755396157503">
     <ele>2261.9000000000001</ele>
-    <name>CS0191B</name>
+    <name>Campsite - 191</name>
     <cmt>Campsite</cmt>
     <desc>Campsite</desc>
     <sym>Campground</sym>
@@ -10533,7 +10546,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.855641987174749" lon="-116.72548896633089">
     <ele>1969.8</ele>
-    <name>CS0194</name>
+    <name>Campsite - 194</name>
     <cmt>Several campsites</cmt>
     <desc>Several campsites</desc>
     <sym>Campground</sym>
@@ -10544,7 +10557,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.864961992949247" lon="-116.71728702262044">
     <ele>1724.5999999999999</ele>
-    <name>CS0195</name>
+    <name>Campsite - 195</name>
     <cmt>Small campsite</cmt>
     <desc>Small campsite</desc>
     <sym>Campground</sym>
@@ -10555,7 +10568,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.87115596793592" lon="-116.71144600957632">
     <ele>1496</ele>
-    <name>CS0197</name>
+    <name>Campsite - 197</name>
     <cmt>Campsite</cmt>
     <desc>Campsite</desc>
     <sym>Campground</sym>
@@ -10566,7 +10579,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.871603980660439" lon="-116.69367796741426">
     <ele>1021.3</ele>
-    <name>CS0201</name>
+    <name>Campsite - 201</name>
     <cmt>Campsite</cmt>
     <desc>Campsite</desc>
     <sym>Campground</sym>
@@ -10577,7 +10590,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.867583014070988" lon="-116.69184995815158">
     <ele>993.39999999999998</ele>
-    <name>CS0202</name>
+    <name>Campsite - 202</name>
     <cmt>Campsite at the saddle W of knob.</cmt>
     <desc>Campsite at the saddle W of knob.</desc>
     <sym>Campground</sym>
@@ -10588,7 +10601,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.880786020308733" lon="-116.68400198221207">
     <ele>642.79999999999995</ele>
-    <name>CS0205</name>
+    <name>Campsite - 205</name>
     <cmt>Campsite</cmt>
     <desc>Campsite</desc>
     <sym>Campground</sym>
@@ -10698,7 +10711,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.441374972462654" lon="-116.60483096726239">
     <ele>1255.0999999999999</ele>
-    <name>GT0134</name>
+    <name>Gate - 134</name>
     <cmt>Pipe gate</cmt>
     <desc>Pipe gate</desc>
     <sym>Flag, Green</sym>
@@ -10709,7 +10722,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.455982031300664" lon="-116.60487103275955">
     <ele>1137.9000000000001</ele>
-    <name>GT0136</name>
+    <name>Gate - 136</name>
     <cmt>Pipe gate</cmt>
     <desc>Pipe gate</desc>
     <sym>Flag, Green</sym>
@@ -10720,7 +10733,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.622486023232341" lon="-116.56446497887373">
     <ele>1813.9000000000001</ele>
-    <name>GT0158</name>
+    <name>Gate - 158</name>
     <cmt>Gate, fence.</cmt>
     <desc>Gate, fence.</desc>
     <sym>Flag, Green</sym>
@@ -10731,7 +10744,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.892217008396983" lon="-116.68134299106896">
     <ele>373.69999999999999</ele>
-    <name>GT0207</name>
+    <name>Gate - 207</name>
     <cmt>Gate, blocks vehicle traffic S on paved road.</cmt>
     <desc>Gate, blocks vehicle traffic S on paved road.</desc>
     <sym>Flag, Green</sym>
@@ -10797,7 +10810,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.924239985644817" lon="-116.69454700313509">
     <ele>407.69999999999999</ele>
-    <name>Hwy10</name>
+    <name>Highway 10</name>
     <cmt>Interstate Highway 10</cmt>
     <desc>Interstate Highway 10</desc>
     <sym>Car</sym>
@@ -10808,7 +10821,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.745750961825252" lon="-116.71458696015179">
     <ele>1632.7</ele>
-    <name>Hwy243</name>
+    <name>Highway 243</name>
     <cmt>Arrive Hwy 243 - mi 3.7</cmt>
     <desc>Arrive Hwy 243 - mi 3.7</desc>
     <sym>Car</sym>
@@ -10830,7 +10843,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.563126977533102" lon="-116.57674999907613">
     <ele>1064.5999999999999</ele>
-    <name>Hwy74</name>
+    <name>Highway 74</name>
     <cmt>Highway 74, Idyllwild is 13.5 miles NW on Hwy 74, then 4.5 miles N on Hwy 243. The small town of Anza is 1 mile W on Hwy 74, then 5.8 miles SW on Hwy 371.</cmt>
     <desc>Highway 74, Idyllwild is 13.5 miles NW on Hwy 74, then 4.5 miles N on Hwy 243. The small town of Anza is 1 mile W on Hwy 74, then 5.8 miles SW on Hwy 371.</desc>
     <sym>Car</sym>
@@ -10841,7 +10854,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.288558041676879" lon="-116.65385697036982">
     <ele>892.70000000000005</ele>
-    <name>Hwy79B</name>
+    <name>Highway 79</name>
     <cmt>Hwy 79, 2nd crossing, Agua Caliente Creek.</cmt>
     <desc>Hwy 79, 2nd crossing, Agua Caliente Creek.</desc>
     <sym>Car</sym>
@@ -10984,7 +10997,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.460217993706465" lon="-116.599938031286">
     <ele>1103.3</ele>
-    <name>RD0137</name>
+    <name>Road Crossing - 137</name>
     <cmt>Upaved Tule Canyon Truck Trail</cmt>
     <desc>Upaved Tule Canyon Truck Trail</desc>
     <sym>Truck</sym>
@@ -10995,7 +11008,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.476663958281279" lon="-116.57733597792685">
     <ele>1069.7</ele>
-    <name>RD0140</name>
+    <name>Road Crossing - 140</name>
     <cmt>Coyote Canyon Rd, unpaved.</cmt>
     <desc>Coyote Canyon Rd, unpaved.</desc>
     <sym>Truck</sym>
@@ -11006,7 +11019,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.4995680116117" lon="-116.57030800357461">
     <ele>1245.5</ele>
-    <name>RD0143</name>
+    <name>Road Crossing - 143</name>
     <cmt>Unpaved Table Mountain Truck Trail, trail gate.</cmt>
     <desc>Unpaved Table Mountain Truck Trail, trail gate.</desc>
     <sym>Truck</sym>
@@ -11017,7 +11030,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.528188019990921" lon="-116.59078197553754">
     <ele>1496.3</ele>
-    <name>RD0147</name>
+    <name>Road Crossing - 147</name>
     <cmt>Table Mountain Truck Trail, unpaved, 2nd crossing.</cmt>
     <desc>Table Mountain Truck Trail, unpaved, 2nd crossing.</desc>
     <sym>Truck</sym>
@@ -11028,7 +11041,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.840742986649275" lon="-116.73848200589418">
     <ele>2335.8000000000002</ele>
-    <name>RD0191</name>
+    <name>Road Crossing - 191</name>
     <cmt>Black Mountain Road, unpaved.</cmt>
     <desc>Black Mountain Road, unpaved.</desc>
     <sym>Truck</sym>
@@ -11039,7 +11052,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.856341037899256" lon="-116.73310996033251">
     <ele>2087</ele>
-    <name>RD0193</name>
+    <name>Road Crossing - 193</name>
     <cmt>Round-about of unpaved roads, small unpaved parking area, possible trailhead for high clearance vehicles.</cmt>
     <desc>Round-about of unpaved roads, small unpaved parking area, possible trailhead for high clearance vehicles.</desc>
     <sym>Truck</sym>
@@ -11050,7 +11063,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.893646039068699" lon="-116.68301803059876">
     <ele>376.5</ele>
-    <name>RD0207</name>
+    <name>Road Crossing - 207</name>
     <cmt>PCT departs the paved road,</cmt>
     <desc>PCT departs the paved road,</desc>
     <sym>Truck</sym>
@@ -11336,7 +11349,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.326798966154456" lon="-116.63585498929024">
     <ele>1242.8</ele>
-    <name>TR0118</name>
+    <name>Trail Junction - 118</name>
     <cmt>Unmarked spur trail going 100 yards S to Lost Creek Road.</cmt>
     <desc>Unmarked spur trail going 100 yards S to Lost Creek Road.</desc>
     <sym>Trail Head</sym>
@@ -11347,7 +11360,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.32614098675549" lon="-116.6360229626298">
     <ele>1227.9000000000001</ele>
-    <name>TR0118b</name>
+    <name>Trail Junction - 118</name>
     <cmt>100 yard spur trail from Lost Creek Rd to the PCT.</cmt>
     <desc>100 yard spur trail from Lost Creek Rd to the PCT.</desc>
     <sym>Trail Head</sym>
@@ -11358,7 +11371,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.379032975062728" lon="-116.59234796650708">
     <ele>1558.0999999999999</ele>
-    <name>TR0127</name>
+    <name>Trail Junction - 127</name>
     <cmt>Spur trail to Mike Herrera's place.</cmt>
     <desc>Spur trail to Mike Herrera's place.</desc>
     <sym>Trail Head</sym>
@@ -11369,7 +11382,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.623103015124798" lon="-116.5640140324831">
     <ele>1814.2</ele>
-    <name>TR0158</name>
+    <name>Trail Junction - 158</name>
     <cmt>Trail junction for Live Oak Spring and Tunnel Spring, trail gate 250 feet S of junction.</cmt>
     <desc>Trail junction for Live Oak Spring and Tunnel Spring, trail gate 250 feet S of junction.</desc>
     <sym>Trail Head</sym>
@@ -11380,7 +11393,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.672364968806505" lon="-116.58203797414899">
     <ele>2116.1999999999998</ele>
-    <name>TR0163</name>
+    <name>Trail Junction - 163</name>
     <cmt>Eagle Spring trail junction</cmt>
     <desc>Eagle Spring trail junction</desc>
     <sym>Trail Head</sym>
@@ -11391,7 +11404,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.855115016922355" lon="-116.72263199463487">
     <ele>1948.5999999999999</ele>
-    <name>TR0194</name>
+    <name>Trail Junction - 194</name>
     <cmt>Unmarked use trail to West Fork Snow Creek.</cmt>
     <desc>Unmarked use trail to West Fork Snow Creek.</desc>
     <sym>Trail Head</sym>
@@ -11446,7 +11459,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.795005036517978" lon="-116.67819198220968">
     <ele>2830.9000000000001</ele>
-    <name>WA0181</name>
+    <name>Water - 181</name>
     <cmt>Wellmans Cienaga, 7/10 mile N of PCT.</cmt>
     <desc>Wellmans Cienaga, 7/10 mile N of PCT.</desc>
     <sym>Water Source</sym>
@@ -11490,7 +11503,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.295564977452159" lon="-116.63865395821631">
     <ele>911.29999999999995</ele>
-    <name>WR113</name>
+    <name>Water (reported) - 113</name>
     <cmt>Agua Caliente Creek, just past picnic tables.</cmt>
     <desc>Agua Caliente Creek, just past picnic tables.</desc>
     <sym>Water Source</sym>
@@ -11501,7 +11514,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.309272993355989" lon="-116.63054203614593">
     <ele>972.10000000000002</ele>
-    <name>WR115</name>
+    <name>Water (reported) - 115</name>
     <cmt>Agua Caliente Creek</cmt>
     <desc>Agua Caliente Creek</desc>
     <sym>Water Source</sym>
@@ -11512,7 +11525,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.317172015085816" lon="-116.62668703123927">
     <ele>1013.8</ele>
-    <name>WR115B</name>
+    <name>Water (reported) - 115</name>
     <cmt>Agua Caliente Creek, last crossing.</cmt>
     <desc>Agua Caliente Creek, last crossing.</desc>
     <sym>Water Source</sym>
@@ -11523,7 +11536,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.344276994466782" lon="-116.63695796392858">
     <ele>1325.5</ele>
-    <name>WR120</name>
+    <name>Water (reported) - 120</name>
     <cmt>Lost Valley Spring, 2/10 mile N of PCT.</cmt>
     <desc>Lost Valley Spring, 2/10 mile N of PCT.</desc>
     <sym>Water Source</sym>
@@ -11534,7 +11547,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.381612002849579" lon="-116.59517400898039">
     <ele>1541.2</ele>
-    <name>WR127</name>
+    <name>Water (reported) - 127</name>
     <cmt>Chihuahua Valley Rd, unpaved.</cmt>
     <desc>Chihuahua Valley Rd, unpaved.</desc>
     <sym>Water Source</sym>
@@ -11545,7 +11558,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.380506010726094" lon="-116.59118397161365">
     <ele>1548.0999999999999</ele>
-    <name>WR127B</name>
+    <name>Water (reported) - 127</name>
     <cmt>Water tank, 2/10 mile E of PCT mile.</cmt>
     <desc>Water tank, 2/10 mile E of PCT mile.</desc>
     <sym>Water Source</sym>
@@ -11556,7 +11569,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.457890003919601" lon="-116.60481797531247">
     <ele>1095</ele>
-    <name>WR137</name>
+    <name>Water (reported) - 137</name>
     <cmt>Tule Canyon Creek</cmt>
     <desc>Tule Canyon Creek</desc>
     <sym>Water Source</sym>
@@ -11567,7 +11580,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.45921702682972" lon="-116.59770601429045">
     <ele>1060.9000000000001</ele>
-    <name>WR137B</name>
+    <name>Water (reported) - 137</name>
     <cmt>Tule Spring, 3/10 mile E of PCT.&lt;br/&gt;---&lt;br/&gt;WATER ALERT: Next northbound water after Tule Spring may be the Paradise Cafe in 14.9 miles.</cmt>
     <desc>Tule Spring, 3/10 mile E of PCT.&lt;br/&gt;---&lt;br/&gt;WATER ALERT: Next northbound water after Tule Spring may be the Paradise Cafe in 14.9 miles.</desc>
     <sym>Water Source</sym>
@@ -11578,7 +11591,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.475361997261643" lon="-116.57838103361428">
     <ele>1088</ele>
-    <name>WR140</name>
+    <name>Water (reported) - 140</name>
     <cmt>Guzzler cistern</cmt>
     <desc>Guzzler cistern</desc>
     <sym>Water Source</sym>
@@ -11589,7 +11602,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.569051977247" lon="-116.59140600822866">
     <ele>1460.5</ele>
-    <name>WR152</name>
+    <name>Water (reported) - 152</name>
     <cmt>Paradise Valley Cafe [theparadisevalleycafe.com, 951-659-3663], water spigot outside, 1 mile W of PCT.&lt;br/&gt;---&lt;br/&gt;WATER ALERT: Next southbound water after Paradise Cafe may be Tule Spring in 14.9 miles.</cmt>
     <desc>Paradise Valley Cafe [theparadisevalleycafe.com, 951-659-3663], water spigot outside, 1 mile W of PCT.&lt;br/&gt;---&lt;br/&gt;WATER ALERT: Next southbound water after Paradise Cafe may be Tule Spring in 14.9 miles.</desc>
     <sym>Water Source</sym>
@@ -11600,7 +11613,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.622547965496778" lon="-116.55653603374958">
     <ele>1657</ele>
-    <name>WR158</name>
+    <name>Water (reported) - 158</name>
     <cmt>Live Oak Spring, 1 mile E of PCT.</cmt>
     <desc>Live Oak Spring, 1 mile E of PCT.</desc>
     <sym>Water Source</sym>
@@ -11611,7 +11624,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.622195003554225" lon="-116.56721499748528">
     <ele>1733.5999999999999</ele>
-    <name>WR158b</name>
+    <name>Water (reported) - 158</name>
     <cmt>Tunnel Spring, 3/10 mile W of PCT.</cmt>
     <desc>Tunnel Spring, 3/10 mile W of PCT.</desc>
     <sym>Water Source</sym>
@@ -11622,7 +11635,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.676725989207625" lon="-116.57657196745276">
     <ele>1947.0999999999999</ele>
-    <name>WR162</name>
+    <name>Water (reported) - 162</name>
     <cmt>Cedar Spring, 1 mile N of PCT.</cmt>
     <desc>Cedar Spring, 1 mile N of PCT.</desc>
     <sym>Water Source</sym>
@@ -11633,7 +11646,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.66943197324872" lon="-116.58141100779176">
     <ele>2052.1999999999998</ele>
-    <name>WR163</name>
+    <name>Water (reported) - 163</name>
     <cmt>Seasonal Eagle Spring, 3/10 mile S of PCT.</cmt>
     <desc>Seasonal Eagle Spring, 3/10 mile S of PCT.</desc>
     <sym>Water Source</sym>
@@ -11644,7 +11657,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.75981998629868" lon="-116.6655830014497">
     <ele>2485.8000000000002</ele>
-    <name>WR177</name>
+    <name>Water (reported) - 177</name>
     <cmt>Tahquitz Creek&lt;br/&gt;---&lt;br/&gt;MOUNTAIN FIRE CLOSURE: 8.6 miles of the PCT from the Tahquitz Creek S to the Spitler Peak Trail will remain closed in 2018 due to the 2013 Mountain Fire. Check with PCTA.org or the San Jacinto Ranger Station at 909-382-2921 for updates. The Spitler to Idyllwild Alternate bypasses this closure.</cmt>
     <desc>Tahquitz Creek&lt;br/&gt;---&lt;br/&gt;MOUNTAIN FIRE CLOSURE: 8.6 miles of the PCT from the Tahquitz Creek S to the Spitler Peak Trail will remain closed in 2018 due to the 2013 Mountain Fire. Check with PCTA.org or the San Jacinto Ranger Station at 909-382-2921 for updates. The Spitler to Idyllwild Alternate bypasses this closure.</desc>
     <sym>Water Source</sym>
@@ -11655,7 +11668,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.786595975980163" lon="-116.68950595892966">
     <ele>2620.4000000000001</ele>
-    <name>WR182</name>
+    <name>Water (reported) - 182</name>
     <cmt>Strawberry Cienaga</cmt>
     <desc>Strawberry Cienaga</desc>
     <sym>Water Source</sym>
@@ -11666,7 +11679,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.790617026388645" lon="-116.70544398017228">
     <ele>2550.8000000000002</ele>
-    <name>WR184</name>
+    <name>Water (reported) - 184</name>
     <cmt>Stone Creek</cmt>
     <desc>Stone Creek</desc>
     <sym>Water Source</sym>
@@ -11677,7 +11690,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.80068302154541" lon="-116.6987790260464">
     <ele>2722.8000000000002</ele>
-    <name>WR186</name>
+    <name>Water (reported) - 186</name>
     <cmt>Deer Springs, North Fork San Jacinto River.</cmt>
     <desc>Deer Springs, North Fork San Jacinto River.</desc>
     <sym>Water Source</sym>
@@ -11688,7 +11701,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.807617034763098" lon="-116.69754001311958">
     <ele>2720.9000000000001</ele>
-    <name>WR186B</name>
+    <name>Water (reported) - 186</name>
     <cmt>N Fork San Jacinto River Tributary, often the best water source in this area.&lt;br/&gt;---&lt;br/&gt;WATER ALERT: Next northbound water after N Fork San Jacinto River Tributary may be the Snow Canyon Road faucet in 19.5 miles.&lt;br/&gt;---&lt;br/&gt;Be sure to fill up here, a long dry and waterless section of trail is ahead as you make the descent toward Cabazon. Over the years, a number of hiker rescues have happened in this area due to snow, ice, or navigation issues on Fuller Ridge [the next 4.3 miles], or because of heat and dehydration at lower elevations.</cmt>
     <desc>N Fork San Jacinto River Tributary, often the best water source in this area.&lt;br/&gt;---&lt;br/&gt;WATER ALERT: Next northbound water after N Fork San Jacinto River Tributary may be the Snow Canyon Road faucet in 19.5 miles.&lt;br/&gt;---&lt;br/&gt;Be sure to fill up here, a long dry and waterless section of trail is ahead as you make the descent toward Cabazon. Over the years, a number of hiker rescues have happened in this area due to snow, ice, or navigation issues on Fuller Ridge [the next 4.3 miles], or because of heat and dehydration at lower elevations.</desc>
     <sym>Water Source</sym>
@@ -11699,7 +11712,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.810660000890493" lon="-116.69742601923645">
     <ele>2712.6999999999998</ele>
-    <name>WR186C</name>
+    <name>Water (reported) - 186</name>
     <cmt>N Fork San Jacinto River</cmt>
     <desc>N Fork San Jacinto River</desc>
     <sym>Water Source</sym>
@@ -11710,7 +11723,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.878122000023723" lon="-116.6790060326457">
     <ele>527.39999999999998</ele>
-    <name>WR206</name>
+    <name>Water (reported) - 206</name>
     <cmt>Snow Canyon Road faucet, campsites 150 feet W, PCT joins paved Snow Creek Road.&lt;br/&gt;---&lt;br/&gt;WATER ALERT: Next southbound water after Snow Canyon Road faucet may be N Fork San Jacinto River Tributary in 19.5 miles.</cmt>
     <desc>Snow Canyon Road faucet, campsites 150 feet W, PCT joins paved Snow Creek Road.&lt;br/&gt;---&lt;br/&gt;WATER ALERT: Next southbound water after Snow Canyon Road faucet may be N Fork San Jacinto River Tributary in 19.5 miles.</desc>
     <sym>Water Source</sym>
@@ -11721,7 +11734,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.480493985116482" lon="-116.57434900291264">
     <ele>1020.1</ele>
-    <name>WRCS140B</name>
+    <name>Campsite &amp; Water (reported) - 140</name>
     <cmt>Nance Canyon, seasonal creek, several sandy beach-like campsites downstream from trail crossing.</cmt>
     <desc>Nance Canyon, seasonal creek, several sandy beach-like campsites downstream from trail crossing.</desc>
     <sym>Water Source</sym>
@@ -11732,7 +11745,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.719821963459253" lon="-116.6203669924289">
     <ele>2085.0999999999999</ele>
-    <name>WRCS169</name>
+    <name>Campsite &amp; Water (reported) - 169</name>
     <cmt>Apache Spring, 1/2 mile E of PCT, several large campsites, can be very windy.</cmt>
     <desc>Apache Spring, 1/2 mile E of PCT, several large campsites, can be very windy.</desc>
     <sym>Water Source</sym>
@@ -11743,7 +11756,7 @@
     </extensions>
   </wpt><wpt xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3" lat="33.85368699207902" lon="-116.72285201959312">
     <ele>1936.9000000000001</ele>
-    <name>WRCS194</name>
+    <name>Campsite &amp; Water (reported) - 194</name>
     <cmt>Seasonal headwaters of the West Fork Snow Creek, campsite, 1/10 mile S of PCT on unmarked use trail.</cmt>
     <desc>Seasonal headwaters of the West Fork Snow Creek, campsite, 1/10 mile S of PCT on unmarked use trail.</desc>
     <sym>Water Source</sym>
@@ -11781,7 +11794,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section C</desc><cmt/><trkseg>
       <trkpt lat="33.924524" lon="-116.694668"><ele>409.33</ele></trkpt>
       <trkpt lat="33.925470" lon="-116.695160"><ele>415.86</ele></trkpt>
       <trkpt lat="33.925847" lon="-116.694995"><ele>415.93</ele></trkpt>
@@ -16329,7 +16342,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section C. Off-Track: Cajon Pass Road</desc><cmt/><trkseg>
       <trkpt lat="34.306033" lon="-117.466190"><ele>926.35</ele></trkpt>
       <trkpt lat="34.306009" lon="-117.466324"><ele>924.76</ele></trkpt>
       <trkpt lat="34.306100" lon="-117.466462"><ele>924.98</ele></trkpt>
@@ -16350,7 +16363,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section C. Off-Track: Cougar Crest Trail</desc><cmt/><trkseg>
       <trkpt lat="34.280891" lon="-116.913193"><ele>2337.77</ele></trkpt>
       <trkpt lat="34.280935" lon="-116.913538"><ele>2333.53</ele></trkpt>
       <trkpt lat="34.280721" lon="-116.914238"><ele>2330.22</ele></trkpt>
@@ -16439,7 +16452,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section C. Off-Track: Fish Creek Trail</desc><cmt/><trkseg>
       <trkpt lat="34.126033" lon="-116.759533"><ele>2429.91</ele></trkpt>
       <trkpt lat="34.125630" lon="-116.760639"><ele>2434.04</ele></trkpt>
       <trkpt lat="34.125447" lon="-116.762725"><ele>2450.88</ele></trkpt>
@@ -16739,7 +16752,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section C. Off-Track: Mojave Dam Alternate</desc><cmt/><trkseg>
       <trkpt lat="34.345002" lon="-117.231139"><ele>958.50</ele></trkpt>
       <trkpt lat="34.345398" lon="-117.231659"><ele>966.26</ele></trkpt>
       <trkpt lat="34.344479" lon="-117.232948"><ele>965.09</ele></trkpt>
@@ -16777,7 +16790,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section C. Off-Track: Splinters Cabin Trail</desc><cmt/><trkseg>
       <trkpt lat="34.274139" lon="-117.128082"><ele>1407.38</ele></trkpt>
       <trkpt lat="34.273872" lon="-117.128487"><ele>1406.37</ele></trkpt>
       <trkpt lat="34.273651" lon="-117.128555"><ele>1402.07</ele></trkpt>
@@ -16792,7 +16805,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section C. Off-Track: Whitewater Preserve Trail</desc><cmt/><trkseg>
       <trkpt lat="33.991983" lon="-116.664394"><ele>704.60</ele></trkpt>
       <trkpt lat="33.991531" lon="-116.663514"><ele>696.24</ele></trkpt>
       <trkpt lat="33.991219" lon="-116.663204"><ele>695.82</ele></trkpt>
@@ -16822,7 +16835,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section C. Off-Track: ZiggyBear Trail</desc><cmt/><trkseg>
       <trkpt lat="33.938968" lon="-116.699178"><ele>500.65</ele></trkpt>
       <trkpt lat="33.938548" lon="-116.698789"><ele>497.55</ele></trkpt>
       <trkpt lat="33.938125" lon="-116.697695"><ele>492.16</ele></trkpt>
@@ -16831,17 +16844,17 @@
     </trkseg>
   </trk><wpt lat="33.925549" lon="-116.695072">
     <ele>415.8</ele>
-    <name>RD0210</name>
+    <name>Road Crossing - 210</name>
     <desc><![CDATA[Cross paved Tamarack Road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="33.930274" lon="-116.696839">
     <ele>440.4</ele>
-    <name>PL0210</name>
+    <name>Powerline - 210</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="33.936814" lon="-116.702137">
     <ele>488.6</ele>
-    <name>RD0211</name>
+    <name>Road Crossing - 211</name>
     <desc><![CDATA[Unpaved road, PCT register, barbed wire fence nearby.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="33.937586" lon="-116.698417">
@@ -16851,47 +16864,47 @@
     <sym>Post Office</sym>
   </wpt><wpt lat="33.939028" lon="-116.699192">
     <ele>501.3</ele>
-    <name>GT0211</name>
+    <name>Gate - 211</name>
     <desc><![CDATA["Friends of the Desert Mountains" gate blocks the end of paved Boulder Drive.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="33.947477" lon="-116.692255">
     <ele>563.5</ele>
-    <name>RD0212</name>
+    <name>Road Crossing - 212</name>
     <desc><![CDATA[Two unpaved road next to each other.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="33.947962" lon="-116.691208">
     <ele>564.9</ele>
-    <name>RD0212B</name>
+    <name>Road Crossing - 212</name>
     <desc><![CDATA[PCT joins an unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="33.948184" lon="-116.689746">
     <ele>560.9</ele>
-    <name>RD0212C</name>
+    <name>Road Crossing - 212</name>
     <desc><![CDATA[PCT departs the unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="33.949648" lon="-116.684802">
     <ele>590.9</ele>
-    <name>GT0212</name>
+    <name>Gate - 212</name>
     <desc><![CDATA[Metal trail gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="33.952116" lon="-116.665771">
     <ele>712.7</ele>
-    <name>TR0213</name>
+    <name>Trail Junction - 213</name>
     <desc><![CDATA[Trail junction to the Mesa Wind Farm.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.952388" lon="-116.664599">
     <ele>716.8</ele>
-    <name>WR0213</name>
+    <name>Water (reported) - 213</name>
     <desc><![CDATA[Mesa Wind Farm maintenance building.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="33.957538" lon="-116.664448">
     <ele>756.6</ele>
-    <name>RD0214</name>
+    <name>Road Crossing - 214</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="33.966089" lon="-116.668982">
     <ele>850.6</ele>
-    <name>RD0215</name>
+    <name>Road Crossing - 215</name>
     <desc><![CDATA[Unpaved road, barbed wire fence nearby.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="33.975354" lon="-116.675194">
@@ -16901,7 +16914,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="33.988110" lon="-116.666956">
     <ele>837.1</ele>
-    <name>TR0218</name>
+    <name>Trail Junction - 218</name>
     <desc><![CDATA[Canyon View Loop trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.991977" lon="-116.664406">
@@ -16911,42 +16924,42 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.989219" lon="-116.656203">
     <ele>673.1</ele>
-    <name>WRCS0219</name>
+    <name>Campsite &amp; Water (reported) - 219</name>
     <desc><![CDATA[Whitewater Preserve [wildlandsconservancy.org, 760-325-7222], 6/10 mile E of PCT, shade, water, wading pool, toilets, and free camping for PCT hikers.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.013162" lon="-116.669843">
     <ele>795.5</ele>
-    <name>WR0220</name>
+    <name>Water (reported) - 220</name>
     <desc><![CDATA[Whitewater Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.043985" lon="-116.657596">
     <ele>953.4</ele>
-    <name>WRCS0226</name>
+    <name>Campsite &amp; Water (reported) - 226</name>
     <desc><![CDATA[Mission Creek Crossing, campsite.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.050904" lon="-116.670839">
     <ele>1028.4</ele>
-    <name>WR0227</name>
+    <name>Water (reported) - 227</name>
     <desc><![CDATA[Mission Creek Crossing]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.058155" lon="-116.672882">
     <ele>1088.9</ele>
-    <name>WR0228</name>
+    <name>Water (reported) - 228</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.070725" lon="-116.666115">
     <ele>1205.5</ele>
-    <name>WRCS0230</name>
+    <name>Campsite &amp; Water (reported) - 230</name>
     <desc><![CDATA[Campsite near Mission Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.090920" lon="-116.673008">
     <ele>1391.0</ele>
-    <name>WRCS0231</name>
+    <name>Campsite &amp; Water (reported) - 231</name>
     <desc><![CDATA[Campsite near Mission Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.097104" lon="-116.679340">
     <ele>1473.5</ele>
-    <name>WRCS0232</name>
+    <name>Campsite &amp; Water (reported) - 232</name>
     <desc><![CDATA[Campsite near Mission Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.122861" lon="-116.700343">
@@ -16956,32 +16969,32 @@
     <sym>Forest</sym>
   </wpt><wpt lat="34.128192" lon="-116.708849">
     <ele>1867.7</ele>
-    <name>WRCS0235</name>
+    <name>Campsite &amp; Water (reported) - 235</name>
     <desc><![CDATA[Creek side camp, small seasonal creek nearby.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.129060" lon="-116.740858">
     <ele>2246.6</ele>
-    <name>WRCS0239</name>
+    <name>Campsite &amp; Water (reported) - 239</name>
     <desc><![CDATA[Forested Flats Junction, seasonal water, campsites nearby.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.125752" lon="-116.758854">
     <ele>2416.4</ele>
-    <name>WRCS0240</name>
+    <name>Campsite &amp; Water (reported) - 240</name>
     <desc><![CDATA[Mission Creek Trail Camp spring, parking, campsites, PCT joins an unpaved road for a short distance. ]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.125204" lon="-116.759544">
     <ele>2428.5</ele>
-    <name>WR0240</name>
+    <name>Water (reported) - 240</name>
     <desc><![CDATA[Spring and trough near Mission Creek Trail Camp, other spring is usually better.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.125108" lon="-116.756521">
     <ele>2414.3</ele>
-    <name>WRCS0240B</name>
+    <name>Campsite &amp; Water (reported) - 240</name>
     <desc><![CDATA[Mission Creek Trail Camp spring, parking, campsites.<br/>---<br/>WATER ALERT: Next northbound water after Mission Creek Trail Camp spring may be Arrastre Trail Camp in 16.3 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.126091" lon="-116.759442">
     <ele>2429.7</ele>
-    <name>RD0240</name>
+    <name>Road Crossing - 240</name>
     <desc><![CDATA[PCT departs the unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.126787" lon="-116.776656">
@@ -17041,52 +17054,52 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.130970" lon="-116.756670">
     <ele>2510.1</ele>
-    <name>RD0241</name>
+    <name>Road Crossing - 241</name>
     <desc><![CDATA[Wide unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.132116" lon="-116.749847">
     <ele>2474.4</ele>
-    <name>RD0241B</name>
+    <name>Road Crossing - 241</name>
     <desc><![CDATA[Unpaved road 2E03.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.144415" lon="-116.732300">
     <ele>2587.9</ele>
-    <name>RD0245</name>
+    <name>Road Crossing - 245</name>
     <desc><![CDATA[PCT joins an unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.144398" lon="-116.726195">
     <ele>2541.6</ele>
-    <name>RD0245B</name>
+    <name>Road Crossing - 245</name>
     <desc><![CDATA[PCT departs the unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.148431" lon="-116.711631">
     <ele>2465.4</ele>
-    <name>RD0246</name>
+    <name>Road Crossing - 246</name>
     <desc><![CDATA[Unpaved road near the Coon Creek Group Campground.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.149350" lon="-116.710567">
     <ele>2478.3</ele>
-    <name>CS0246</name>
+    <name>Campsite - 246</name>
     <desc><![CDATA[Coon Creek Cabin Group Campground, no water.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.161814" lon="-116.712041">
     <ele>2629.9</ele>
-    <name>RD0249</name>
+    <name>Road Crossing - 249</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.163247" lon="-116.709508">
     <ele>2556.3</ele>
-    <name>RD0249B</name>
+    <name>Road Crossing - 249</name>
     <desc><![CDATA[PCT joins an unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.174060" lon="-116.712327">
     <ele>2478.2</ele>
-    <name>RD0250</name>
+    <name>Road Crossing - 250</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.174508" lon="-116.712475">
     <ele>2482.2</ele>
-    <name>RD0250B</name>
+    <name>Road Crossing - 250</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.174630" lon="-116.712568">
@@ -17096,117 +17109,117 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="34.182484" lon="-116.709799">
     <ele>2558.7</ele>
-    <name>RD0251</name>
+    <name>Road Crossing - 251</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.191852" lon="-116.716974">
     <ele>2600.3</ele>
-    <name>RD0252</name>
+    <name>Road Crossing - 252</name>
     <desc><![CDATA[Unpaved road at Onyx Summit.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.202711" lon="-116.717663">
     <ele>2632.3</ele>
-    <name>CS0253</name>
+    <name>Campsite - 253</name>
     <desc><![CDATA[Unpaved road, campsite nearby.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.207320" lon="-116.730063">
     <ele>2407.7</ele>
-    <name>RD0255</name>
+    <name>Road Crossing - 255</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.214728" lon="-116.740094">
     <ele>2318.1</ele>
-    <name>WRCS0256</name>
+    <name>Campsite &amp; Water (reported) - 256</name>
     <desc><![CDATA[Arrastre Trail Camp, Deer Spring, stream 200 feet to the N, picnic table, campsites.<br/>---<br/>WATER ALERT: Next southbound water after Arrastre Trail Camp, Deer Spring, may be Mission Springs Trail Camp in 16.3 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.217718" lon="-116.743811">
     <ele>2272.6</ele>
-    <name>WR0257</name>
+    <name>Water (reported) - 257</name>
     <desc><![CDATA[Spring 1/2 mile N of Arrastre Camp.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.228159" lon="-116.751619">
     <ele>2175.9</ele>
-    <name>RD0258</name>
+    <name>Road Crossing - 258</name>
     <desc><![CDATA[PCT joins an unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.230727" lon="-116.749679">
     <ele>2147.4</ele>
-    <name>WR0258</name>
+    <name>Water (reported) - 258</name>
     <desc><![CDATA[Arrastre Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.231318" lon="-116.749788">
     <ele>2148.3</ele>
-    <name>RD0258B</name>
+    <name>Road Crossing - 258</name>
     <desc><![CDATA[PCT departs the unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.235930" lon="-116.749428">
     <ele>2098.5</ele>
-    <name>WR0258B</name>
+    <name>Water (reported) - 258</name>
     <desc><![CDATA[Arrastre Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.242457" lon="-116.754594">
     <ele>2181.0</ele>
-    <name>CS0259</name>
+    <name>Campsite - 259</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.243817" lon="-116.755889">
     <ele>2174.2</ele>
-    <name>RD0259</name>
+    <name>Road Crossing - 259</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.269369" lon="-116.767893">
     <ele>2067.2</ele>
-    <name>RD0262</name>
+    <name>Road Crossing - 262</name>
     <desc><![CDATA[Unpaved road 2N02]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.279818" lon="-116.778980">
     <ele>2158.6</ele>
-    <name>RD0264</name>
+    <name>Road Crossing - 264</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.290743" lon="-116.802749">
     <ele>2081.8</ele>
-    <name>Hwy18</name>
+    <name>Highway 18</name>
     <desc><![CDATA[Paved Highway 18, access to Big Bear.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="34.302273" lon="-116.823097">
     <ele>2091.4</ele>
-    <name>RD0268</name>
+    <name>Road Crossing - 268</name>
     <desc><![CDATA[Paved road 3N08, power line nearby, near a land fill. ]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.296734" lon="-116.824116">
     <ele>2085.1</ele>
-    <name>WR0269</name>
+    <name>Water (reported) - 269</name>
     <desc><![CDATA[Doble Trail Camp, outhouse, picnic table, water, corral.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.296820" lon="-116.824853">
     <ele>2103.8</ele>
-    <name>TR0269</name>
+    <name>Trail Junction - 269</name>
     <desc><![CDATA[Trail junction to Doble Trail Camp.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.294846" lon="-116.839089">
     <ele>2335.7</ele>
-    <name>RD0271</name>
+    <name>Road Crossing - 271</name>
     <desc><![CDATA[Unpaved jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.290378" lon="-116.883446">
     <ele>2211.9</ele>
-    <name>WRCS0275</name>
+    <name>Campsite &amp; Water (reported) - 275</name>
     <desc><![CDATA[Caribou Creek, small wooden bridge, campsite nearby.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.288810" lon="-116.883362">
     <ele>2214.0</ele>
-    <name>RD0275</name>
+    <name>Road Crossing - 275</name>
     <desc><![CDATA[Unpaved Van Dusen Canyon Rd. Big Bear City is 2.8 miles SE on this medium clearance unpaved road with some rough spots.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.286261" lon="-116.899872">
     <ele>2351.7</ele>
-    <name>CS0277</name>
+    <name>Campsite - 277</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.281416" lon="-116.907058">
     <ele>2356.8</ele>
-    <name>RD0277</name>
+    <name>Road Crossing - 277</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.264011" lon="-116.910838">
@@ -17216,122 +17229,122 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.280917" lon="-116.913176">
     <ele>2339.1</ele>
-    <name>TR0278</name>
+    <name>Trail Junction - 278</name>
     <desc><![CDATA[Cougar Crest trail junction, keep right. It's easy to overlook the PCT sign and follow the well used Cougar Crest Trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.283164" lon="-116.910035">
     <ele>2314.1</ele>
-    <name>RD0278</name>
+    <name>Road Crossing - 278</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.283627" lon="-116.917247">
     <ele>2301.2</ele>
-    <name>RD0279</name>
+    <name>Road Crossing - 279</name>
     <desc><![CDATA[Holcomb Valley Road 2N09, paved for about 1/4 mile leading up to PCT junction, dirt road for about 2 miles beyond that S to Hwy 38, unpaved to R of PCT crossing.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.296204" lon="-116.945316">
     <ele>2363.8</ele>
-    <name>RD0281</name>
+    <name>Road Crossing - 281</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.300596" lon="-116.951037">
     <ele>2318.8</ele>
-    <name>RD0282</name>
+    <name>Road Crossing - 282</name>
     <desc><![CDATA[Unpaved jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.301366" lon="-116.977870">
     <ele>2004.7</ele>
-    <name>CS0286</name>
+    <name>Campsite - 286</name>
     <desc><![CDATA[Little Bear Spring trail camp, picnic table, outhouse, corral.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.300245" lon="-116.981771">
     <ele>1985.5</ele>
-    <name>RD0286</name>
+    <name>Road Crossing - 286</name>
     <desc><![CDATA[PCT joins an unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.300281" lon="-116.982171">
     <ele>1981.9</ele>
-    <name>WR0286</name>
+    <name>Water (reported) - 286</name>
     <desc><![CDATA[Holcomb Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.298725" lon="-116.990878">
     <ele>1978.7</ele>
-    <name>RD0287</name>
+    <name>Road Crossing - 287</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.297999" lon="-116.992510">
     <ele>1968.7</ele>
-    <name>WRCS0287</name>
+    <name>Campsite &amp; Water (reported) - 287</name>
     <desc><![CDATA[Creek, campsite nearby.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.280585" lon="-117.012394">
     <ele>1936.5</ele>
-    <name>RD0289</name>
+    <name>Road Crossing - 289</name>
     <desc><![CDATA[Unpaved jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.281333" lon="-117.029677">
     <ele>1855.8</ele>
-    <name>CS0290</name>
+    <name>Campsite - 290</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.279990" lon="-117.042349">
     <ele>1715.9</ele>
-    <name>WR0292</name>
+    <name>Water (reported) - 292</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.275350" lon="-117.049934">
     <ele>1668.0</ele>
-    <name>WR0292B</name>
+    <name>Water (reported) - 292</name>
     <desc><![CDATA[Large creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.275399" lon="-117.050789">
     <ele>1666.9</ele>
-    <name>RD0292</name>
+    <name>Road Crossing - 292</name>
     <desc><![CDATA[Paved Crab Flats Road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.275125" lon="-117.054256">
     <ele>1656.9</ele>
-    <name>WRCS0292</name>
+    <name>Campsite &amp; Water (reported) - 292</name>
     <desc><![CDATA[Creek, campsites nearby.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.278490" lon="-117.063482">
     <ele>1625.0</ele>
-    <name>CS0293</name>
+    <name>Campsite - 293</name>
     <desc><![CDATA[Large campsite, oak trees, small seasonal stream nearby.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.278133" lon="-117.072402">
     <ele>1591.4</ele>
-    <name>WR0294</name>
+    <name>Water (reported) - 294</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.276978" lon="-117.075532">
     <ele>1589.6</ele>
-    <name>CS0294</name>
+    <name>Campsite - 294</name>
     <desc><![CDATA[Trail camp]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.275890" lon="-117.078600">
     <ele>1611.2</ele>
-    <name>TR0294</name>
+    <name>Trail Junction - 294</name>
     <desc><![CDATA[OHV trail 1W17 to Big Pine Flat.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.278131" lon="-117.083007">
     <ele>1580.5</ele>
-    <name>CS0295</name>
+    <name>Campsite - 295</name>
     <desc><![CDATA[Bench Trail Camp]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.277962" lon="-117.086510">
     <ele>1572.1</ele>
-    <name>TR0295</name>
+    <name>Trail Junction - 295</name>
     <desc><![CDATA[Hawes Peak trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.272545" lon="-117.097841">
     <ele>1597.4</ele>
-    <name>WR0296</name>
+    <name>Water (reported) - 296</name>
     <desc><![CDATA[Piped spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.273972" lon="-117.127887">
     <ele>1396.3</ele>
-    <name>WR0299</name>
+    <name>Water (reported) - 299</name>
     <desc><![CDATA[Deep Creek, large bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.272915" lon="-117.128796">
@@ -17341,34 +17354,34 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="34.274163" lon="-117.128065">
     <ele>1408.7</ele>
-    <name>TR0299</name>
+    <name>Trail Junction - 299</name>
     <desc><![CDATA[Splinter's Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.300652" lon="-117.128246">
     <ele>1299.5</ele>
-    <name>RD0301</name>
+    <name>Road Crossing - 301</name>
     <desc><![CDATA[Unpaved road to Deep Creek day use area. Access to Deep Creek.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.309058" lon="-117.139627">
     <ele>1271.6</ele>
     <name>Bridge0302</name>
     <desc><![CDATA[Bridge over a gully. ]]></desc>
-    <sym>Truck</sym>
+    <sym>Bridge</sym>
   </wpt><wpt lat="34.339264" lon="-117.177016">
     <ele>1073.4</ele>
-    <name>WA0308</name>
+    <name>Water - 308</name>
     <desc><![CDATA[Deep Creek hot spring. ]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.340414" lon="-117.190229">
     <ele>1054.7</ele>
-    <name>WR0309</name>
+    <name>Water (reported) - 309</name>
     <desc><![CDATA[Small stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.344096" lon="-117.195520">
     <ele>1011.3</ele>
     <name>Bridge0310</name>
     <desc><![CDATA[Footbridge painted with rainbow colors.]]></desc>
-    <sym>Truck</sym>
+    <sym>Bridge</sym>
   </wpt><wpt lat="34.345212" lon="-117.230572">
     <ele>955.7</ele>
     <name>MFSpillway</name>
@@ -17376,52 +17389,52 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="34.341191" lon="-117.236990">
     <ele>909.9</ele>
-    <name>WR0314</name>
+    <name>Water (reported) - 314</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.336710" lon="-117.245777">
     <ele>953.2</ele>
-    <name>RD0314</name>
+    <name>Road Crossing - 314</name>
     <desc><![CDATA[Paved Route 173]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.321658" lon="-117.250646">
     <ele>1061.3</ele>
-    <name>WR0316</name>
+    <name>Water (reported) - 316</name>
     <desc><![CDATA[Seasonal trail side spring.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.316419" lon="-117.261742">
     <ele>1022.9</ele>
-    <name>WR0317</name>
+    <name>Water (reported) - 317</name>
     <desc><![CDATA[Piped spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.315855" lon="-117.263827">
     <ele>1027.5</ele>
-    <name>TR0318</name>
+    <name>Trail Junction - 318</name>
     <desc><![CDATA[ Mojave River Campground trail junction. Campground is 3/4 mile off trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.316123" lon="-117.265228">
     <ele>1039.7</ele>
-    <name>RD0318</name>
+    <name>Road Crossing - 318</name>
     <desc><![CDATA[PCT joins an unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.312386" lon="-117.265187">
     <ele>1015.2</ele>
-    <name>WRCS0318</name>
+    <name>Campsite &amp; Water (reported) - 318</name>
     <desc><![CDATA[Seasonal Grass Valley Creek, campsite nearby.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.312309" lon="-117.265540">
     <ele>1015.8</ele>
-    <name>RD0318B</name>
+    <name>Road Crossing - 318</name>
     <desc><![CDATA[PCT departs the unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.311685" lon="-117.271032">
     <ele>1058.2</ele>
-    <name>RD0319</name>
+    <name>Road Crossing - 319</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.305877" lon="-117.276203">
     <ele>1095.9</ele>
-    <name>CS0320</name>
+    <name>Campsite - 320</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.303477" lon="-117.300510">
@@ -17431,22 +17444,22 @@
     <sym>Park</sym>
   </wpt><wpt lat="34.305633" lon="-117.308549">
     <ele>1028.2</ele>
-    <name>RD0323</name>
+    <name>Road Crossing - 323</name>
     <desc><![CDATA[Paved road to the Silverwood Lake day use parking area.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.306538" lon="-117.312665">
     <ele>970.5</ele>
-    <name>RD0324</name>
+    <name>Road Crossing - 324</name>
     <desc><![CDATA[PCT joins an unpaved road toward a bridge over the Silverwood Lake dam outlet.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.306818" lon="-117.313477">
     <ele>963.8</ele>
-    <name>WR0324</name>
+    <name>Water (reported) - 324</name>
     <desc><![CDATA[Bridge over Cedar Springs Dam outlet.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.308588" lon="-117.315367">
     <ele>964.9</ele>
-    <name>RD0324B</name>
+    <name>Road Crossing - 324</name>
     <desc><![CDATA[PCT joins paved Hwy 73 after after crossing smaller road and passing through a small industrial work yard.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.308699" lon="-117.322236">
@@ -17456,77 +17469,77 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="34.307965" lon="-117.324110">
     <ele>975.8</ele>
-    <name>RD0324C</name>
+    <name>Road Crossing - 324</name>
     <desc><![CDATA[PCT departs the paved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.305417" lon="-117.330078">
     <ele>1024.5</ele>
-    <name>RD0325</name>
+    <name>Road Crossing - 325</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.305286" lon="-117.328981">
     <ele>1040.6</ele>
-    <name>PL0325</name>
+    <name>Powerline - 325</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.302591" lon="-117.331506">
     <ele>1035.9</ele>
-    <name>RD0325B</name>
+    <name>Road Crossing - 325</name>
     <desc><![CDATA[PCT joins an unpaved service road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.301239" lon="-117.331726">
     <ele>1034.4</ele>
-    <name>WR0325</name>
+    <name>Water (reported) - 325</name>
     <desc><![CDATA[Small trail side beach on the lake.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.300614" lon="-117.332303">
     <ele>1036.4</ele>
-    <name>RD0325C</name>
+    <name>Road Crossing - 325</name>
     <desc><![CDATA[PCT departs an unpaved service road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.299474" lon="-117.334035">
     <ele>1038.0</ele>
-    <name>PL0326</name>
+    <name>Powerline - 326</name>
     <desc><![CDATA[High voltage power line.]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.288424" lon="-117.344810">
     <ele>1059.8</ele>
-    <name>PL0328</name>
+    <name>Powerline - 328</name>
     <desc><![CDATA[High voltage power line, unpaved road nearby.]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.287663" lon="-117.348119">
     <ele>1033.8</ele>
-    <name>WR0329</name>
+    <name>Water (reported) - 329</name>
     <desc><![CDATA[Cleghorn Picnic Area, shade, picnic tables, water, outhouse, trash can, paved road. ]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.288375" lon="-117.351046">
     <ele>1034.0</ele>
-    <name>TR0329</name>
+    <name>Trail Junction - 329</name>
     <desc><![CDATA[PCT joins a paved bicycle path.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.287763" lon="-117.354711">
     <ele>1035.3</ele>
-    <name>RD0329</name>
+    <name>Road Crossing - 329</name>
     <desc><![CDATA[PCT joins a paved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.287930" lon="-117.355550">
     <ele>1035.5</ele>
-    <name>Hwy138</name>
+    <name>Highway 138</name>
     <desc><![CDATA[Highway 138 overpass.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="34.288114" lon="-117.355881">
     <ele>1035.6</ele>
-    <name>RD0329B</name>
+    <name>Road Crossing - 329</name>
     <desc><![CDATA[PCT departs the paved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.288413" lon="-117.358663">
     <ele>1061.2</ele>
-    <name>PL0329</name>
+    <name>Powerline - 329</name>
     <desc><![CDATA[High voltage power line.]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.288976" lon="-117.367346">
     <ele>1076.6</ele>
-    <name>RD0330</name>
+    <name>Road Crossing - 330</name>
     <desc><![CDATA[Paved road to a water tank. No access to water.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.288243" lon="-117.369673">
@@ -17536,62 +17549,62 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="34.294578" lon="-117.378108">
     <ele>1271.4</ele>
-    <name>GT0332</name>
+    <name>Gate - 332</name>
     <desc><![CDATA[Trail gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="34.294921" lon="-117.378036">
     <ele>1271.0</ele>
-    <name>RD0332</name>
+    <name>Road Crossing - 332</name>
     <desc><![CDATA[PCT joins an unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.295750" lon="-117.377655">
     <ele>1259.6</ele>
-    <name>RD0332B</name>
+    <name>Road Crossing - 332</name>
     <desc><![CDATA[PCT departs the unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.298685" lon="-117.384568">
     <ele>1167.2</ele>
-    <name>WR0333</name>
+    <name>Water (reported) - 333</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.311981" lon="-117.409725">
     <ele>1093.2</ele>
-    <name>CS0336</name>
+    <name>Campsite - 336</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.317312" lon="-117.432144">
     <ele>1174.8</ele>
-    <name>PL0338</name>
+    <name>Powerline - 338</name>
     <desc><![CDATA[PCT follows an unpaved road for about 100 yards near a high voltage power line.]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.316802" lon="-117.453849">
     <ele>1021.1</ele>
-    <name>RD0340</name>
+    <name>Road Crossing - 340</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.317052" lon="-117.454548">
     <ele>1020.3</ele>
-    <name>PL0340</name>
+    <name>Powerline - 340</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.315547" lon="-117.457791">
     <ele>1003.1</ele>
-    <name>RD0341</name>
+    <name>Road Crossing - 341</name>
     <desc><![CDATA[Cross an unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.315308" lon="-117.459777">
     <ele>997.7</ele>
-    <name>PL0341</name>
+    <name>Powerline - 341</name>
     <desc><![CDATA[PCT passes under a high voltage powerline tower.]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.310298" lon="-117.462045">
     <ele>953.6</ele>
-    <name>WR0341</name>
+    <name>Water (reported) - 341</name>
     <desc><![CDATA[Crowder Canyon, small seasonal creek nearby.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.306050" lon="-117.466160">
     <ele>927.0</ele>
-    <name>TR0342</name>
+    <name>Trail Junction - 342</name>
     <desc><![CDATA[Side trail to McDonalds, mini-mart, and Best Western Motel at Cajon Pass.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.309107" lon="-117.470368">
@@ -17599,6 +17612,10 @@
     <name>McDonalds</name>
     <desc><![CDATA[McDonalds Restaurant, 3/10 mile NW of PCT, mini-mart next door, Best Western Motel nearby.]]></desc>
     <sym>Restaurant</sym>
+  </wpt><wpt lat="34.289351" lon="-117.128912">
+    <ele>1356.8</ele>
+    <name>0300</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>CA Sec D</name>
     <extensions>
@@ -17606,7 +17623,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section D</desc><cmt/><trkseg>
       <trkpt lat="34.304641" lon="-117.465203"><ele>912.98</ele></trkpt>
       <trkpt lat="34.304168" lon="-117.465303"><ele>903.81</ele></trkpt>
       <trkpt lat="34.304042" lon="-117.465112"><ele>902.78</ele></trkpt>
@@ -21398,7 +21415,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section D. Off-Track: Acorn Trail</desc><cmt/><trkseg>
       <trkpt lat="34.336671" lon="-117.641760"><ele>2513.70</ele></trkpt>
       <trkpt lat="34.336989" lon="-117.642152"><ele>2504.63</ele></trkpt>
       <trkpt lat="34.337277" lon="-117.642338"><ele>2496.02</ele></trkpt>
@@ -21513,7 +21530,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section D. Off-Track: Acton KOA Route</desc><cmt/><trkseg>
       <trkpt lat="34.438358" lon="-118.272085"><ele>677.26</ele></trkpt>
       <trkpt lat="34.438390" lon="-118.271695"><ele>677.58</ele></trkpt>
       <trkpt lat="34.437954" lon="-118.268660"><ele>678.79</ele></trkpt>
@@ -21528,7 +21545,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section D. Off-Track: Baden Powell Trail</desc><cmt/><trkseg>
       <trkpt lat="34.359606" lon="-117.763784"><ele>2818.61</ele></trkpt>
       <trkpt lat="34.359277" lon="-117.764087"><ele>2832.74</ele></trkpt>
       <trkpt lat="34.359234" lon="-117.764581"><ele>2836.78</ele></trkpt>
@@ -21544,7 +21561,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section D. Off-Track: Endangered Alternate</desc><cmt/><trkseg>
       <trkpt lat="34.357178" lon="-117.851378"><ele>2028.66</ele></trkpt>
       <trkpt lat="34.357264" lon="-117.851472"><ele>2029.64</ele></trkpt>
       <trkpt lat="34.357467" lon="-117.851403"><ele>2024.64</ele></trkpt>
@@ -22289,7 +22306,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section D. Off-Track: Endangered Old Alternate</desc><cmt/><trkseg>
       <trkpt lat="34.354549" lon="-117.878247"><ele>2030.91</ele></trkpt>
       <trkpt lat="34.353615" lon="-117.880213"><ele>2038.59</ele></trkpt>
       <trkpt lat="34.353284" lon="-117.880470"><ele>2040.16</ele></trkpt>
@@ -22422,7 +22439,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section D. Off-Track: Guffy Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="34.341566" lon="-117.654281"><ele>2494.27</ele></trkpt>
       <trkpt lat="34.341678" lon="-117.654177"><ele>2485.61</ele></trkpt>
       <trkpt lat="34.341965" lon="-117.654321"><ele>2483.14</ele></trkpt>
@@ -22439,7 +22456,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section D. Off-Track: Lamel Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="34.368659" lon="-117.757418"><ele>2368.67</ele></trkpt>
       <trkpt lat="34.368383" lon="-117.757208"><ele>2360.85</ele></trkpt>
       <trkpt lat="34.367659" lon="-117.756955"><ele>2360.23</ele></trkpt>
@@ -22451,7 +22468,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section D. Off-Track: Manzanita Trail</desc><cmt/><trkseg>
       <trkpt lat="34.373588" lon="-117.752216"><ele>2007.02</ele></trkpt>
       <trkpt lat="34.373560" lon="-117.752624"><ele>2003.87</ele></trkpt>
       <trkpt lat="34.373736" lon="-117.752767"><ele>2002.12</ele></trkpt>
@@ -22642,7 +22659,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section D. Off-Track: Mount Baldy Trail</desc><cmt>simplification:keep</cmt><trkseg>
       <trkpt lat="34.329569" lon="-117.636241"><ele>2544.83</ele></trkpt>
       <trkpt lat="34.329146" lon="-117.636477"><ele>2529.94</ele></trkpt>
       <trkpt lat="34.329077" lon="-117.636679"><ele>2526.58</ele></trkpt>
@@ -22802,82 +22819,82 @@
     </trkseg>
   </trk><wpt lat="34.304640" lon="-117.465200">
     <ele>913.0</ele>
-    <name>Hwy15</name>
+    <name>Highway 15</name>
     <desc><![CDATA[Interstate Highway 15 and Cajon Pass [about 1/2 mile N of the PCT] is a busy interstate highway intersection with a McDonald's restaurant, pay phone, gas station mini-mart and a hiker-friendly Best Western Motel [760-249-6777].<br/>---<br/>WATER ALERT: Next northbound water after Cajon Pass may be Guffy Spring in 22.3 miles. This can be a very long, hot, steep, waterless climb.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="34.304085" lon="-117.467344">
     <ele>910.8</ele>
-    <name>RD0342</name>
+    <name>Road Crossing - 342</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.299517" lon="-117.470027">
     <ele>916.2</ele>
     <name>Bridge0343</name>
     <desc><![CDATA[Small wooden hiker bridge]]></desc>
-    <sym>Flag, Blue</sym>
+    <sym>Bridge</sym>
   </wpt><wpt lat="34.299153" lon="-117.469628">
     <ele>913.8</ele>
-    <name>RD0343</name>
+    <name>Road Crossing - 343</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.298540" lon="-117.468349">
     <ele>905.1</ele>
-    <name>RR0343</name>
+    <name>Railroad - 343</name>
     <desc><![CDATA[Tunnel under a railroad track, shade.]]></desc>
     <sym>Flag, Red</sym>
   </wpt><wpt lat="34.297255" lon="-117.469253">
     <ele>918.2</ele>
-    <name>RR0343B</name>
+    <name>Railroad - 343</name>
     <desc><![CDATA[Railroad track]]></desc>
     <sym>Flag, Red</sym>
   </wpt><wpt lat="34.295198" lon="-117.472144">
     <ele>941.7</ele>
-    <name>RD0344</name>
+    <name>Road Crossing - 344</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.293810" lon="-117.477084">
     <ele>981.6</ele>
-    <name>RD0344B</name>
+    <name>Road Crossing - 344</name>
     <desc><![CDATA[Unpaved road near a high voltage power line.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.291652" lon="-117.478242">
     <ele>1016.5</ele>
-    <name>RD0344C</name>
+    <name>Road Crossing - 344</name>
     <desc><![CDATA[PCT joins an unpaved road along a high voltage power line.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.290935" lon="-117.477503">
     <ele>1026.6</ele>
-    <name>RD0344D</name>
+    <name>Road Crossing - 344</name>
     <desc><![CDATA[PCT departs the unpaved road and crosses under a power line.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.296383" lon="-117.506980">
     <ele>1087.5</ele>
-    <name>RD0347</name>
+    <name>Road Crossing - 347</name>
     <desc><![CDATA[Unpaved Swarthout Canyon Road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.293499" lon="-117.509784">
     <ele>1123.2</ele>
-    <name>WR0348</name>
+    <name>Water (reported) - 348</name>
     <desc><![CDATA[Bike Spring, always dry. ]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.292840" lon="-117.529274">
     <ele>1583.3</ele>
-    <name>RD0352</name>
+    <name>Road Crossing - 352</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.311712" lon="-117.579765">
     <ele>1918.1</ele>
-    <name>RD0356</name>
+    <name>Road Crossing - 356</name>
     <desc><![CDATA[Unpaved road 3N31]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.313302" lon="-117.589393">
     <ele>1970.7</ele>
-    <name>RD0357</name>
+    <name>Road Crossing - 357</name>
     <desc><![CDATA[Unpaved road, campsite nearby.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.330245" lon="-117.625636">
     <ele>2479.5</ele>
-    <name>CS0362</name>
+    <name>Campsite - 362</name>
     <desc><![CDATA[Campsite near the end of an unpaved road.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.329253" lon="-117.636483">
@@ -22897,12 +22914,12 @@
     <sym>Flag, Green</sym>
   </wpt><wpt lat="34.336656" lon="-117.641776">
     <ele>2513.7</ele>
-    <name>TR0363</name>
+    <name>Trail Junction - 363</name>
     <desc><![CDATA[Acorn trail junction to Wrightwood [3.6 miles, dropping 2,337 feet]. It's probably better for most hikers to go 6 miles N on the PCT to Hwy 2 and hitch 5.5 miles E to Wrightwood on Hwy 2.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.338588" lon="-117.648973">
     <ele>2465.5</ele>
-    <name>RD0364</name>
+    <name>Road Crossing - 364</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.338740" lon="-117.650405">
@@ -22912,82 +22929,82 @@
     <sym>Forest</sym>
   </wpt><wpt lat="34.339705" lon="-117.652225">
     <ele>2465.4</ele>
-    <name>RD0364B</name>
+    <name>Road Crossing - 364</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.343081" lon="-117.654887">
     <ele>2453.5</ele>
-    <name>WR0364</name>
+    <name>Water (reported) - 364</name>
     <desc><![CDATA[Guffy Spring, 1/10 mile N of the PCT. Follow use trail about 1/10 mile before campground]<br/>---<br/>WATER ALERT: Next water southbound after Guffy Spring may be Cajon Pass in 22.3 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.341102" lon="-117.654738">
     <ele>2515.0</ele>
-    <name>CS0364</name>
+    <name>Campsite - 364</name>
     <desc><![CDATA[Guffy Campground]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.355759" lon="-117.680838">
     <ele>2478.0</ele>
-    <name>RD0367</name>
+    <name>Road Crossing - 367</name>
     <desc><![CDATA[PCT joins an unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.355936" lon="-117.682733">
     <ele>2476.5</ele>
-    <name>RD0367B</name>
+    <name>Road Crossing - 367</name>
     <desc><![CDATA[PCT departs the unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.359196" lon="-117.686286">
     <ele>2419.3</ele>
-    <name>RD0367C</name>
+    <name>Road Crossing - 367</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.359294" lon="-117.687855">
     <ele>2406.0</ele>
-    <name>CS0367</name>
+    <name>Campsite - 367</name>
     <desc><![CDATA[Exit for Blue Ridge Campground.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.369413" lon="-117.700430">
     <ele>2300.4</ele>
-    <name>RD0369</name>
+    <name>Road Crossing - 369</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.370927" lon="-117.702091">
     <ele>2247.4</ele>
-    <name>PL0369</name>
+    <name>Powerline - 369</name>
     <desc><![CDATA[Power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.371392" lon="-117.705466">
     <ele>2250.9</ele>
-    <name>RD0369B</name>
+    <name>Road Crossing - 369</name>
     <desc><![CDATA[A junction of unpaved roads.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.372532" lon="-117.710476">
     <ele>2247.1</ele>
-    <name>Hwy2</name>
+    <name>Highway 2</name>
     <desc><![CDATA[Inspiration Point trailhead parking, 1st crossing of Hwy 2, outhouse, trash can, paved parking area. Access to the town of Wrightwood.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="34.376360" lon="-117.722119">
     <ele>2228.2</ele>
-    <name>WR0370</name>
+    <name>Water (reported) - 370</name>
     <desc><![CDATA[Grassy Hollow Visitor Center, water spigot.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.379401" lon="-117.726901">
     <ele>2235.7</ele>
-    <name>RD0371</name>
+    <name>Road Crossing - 371</name>
     <desc><![CDATA[PCT joins a narrow paved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.379841" lon="-117.727357">
     <ele>2236.7</ele>
-    <name>RD0371B</name>
+    <name>Road Crossing - 371</name>
     <desc><![CDATA[PCT departs the narrow paved road. ]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.382006" lon="-117.741486">
     <ele>2264.2</ele>
-    <name>TR0372</name>
+    <name>Trail Junction - 372</name>
     <desc><![CDATA[Jackson Lake trail junction. ]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.377575" lon="-117.749981">
     <ele>2203.8</ele>
-    <name>RD0373</name>
+    <name>Road Crossing - 373</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.384751" lon="-117.789215">
@@ -23002,27 +23019,27 @@
     <sym>Campground</sym>
   </wpt><wpt lat="34.373262" lon="-117.752393">
     <ele>2006.3</ele>
-    <name>Hwy2B</name>
+    <name>Highway 2</name>
     <desc><![CDATA[Vincent Gap, 2nd crossing of Hwy 2, outhouse, trash cans, picnic table, large paved parking area, used by Mt Baden Powell day hikers.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="34.368693" lon="-117.757411">
     <ele>2367.7</ele>
-    <name>TR0376</name>
+    <name>Trail Junction - 376</name>
     <desc><![CDATA[ Lamel Spring trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.367621" lon="-117.756947">
     <ele>2362.9</ele>
-    <name>WR0376</name>
+    <name>Water (reported) - 376</name>
     <desc><![CDATA[Lamel Spring, 425 ft S of PCT mile 375.9.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.364260" lon="-117.760738">
     <ele>2632.9</ele>
-    <name>CS0377</name>
+    <name>Campsite - 377</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.359627" lon="-117.763789">
     <ele>2817.7</ele>
-    <name>TR0378</name>
+    <name>Trail Junction - 378</name>
     <desc><![CDATA[Mount Baden Powell spur trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.358513" lon="-117.764647">
@@ -23032,47 +23049,47 @@
     <sym>Summit</sym>
   </wpt><wpt lat="34.359254" lon="-117.783885">
     <ele>2649.6</ele>
-    <name>CS0379</name>
+    <name>Campsite - 379</name>
     <desc><![CDATA[Small Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.352921" lon="-117.796817">
     <ele>2699.4</ele>
-    <name>TR0381</name>
+    <name>Trail Junction - 381</name>
     <desc><![CDATA[Dawson Saddle trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.343391" lon="-117.829286">
     <ele>2309.1</ele>
-    <name>TR0384</name>
+    <name>Trail Junction - 384</name>
     <desc><![CDATA[Windy Gap, trail junction to Crystal Lake, Mount Islip.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.344958" lon="-117.829279">
     <ele>2288.1</ele>
-    <name>TR0384B</name>
+    <name>Trail Junction - 384</name>
     <desc><![CDATA[Trail junction to Little Jimmy Spring.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.345419" lon="-117.829508">
     <ele>2266.1</ele>
-    <name>WR0384</name>
+    <name>Water (reported) - 384</name>
     <desc><![CDATA[Little Jimmy Spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.346050" lon="-117.829783">
     <ele>2281.1</ele>
-    <name>TR0384C</name>
+    <name>Trail Junction - 384</name>
     <desc><![CDATA[Another trail junction to Little Jimmy Spring.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.347283" lon="-117.830514">
     <ele>2279.7</ele>
-    <name>CS0384</name>
+    <name>Campsite - 384</name>
     <desc><![CDATA[Little Jimmy Campground. The PCT goes right at the unsigned trail just before the campground.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.355332" lon="-117.840289">
     <ele>2243.8</ele>
-    <name>RD0385</name>
+    <name>Road Crossing - 385</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.357038" lon="-117.850553">
     <ele>2031.9</ele>
-    <name>Hwy2C</name>
+    <name>Highway 2</name>
     <desc><![CDATA[Islip Saddle, 3rd crossing of Hwy 2, outhouse, trash can, paved trailhead parking, start of the official endangered species detour.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="34.392790" lon="-117.821622">
@@ -23142,12 +23159,12 @@
     <sym>Drinking Water</sym>
   </wpt><wpt lat="34.361828" lon="-117.870593">
     <ele>2042.3</ele>
-    <name>Hwy2D</name>
+    <name>Highway 2</name>
     <desc><![CDATA[4th crossing of Highway 2.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="34.354743" lon="-117.877760">
     <ele>2028.2</ele>
-    <name>Hwy2E</name>
+    <name>Highway 2</name>
     <desc><![CDATA[5th crossing of Highway 2.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="34.344915" lon="-117.909722">
@@ -23177,49 +23194,49 @@
     <sym>Picnic Area</sym>
   </wpt><wpt lat="34.355371" lon="-117.906473">
     <ele>1875.6</ele>
-    <name>WA0390</name>
+    <name>Water - 390</name>
     <desc><![CDATA[Seasonal spring 7/10 mile S of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.360605" lon="-117.903025">
     <ele>1743.8</ele>
-    <name>TR0394</name>
+    <name>Trail Junction - 394</name>
     <desc><![CDATA[Burkhart Trail, 2nd junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.361157" lon="-117.921014">
     <ele>1900.5</ele>
-    <name>WRCS0395</name>
+    <name>Campsite &amp; Water (reported) - 395</name>
     <desc><![CDATA[Cooper Canyon Trail Camp, seasonal creek nearby.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.357933" lon="-117.926312">
     <ele>2025.5</ele>
-    <name>RD0397</name>
+    <name>Road Crossing - 397</name>
     <desc><![CDATA[Unpaved jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.355029" lon="-117.929231">
     <ele>1996.3</ele>
-    <name>WR0397</name>
+    <name>Water (reported) - 397</name>
     <desc><![CDATA[Headwaters of Cooper Canyon]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.351414" lon="-117.934787">
     <ele>2143.3</ele>
-    <name>HWY2F</name>
+    <name>Highway 2</name>
     <desc><![CDATA[Hwy 2, 6th crossing.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="34.351001" lon="-117.935414">
     <ele>2133.9</ele>
-    <name>PL0398</name>
+    <name>Powerline - 398</name>
     <desc><![CDATA[Power line ]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.352039" lon="-117.945350">
     <ele>2052.1</ele>
-    <name>Hwy2G</name>
+    <name>Highway 2</name>
     <desc><![CDATA[Hwy 2, 7th crossing.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="34.349451" lon="-117.943861">
     <ele>1979.4</ele>
-    <name>PL0400</name>
+    <name>Powerline - 400</name>
     <desc><![CDATA[Power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.351934" lon="-117.957436">
     <ele>1906.7</ele>
     <name>PleasantViewWild</name>
@@ -23227,54 +23244,54 @@
     <sym>Forest</sym>
   </wpt><wpt lat="34.352157" lon="-117.957871">
     <ele>1905.5</ele>
-    <name>WR0401</name>
+    <name>Water (reported) - 401</name>
     <desc><![CDATA[Camp Glenwood, Boy Scout Camp, outhouse, picnic table, possible water tank.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.351191" lon="-117.960450">
     <ele>1919.6</ele>
-    <name>RD0401</name>
+    <name>Road Crossing - 401</name>
     <desc><![CDATA[PCT departs the unpaved road to Camp Glenwood.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.349211" lon="-117.963998">
     <ele>1910.4</ele>
-    <name>Hwy2H</name>
+    <name>Highway 2</name>
     <desc><![CDATA[8th crossing of Hwy 2, outhouse, parking, trash can nearby.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="34.346628" lon="-117.966096">
     <ele>1910.2</ele>
-    <name>RD0401B</name>
+    <name>Road Crossing - 401</name>
     <desc><![CDATA[PCT joins an abandoned roadbed.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.342058" lon="-117.975292">
     <ele>1842.2</ele>
-    <name>PL0402</name>
+    <name>Powerline - 402</name>
     <desc><![CDATA[Low voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.343214" lon="-117.978499">
     <ele>1820.8</ele>
-    <name>RD0403</name>
+    <name>Road Crossing - 403</name>
     <desc><![CDATA[PCT departs the abandoned road bed.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.343151" lon="-117.979075">
     <ele>1823.0</ele>
-    <name>PL0403</name>
+    <name>Powerline - 403</name>
     <desc><![CDATA[Powerline]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.343347" lon="-117.983131">
     <ele>1807.0</ele>
-    <name>Hwy2I</name>
+    <name>Highway 2</name>
     <desc><![CDATA[Three Points Trailhead, 9th crossing of Hwy 2, outhouse, picnic tables, trash cans, paved parking.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="34.343496" lon="-117.983602">
     <ele>1808.0</ele>
-    <name>RD0403B</name>
+    <name>Road Crossing - 403</name>
     <desc><![CDATA[Paved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.346155" lon="-117.982600">
     <ele>1810.2</ele>
-    <name>PL0403B</name>
+    <name>Powerline - 403</name>
     <desc><![CDATA[Powerline]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.347718" lon="-117.982473">
     <ele>1810.1</ele>
     <name>PleasantViewWild2</name>
@@ -23282,97 +23299,97 @@
     <sym>Forest</sym>
   </wpt><wpt lat="34.355228" lon="-117.982708">
     <ele>1801.7</ele>
-    <name>CS0404</name>
+    <name>Campsite - 404</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.354501" lon="-117.987037">
     <ele>1758.8</ele>
-    <name>RD0405</name>
+    <name>Road Crossing - 405</name>
     <desc><![CDATA[PCT joins an abandoned roadbed.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.353915" lon="-117.988445">
     <ele>1745.3</ele>
-    <name>RD0405B</name>
+    <name>Road Crossing - 405</name>
     <desc><![CDATA[PCT departs the abandoned roadbed.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.366733" lon="-117.990777">
     <ele>1606.4</ele>
-    <name>TR0407</name>
+    <name>Trail Junction - 407</name>
     <desc><![CDATA[Trail junction with equestrian PCT alternate.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.367509" lon="-117.989352">
     <ele>1582.3</ele>
-    <name>WR0407</name>
+    <name>Water (reported) - 407</name>
     <desc><![CDATA[Sulphur Spring, 1/10 mile E of PCT. ]]></desc>
-    <sym>Drinking Water</sym>
+    <sym>Water Source</sym>
   </wpt><wpt lat="34.370081" lon="-117.995515">
     <ele>1609.3</ele>
-    <name>TR0407B</name>
+    <name>Trail Junction - 407</name>
     <desc><![CDATA[Equestrian alternate rejoins the PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.371044" lon="-117.998619">
     <ele>1620.0</ele>
-    <name>RD0407</name>
+    <name>Road Crossing - 407</name>
     <desc><![CDATA[Narrow paved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.372528" lon="-118.003155">
     <ele>1684.6</ele>
-    <name>CS0408</name>
+    <name>Campsite - 408</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.375420" lon="-118.022016">
     <ele>1887.0</ele>
-    <name>CS0410</name>
+    <name>Campsite - 410</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.376010" lon="-118.022713">
     <ele>1899.6</ele>
-    <name>WR0410</name>
+    <name>Water (reported) - 410</name>
     <desc><![CDATA[Seasonal Fiddleneck Spring ]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.380726" lon="-118.027200">
     <ele>1961.7</ele>
-    <name>WR0411</name>
+    <name>Water (reported) - 411</name>
     <desc><![CDATA[Fountainhead Spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.389074" lon="-118.028547">
     <ele>2036.5</ele>
-    <name>CS0412</name>
+    <name>Campsite - 412</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.380917" lon="-118.039837">
     <ele>2026.9</ele>
-    <name>CS0413</name>
+    <name>Campsite - 413</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.397213" lon="-118.054089">
     <ele>1895.5</ele>
-    <name>CS0415</name>
+    <name>Campsite - 415</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.389964" lon="-118.079799">
     <ele>1516.3</ele>
-    <name>PL0418</name>
+    <name>Powerline - 418</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.389965" lon="-118.080944">
     <ele>1517.7</ele>
-    <name>WR0419</name>
+    <name>Water (reported) - 419</name>
     <desc><![CDATA[Mill Creek Fire Station, water spigot, trail register.<br/>---<br/>WATER ALERT: Next northbound water after Mill Creek Fire Station may be the North Fork Ranger Station in 17.5 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.395970" lon="-118.106967">
     <ele>1705.3</ele>
-    <name>RD0421</name>
+    <name>Road Crossing - 421</name>
     <desc><![CDATA[Unpaved Mount Gleason road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.380422" lon="-118.138581">
     <ele>1682.8</ele>
-    <name>RD0425</name>
+    <name>Road Crossing - 425</name>
     <desc><![CDATA[PCT joins an unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.379887" lon="-118.139795">
     <ele>1677.3</ele>
-    <name>RD0425B</name>
+    <name>Road Crossing - 425</name>
     <desc><![CDATA[PCT departs the unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.381223" lon="-118.190017">
@@ -23382,32 +23399,32 @@
     <sym>Campground</sym>
   </wpt><wpt lat="34.378919" lon="-118.203679">
     <ele>1638.3</ele>
-    <name>WR0432</name>
+    <name>Water (reported) - 432</name>
     <desc><![CDATA[Spring near Moody Canyon Road]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.387541" lon="-118.252285">
     <ele>1275.7</ele>
-    <name>WR0436</name>
+    <name>Water (reported) - 436</name>
     <desc><![CDATA[Paved road to the North Fork Ranger Station.<br/>---<br/>WATER ALERT: Next southbound water after North Fork Ranger Station may be the Mill Creek Ranger Station in 17.5 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.433949" lon="-118.272149">
     <ele>798.3</ele>
-    <name>RD0443</name>
+    <name>Road Crossing - 443</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.436985" lon="-118.273844">
     <ele>685.7</ele>
-    <name>GT0444</name>
+    <name>Gate - 444</name>
     <desc><![CDATA[Trail gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="34.436775" lon="-118.273396">
     <ele>700.5</ele>
-    <name>TH0444</name>
+    <name>Trailhead - 444</name>
     <desc><![CDATA[Indian Canyon Trailhead near Soledad Canyon Road, parking, outhouse, picnic table, trash can.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.437611" lon="-118.272335">
     <ele>1391.2</ele>
-    <name>RD0444</name>
+    <name>Road Crossing - 444</name>
     <desc><![CDATA[Paved Soledad Canyon Road, Indian Canyon Trailhead, paved parking, outhouse, trash can. Access to the community of Acton, 6.5 miles E on Soledad Canyon Road.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="34.438371" lon="-118.268510">
@@ -23417,12 +23434,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="34.438362" lon="-118.272115">
     <ele>677.1</ele>
-    <name>TR0444</name>
+    <name>Trail Junction - 444</name>
     <desc><![CDATA[Use trail to the Acton KOA RV park, 2/10 mile E of PCT.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Trail Head</sym>
   </wpt><wpt lat="34.438765" lon="-118.272117">
     <ele>675.9</ele>
-    <name>WR0444</name>
+    <name>Water (reported) - 444</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.440155" lon="-118.270821">
@@ -23432,17 +23449,17 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="34.457064" lon="-118.271326">
     <ele>879.1</ele>
-    <name>PL0446</name>
+    <name>Powerline - 446</name>
     <desc><![CDATA[High voltage powerline]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.475384" lon="-118.304685">
     <ele>725.1</ele>
-    <name>Hwy14</name>
+    <name>Highway 14</name>
     <desc><![CDATA[Tunnel under Highway 14.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="34.485096" lon="-118.311882">
     <ele>756.5</ele>
-    <name>WR0453</name>
+    <name>Water (reported) - 453</name>
     <desc><![CDATA[Vasquez Rocks Picnic Area]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.496190" lon="-118.326370">
@@ -23450,6 +23467,10 @@
     <name>AguaDulce</name>
     <desc><![CDATA[Agua Dulce is a small town on the PCT with a good grocery store, restaurants, pay phones, ATM and Hiker Heaven [AKA the Saufley's, hikerheaven.com, 661-268-1235, guest [hiker] phone 661-402-5000]. Hiker Heaven is usually open March - June and in the fall for southbounders. The PCT follows the road through the center of Agua Dulce. To reach Hiker Heaven walk past the grocery store and pizza place and turn left on Darling Road for 1 mile.]]></desc>
     <sym>Residence</sym>
+  </wpt><wpt lat="34.348289" lon="-117.949714">
+    <ele>1929.3</ele>
+    <name>0400</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>CA Sec E</name>
     <extensions>
@@ -23457,7 +23478,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section E</desc><cmt/><trkseg>
       <trkpt lat="34.496186" lon="-118.326366"><ele>773.12</ele></trkpt>
       <trkpt lat="34.496122" lon="-118.326252"><ele>772.50</ele></trkpt>
       <trkpt lat="34.499015" lon="-118.326325"><ele>784.65</ele></trkpt>
@@ -26674,7 +26695,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section E. Off-Track: Horse Camp Trail</desc><cmt/><trkseg>
       <trkpt lat="34.731458" lon="-118.660521"><ele>1480.39</ele></trkpt>
       <trkpt lat="34.731704" lon="-118.660882"><ele>1469.64</ele></trkpt>
       <trkpt lat="34.731738" lon="-118.661096"><ele>1463.41</ele></trkpt>
@@ -26692,7 +26713,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section E. Off-Track: Sawmill Trail</desc><cmt/><trkseg>
       <trkpt lat="34.703393" lon="-118.576128"><ele>1525.50</ele></trkpt>
       <trkpt lat="34.703369" lon="-118.575870"><ele>1527.50</ele></trkpt>
       <trkpt lat="34.702972" lon="-118.575384"><ele>1536.71</ele></trkpt>
@@ -26712,87 +26733,87 @@
     <sym>Car</sym>
   </wpt><wpt lat="34.522061" lon="-118.320925">
     <ele>839.6</ele>
-    <name>RD0457</name>
+    <name>Road Crossing - 457</name>
     <desc><![CDATA[Follow unpaved road along power line.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.525365" lon="-118.315595">
     <ele>882.6</ele>
-    <name>PL0457</name>
+    <name>Powerline - 457</name>
     <desc><![CDATA[Powerline]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.525608" lon="-118.315333">
     <ele>886.2</ele>
-    <name>RD0457B</name>
+    <name>Road Crossing - 457</name>
     <desc><![CDATA[Depart the unpaved powerline road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.540156" lon="-118.309306">
     <ele>878.6</ele>
-    <name>RD0459</name>
+    <name>Road Crossing - 459</name>
     <desc><![CDATA[Cross an unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.566085" lon="-118.327962">
     <ele>1371.7</ele>
-    <name>RD0462</name>
+    <name>Road Crossing - 462</name>
     <desc><![CDATA[PCT follows an unpaved road E.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.566366" lon="-118.322829">
     <ele>1389.3</ele>
-    <name>RD0463</name>
+    <name>Road Crossing - 463</name>
     <desc><![CDATA[PCT departs the unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.566686" lon="-118.321982">
     <ele>1385.3</ele>
-    <name>GT0463</name>
+    <name>Gate - 463</name>
     <desc><![CDATA[Gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="34.570222" lon="-118.316059">
     <ele>1320.2</ele>
-    <name>WR0463</name>
+    <name>Water (reported) - 463</name>
     <desc><![CDATA[Bear Spring.<br/>---<br/>WATER ALERT: Next northbound water after Bear Spring may be the Fire Station at San Francisquito Canyon Road in 15 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.575681" lon="-118.320811">
     <ele>1212.0</ele>
-    <name>GT0464</name>
+    <name>Gate - 464</name>
     <desc><![CDATA[Gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="34.577347" lon="-118.330083">
     <ele>1154.9</ele>
-    <name>GT0465</name>
+    <name>Gate - 465</name>
     <desc><![CDATA[Gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="34.582880" lon="-118.322537">
     <ele>1019.2</ele>
-    <name>GT0465B</name>
+    <name>Gate - 465</name>
     <desc><![CDATA[Gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="34.583730" lon="-118.321236">
     <ele>1016.1</ele>
-    <name>RD0466</name>
+    <name>Road Crossing - 466</name>
     <desc><![CDATA[Paved Bouquet Canyon Road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.587647" lon="-118.321819">
     <ele>1052.6</ele>
-    <name>CS0466</name>
+    <name>Campsite - 466</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.596429" lon="-118.338435">
     <ele>1207.2</ele>
-    <name>PL0468</name>
+    <name>Powerline - 468</name>
     <desc><![CDATA[Powerline]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.597130" lon="-118.338269">
     <ele>1211.8</ele>
-    <name>CS0468</name>
+    <name>Campsite - 468</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.609034" lon="-118.361522">
     <ele>1117.2</ele>
-    <name>CS0471</name>
+    <name>Campsite - 471</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.609545" lon="-118.363183">
     <ele>1142.2</ele>
-    <name>RD0471</name>
+    <name>Road Crossing - 471</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.611695" lon="-118.369323">
@@ -26807,52 +26828,52 @@
     <sym>Residence</sym>
   </wpt><wpt lat="34.634464" lon="-118.389984">
     <ele>1034.0</ele>
-    <name>RD0478</name>
+    <name>Road Crossing - 478</name>
     <desc><![CDATA[Paved San Francisquito Canyon Road, the Green Valley fire station, 2/10 mile SW of PCT has a water spigot.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.633193" lon="-118.392440">
     <ele>1015.5</ele>
-    <name>WR478B</name>
+    <name>Water (reported) - 478</name>
     <desc><![CDATA[Green Valley fire station, 2/10 mile SW of PCT.<br/>---<br/>WATER ALERT: Next southbound water after Green Valley fire station may be Bear Spring in 15 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.641151" lon="-118.404533">
     <ele>1301.6</ele>
-    <name>RD0480</name>
+    <name>Road Crossing - 480</name>
     <desc><![CDATA[Grass Mountain Fire Road, unpaved.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.648236" lon="-118.416738">
     <ele>1188.5</ele>
-    <name>RD0481</name>
+    <name>Road Crossing - 481</name>
     <desc><![CDATA[Unpaved road junction.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.646112" lon="-118.433005">
     <ele>1189.5</ele>
-    <name>RD0482</name>
+    <name>Road Crossing - 482</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.659690" lon="-118.460434">
     <ele>932.1</ele>
-    <name>RD0486</name>
+    <name>Road Crossing - 486</name>
     <desc><![CDATA[Lake Hughes Road, paved.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.666825" lon="-118.466487">
     <ele>1138.1</ele>
-    <name>WR487</name>
+    <name>Water (reported) - 487</name>
     <desc><![CDATA[Trailside Spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.670591" lon="-118.474264">
     <ele>1286.9</ele>
-    <name>RD0488</name>
+    <name>Road Crossing - 488</name>
     <desc><![CDATA[Unpaved roads]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.679719" lon="-118.493847">
     <ele>1378.3</ele>
-    <name>CS0490</name>
+    <name>Campsite - 490</name>
     <desc><![CDATA[Boy Scout Trail Camp]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.687892" lon="-118.521664">
     <ele>1415.1</ele>
-    <name>WRCS493</name>
+    <name>Campsite &amp; Water (reported) - 493</name>
     <desc><![CDATA[Maxwell Trail Camp Guzzler, campsites.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.688906" lon="-118.527883">
@@ -26862,17 +26883,17 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.691850" lon="-118.528910">
     <ele>1315.1</ele>
-    <name>WRCS494</name>
+    <name>Campsite &amp; Water (reported) - 494</name>
     <desc><![CDATA[Upper Shake Campground, 2/10 mile N of PCT. Spring is on the floor of Shake Canyon 100 yards N of the campground. From the first campsite E of the campground entrance sign, walk N down the steep hill into Shake Canyon N of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.684810" lon="-118.531258">
     <ele>1485.3</ele>
-    <name>WR494B</name>
+    <name>Water (reported) - 494</name>
     <desc><![CDATA[Seasonal Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.691848" lon="-118.555102">
     <ele>1614.2</ele>
-    <name>WR496</name>
+    <name>Water (reported) - 496</name>
     <desc><![CDATA[Concrete Tank at Ridgetop Junction]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.701733" lon="-118.572545">
@@ -26887,117 +26908,117 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.708894" lon="-118.587710">
     <ele>1460.5</ele>
-    <name>RD0499</name>
+    <name>Road Crossing - 499</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.710114" lon="-118.594727">
     <ele>1435.5</ele>
-    <name>RD0500</name>
+    <name>Road Crossing - 500</name>
     <desc><![CDATA[Trail follows unpaved road 200 feet W.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.704848" lon="-118.616875">
     <ele>1720.8</ele>
-    <name>WR502</name>
+    <name>Water (reported) - 502</name>
     <desc><![CDATA[Red Rock Water Tank]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.704575" lon="-118.617524">
     <ele>1711.8</ele>
-    <name>WR502B</name>
+    <name>Water (reported) - 502</name>
     <desc><![CDATA[Guzzler behind oak shrubs]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.713746" lon="-118.635467">
     <ele>1692.8</ele>
-    <name>RD0505</name>
+    <name>Road Crossing - 505</name>
     <desc><![CDATA[Unpaved Liebre Mtn Truck Trail 7N23.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.714329" lon="-118.634228">
     <ele>1674.5</ele>
-    <name>WR505</name>
+    <name>Water (reported) - 505</name>
     <desc><![CDATA[Guzzler near Liebre Mtn Truck Trail 7N23.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.713870" lon="-118.653887">
     <ele>1753.8</ele>
-    <name>RD0506</name>
+    <name>Road Crossing - 506</name>
     <desc><![CDATA[PCT joins jeep road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.727155" lon="-118.660475">
     <ele>1532.4</ele>
-    <name>RD0508</name>
+    <name>Road Crossing - 508</name>
     <desc><![CDATA[PCT departs from jeep road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.731434" lon="-118.660514">
     <ele>1480.9</ele>
-    <name>CS0508</name>
+    <name>Campsite - 508</name>
     <desc><![CDATA[Horse Camp, picnic table, trail to spring in canyon below.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="34.730220" lon="-118.662209">
     <ele>1432.3</ele>
-    <name>WR508</name>
+    <name>Water (reported) - 508</name>
     <desc><![CDATA[Spring in canyon 2/10 mile W of Horse Camp.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.738452" lon="-118.655891">
     <ele>1220.3</ele>
-    <name>TR0510</name>
+    <name>Trail Junction - 510</name>
     <desc><![CDATA[Unpaved trailhead parking area.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.736354" lon="-118.646695">
     <ele>1158.1</ele>
-    <name>WR511</name>
+    <name>Water (reported) - 511</name>
     <desc><![CDATA[Pine Canyon Creek and pond.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.735592" lon="-118.643395">
     <ele>1172.9</ele>
-    <name>WR511B</name>
+    <name>Water (reported) - 511</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.736054" lon="-118.642505">
     <ele>1170.1</ele>
-    <name>RD0511</name>
+    <name>Road Crossing - 511</name>
     <desc><![CDATA[Pine Canyon Road, paved. Private land N of road for 7 miles, No Camping Allowed.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.737774" lon="-118.642696">
     <ele>1175.8</ele>
-    <name>GT0511</name>
+    <name>Gate - 511</name>
     <desc><![CDATA[Two trail gates.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="34.745074" lon="-118.641003">
     <ele>1091.3</ele>
-    <name>WR512</name>
+    <name>Water (reported) - 512</name>
     <desc><![CDATA[Seasonal Stream.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.775685" lon="-118.607181">
     <ele>930.2</ele>
-    <name>Hwy138B</name>
+    <name>Highway 138</name>
     <desc><![CDATA[Highway 138]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="34.775889" lon="-118.605708">
     <ele>929.6</ele>
-    <name>WR518</name>
+    <name>Water (reported) - 518</name>
     <desc><![CDATA[Hikertown [hikertown.com], hosts hikers, has water spigots, and accepts hiker resupply packages. ]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.788109" lon="-118.607755">
     <ele>905.1</ele>
-    <name>WR519</name>
+    <name>Water (reported) - 519</name>
     <desc><![CDATA[Open aqueduct.<br/>---<br/>WATER ALERT: Next northbound water after the aqueduct may be the faucet near the Cottonwood Creek bridge in in 16.4 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.854481" lon="-118.519470">
     <ele>946.4</ele>
-    <name>PL0528</name>
+    <name>Powerline - 528</name>
     <desc><![CDATA[Low voltage powerline]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.855287" lon="-118.494613">
     <ele>947.6</ele>
-    <name>RD0529</name>
+    <name>Road Crossing - 529</name>
     <desc><![CDATA[Depart Aqueduct Rd on an unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="34.869011" lon="-118.450780">
     <ele>882.4</ele>
-    <name>PL0532</name>
+    <name>Powerline - 532</name>
     <desc><![CDATA[Powerline]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="34.897612" lon="-118.455544">
     <ele>940.5</ele>
-    <name>WR535</name>
+    <name>Water (reported) - 535</name>
     <desc><![CDATA[Faucet near Cottonwood Creek bridge. Faucet only works when the aqueduct has water, check pctwater.com.<br/>---<br/>WATER ALERT: Next southbound water after Cottonwood Creek bridge may be the open aqueduct in 16.4 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="34.919390" lon="-118.447050">
@@ -27007,64 +27028,68 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="34.979435" lon="-118.468572">
     <ele>1476.1</ele>
-    <name>WRCS542</name>
+    <name>Campsite &amp; Water (reported) - 542</name>
     <desc><![CDATA[Tylerhorse Canyon, small creek, campsite.<br/>---<br/>WATER ALERT: Next northbound water after Tylerhorse Canyon may be Oak Creek in 16.6 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.034030" lon="-118.380868">
     <ele>1510.1</ele>
-    <name>GT0556</name>
+    <name>Gate - 556</name>
     <desc><![CDATA[Gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="35.034219" lon="-118.380221">
     <ele>1509.9</ele>
-    <name>WR556</name>
+    <name>Water (reported) - 556</name>
     <desc><![CDATA[Tiger Tank and shower. Probably dry, no water here the past few years. ]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.037735" lon="-118.378300">
     <ele>1499.7</ele>
-    <name>GT0556B</name>
+    <name>Gate - 556</name>
     <desc><![CDATA[Gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="35.049790" lon="-118.356507">
     <ele>1240.5</ele>
-    <name>WR558</name>
+    <name>Water (reported) - 558</name>
     <desc><![CDATA[Oak Creek<br/>---<br/>WATER ALERT: Next northbound water after Oak Creek may be Golden Oak Spring in 25.1 miles. Next southbound water may be Tylerhorse Canyon in 16.6 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.052248" lon="-118.358443">
     <ele>1263.3</ele>
-    <name>RD0558</name>
+    <name>Road Crossing - 558</name>
     <desc><![CDATA[Paved Tehachapi Willow Springs Road. Tehachapi is 9.1 miles NW of the PCT on Tehachapi Willow Springs Rd, Mojave is 11.5 miles E of the PCT on nearby Oak Creek Rd.<br/>---<br/>Tehachapi Willow Springs Road has easier hitching to Tehachapi or Mojave than the almost freeway like Hwy 58, but resuming the PCT from Hwy 58 cuts 8 miles from the 25 mile northbound waterless section to the N.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.063707" lon="-118.345996">
     <ele>1333.5</ele>
-    <name>GT0560</name>
+    <name>Gate - 560</name>
     <desc><![CDATA[Gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="35.067406" lon="-118.345770">
     <ele>1341.6</ele>
-    <name>GT0560B</name>
+    <name>Gate - 560</name>
     <desc><![CDATA[Two trail gates]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="35.071552" lon="-118.324608">
     <ele>1373.5</ele>
-    <name>RD0562</name>
+    <name>Road Crossing - 562</name>
     <desc><![CDATA[Paved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.081433" lon="-118.310233">
     <ele>1453.5</ele>
-    <name>GT0563</name>
+    <name>Gate - 563</name>
     <desc><![CDATA[Gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="35.090910" lon="-118.309668">
     <ele>1188.7</ele>
-    <name>RD0565</name>
+    <name>Road Crossing - 565</name>
     <desc><![CDATA[PCT joins paved Cameron Canyon Road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.099399" lon="-118.292893">
     <ele>1165.8</ele>
-    <name>Hwy58</name>
+    <name>Highway 58</name>
     <desc><![CDATA[Highway 58, PCT departs the paved road at a trail gate north of the highway. Tehachapi is 9.2 miles W of the PCT on Highway 58, Mojave is 11 miles E of the PCT on Highway 58.]]></desc>
     <sym>Car</sym>
+  </wpt><wpt lat="34.709245" lon="-118.592707">
+    <ele>1426.7</ele>
+    <name>0500</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>CA Sec F</name>
     <extensions>
@@ -27072,7 +27097,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section F</desc><cmt/><trkseg>
       <trkpt lat="35.100080" lon="-118.292786"><ele>1171.05</ele></trkpt>
       <trkpt lat="35.100008" lon="-118.292672"><ele>1170.61</ele></trkpt>
       <trkpt lat="35.100201" lon="-118.292384"><ele>1172.99</ele></trkpt>
@@ -29570,7 +29595,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section F. Off-Track: Landers Trail</desc><cmt/><trkseg>
       <trkpt lat="35.451657" lon="-118.313449"><ele>1924.36</ele></trkpt>
       <trkpt lat="35.451805" lon="-118.313528"><ele>1922.98</ele></trkpt>
       <trkpt lat="35.452054" lon="-118.313476"><ele>1923.03</ele></trkpt>
@@ -29588,7 +29613,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section F. Off-Track: McIvers Spring Road</desc><cmt/><trkseg>
       <trkpt lat="35.621233" lon="-118.077323"><ele>2039.35</ele></trkpt>
       <trkpt lat="35.621210" lon="-118.076951"><ele>2038.28</ele></trkpt>
       <trkpt lat="35.621416" lon="-118.076510"><ele>2037.29</ele></trkpt>
@@ -29608,7 +29633,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section F. Off-Track: Robin Bird Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="35.386793" lon="-118.300388"><ele>1929.12</ele></trkpt>
       <trkpt lat="35.386951" lon="-118.300726"><ele>1926.40</ele></trkpt>
       <trkpt lat="35.386927" lon="-118.301260"><ele>1918.56</ele></trkpt>
@@ -29621,7 +29646,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section F. Off-Track: Walker Pass CG Trail</desc><cmt/><trkseg>
       <trkpt lat="35.663099" lon="-118.036445"><ele>1560.40</ele></trkpt>
       <trkpt lat="35.663461" lon="-118.037143"><ele>1550.60</ele></trkpt>
       <trkpt lat="35.663692" lon="-118.037417"><ele>1546.81</ele></trkpt>
@@ -29634,7 +29659,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section F. Off-Track: Willow Spring Alternate</desc><cmt/><trkseg>
       <trkpt lat="35.457750" lon="-118.171779"><ele>1592.49</ele></trkpt>
       <trkpt lat="35.457906" lon="-118.172011"><ele>1588.34</ele></trkpt>
       <trkpt lat="35.458141" lon="-118.172172"><ele>1584.32</ele></trkpt>
@@ -29709,52 +29734,52 @@
     </trkseg>
   </trk><wpt lat="35.100611" lon="-118.290228">
     <ele>1158.7</ele>
-    <name>GT0567</name>
+    <name>Gate - 567</name>
     <desc><![CDATA[Trail gate and trail register.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="35.104803" lon="-118.272081">
     <ele>1152.5</ele>
-    <name>RD0568</name>
+    <name>Road Crossing - 568</name>
     <desc><![CDATA[Unpaved road and nearby metal gate]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.114082" lon="-118.257761">
     <ele>1318.7</ele>
-    <name>CS0569</name>
+    <name>Campsite - 569</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="35.115011" lon="-118.261114">
     <ele>1397.2</ele>
-    <name>BV0570</name>
+    <name>Bivy - 570</name>
     <desc><![CDATA[Small bivy campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="35.116412" lon="-118.265266">
     <ele>1519.0</ele>
-    <name>BV0571</name>
+    <name>Bivy - 571</name>
     <desc><![CDATA[Small bivy campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="35.118869" lon="-118.264444">
     <ele>1571.6</ele>
-    <name>CS0571</name>
+    <name>Campsite - 571</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="35.119464" lon="-118.265547">
     <ele>1588.9</ele>
-    <name>CS0571B</name>
+    <name>Campsite - 571</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="35.137844" lon="-118.266436">
     <ele>1845.6</ele>
-    <name>CS0573</name>
+    <name>Campsite - 573</name>
     <desc><![CDATA[Small campsite, under a tree.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="35.157705" lon="-118.255035">
     <ele>1867.1</ele>
-    <name>RD0575</name>
+    <name>Road Crossing - 575</name>
     <desc><![CDATA[PCT joins unpaved road MK10 for 4.4 miles.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.192964" lon="-118.238386">
     <ele>1825.9</ele>
-    <name>RD0579</name>
+    <name>Road Crossing - 579</name>
     <desc><![CDATA[Pass junction with jeep road MK13.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.196900" lon="-118.234818">
@@ -29764,32 +29789,32 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="35.196671" lon="-118.232905">
     <ele>1830.4</ele>
-    <name>RD0579B</name>
+    <name>Road Crossing - 579</name>
     <desc><![CDATA[PCT departs unpaved road MK10 on a trail.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.199688" lon="-118.229270">
     <ele>1794.3</ele>
-    <name>RD0580</name>
+    <name>Road Crossing - 580</name>
     <desc><![CDATA[Cross an unpaved windfarm road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.225840" lon="-118.234625">
     <ele>1668.4</ele>
-    <name>WR583</name>
+    <name>Water (reported) - 583</name>
     <desc><![CDATA[Golden Oaks Spring, paved road nearby.<br/>---<br/>WATER ALERT: Next northbound water after Golden Oaks Spring may be Robin Bird Spring in 18.8 miles. Next southbound water may be Oak Creek in 25.1 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.235844" lon="-118.240343">
     <ele>1611.9</ele>
-    <name>PL0584</name>
+    <name>Powerline - 584</name>
     <desc><![CDATA[Powerline near windfarm.]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="35.280317" lon="-118.255801">
     <ele>1555.4</ele>
-    <name>GT0590</name>
+    <name>Gate - 590</name>
     <desc><![CDATA[Gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="35.300806" lon="-118.267250">
     <ele>1529.6</ele>
-    <name>CS0593</name>
+    <name>Campsite - 593</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="35.336589" lon="-118.285105">
@@ -29799,92 +29824,92 @@
     <sym>Summit</sym>
   </wpt><wpt lat="35.364931" lon="-118.293900">
     <ele>1717.0</ele>
-    <name>RD0600</name>
+    <name>Road Crossing - 600</name>
     <desc><![CDATA[PCT joins unpaved road 1.1 miles.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.375993" lon="-118.293850">
     <ele>1902.3</ele>
-    <name>RD0601</name>
+    <name>Road Crossing - 601</name>
     <desc><![CDATA[PCT departs the unpaved road on a trail.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.386760" lon="-118.300367">
     <ele>1929.2</ele>
-    <name>TR0602</name>
+    <name>Trail Junction - 602</name>
     <desc><![CDATA[Trail junction to Robin Bird Spring]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="35.387442" lon="-118.301802">
     <ele>1930.6</ele>
-    <name>WRCS602</name>
+    <name>Campsite &amp; Water (reported) - 602</name>
     <desc><![CDATA[Robin Bird Spring, 1/10 mile W of PCT, campsite.<br/>---<br/>WATER ALERT: Next southbound water after Robin Bird Spring may be Golden Oak Spring in 18.8 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.390484" lon="-118.299076">
     <ele>2014.4</ele>
-    <name>RD0602</name>
+    <name>Road Crossing - 602</name>
     <desc><![CDATA[Unpaved Jawbone Canyon Road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.403485" lon="-118.306832">
     <ele>1987.2</ele>
-    <name>CS0604</name>
+    <name>Campsite - 604</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="35.405254" lon="-118.306815">
     <ele>1971.0</ele>
-    <name>WR604</name>
+    <name>Water (reported) - 604</name>
     <desc><![CDATA[Cottonwood Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.417094" lon="-118.304679">
     <ele>2047.4</ele>
-    <name>RD0605</name>
+    <name>Road Crossing - 605</name>
     <desc><![CDATA[Unpaved road 29S19]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.421111" lon="-118.304627">
     <ele>2057.3</ele>
-    <name>WR606</name>
+    <name>Water (reported) - 606</name>
     <desc><![CDATA[Concrete dam and spring.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.434233" lon="-118.309612">
     <ele>1931.6</ele>
-    <name>WR607</name>
+    <name>Water (reported) - 607</name>
     <desc><![CDATA[Landers Creek, often dry.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.444684" lon="-118.314674">
     <ele>1890.8</ele>
-    <name>WR608</name>
+    <name>Water (reported) - 608</name>
     <desc><![CDATA[Landers Meadow drainage at 1st Piute Mountain Road crossing.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.445018" lon="-118.314756">
     <ele>1893.2</ele>
-    <name>RD0608</name>
+    <name>Road Crossing - 608</name>
     <desc><![CDATA[Piute Mountain Rd, 1st crossing.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.451654" lon="-118.313451">
     <ele>1924.3</ele>
-    <name>RD0609</name>
+    <name>Road Crossing - 609</name>
     <desc><![CDATA[Unpaved road 29S05 to Landers Camp.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.455248" lon="-118.312920">
     <ele>1904.7</ele>
-    <name>WRCS609</name>
+    <name>Campsite &amp; Water (reported) - 609</name>
     <desc><![CDATA[Landers Camp, spring, fire tank, 2/10 mile N of PCT.<br/>---<br/>WATER ALERT: Next northbound water after Landers Camp may be Willow Spring [about 1.4 miles off trail] in 11.1 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.456296" lon="-118.278333">
     <ele>2015.1</ele>
-    <name>RD0611</name>
+    <name>Road Crossing - 611</name>
     <desc><![CDATA[Piute Mountain Road, 2nd crossing at Harris Grade.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.450703" lon="-118.224090">
     <ele>1509.8</ele>
-    <name>WR616</name>
+    <name>Water (reported) - 616</name>
     <desc><![CDATA[Kelso Valley Road, paved N of PCT, unpaved S of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.452907" lon="-118.204413">
     <ele>1387.1</ele>
-    <name>RD0618</name>
+    <name>Road Crossing - 618</name>
     <desc><![CDATA[Unpaved Butterbredt Canyon Road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.473354" lon="-118.174017">
     <ele>1381.5</ele>
-    <name>WR620</name>
+    <name>Water (reported) - 620</name>
     <desc><![CDATA[Willow Spring, 1.6 miles N of PCT, pond, trough.<br/>---<br/>WATER ALERT: Next northbound water after Willow Spring may be Joshua Tree Spring in 43.7 miles. Next water southbound may be Landers Camp in 11.1 miles. See pctwater.com.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.457762" lon="-118.171749">
@@ -29894,79 +29919,83 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="35.464182" lon="-118.150104">
     <ele>1610.9</ele>
-    <name>RD0622</name>
+    <name>Road Crossing - 622</name>
     <desc><![CDATA[Unpaved Dove Spring Canyon Road SC103.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.481547" lon="-118.145423">
     <ele>1641.3</ele>
-    <name>RD0624</name>
+    <name>Road Crossing - 624</name>
     <desc><![CDATA[Junction of unpaved roads SC111 and SC39.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.495572" lon="-118.134664">
     <ele>1614.1</ele>
-    <name>RD0625</name>
+    <name>Road Crossing - 625</name>
     <desc><![CDATA[Unpaved road SC328]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.497405" lon="-118.133210">
     <ele>1611.2</ele>
-    <name>RD0626</name>
+    <name>Road Crossing - 626</name>
     <desc><![CDATA[Unpaved road SC47]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.530628" lon="-118.129457">
     <ele>1746.7</ele>
-    <name>RD0628</name>
+    <name>Road Crossing - 628</name>
     <desc><![CDATA[Junction of unpaved roads SC34 and SC37.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.546134" lon="-118.143559">
     <ele>1675.7</ele>
-    <name>RD0630</name>
+    <name>Road Crossing - 630</name>
     <desc><![CDATA[Dirt bike road SC42.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.552860" lon="-118.133635">
     <ele>1632.1</ele>
-    <name>RD0631</name>
+    <name>Road Crossing - 631</name>
     <desc><![CDATA[Bird Spring Pass, unpaved road SC120.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.563925" lon="-118.121878">
     <ele>2098.5</ele>
-    <name>CS0634</name>
+    <name>Campsite - 634</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="35.576462" lon="-118.130016">
     <ele>2046.0</ele>
-    <name>CS0635</name>
+    <name>Campsite - 635</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="35.582762" lon="-118.123740">
     <ele>1907.2</ele>
-    <name>TR0637</name>
+    <name>Trail Junction - 637</name>
     <desc><![CDATA[Trail junction to Yellow Jacket Spring.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="35.594416" lon="-118.127317">
     <ele>1866.6</ele>
-    <name>WR637</name>
+    <name>Water (reported) - 637</name>
     <desc><![CDATA[Yellow Jacket Spring, 7/10 mile NW of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.614318" lon="-118.113240">
     <ele>2036.4</ele>
-    <name>RD0641</name>
+    <name>Road Crossing - 641</name>
     <desc><![CDATA[PCT joins unpaved road to the NE for 2.3 miles.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.621252" lon="-118.077347">
     <ele>2039.6</ele>
-    <name>RD0644</name>
+    <name>Road Crossing - 644</name>
     <desc><![CDATA[PCT departs an unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.621932" lon="-118.073155">
     <ele>2035.5</ele>
-    <name>WR644</name>
+    <name>Water (reported) - 644</name>
     <desc><![CDATA[McIvers Spring, 2/10 mile E of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.663884" lon="-118.037523">
     <ele>1544.8</ele>
-    <name>CS0651</name>
+    <name>Campsite - 651</name>
     <desc><![CDATA[Walker Pass Campground, with picnic tables, and outhouse. This campground usually does not have water.<br/>---<br/>Spring-fed cisterns 2/10 mile NW of the campground may have water. Follow Hwy 178 for 250 yards W from the campground entrance and look to the left. Check pctwater.com.]]></desc>
     <sym>Campground</sym>
+  </wpt><wpt lat="35.368533" lon="-118.292546">
+    <ele>1777.0</ele>
+    <name>0600</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>CA Sec G</name>
     <extensions>
@@ -29974,7 +30003,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section G</desc><cmt/><trkseg>
       <trkpt lat="35.663089" lon="-118.027357"><ele>1604.54</ele></trkpt>
       <trkpt lat="35.663149" lon="-118.027112"><ele>1605.18</ele></trkpt>
       <trkpt lat="35.662930" lon="-118.026406"><ele>1605.60</ele></trkpt>
@@ -33103,7 +33132,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section G. Off-Track: Kennedy Meadow Trail</desc><cmt/><trkseg>
       <trkpt lat="36.023584" lon="-118.134144"><ele>1831.22</ele></trkpt>
       <trkpt lat="36.023558" lon="-118.133262"><ele>1834.26</ele></trkpt>
       <trkpt lat="36.023252" lon="-118.132368"><ele>1838.31</ele></trkpt>
@@ -33118,107 +33147,107 @@
     </trkseg>
   </trk><wpt lat="35.663090" lon="-118.027350">
     <ele>2698.4</ele>
-    <name>Hwy178</name>
+    <name>Highway 178</name>
     <desc><![CDATA[Highway 178. Onyx is 17.7 miles W of the PCT, the town of Lake Isabella is 37 miles W of the PCT on Hwy 178.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="35.677905" lon="-118.012192">
     <ele>1879.8</ele>
-    <name>CS0654</name>
+    <name>Campsite - 654</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="35.687177" lon="-117.994046">
     <ele>2005.2</ele>
-    <name>CS0656</name>
+    <name>Campsite - 656</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="35.694815" lon="-117.986120">
     <ele>1984.0</ele>
-    <name>CS0657</name>
+    <name>Campsite - 657</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="35.742750" lon="-118.018518">
     <ele>1711.5</ele>
-    <name>WR664</name>
+    <name>Water (reported) - 664</name>
     <desc><![CDATA[Stream past a dirt road. ]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.742903" lon="-118.022966">
     <ele>1670.7</ele>
-    <name>TR0664</name>
+    <name>Trail Junction - 664</name>
     <desc><![CDATA[Trail junction to Joshua Tree Spring.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="35.741271" lon="-118.024682">
     <ele>1609.3</ele>
-    <name>WR664B</name>
+    <name>Water (reported) - 664</name>
     <desc><![CDATA[Joshua Tree Spring<br/>---<br/>WATER ALERT: Next southbound water after Joshua Tree Spring may be Willow Spring in 43.7 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.769063" lon="-118.027921">
     <ele>1556.1</ele>
-    <name>WR669</name>
+    <name>Water (reported) - 669</name>
     <desc><![CDATA[Spanish Needle Creek, first crossing.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.773841" lon="-118.029361">
     <ele>1606.1</ele>
-    <name>WR669B</name>
+    <name>Water (reported) - 669</name>
     <desc><![CDATA[Another crossing of Spanish Needle Creek.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.776955" lon="-118.027193">
     <ele>1693.7</ele>
-    <name>WA0670</name>
+    <name>Water - 670</name>
     <desc><![CDATA[Another crossing of Spanish Needle Creek.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.775679" lon="-118.024998">
     <ele>1718.3</ele>
-    <name>WR670B</name>
+    <name>Water (reported) - 670</name>
     <desc><![CDATA[Spanish Needle Creek, forth crossing.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.782089" lon="-118.022325">
     <ele>2060.9</ele>
-    <name>CS0673</name>
+    <name>Campsite - 673</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="35.803563" lon="-118.011644">
     <ele>2102.7</ele>
-    <name>CS0676</name>
+    <name>Campsite - 676</name>
     <desc><![CDATA[Several small campsites along a ridge.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="35.834951" lon="-118.043791">
     <ele>1688.2</ele>
-    <name>WR681</name>
+    <name>Water (reported) - 681</name>
     <desc><![CDATA[Chimney Creek, seasonal spring nearby.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.835773" lon="-118.044029">
     <ele>1694.8</ele>
-    <name>RD0681</name>
+    <name>Road Crossing - 681</name>
     <desc><![CDATA[Unpaved Canebreak Road to Chimney Creek campground 2/10 mile to the E.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.854846" lon="-118.063841">
     <ele>1986.5</ele>
-    <name>WR683</name>
+    <name>Water (reported) - 683</name>
     <desc><![CDATA[Fox Mill Spring and trough.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.855975" lon="-118.064440">
     <ele>2005.8</ele>
-    <name>RD0683</name>
+    <name>Road Crossing - 683</name>
     <desc><![CDATA[Unpaved Fox Mill Road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.899450" lon="-118.110245">
     <ele>2202.5</ele>
-    <name>RD0689</name>
+    <name>Road Crossing - 689</name>
     <desc><![CDATA[Unpaved Chimney Basin Road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="35.924663" lon="-118.149306">
     <ele>1782.0</ele>
-    <name>WR694</name>
+    <name>Water (reported) - 694</name>
     <desc><![CDATA[Manter Creek, 1st Creek in Rockhouse Basin.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="35.976874" lon="-118.155094">
     <ele>1752.7</ele>
-    <name>WR699</name>
+    <name>Water (reported) - 699</name>
     <desc><![CDATA[South Fork Kern River]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.013519" lon="-118.132244">
     <ele>1819.0</ele>
-    <name>GT0701</name>
+    <name>Gate - 701</name>
     <desc><![CDATA[Trail Gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="36.018998" lon="-118.123605">
@@ -33228,17 +33257,17 @@
     <sym>Shopping Center</sym>
   </wpt><wpt lat="36.023648" lon="-118.134152">
     <ele>1831.4</ele>
-    <name>RD0702</name>
+    <name>Road Crossing - 702</name>
     <desc><![CDATA[Sherman Pass Road, paved, bridge near Kennedy Meadows Store.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="36.046899" lon="-118.131119">
     <ele>1854.1</ele>
-    <name>RD0704</name>
+    <name>Road Crossing - 704</name>
     <desc><![CDATA[Paved Kennedy Meadows Road to campground.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="36.051857" lon="-118.130474">
     <ele>1866.0</ele>
-    <name>RD0704B</name>
+    <name>Road Crossing - 704</name>
     <desc><![CDATA[Second crossing of paved Kennedy Meadows Road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="36.054498" lon="-118.130468">
@@ -33248,7 +33277,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="36.055678" lon="-118.130120">
     <ele>1881.7</ele>
-    <name>GT0705</name>
+    <name>Gate - 705</name>
     <desc><![CDATA[Gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="36.056417" lon="-118.130028">
@@ -33258,17 +33287,17 @@
     <sym>Forest</sym>
   </wpt><wpt lat="36.078951" lon="-118.124061">
     <ele>1916.5</ele>
-    <name>WA0707</name>
+    <name>Water - 707</name>
     <desc><![CDATA[South Fork of Kern River, wooden bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.101479" lon="-118.118883">
     <ele>2077.2</ele>
-    <name>WA0709</name>
+    <name>Water - 709</name>
     <desc><![CDATA[Seasonal Crag Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.108537" lon="-118.123951">
     <ele>2141.4</ele>
-    <name>CS0710</name>
+    <name>Campsite - 710</name>
     <desc><![CDATA[Campsite 200 feet W of trail.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.139137" lon="-118.140020">
@@ -33278,44 +33307,44 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.152432" lon="-118.145326">
     <ele>2437.1</ele>
-    <name>CS0713</name>
+    <name>Campsite - 713</name>
     <desc><![CDATA[Campsite in the trees 500 feet E of PCT near small seasonal creek.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.156901" lon="-118.146354">
     <ele>2429.7</ele>
-    <name>TR0714</name>
+    <name>Trail Junction - 714</name>
     <desc><![CDATA[Use trail to spring.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.157011" lon="-118.147351">
     <ele>2414.2</ele>
-    <name>WA0714</name>
+    <name>Water - 714</name>
     <desc><![CDATA[Spring, trough, near Beck Meadow.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.163495" lon="-118.144350">
     <ele>2488.3</ele>
-    <name>GT0714</name>
+    <name>Gate - 714</name>
     <desc><![CDATA[Gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="36.182027" lon="-118.128819">
     <ele>2387.3</ele>
-    <name>WACS0716</name>
+    <name>Campsite &amp; Water - 716</name>
     <desc><![CDATA[South Fork Kern River, steel bridge, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.213209" lon="-118.137454">
     <ele>2522.0</ele>
-    <name>CS0719</name>
+    <name>Campsite - 719</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.214553" lon="-118.137577">
     <ele>2536.1</ele>
-    <name>WA0719</name>
+    <name>Water - 719</name>
     <desc><![CDATA[Cow Creek, campsite.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.222656" lon="-118.135364">
     <ele>2627.4</ele>
-    <name>WACS0720</name>
+    <name>Campsite &amp; Water - 720</name>
     <desc><![CDATA[Cow Creek]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.227402" lon="-118.134708">
     <ele>2717.5</ele>
     <name>MonacheMdwTr</name>
@@ -33333,57 +33362,57 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.232096" lon="-118.121977">
     <ele>2958.8</ele>
-    <name>WA0722</name>
+    <name>Water - 722</name>
     <desc><![CDATA[Cow Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.286291" lon="-118.140410">
     <ele>2870.0</ele>
-    <name>WA0727</name>
+    <name>Water - 727</name>
     <desc><![CDATA[Seasonal Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.296552" lon="-118.130564">
     <ele>2757.0</ele>
-    <name>WA0728</name>
+    <name>Water - 728</name>
     <desc><![CDATA[Seasonal creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.321513" lon="-118.131011">
     <ele>2727.5</ele>
-    <name>WACS0731</name>
+    <name>Campsite &amp; Water - 731</name>
     <desc><![CDATA[Death Canyon Creek, large camping area.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.321807" lon="-118.131167">
     <ele>2728.2</ele>
-    <name>TR0731</name>
+    <name>Trail Junction - 731</name>
     <desc><![CDATA[Trail junction to a spring.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.323956" lon="-118.129786">
     <ele>2750.3</ele>
-    <name>WA0731B</name>
+    <name>Water - 731</name>
     <desc><![CDATA[Spring, 2/10 mile NE of PCT [often better water than Death Canyon Creek].]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.369909" lon="-118.137320">
     <ele>3158.9</ele>
-    <name>TR0736</name>
+    <name>Trail Junction - 736</name>
     <desc><![CDATA[Use trail to a seasonal spring.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.373878" lon="-118.134341">
     <ele>3139.1</ele>
-    <name>WA0736</name>
+    <name>Water - 736</name>
     <desc><![CDATA[Seasonal spring, 3/10 mile N of PCT]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.413078" lon="-118.139112">
     <ele>2948.1</ele>
-    <name>TR0742</name>
+    <name>Trail Junction - 742</name>
     <desc><![CDATA[Trail junction to Diaz Creek, large campsites nearby.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.413390" lon="-118.137521">
     <ele>2934.6</ele>
-    <name>WACS0742</name>
+    <name>Campsite &amp; Water - 742</name>
     <desc><![CDATA[Diaz Creek, campsite, 1/10 mile E of PCT.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.428872" lon="-118.148091">
     <ele>3033.2</ele>
-    <name>WA0743</name>
+    <name>Water - 743</name>
     <desc><![CDATA[Dutch Meadow, spring.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.447887" lon="-118.168924">
@@ -33393,17 +33422,17 @@
     <sym>Campground</sym>
   </wpt><wpt lat="36.429764" lon="-118.165655">
     <ele>3168.2</ele>
-    <name>TR0745</name>
+    <name>Trail Junction - 745</name>
     <desc><![CDATA[Mulkey Pass and Horseshoe Meadow Trail junctions. Horseshoe Meadow, 1.7 miles N of the PCT, campground, water, toilet, trash, paved road.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.427120" lon="-118.176308">
     <ele>3198.1</ele>
-    <name>TR0745B</name>
+    <name>Trail Junction - 745</name>
     <desc><![CDATA[Second Mulkey Pass and Horseshoe Meadow Trail junctions.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.432331" lon="-118.195149">
     <ele>3272.9</ele>
-    <name>WA0747</name>
+    <name>Water - 747</name>
     <desc><![CDATA[Poison Meadow Spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.453183" lon="-118.215748">
@@ -33413,7 +33442,7 @@
     <sym>Summit</sym>
   </wpt><wpt lat="36.454157" lon="-118.225141">
     <ele>3417.8</ele>
-    <name>WA0751</name>
+    <name>Water - 751</name>
     <desc><![CDATA[Chicken Spring Lake outlet, in dry years the outlet may be dry but the nearby lake will have water.<br/>---<br/>Water is usually plentiful in the Sierra Nevada sections of the Pacific Crest Trail. Water sources listed here were all checked in July and again late August 2012 (a very dry year). PCT hikers entering the Sierra earlier in the season will find more water sources that what is listed on Halfmile apps or maps.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.473713" lon="-118.260188">
@@ -33423,49 +33452,53 @@
     <sym>Forest</sym>
   </wpt><wpt lat="36.478718" lon="-118.271963">
     <ele>3378.2</ele>
-    <name>TR0755</name>
+    <name>Trail Junction - 755</name>
     <desc><![CDATA[Rock Creek and Siberian Pass Trail junctions.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.493896" lon="-118.320373">
     <ele>3029.6</ele>
-    <name>TR0759</name>
+    <name>Trail Junction - 759</name>
     <desc><![CDATA[New Army Pass and Lower Rock Creek Trail junctions]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.494201" lon="-118.322474">
     <ele>2994.7</ele>
-    <name>WA0759</name>
+    <name>Water - 759</name>
     <desc><![CDATA[Good creek before Rock Creek.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.496357" lon="-118.329881">
     <ele>2936.2</ele>
-    <name>CS0760</name>
+    <name>Campsite - 760</name>
     <desc><![CDATA[Large campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.496179" lon="-118.337407">
     <ele>2901.0</ele>
-    <name>WACSBB0760</name>
+    <name>Campsite, Water &amp; Bear Locker - 760</name>
     <desc><![CDATA[Rock Creek, several campsites, bear box.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.506533" lon="-118.343229">
     <ele>3158.7</ele>
-    <name>WA0762</name>
+    <name>Water - 762</name>
     <desc><![CDATA[Guyot Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.551992" lon="-118.358284">
     <ele>3145.9</ele>
-    <name>WACSBB0766</name>
+    <name>Campsite, Water &amp; Bear Locker - 766</name>
     <desc><![CDATA[Several campsites, bear locker, creek nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.563886" lon="-118.349365">
     <ele>3243.1</ele>
-    <name>WACSBB0767B</name>
+    <name>Campsite, Water &amp; Bear Locker - 767</name>
     <desc><![CDATA[Campsite, water, bear box, Crabtree Ranger, 1 mile NE of PCT.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.558887" lon="-118.361772">
     <ele>3285.4</ele>
     <name>JMT0767</name>
     <desc><![CDATA[John Muir Trail junction, PCT joins the JMT north from this point.]]></desc>
     <sym>Flag, Blue</sym>
+  </wpt><wpt lat="36.000370" lon="-118.141359">
+    <ele>1815.7</ele>
+    <name>0700</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>CA Sec H</name>
     <extensions>
@@ -33473,7 +33506,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H</desc><cmt/><trkseg>
       <trkpt lat="36.558933" lon="-118.361780"><ele>3286.04</ele></trkpt>
       <trkpt lat="36.559514" lon="-118.361998"><ele>3295.06</ele></trkpt>
       <trkpt lat="36.559635" lon="-118.362127"><ele>3297.47</ele></trkpt>
@@ -39304,7 +39337,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Bear Ridge Trail</desc><cmt/><trkseg>
       <trkpt lat="37.382544" lon="-118.910548"><ele>3010.07</ele></trkpt>
       <trkpt lat="37.382419" lon="-118.912260"><ele>2999.79</ele></trkpt>
       <trkpt lat="37.382313" lon="-118.912496"><ele>2997.51</ele></trkpt>
@@ -39518,7 +39551,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Bishop Pass Trail</desc><cmt/><trkseg>
       <trkpt lat="37.094103" lon="-118.594284"><ele>2667.47</ele></trkpt>
       <trkpt lat="37.094095" lon="-118.594112"><ele>2668.66</ele></trkpt>
       <trkpt lat="37.093458" lon="-118.593178"><ele>2677.45</ele></trkpt>
@@ -39927,7 +39960,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Bullfrog Lake Trail</desc><cmt/><trkseg>
       <trkpt lat="36.768198" lon="-118.411426"><ele>3208.82</ele></trkpt>
       <trkpt lat="36.768848" lon="-118.411203"><ele>3215.81</ele></trkpt>
       <trkpt lat="36.769139" lon="-118.410843"><ele>3220.12</ele></trkpt>
@@ -40008,7 +40041,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Devils Postpile Alternate</desc><cmt/><trkseg>
       <trkpt lat="37.614004" lon="-119.082852"><ele>2279.93</ele></trkpt>
       <trkpt lat="37.615462" lon="-119.082807"><ele>2282.35</ele></trkpt>
       <trkpt lat="37.615939" lon="-119.082443"><ele>2287.32</ele></trkpt>
@@ -40067,7 +40100,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Evolution Creek Alternate</desc><cmt/><trkseg>
       <trkpt lat="37.194849" lon="-118.773032"><ele>2815.25</ele></trkpt>
       <trkpt lat="37.195110" lon="-118.773701"><ele>2813.89</ele></trkpt>
       <trkpt lat="37.195285" lon="-118.774569"><ele>2811.83</ele></trkpt>
@@ -40098,7 +40131,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Horseshoe Lake Trail</desc><cmt/><trkseg>
       <trkpt lat="37.586358" lon="-119.051590"><ele>2720.45</ele></trkpt>
       <trkpt lat="37.586599" lon="-119.051648"><ele>2722.25</ele></trkpt>
       <trkpt lat="37.588048" lon="-119.053023"><ele>2729.13</ele></trkpt>
@@ -40128,7 +40161,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: JMT Alternate</desc><cmt/><trkseg>
       <trkpt lat="37.632920" lon="-119.088963"><ele>2341.16</ele></trkpt>
       <trkpt lat="37.632986" lon="-119.089157"><ele>2343.72</ele></trkpt>
       <trkpt lat="37.633334" lon="-119.089554"><ele>2350.40</ele></trkpt>
@@ -40654,7 +40687,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Kearsarge Spur Trail</desc><cmt/><trkseg>
       <trkpt lat="36.773378" lon="-118.417887"><ele>3285.32</ele></trkpt>
       <trkpt lat="36.772716" lon="-118.417025"><ele>3291.77</ele></trkpt>
       <trkpt lat="36.772422" lon="-118.416432"><ele>3293.89</ele></trkpt>
@@ -40672,7 +40705,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Kearsarge Trail</desc><cmt/><trkseg>
       <trkpt lat="36.770631" lon="-118.416159"><ele>3275.97</ele></trkpt>
       <trkpt lat="36.770648" lon="-118.415451"><ele>3277.54</ele></trkpt>
       <trkpt lat="36.770858" lon="-118.414685"><ele>3278.74</ele></trkpt>
@@ -40927,7 +40960,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Mammoth Pass Trail</desc><cmt/><trkseg>
       <trkpt lat="37.591205" lon="-119.058359"><ele>2640.70</ele></trkpt>
       <trkpt lat="37.591547" lon="-119.056952"><ele>2654.33</ele></trkpt>
       <trkpt lat="37.591510" lon="-119.056237"><ele>2656.84</ele></trkpt>
@@ -41015,7 +41048,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Muir Ranch Alternate</desc><cmt/><trkseg>
       <trkpt lat="37.225798" lon="-118.861272"><ele>2404.32</ele></trkpt>
       <trkpt lat="37.225711" lon="-118.861373"><ele>2402.88</ele></trkpt>
       <trkpt lat="37.225805" lon="-118.861915"><ele>2405.97</ele></trkpt>
@@ -41097,7 +41130,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Muir Ranch Trail</desc><cmt/><trkseg>
       <trkpt lat="37.237146" lon="-118.877746"><ele>2377.56</ele></trkpt>
       <trkpt lat="37.237078" lon="-118.878701"><ele>2367.15</ele></trkpt>
       <trkpt lat="37.236765" lon="-118.879385"><ele>2366.07</ele></trkpt>
@@ -41120,7 +41153,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Reds Meadow Trail</desc><cmt/><trkseg>
       <trkpt lat="37.609982" lon="-119.075450"><ele>2351.91</ele></trkpt>
       <trkpt lat="37.610656" lon="-119.075735"><ele>2349.48</ele></trkpt>
       <trkpt lat="37.612021" lon="-119.075343"><ele>2354.17</ele></trkpt>
@@ -41137,7 +41170,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Soda Springs Trail</desc><cmt/><trkseg>
       <trkpt lat="37.653854" lon="-119.079915"><ele>2343.26</ele></trkpt>
       <trkpt lat="37.653448" lon="-119.078755"><ele>2343.25</ele></trkpt>
     </trkseg>
@@ -41148,7 +41181,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Tuolumne CG Trail</desc><cmt/><trkseg>
       <trkpt lat="37.868738" lon="-119.333659"><ele>2642.50</ele></trkpt>
       <trkpt lat="37.868765" lon="-119.334443"><ele>2643.38</ele></trkpt>
       <trkpt lat="37.868663" lon="-119.334995"><ele>2644.51</ele></trkpt>
@@ -41186,7 +41219,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: VVR Trail</desc><cmt/><trkseg>
       <trkpt lat="37.412547" lon="-118.924676"><ele>2407.56</ele></trkpt>
       <trkpt lat="37.412295" lon="-118.925479"><ele>2403.77</ele></trkpt>
       <trkpt lat="37.412281" lon="-118.925903"><ele>2403.56</ele></trkpt>
@@ -41243,7 +41276,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Whitney Portal Trail</desc><cmt/><trkseg>
       <trkpt lat="36.560550" lon="-118.293116"><ele>4099.98</ele></trkpt>
       <trkpt lat="36.560264" lon="-118.292694"><ele>4116.92</ele></trkpt>
       <trkpt lat="36.560014" lon="-118.292502"><ele>4116.87</ele></trkpt>
@@ -41570,7 +41603,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Whitney Spur Trail</desc><cmt/><trkseg>
       <trkpt lat="36.552496" lon="-118.358631"><ele>3150.08</ele></trkpt>
       <trkpt lat="36.552823" lon="-118.358287"><ele>3153.54</ele></trkpt>
       <trkpt lat="36.554119" lon="-118.357546"><ele>3159.42</ele></trkpt>
@@ -41618,7 +41651,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Whitney Trail</desc><cmt>simplification:keep</cmt><trkseg>
       <trkpt lat="36.558943" lon="-118.361772"><ele>3286.15</ele></trkpt>
       <trkpt lat="36.558893" lon="-118.361616"><ele>3284.73</ele></trkpt>
       <trkpt lat="36.558937" lon="-118.360961"><ele>3281.91</ele></trkpt>
@@ -41844,7 +41877,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section H. Off-Track: Yosemite Valley Spur Trail</desc><cmt/><trkseg>
       <trkpt lat="37.870311" lon="-119.371575"><ele>2632.19</ele></trkpt>
       <trkpt lat="37.870318" lon="-119.371328"><ele>2632.35</ele></trkpt>
       <trkpt lat="37.870195" lon="-119.370983"><ele>2633.23</ele></trkpt>
@@ -41883,32 +41916,32 @@
     </trkseg>
   </trk><wpt lat="36.561118" lon="-118.293920">
     <ele>4050.1</ele>
-    <name>BV0767I</name>
+    <name>Bivy - 767</name>
     <desc><![CDATA[Small bivy campsite, 6.1 miles E of PCT.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.563746" lon="-118.351490">
     <ele>3252.5</ele>
-    <name>CS0767</name>
+    <name>Campsite - 767</name>
     <desc><![CDATA[Several large campsites, 7/10 mile E of PCT.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.567344" lon="-118.303395">
     <ele>3635.9</ele>
-    <name>CS0767H</name>
+    <name>Campsite - 767</name>
     <desc><![CDATA[Campsites, no water, 4.4 miles E of PCT.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.563686" lon="-118.275544">
     <ele>3639.1</ele>
-    <name>CS0767L</name>
+    <name>Campsite - 767</name>
     <desc><![CDATA[Campsite, 2.4 miles E of Mt Whitney trail.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.564683" lon="-118.273199">
     <ele>3617.3</ele>
-    <name>CS0767M</name>
+    <name>Campsite - 767</name>
     <desc><![CDATA[Campsite, 2.6 miles E of Mt Whitney trail.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.568221" lon="-118.262464">
     <ele>3364.7</ele>
-    <name>CS0767P</name>
+    <name>Campsite - 767</name>
     <desc><![CDATA[Campsite, 3.6 miles E of Mt Whitney trail.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.574997" lon="-118.250497">
@@ -41933,74 +41966,74 @@
     <sym>Summit</sym>
   </wpt><wpt lat="36.567888" lon="-118.338823">
     <ele>3317.8</ele>
-    <name>WA0767C</name>
+    <name>Water - 767</name>
     <desc><![CDATA[Trailside water from Whitney Creek, 1.7 miles E of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.567708" lon="-118.330242">
     <ele>3379.4</ele>
-    <name>WA0767D</name>
+    <name>Water - 767</name>
     <desc><![CDATA[Timberline Lake, no camping, 2.3 miles E of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.572247" lon="-118.313973">
     <ele>3500.4</ele>
-    <name>WA0767E</name>
+    <name>Water - 767</name>
     <desc><![CDATA[Whitney Creek crossing near Guitar Lake, 3.5 miles E of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.561406" lon="-118.282993">
     <ele>3774.2</ele>
-    <name>WA0767J</name>
+    <name>Water - 767</name>
     <desc><![CDATA[Stream crossing the trail, 1.7 miles E of Mount Whitney Trail.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.565458" lon="-118.271942">
     <ele>3591.4</ele>
-    <name>WA0767N</name>
+    <name>Water - 767</name>
     <desc><![CDATA[Lone Pine Creek, 2.7 miles E of Mt Whitney trail.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.566617" lon="-118.268158">
     <ele>3461.7</ele>
-    <name>WA0767O</name>
+    <name>Water - 767</name>
     <desc><![CDATA[Trailside water from Lone Pine Creek, no camping, 3.1 miles E of Mt Whitney trail.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.570504" lon="-118.262106">
     <ele>3256.1</ele>
-    <name>WA0767Q</name>
+    <name>Water - 767</name>
     <desc><![CDATA[Mirror Lake, no camping, 4 miles E of Mt Whitney trail.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.575923" lon="-118.251581">
     <ele>3051.0</ele>
-    <name>WA0767S</name>
+    <name>Water - 767</name>
     <desc><![CDATA[Lone Pine Creek, log crossing, 5.6 miles E of Mt Whitney trail.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.586894" lon="-118.245349">
     <ele>2658.6</ele>
-    <name>WA0767T</name>
+    <name>Water - 767</name>
     <desc><![CDATA[N Fork Lone Pine Creek, 7.5 miles E of Mt Whitney Trail.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.589287" lon="-118.242504">
     <ele>2627.6</ele>
-    <name>WA0767U</name>
+    <name>Water - 767</name>
     <desc><![CDATA[Carillon Creek, 7.8 miles E of Mt Whitney trail.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.571735" lon="-118.311753">
     <ele>3509.5</ele>
-    <name>WACS0767F</name>
+    <name>Campsite &amp; Water - 767</name>
     <desc><![CDATA[Guitar Lake, water, many campsites, 3.7 miles E of PCT.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.569784" lon="-118.308034">
     <ele>3549.2</ele>
-    <name>WACS0767G</name>
+    <name>Campsite &amp; Water - 767</name>
     <desc><![CDATA[Small ponds, last water on the way to Mt. Whitney, 4 miles E of PCT.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.563384" lon="-118.278527">
     <ele>3659.5</ele>
-    <name>WACS0767K</name>
+    <name>Campsite &amp; Water - 767</name>
     <desc><![CDATA[Trail Camp, water from small lake, 2.2 miles E of Mt Whitney trail.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.571431" lon="-118.258728">
     <ele>3162.5</ele>
-    <name>WACS0767R</name>
+    <name>Campsite &amp; Water - 767</name>
     <desc><![CDATA[Outpost camp, water from Lone Pine Creek 100 yards N, 4.6 miles E of Mt Whitney trail.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.560536" lon="-118.293099">
     <ele>4101.1</ele>
     <name>WhitneyPtlTR</name>
@@ -42008,14 +42041,14 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.590789" lon="-118.370358">
     <ele>3246.1</ele>
-    <name>WA0770</name>
+    <name>Water - 770</name>
     <desc><![CDATA[Seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.593883" lon="-118.370986">
     <ele>3167.5</ele>
-    <name>WACSBB0770B</name>
+    <name>Campsite, Water &amp; Bear Locker - 770</name>
     <desc><![CDATA[Wallace Creek ford, water, campsites, bear locker S of creek.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.594283" lon="-118.371148">
     <ele>3172.8</ele>
     <name>JunctionMdwTR</name>
@@ -42023,24 +42056,24 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.598054" lon="-118.375016">
     <ele>3261.3</ele>
-    <name>WACS0771</name>
+    <name>Campsite &amp; Water - 771</name>
     <desc><![CDATA[Wright Creek ford, water, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.599514" lon="-118.374371">
     <ele>3275.1</ele>
-    <name>CS0771B</name>
+    <name>Campsite - 771</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.602738" lon="-118.371774">
     <ele>3301.8</ele>
-    <name>CS0771C</name>
+    <name>Campsite - 771</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.635161" lon="-118.385499">
     <ele>3365.7</ele>
-    <name>WACSBB0774</name>
+    <name>Campsite, Water &amp; Bear Locker - 774</name>
     <desc><![CDATA[Water, several campsites, bear box, near the Tyndall Frog Ponds.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.639757" lon="-118.388285">
     <ele>3315.2</ele>
     <name>TyndallRngrTR</name>
@@ -42048,9 +42081,9 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.639910" lon="-118.388327">
     <ele>3314.8</ele>
-    <name>WACSBB0774B</name>
+    <name>Campsite, Water &amp; Bear Locker - 774</name>
     <desc><![CDATA[Tyndall Creek, campsite, bear box.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.641318" lon="-118.387491">
     <ele>3329.4</ele>
     <name>ShepherdPassTR</name>
@@ -42058,39 +42091,39 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.642122" lon="-118.387513">
     <ele>3332.6</ele>
-    <name>WA0775</name>
+    <name>Water - 775</name>
     <desc><![CDATA[Tyndall Creek ford [sometimes difficult].]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.642935" lon="-118.387701">
     <ele>3345.7</ele>
-    <name>WACSBB0775B</name>
+    <name>Campsite, Water &amp; Bear Locker - 775</name>
     <desc><![CDATA[Campsite, water, bear locker, Tyndall Creek nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.645179" lon="-118.388195">
     <ele>3367.9</ele>
-    <name>TR0775</name>
+    <name>Trail Junction - 775</name>
     <desc><![CDATA[Lake South America Trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.649469" lon="-118.390611">
     <ele>3414.0</ele>
-    <name>WA0775C</name>
+    <name>Water - 775</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.671448" lon="-118.383728">
     <ele>3630.4</ele>
-    <name>WA0777</name>
+    <name>Water - 777</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.689205" lon="-118.375804">
     <ele>3808.4</ele>
-    <name>WA0778</name>
+    <name>Water - 778</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.690816" lon="-118.374226">
     <ele>3810.6</ele>
-    <name>WACS0779</name>
+    <name>Campsite &amp; Water - 779</name>
     <desc><![CDATA[Several small exposed campsites below Forester Pass, water nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.694520" lon="-118.373488">
     <ele>3998.4</ele>
     <name>ForesterPass</name>
@@ -42098,64 +42131,64 @@
     <sym>Summit</sym>
   </wpt><wpt lat="36.702418" lon="-118.368600">
     <ele>3736.4</ele>
-    <name>WACS0781</name>
+    <name>Campsite &amp; Water - 781</name>
     <desc><![CDATA[Water, several small exposed campsites at the lake outlet.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.708924" lon="-118.365780">
     <ele>3607.0</ele>
-    <name>WA0781B</name>
+    <name>Water - 781</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.712267" lon="-118.364075">
     <ele>3555.2</ele>
-    <name>WA0781C</name>
+    <name>Water - 781</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.712829" lon="-118.371565">
     <ele>3424.1</ele>
-    <name>WACS0783</name>
+    <name>Campsite &amp; Water - 783</name>
     <desc><![CDATA[Campsite, water from creek south of trail.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.720708" lon="-118.371424">
     <ele>3322.4</ele>
-    <name>CS0783B</name>
+    <name>Campsite - 783</name>
     <desc><![CDATA[Several small campsites.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.730967" lon="-118.372943">
     <ele>3211.4</ele>
-    <name>WA0784</name>
+    <name>Water - 784</name>
     <desc><![CDATA[Bubbs Creek ford]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.734041" lon="-118.375642">
     <ele>3194.2</ele>
-    <name>WACSBB0784B</name>
+    <name>Campsite, Water &amp; Bear Locker - 784</name>
     <desc><![CDATA[Campsite, bear box, water from nearby Bubbs Creek.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.737725" lon="-118.379098">
     <ele>3170.1</ele>
-    <name>WACS0785</name>
+    <name>Campsite &amp; Water - 785</name>
     <desc><![CDATA[Campsite, water from nearby Bubbs Creek.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.749827" lon="-118.388179">
     <ele>3081.7</ele>
-    <name>GT0786</name>
+    <name>Gate - 786</name>
     <desc><![CDATA[Wire gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="36.752937" lon="-118.394279">
     <ele>3021.3</ele>
-    <name>WACSBB0786</name>
+    <name>Campsite, Water &amp; Bear Locker - 786</name>
     <desc><![CDATA[Upper Vidette Meadow, large campsite, water, bear box.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.759158" lon="-118.406127">
     <ele>2912.2</ele>
-    <name>WACSBB0787</name>
+    <name>Campsite, Water &amp; Bear Locker - 787</name>
     <desc><![CDATA[Middle Vidette Meadow, large campsites, bear locker, water from Bubbs Creek, more campsites 1/10 mi N or S of the bear locker.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.760298" lon="-118.411857">
     <ele>2915.1</ele>
-    <name>WACS0787B</name>
+    <name>Campsite &amp; Water - 787</name>
     <desc><![CDATA[Campsite, water nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.760230" lon="-118.412249">
     <ele>2914.5</ele>
     <name>CedarGroveTR</name>
@@ -42163,14 +42196,14 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.764506" lon="-118.407986">
     <ele>3069.6</ele>
-    <name>WA0788</name>
+    <name>Water - 788</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.766093" lon="-118.410744">
     <ele>3161.5</ele>
-    <name>WACS788B</name>
+    <name>Campsite &amp; Water - 788</name>
     <desc><![CDATA[Stream, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.768131" lon="-118.411467">
     <ele>3207.9</ele>
     <name>BullFrogLkTR</name>
@@ -42178,7 +42211,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.768246" lon="-118.411384">
     <ele>3209.6</ele>
-    <name>CS0788C</name>
+    <name>Campsite - 788</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.772826" lon="-118.340367">
@@ -42188,7 +42221,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.775530" lon="-118.406002">
     <ele>3346.3</ele>
-    <name>CS0789B</name>
+    <name>Campsite - 789</name>
     <desc><![CDATA[Campsite, 9/10 mile E of PCT.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.773681" lon="-118.381803">
@@ -42203,12 +42236,12 @@
     <sym>Summit</sym>
   </wpt><wpt lat="36.771900" lon="-118.413522">
     <ele>3292.4</ele>
-    <name>TR0789</name>
+    <name>Trail Junction - 789</name>
     <desc><![CDATA[Junction with spur trail to PCT, 2/10 mile E of PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.775351" lon="-118.394891">
     <ele>3397.0</ele>
-    <name>WA0789C</name>
+    <name>Water - 789</name>
     <desc><![CDATA[Seasonal spring, 1.5 miles E of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.770610" lon="-118.416297">
@@ -42223,12 +42256,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.782932" lon="-118.422586">
     <ele>3356.6</ele>
-    <name>CS0790</name>
+    <name>Campsite - 790</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.784672" lon="-118.421005">
     <ele>3381.6</ele>
-    <name>CS0790B</name>
+    <name>Campsite - 790</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.789552" lon="-118.411768">
@@ -42238,7 +42271,7 @@
     <sym>Summit</sym>
   </wpt><wpt lat="36.797419" lon="-118.406813">
     <ele>3379.7</ele>
-    <name>WA0792</name>
+    <name>Water - 792</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.802766" lon="-118.402551">
@@ -42248,22 +42281,22 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.803584" lon="-118.402038">
     <ele>3215.8</ele>
-    <name>WA0793</name>
+    <name>Water - 793</name>
     <desc><![CDATA[Upper Rae Lakes outlet]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.806762" lon="-118.398019">
     <ele>3236.6</ele>
-    <name>TR0793</name>
+    <name>Trail Junction - 793</name>
     <desc><![CDATA[Trail junction to bear locker and campsite.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.806820" lon="-118.399415">
     <ele>3221.9</ele>
-    <name>WACSBB0793B</name>
+    <name>Campsite, Water &amp; Bear Locker - 793</name>
     <desc><![CDATA[Middle Rae Lake, campsite, bear locker.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.809910" lon="-118.398664">
     <ele>3224.2</ele>
-    <name>WA0794</name>
+    <name>Water - 794</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.811347" lon="-118.400771">
@@ -42273,19 +42306,19 @@
     <sym>City (Capitol)</sym>
   </wpt><wpt lat="36.814710" lon="-118.405350">
     <ele>3220.0</ele>
-    <name>WACSBB0794B</name>
+    <name>Campsite, Water &amp; Bear Locker - 794</name>
     <desc><![CDATA[Lower Rae Lake, campsite, bear locker.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.827550" lon="-118.409600">
     <ele>3144.0</ele>
-    <name>WACSBB0795</name>
+    <name>Campsite, Water &amp; Bear Locker - 795</name>
     <desc><![CDATA[Arrowhead Lake, large campsite, bear locker.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.834396" lon="-118.408601">
     <ele>3115.5</ele>
-    <name>WACS0796</name>
+    <name>Campsite &amp; Water - 796</name>
     <desc><![CDATA[Dollar Lake, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.834616" lon="-118.408192">
     <ele>3114.3</ele>
     <name>BaxterPassTR</name>
@@ -42293,24 +42326,24 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.849802" lon="-118.412590">
     <ele>2902.6</ele>
-    <name>WA0797</name>
+    <name>Water - 797</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.850054" lon="-118.412932">
     <ele>2905.3</ele>
-    <name>GT0797B</name>
+    <name>Gate - 797</name>
     <desc><![CDATA[Fence, wire gate.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="36.852405" lon="-118.415188">
     <ele>2886.5</ele>
-    <name>WA0797C</name>
+    <name>Water - 797</name>
     <desc><![CDATA[Wooden boardwalk, water is probably stagnant late season.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.873630" lon="-118.438005">
     <ele>2600.5</ele>
-    <name>WACSBB0800</name>
+    <name>Campsite, Water &amp; Bear Locker - 800</name>
     <desc><![CDATA[Woods Creek, suspension bridge, campsites, bear locker.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.873774" lon="-118.439193">
     <ele>2602.1</ele>
     <name>ParadiseValTR</name>
@@ -42318,32 +42351,32 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.879628" lon="-118.433491">
     <ele>2694.4</ele>
-    <name>WA0800B</name>
+    <name>Water - 800</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.886289" lon="-118.425592">
     <ele>2774.6</ele>
-    <name>WA0801</name>
+    <name>Water - 801</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.888887" lon="-118.421149">
     <ele>2817.8</ele>
-    <name>CS0801</name>
+    <name>Campsite - 801</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.895595" lon="-118.416448">
     <ele>2931.8</ele>
-    <name>WA0802</name>
+    <name>Water - 802</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.899319" lon="-118.410832">
     <ele>2986.7</ele>
-    <name>CS0803</name>
+    <name>Campsite - 803</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.901773" lon="-118.402185">
     <ele>3129.0</ele>
-    <name>WA0803B</name>
+    <name>Water - 803</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.902592" lon="-118.400413">
@@ -42353,7 +42386,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.927529" lon="-118.406366">
     <ele>3493.4</ele>
-    <name>WA0806</name>
+    <name>Water - 806</name>
     <desc><![CDATA[Stream below a small pond.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.936104" lon="-118.412534">
@@ -42363,37 +42396,37 @@
     <sym>Summit</sym>
   </wpt><wpt lat="36.945092" lon="-118.428647">
     <ele>3400.9</ele>
-    <name>WACS0809</name>
+    <name>Campsite &amp; Water - 809</name>
     <desc><![CDATA[Lake Marjorie, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.946800" lon="-118.431774">
     <ele>3394.6</ele>
-    <name>WACS0808B</name>
+    <name>Campsite &amp; Water - 808</name>
     <desc><![CDATA[Lake Marjorie, small campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.950702" lon="-118.433073">
     <ele>3366.6</ele>
-    <name>WA0809</name>
+    <name>Water - 809</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.951629" lon="-118.433053">
     <ele>3363.6</ele>
-    <name>WA0809B</name>
+    <name>Water - 809</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.955827" lon="-118.436518">
     <ele>3344.6</ele>
-    <name>WA0810</name>
+    <name>Water - 810</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.958620" lon="-118.436851">
     <ele>3312.6</ele>
-    <name>WACS0810B</name>
+    <name>Campsite &amp; Water - 810</name>
     <desc><![CDATA[Campsite]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.961195" lon="-118.439079">
     <ele>3282.7</ele>
-    <name>WA0810C</name>
+    <name>Water - 810</name>
     <desc><![CDATA[Stream near the Bench Lake Trail junction]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.962155" lon="-118.438753">
@@ -42403,52 +42436,52 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.969124" lon="-118.441787">
     <ele>3090.9</ele>
-    <name>WA0811</name>
+    <name>Water - 811</name>
     <desc><![CDATA[Large stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.969574" lon="-118.444136">
     <ele>3066.8</ele>
-    <name>CS0811</name>
+    <name>Campsite - 811</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="36.970435" lon="-118.444842">
     <ele>3060.0</ele>
-    <name>WA0811B</name>
+    <name>Water - 811</name>
     <desc><![CDATA[South Fork of the Kings River ford [a large river, sometimes difficult], area closed to camping.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.974809" lon="-118.442606">
     <ele>3105.6</ele>
-    <name>WACS0812</name>
+    <name>Campsite &amp; Water - 812</name>
     <desc><![CDATA[Campsite, water, along South Fork of Kings River.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="36.980276" lon="-118.444226">
     <ele>3161.4</ele>
-    <name>WA0812B</name>
+    <name>Water - 812</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.983104" lon="-118.445057">
     <ele>3172.3</ele>
-    <name>WA0812C</name>
+    <name>Water - 812</name>
     <desc><![CDATA[Trailside creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="36.994367" lon="-118.450301">
     <ele>3251.1</ele>
-    <name>WACS0813</name>
+    <name>Campsite &amp; Water - 813</name>
     <desc><![CDATA[Stream, several campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.000860" lon="-118.451898">
     <ele>3302.6</ele>
-    <name>WA0814</name>
+    <name>Water - 814</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.011164" lon="-118.457535">
     <ele>3393.0</ele>
-    <name>WA0815</name>
+    <name>Water - 815</name>
     <desc><![CDATA[Ford a stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.020121" lon="-118.459869">
     <ele>3487.0</ele>
-    <name>WA0815B</name>
+    <name>Water - 815</name>
     <desc><![CDATA[Small stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.031323" lon="-118.460103">
@@ -42458,89 +42491,89 @@
     <sym>Summit</sym>
   </wpt><wpt lat="37.039624" lon="-118.465235">
     <ele>3425.0</ele>
-    <name>WA0818</name>
+    <name>Water - 818</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.052285" lon="-118.471273">
     <ele>3311.6</ele>
-    <name>CS0819</name>
+    <name>Campsite - 819</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.053846" lon="-118.472654">
     <ele>3304.6</ele>
-    <name>WA0819B</name>
+    <name>Water - 819</name>
     <desc><![CDATA[Palisade Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.054529" lon="-118.473010">
     <ele>3308.2</ele>
-    <name>CS0819C</name>
+    <name>Campsite - 819</name>
     <desc><![CDATA[Several small campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.056832" lon="-118.477054">
     <ele>3284.9</ele>
-    <name>WACS0820</name>
+    <name>Campsite &amp; Water - 820</name>
     <desc><![CDATA[Small stream, small campsites 100 feet S of the stream crossing.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.057425" lon="-118.478369">
     <ele>3276.6</ele>
-    <name>WACS0820B</name>
+    <name>Campsite &amp; Water - 820</name>
     <desc><![CDATA[Stream, small campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.060189" lon="-118.488290">
     <ele>3233.3</ele>
-    <name>WACS0821</name>
+    <name>Campsite &amp; Water - 821</name>
     <desc><![CDATA[Lower Palisade Lake, exposed campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.060149" lon="-118.491845">
     <ele>3224.2</ele>
-    <name>WA0821B</name>
+    <name>Water - 821</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.053411" lon="-118.506656">
     <ele>2837.1</ele>
-    <name>WA0823</name>
+    <name>Water - 823</name>
     <desc><![CDATA[Trailside water, Palisade Creek.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.054642" lon="-118.514841">
     <ele>2736.2</ele>
-    <name>WACS0823B</name>
+    <name>Campsite &amp; Water - 823</name>
     <desc><![CDATA[Campsite, Palisade Creek nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.054579" lon="-118.518723">
     <ele>2716.8</ele>
-    <name>WACS0823C</name>
+    <name>Campsite &amp; Water - 823</name>
     <desc><![CDATA[Campsite, water.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.055010" lon="-118.519849">
     <ele>2706.7</ele>
-    <name>WA0824</name>
+    <name>Water - 824</name>
     <desc><![CDATA[Glacier Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.055322" lon="-118.525851">
     <ele>2695.4</ele>
-    <name>WACS0824B</name>
+    <name>Campsite &amp; Water - 824</name>
     <desc><![CDATA[Large campsite, 200 feet S of trail, toward Palisade Creek.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.055411" lon="-118.528882">
     <ele>2680.8</ele>
-    <name>WA0824B</name>
+    <name>Water - 824</name>
     <desc><![CDATA[Trailside creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.053647" lon="-118.537455">
     <ele>2647.1</ele>
-    <name>WACS0825</name>
+    <name>Campsite &amp; Water - 825</name>
     <desc><![CDATA[Campsite, water, along Palisade Creek.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.052031" lon="-118.550060">
     <ele>2609.5</ele>
-    <name>GT0825B</name>
+    <name>Gate - 825</name>
     <desc><![CDATA[Fence, wire gate.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="37.052704" lon="-118.563107">
     <ele>2568.0</ele>
-    <name>WACS0826</name>
+    <name>Campsite &amp; Water - 826</name>
     <desc><![CDATA[Campsite near Palisade Creek, also several other campsites 1/10 mile E.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.052793" lon="-118.579340">
     <ele>2450.1</ele>
     <name>SimpsonMdwTR</name>
@@ -42548,59 +42581,59 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.052761" lon="-118.579433">
     <ele>2449.7</ele>
-    <name>WACS0827</name>
+    <name>Campsite &amp; Water - 827</name>
     <desc><![CDATA[Campsite, Middle Fork Kings River nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.052973" lon="-118.580543">
     <ele>2466.2</ele>
-    <name>WACS0828</name>
+    <name>Campsite &amp; Water - 828</name>
     <desc><![CDATA[Campsite, Middle Fork Kings River nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.058528" lon="-118.585383">
     <ele>2512.6</ele>
-    <name>WACS0828B</name>
+    <name>Campsite &amp; Water - 828</name>
     <desc><![CDATA[Campsite along the Middle Fork Kings River.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.062806" lon="-118.588289">
     <ele>2512.1</ele>
-    <name>WACS0828C</name>
+    <name>Campsite &amp; Water - 828</name>
     <desc><![CDATA[Campsite, water.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.063508" lon="-118.589125">
     <ele>2512.7</ele>
-    <name>WACS0828D</name>
+    <name>Campsite &amp; Water - 828</name>
     <desc><![CDATA[Grouse Meadow, campsite, water.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.076075" lon="-118.596673">
     <ele>2549.8</ele>
-    <name>GT0830</name>
+    <name>Gate - 830</name>
     <desc><![CDATA[Fence, wire gate.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="37.088052" lon="-118.595007">
     <ele>2635.8</ele>
-    <name>WACS0831</name>
+    <name>Campsite &amp; Water - 831</name>
     <desc><![CDATA[Campsite, water, along Middle Fork Kings River.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.089047" lon="-118.595442">
     <ele>2636.9</ele>
-    <name>WACS0831B</name>
+    <name>Campsite &amp; Water - 831</name>
     <desc><![CDATA[Campsite, water, along Middle Fork Kings River.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.091085" lon="-118.594356">
     <ele>2649.5</ele>
-    <name>WACS0831C</name>
+    <name>Campsite &amp; Water - 831</name>
     <desc><![CDATA[Campsite, water, along Middle Fork Kings River.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.092517" lon="-118.593852">
     <ele>2654.9</ele>
-    <name>WA0831D</name>
+    <name>Water - 831</name>
     <desc><![CDATA[Creek, steel bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.093599" lon="-118.594196">
     <ele>2658.9</ele>
-    <name>WACS0831E</name>
+    <name>Campsite &amp; Water - 831</name>
     <desc><![CDATA[Several campsites]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.114951" lon="-118.545442">
     <ele>3651.8</ele>
     <name>BishopPass</name>
@@ -42618,102 +42651,102 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.099616" lon="-118.597659">
     <ele>2703.4</ele>
-    <name>WACS0831F</name>
+    <name>Campsite &amp; Water - 831</name>
     <desc><![CDATA[Campsite]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.102238" lon="-118.598497">
     <ele>2706.6</ele>
-    <name>WACS0832</name>
+    <name>Campsite &amp; Water - 832</name>
     <desc><![CDATA[Several campsites]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.103185" lon="-118.599300">
     <ele>2706.6</ele>
-    <name>WACS0832B</name>
+    <name>Campsite &amp; Water - 832</name>
     <desc><![CDATA[Small campsite]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.104689" lon="-118.599818">
     <ele>2708.5</ele>
-    <name>WACS0832C</name>
+    <name>Campsite &amp; Water - 832</name>
     <desc><![CDATA[Campsite near a creek]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.109527" lon="-118.602992">
     <ele>2800.6</ele>
-    <name>GT0832D</name>
+    <name>Gate - 832</name>
     <desc><![CDATA[Fence, wire gate.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="37.112852" lon="-118.605830">
     <ele>2819.4</ele>
-    <name>WACS0833</name>
+    <name>Campsite &amp; Water - 833</name>
     <desc><![CDATA[Big Pete Meadow, campsites, creek.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.112582" lon="-118.606994">
     <ele>2817.8</ele>
-    <name>WA0833B</name>
+    <name>Water - 833</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.113480" lon="-118.611313">
     <ele>2837.6</ele>
-    <name>WACS0833C</name>
+    <name>Campsite &amp; Water - 833</name>
     <desc><![CDATA[Large campsites, Middle Fork Kings River nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.112727" lon="-118.616559">
     <ele>2859.3</ele>
-    <name>WACS0833D</name>
+    <name>Campsite &amp; Water - 833</name>
     <desc><![CDATA[Large campsite along Middle Fork Kings River.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.112595" lon="-118.621239">
     <ele>2891.8</ele>
-    <name>WACS0834</name>
+    <name>Campsite &amp; Water - 834</name>
     <desc><![CDATA[Large campsite along the Middle Fork Kings River.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.114262" lon="-118.637532">
     <ele>3148.0</ele>
-    <name>WACS0835</name>
+    <name>Campsite &amp; Water - 835</name>
     <desc><![CDATA[Campsite along the Middle Fork Kings River.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.115692" lon="-118.637734">
     <ele>3168.6</ele>
-    <name>WA0835B</name>
+    <name>Water - 835</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.116134" lon="-118.639698">
     <ele>3194.9</ele>
-    <name>WACS0835C</name>
+    <name>Campsite &amp; Water - 835</name>
     <desc><![CDATA[Campsite along the Middle Fork Kings River.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.119410" lon="-118.641469">
     <ele>3260.4</ele>
-    <name>WA0835D</name>
+    <name>Water - 835</name>
     <desc><![CDATA[Middle Fork Kings River]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.123748" lon="-118.645176">
     <ele>3311.8</ele>
-    <name>WA0836</name>
+    <name>Water - 836</name>
     <desc><![CDATA[Middle Fork Kings River, inlet to small lake, camping not permitted in this area.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.124105" lon="-118.648219">
     <ele>3355.1</ele>
-    <name>WA0836B</name>
+    <name>Water - 836</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.122196" lon="-118.653622">
     <ele>3449.2</ele>
-    <name>WA0837</name>
+    <name>Water - 837</name>
     <desc><![CDATA[Lake outlet]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.120931" lon="-118.654437">
     <ele>3449.8</ele>
-    <name>WA0837B</name>
+    <name>Water - 837</name>
     <desc><![CDATA[Middle Fork Kings River]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.118805" lon="-118.659862">
     <ele>3545.1</ele>
-    <name>WA0837C</name>
+    <name>Water - 837</name>
     <desc><![CDATA[Helen Lake outlet]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.114111" lon="-118.663812">
     <ele>3547.9</ele>
-    <name>WA0838</name>
+    <name>Water - 838</name>
     <desc><![CDATA[Inflow to Helen Lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.112048" lon="-118.670911">
@@ -42723,102 +42756,102 @@
     <sym>Summit</sym>
   </wpt><wpt lat="37.116316" lon="-118.680115">
     <ele>3527.5</ele>
-    <name>WA0839</name>
+    <name>Water - 839</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.119174" lon="-118.683516">
     <ele>3518.1</ele>
-    <name>WA0840</name>
+    <name>Water - 840</name>
     <desc><![CDATA[Outflow from Lake McDermand]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.124070" lon="-118.690919">
     <ele>3485.1</ele>
-    <name>WA0840B</name>
+    <name>Water - 840</name>
     <desc><![CDATA[Wanda Lake midpoint.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.128010" lon="-118.695901">
     <ele>3487.9</ele>
-    <name>WACS0840C</name>
+    <name>Campsite &amp; Water - 840</name>
     <desc><![CDATA[Wanda Lake, several small campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.128631" lon="-118.697326">
     <ele>3485.3</ele>
-    <name>WACS0841</name>
+    <name>Campsite &amp; Water - 841</name>
     <desc><![CDATA[Campsites]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.130777" lon="-118.698295">
     <ele>3466.2</ele>
-    <name>WA0841B</name>
+    <name>Water - 841</name>
     <desc><![CDATA[Headwaters of Evolution Creek.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.135196" lon="-118.699107">
     <ele>3450.4</ele>
-    <name>WA0841C</name>
+    <name>Water - 841</name>
     <desc><![CDATA[Evolution Basin, water.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.148667" lon="-118.696656">
     <ele>3362.9</ele>
-    <name>WA0842</name>
+    <name>Water - 842</name>
     <desc><![CDATA[Sapphire Lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.160600" lon="-118.691883">
     <ele>3312.0</ele>
-    <name>WA0843</name>
+    <name>Water - 843</name>
     <desc><![CDATA[Evolution Creek, inflow to Evolution Lake.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.166235" lon="-118.691835">
     <ele>3315.4</ele>
-    <name>WACS0844</name>
+    <name>Campsite &amp; Water - 844</name>
     <desc><![CDATA[Evolution Lake, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.172134" lon="-118.700312">
     <ele>3313.3</ele>
-    <name>WACS0844B</name>
+    <name>Campsite &amp; Water - 844</name>
     <desc><![CDATA[Evolution Lake, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.175367" lon="-118.706755">
     <ele>3189.3</ele>
-    <name>WA0845</name>
+    <name>Water - 845</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.174299" lon="-118.707707">
     <ele>3171.2</ele>
-    <name>CS0845B</name>
+    <name>Campsite - 845</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.173652" lon="-118.711608">
     <ele>3054.2</ele>
-    <name>CS0846</name>
+    <name>Campsite - 846</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.174412" lon="-118.713903">
     <ele>3030.3</ele>
-    <name>WACS0846B</name>
+    <name>Campsite &amp; Water - 846</name>
     <desc><![CDATA[Stream, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.178001" lon="-118.720834">
     <ele>2991.4</ele>
-    <name>WACS0847</name>
+    <name>Campsite &amp; Water - 847</name>
     <desc><![CDATA[Several campsites W of trail.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.184903" lon="-118.732578">
     <ele>2964.1</ele>
-    <name>WA0847B</name>
+    <name>Water - 847</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.185539" lon="-118.734433">
     <ele>2953.9</ele>
-    <name>WACS0848</name>
+    <name>Campsite &amp; Water - 848</name>
     <desc><![CDATA[Campsite near Evolution Creek]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.187815" lon="-118.741628">
     <ele>2941.1</ele>
-    <name>WACS0848B</name>
+    <name>Campsite &amp; Water - 848</name>
     <desc><![CDATA[McClure Meadow, campsite, water.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.188011" lon="-118.742014">
     <ele>2941.7</ele>
-    <name>WA0848</name>
+    <name>Water - 848</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.187963" lon="-118.742541">
@@ -42828,107 +42861,107 @@
     <sym>City (Capitol)</sym>
   </wpt><wpt lat="37.188348" lon="-118.746233">
     <ele>2938.8</ele>
-    <name>WACS0848C</name>
+    <name>Campsite &amp; Water - 848</name>
     <desc><![CDATA[McClure Meadow, campsite, water.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.188836" lon="-118.751705">
     <ele>2912.3</ele>
-    <name>WACS0849</name>
+    <name>Campsite &amp; Water - 849</name>
     <desc><![CDATA[Evolution Creek, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.189295" lon="-118.752871">
     <ele>2905.0</ele>
-    <name>GT0849B</name>
+    <name>Gate - 849</name>
     <desc><![CDATA[Fence, wood gate.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="37.190936" lon="-118.757854">
     <ele>2891.4</ele>
-    <name>WA0849C</name>
+    <name>Water - 849</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.194791" lon="-118.772986">
     <ele>2815.2</ele>
-    <name>TR0850</name>
+    <name>Trail Junction - 850</name>
     <desc><![CDATA[Alternate route across Evolution Creek during high water.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.195844" lon="-118.773483">
     <ele>2817.0</ele>
-    <name>WACS0850B</name>
+    <name>Campsite &amp; Water - 850</name>
     <desc><![CDATA[Evolution Meadow, campsite, water.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.195717" lon="-118.781801">
     <ele>2804.5</ele>
-    <name>WACS0851</name>
+    <name>Campsite &amp; Water - 851</name>
     <desc><![CDATA[Evolution Creek ford, campsites, can be a dangerous crossing early season during high water.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.195014" lon="-118.783334">
     <ele>2807.6</ele>
-    <name>GT0851B</name>
+    <name>Gate - 851</name>
     <desc><![CDATA[Fence, wire gate.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="37.195630" lon="-118.794815">
     <ele>2584.6</ele>
-    <name>CS0852</name>
+    <name>Campsite - 852</name>
     <desc><![CDATA[Large campsite.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.192864" lon="-118.794842">
     <ele>2585.3</ele>
-    <name>WACS0852B</name>
+    <name>Campsite &amp; Water - 852</name>
     <desc><![CDATA[South Fork San Joaquin River, wood bridge, several campsites, water, Goddard Canyon Trail junction.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.193572" lon="-118.795593">
     <ele>2585.2</ele>
-    <name>CS0853</name>
+    <name>Campsite - 853</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.194520" lon="-118.796796">
     <ele>2581.9</ele>
-    <name>WA0853B</name>
+    <name>Water - 853</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.200975" lon="-118.799082">
     <ele>2568.2</ele>
-    <name>CS0853C</name>
+    <name>Campsite - 853</name>
     <desc><![CDATA[Several campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.202608" lon="-118.800597">
     <ele>2560.7</ele>
-    <name>GT0853D</name>
+    <name>Gate - 853</name>
     <desc><![CDATA[Fence, wire gate.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="37.203186" lon="-118.800887">
     <ele>2552.7</ele>
-    <name>WACS0853E</name>
+    <name>Campsite &amp; Water - 853</name>
     <desc><![CDATA[South Fork San Joaquin River, steel bridge, large campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.213150" lon="-118.815528">
     <ele>2514.4</ele>
-    <name>WA0854</name>
+    <name>Water - 854</name>
     <desc><![CDATA[Aspen Meadow, stream.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.214184" lon="-118.817823">
     <ele>2501.4</ele>
-    <name>WACS0855</name>
+    <name>Campsite &amp; Water - 855</name>
     <desc><![CDATA[Campsite in Aspen Meadow, water, another campsite 1/10th mile S.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.221907" lon="-118.827135">
     <ele>2471.1</ele>
-    <name>WACS0856</name>
+    <name>Campsite &amp; Water - 856</name>
     <desc><![CDATA[Campsite, water.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.223915" lon="-118.830443">
     <ele>2460.5</ele>
-    <name>WACS0856B</name>
+    <name>Campsite &amp; Water - 856</name>
     <desc><![CDATA[Large campsite along the South Fork San Joaquin River.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.224837" lon="-118.832346">
     <ele>2461.8</ele>
-    <name>WACS0856C</name>
+    <name>Campsite &amp; Water - 856</name>
     <desc><![CDATA[Large campsite, near Piute Creek.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.225288" lon="-118.833210">
     <ele>2460.2</ele>
-    <name>WA0856D</name>
+    <name>Water - 856</name>
     <desc><![CDATA[Piute Creek, steel bridge, Piute Pass Trail junction, John Muir Wilderness boundary nearby.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.225804" lon="-118.861256">
@@ -42953,14 +42986,14 @@
     <sym>Post Office</sym>
   </wpt><wpt lat="37.227992" lon="-118.866454">
     <ele>2374.0</ele>
-    <name>WACS0858</name>
+    <name>Campsite &amp; Water - 858</name>
     <desc><![CDATA[Campsite along the South Fork San Joaquin River, 4/10 mile NW of PCT.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.235175" lon="-118.880623">
     <ele>2342.3</ele>
-    <name>WACS0858B</name>
+    <name>Campsite &amp; Water - 858</name>
     <desc><![CDATA[Campsite near Muir Ranch, 1.6 miles NW of PCT on Florence Lake Trail.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.242209" lon="-118.871757">
     <ele>2563.5</ele>
     <name>FlorenceLakeTR2</name>
@@ -42968,42 +43001,42 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.253533" lon="-118.864398">
     <ele>2971.2</ele>
-    <name>WACS0862</name>
+    <name>Campsite &amp; Water - 862</name>
     <desc><![CDATA[Senger Creek]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.258814" lon="-118.869598">
     <ele>3075.9</ele>
-    <name>CS0862B</name>
+    <name>Campsite - 862</name>
     <desc><![CDATA[Several campsites near a seasonal creek]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.259226" lon="-118.870510">
     <ele>3076.4</ele>
-    <name>WA0862C</name>
+    <name>Water - 862</name>
     <desc><![CDATA[Seasonal water, may not be flowing late season in dry years.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.258608" lon="-118.872418">
     <ele>3081.9</ele>
-    <name>CS0863D</name>
+    <name>Campsite - 863</name>
     <desc><![CDATA[Large campsite near seasonal creek.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.270064" lon="-118.876506">
     <ele>3108.9</ele>
-    <name>WACS0864</name>
+    <name>Campsite &amp; Water - 864</name>
     <desc><![CDATA[Sallie Keyes Lake outlet, campsites nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.273769" lon="-118.875392">
     <ele>3107.1</ele>
-    <name>WA0864B</name>
+    <name>Water - 864</name>
     <desc><![CDATA[Sallie Keyes Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.282080" lon="-118.874317">
     <ele>3222.1</ele>
-    <name>WA0865</name>
+    <name>Water - 865</name>
     <desc><![CDATA[Heart Lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.285344" lon="-118.874414">
     <ele>3230.4</ele>
-    <name>WA0865B</name>
+    <name>Water - 865</name>
     <desc><![CDATA[Sallie Keyes Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.289938" lon="-118.872927">
@@ -43013,19 +43046,19 @@
     <sym>Summit</sym>
   </wpt><wpt lat="37.297432" lon="-118.872073">
     <ele>3225.4</ele>
-    <name>WACS0866</name>
+    <name>Campsite &amp; Water - 866</name>
     <desc><![CDATA[Marie Lake, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.298338" lon="-118.871527">
     <ele>3221.1</ele>
-    <name>WACS0866B</name>
+    <name>Campsite &amp; Water - 866</name>
     <desc><![CDATA[Marie Lake, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.300117" lon="-118.871748">
     <ele>3223.6</ele>
-    <name>WACS0866C</name>
+    <name>Campsite &amp; Water - 866</name>
     <desc><![CDATA[Marie Lake, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.316619" lon="-118.872172">
     <ele>3059.3</ele>
     <name>RoseLakeTR</name>
@@ -43033,17 +43066,17 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.319557" lon="-118.869566">
     <ele>3053.4</ele>
-    <name>CS0868</name>
+    <name>Campsite - 868</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.320321" lon="-118.869656">
     <ele>3050.6</ele>
-    <name>WACS0868B</name>
+    <name>Campsite &amp; Water - 868</name>
     <desc><![CDATA[West Fork Bear Creek, campsite S of the creek.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.330108" lon="-118.867494">
     <ele>2918.2</ele>
-    <name>WA0869</name>
+    <name>Water - 869</name>
     <desc><![CDATA[Bear Creek ford, WA0869, can be a difficult ford.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.330297" lon="-118.867182">
@@ -43053,7 +43086,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.344545" lon="-118.875128">
     <ele>2848.3</ele>
-    <name>WA0870</name>
+    <name>Water - 870</name>
     <desc><![CDATA[Hilgard Branch ford]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.345651" lon="-118.876151">
@@ -43063,24 +43096,24 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.351065" lon="-118.877980">
     <ele>2815.2</ele>
-    <name>WACS0871</name>
+    <name>Campsite &amp; Water - 871</name>
     <desc><![CDATA[Bear Creek, several campsites]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.356130" lon="-118.879627">
     <ele>2787.1</ele>
-    <name>WACS0871B</name>
+    <name>Campsite &amp; Water - 871</name>
     <desc><![CDATA[Bear Creek, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.362598" lon="-118.882389">
     <ele>2767.8</ele>
-    <name>WACS0872</name>
+    <name>Campsite &amp; Water - 872</name>
     <desc><![CDATA[Bear Creek, several campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.367734" lon="-118.887218">
     <ele>2729.4</ele>
-    <name>WACS0872B</name>
+    <name>Campsite &amp; Water - 872</name>
     <desc><![CDATA[Bear Creek, large campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.368113" lon="-118.888484">
     <ele>2726.2</ele>
     <name>BearCreekTR</name>
@@ -43088,42 +43121,42 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.372645" lon="-118.896112">
     <ele>2746.4</ele>
-    <name>WA0873</name>
+    <name>Water - 873</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.373798" lon="-118.897184">
     <ele>2749.7</ele>
-    <name>CS0873B</name>
+    <name>Campsite - 873</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.374968" lon="-118.898337">
     <ele>2771.5</ele>
-    <name>WACS0873C</name>
+    <name>Campsite &amp; Water - 873</name>
     <desc><![CDATA[Seasonal stream, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.376939" lon="-118.902149">
     <ele>2799.3</ele>
-    <name>CS0873D</name>
+    <name>Campsite - 873</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.378036" lon="-118.903395">
     <ele>2835.2</ele>
-    <name>WACS0874</name>
+    <name>Campsite &amp; Water - 874</name>
     <desc><![CDATA[Small campsite near seasonal water.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.379175" lon="-118.906187">
     <ele>2903.7</ele>
-    <name>WA0874B</name>
+    <name>Water - 874</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.380864" lon="-118.906116">
     <ele>2972.1</ele>
-    <name>WA0874C</name>
+    <name>Water - 874</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.382500" lon="-118.910492">
     <ele>3009.7</ele>
-    <name>TR0875</name>
+    <name>Trail Junction - 875</name>
     <desc><![CDATA[Bear Ridge Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.372780" lon="-119.007271">
@@ -43138,7 +43171,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="37.383271" lon="-118.942180">
     <ele>2687.2</ele>
-    <name>WA0875C</name>
+    <name>Water - 875</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.381952" lon="-118.927320">
@@ -43153,24 +43186,24 @@
     <sym>Shopping Center</sym>
   </wpt><wpt lat="37.402214" lon="-118.927221">
     <ele>2755.0</ele>
-    <name>WA0877</name>
+    <name>Water - 877</name>
     <desc><![CDATA[Seasonal water near trail switchback.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.410948" lon="-118.925466">
     <ele>2395.4</ele>
-    <name>WA0878</name>
+    <name>Water - 878</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.412387" lon="-118.923792">
     <ele>2400.8</ele>
-    <name>WACS0879</name>
+    <name>Campsite &amp; Water - 879</name>
     <desc><![CDATA[Mono Creek, steel bridge, several campsites on either side of the bridge.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.405158" lon="-118.942372">
     <ele>2339.0</ele>
-    <name>WACSBB0879C</name>
+    <name>Campsite, Water &amp; Bear Locker - 879</name>
     <desc><![CDATA[Campsite, bear locker, 1.5 miles W of PCT.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.412557" lon="-118.924659">
     <ele>2407.7</ele>
     <name>VVRFerryTR</name>
@@ -43178,14 +43211,14 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.415591" lon="-118.915219">
     <ele>2429.9</ele>
-    <name>WACS0879B</name>
+    <name>Campsite &amp; Water - 879</name>
     <desc><![CDATA[North Fork Mono Creek ford, campsites at the ford and 400 feet E.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.421085" lon="-118.910909">
     <ele>2538.7</ele>
-    <name>WACS0880</name>
+    <name>Campsite &amp; Water - 880</name>
     <desc><![CDATA[North Fork Mono Creek, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.422261" lon="-118.910489">
     <ele>2546.8</ele>
     <name>MonoPassTR</name>
@@ -43193,9 +43226,9 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.433611" lon="-118.908591">
     <ele>2719.4</ele>
-    <name>WACS0881</name>
+    <name>Campsite &amp; Water - 881</name>
     <desc><![CDATA[North Fork Mono Creek, near Pocket Meadow, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.438441" lon="-118.907376">
     <ele>2745.7</ele>
     <name>MottLakeTR</name>
@@ -43203,27 +43236,27 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.438706" lon="-118.907570">
     <ele>2741.1</ele>
-    <name>WACS0882</name>
+    <name>Campsite &amp; Water - 882</name>
     <desc><![CDATA[North Fork Mono Creek, second ford, campsites nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.438414" lon="-118.910479">
     <ele>2813.6</ele>
-    <name>WA0882B</name>
+    <name>Water - 882</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.441734" lon="-118.919532">
     <ele>2954.7</ele>
-    <name>WA0883</name>
+    <name>Water - 883</name>
     <desc><![CDATA[Silver Pass Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.442987" lon="-118.921699">
     <ele>2984.5</ele>
-    <name>WACS0883B</name>
+    <name>Campsite &amp; Water - 883</name>
     <desc><![CDATA[Campsite along Silver Pass Creek]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.444678" lon="-118.923212">
     <ele>3019.7</ele>
-    <name>CS0883C</name>
+    <name>Campsite - 883</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.467771" lon="-118.923211">
@@ -43238,12 +43271,12 @@
     <sym>Summit</sym>
   </wpt><wpt lat="37.472826" lon="-118.925062">
     <ele>3259.5</ele>
-    <name>CS0886</name>
+    <name>Campsite - 886</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.472126" lon="-118.926904">
     <ele>3224.7</ele>
-    <name>WA0886B</name>
+    <name>Water - 886</name>
     <desc><![CDATA[Chief Lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.475055" lon="-118.929442">
@@ -43253,27 +43286,27 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.475961" lon="-118.928301">
     <ele>3201.2</ele>
-    <name>CS0886C</name>
+    <name>Campsite - 886</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.477774" lon="-118.924241">
     <ele>3136.0</ele>
-    <name>WA0886D</name>
+    <name>Water - 886</name>
     <desc><![CDATA[Squaw Lake outlet]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.479865" lon="-118.932688">
     <ele>3009.3</ele>
-    <name>CS0887</name>
+    <name>Campsite - 887</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.481270" lon="-118.935929">
     <ele>2965.4</ele>
-    <name>WA0887B</name>
+    <name>Water - 887</name>
     <desc><![CDATA[Stream, wood bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.481737" lon="-118.936187">
     <ele>2960.3</ele>
-    <name>WA0888</name>
+    <name>Water - 888</name>
     <desc><![CDATA[Ford a stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.491055" lon="-118.932884">
@@ -43283,34 +43316,34 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.491366" lon="-118.932909">
     <ele>2803.3</ele>
-    <name>CS0888B</name>
+    <name>Campsite - 888</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.492022" lon="-118.932112">
     <ele>2807.5</ele>
-    <name>CS0889</name>
+    <name>Campsite - 889</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.492936" lon="-118.932843">
     <ele>2819.1</ele>
-    <name>WA0889B</name>
+    <name>Water - 889</name>
     <desc><![CDATA[Fish Creek, steel bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.498788" lon="-118.927794">
     <ele>2898.1</ele>
-    <name>WACS0889C</name>
+    <name>Campsite &amp; Water - 889</name>
     <desc><![CDATA[Campsite, near Fish Creek.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.499994" lon="-118.926334">
     <ele>2897.5</ele>
-    <name>WACS0889D</name>
+    <name>Campsite &amp; Water - 889</name>
     <desc><![CDATA[Campsite, near Fish Creek.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.501509" lon="-118.924706">
     <ele>2898.6</ele>
-    <name>WACS0890</name>
+    <name>Campsite &amp; Water - 890</name>
     <desc><![CDATA[Campsite, near Fish Creek.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.501661" lon="-118.924643">
     <ele>2902.8</ele>
     <name>McGeePassTR</name>
@@ -43318,32 +43351,32 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.503900" lon="-118.922606">
     <ele>2963.5</ele>
-    <name>WA0890B</name>
+    <name>Water - 890</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.508080" lon="-118.929390">
     <ele>3179.7</ele>
-    <name>CS0891</name>
+    <name>Campsite - 891</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.510485" lon="-118.930976">
     <ele>3174.1</ele>
-    <name>CS0891B</name>
+    <name>Campsite - 891</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.516027" lon="-118.933737">
     <ele>3154.7</ele>
-    <name>WA0892</name>
+    <name>Water - 892</name>
     <desc><![CDATA[Lake Virginia inflow]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.516237" lon="-118.936078">
     <ele>3161.4</ele>
-    <name>CS0892B</name>
+    <name>Campsite - 892</name>
     <desc><![CDATA[Several campsites near Lake Virginia.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.527302" lon="-118.949248">
     <ele>3022.7</ele>
-    <name>WA0893</name>
+    <name>Water - 893</name>
     <desc><![CDATA[Purple Lake outlet, wood bridge. No camping within 300 feet of the outlet of Purple Lake.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.527472" lon="-118.949502">
@@ -43353,9 +43386,9 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.528977" lon="-118.950095">
     <ele>3039.2</ele>
-    <name>WACS0894</name>
+    <name>Campsite &amp; Water - 894</name>
     <desc><![CDATA[Campsite near Purple Lake]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.528996" lon="-118.950295">
     <ele>3041.7</ele>
     <name>RamLakeTR</name>
@@ -43368,27 +43401,27 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.539139" lon="-118.971318">
     <ele>3055.0</ele>
-    <name>WACS0896</name>
+    <name>Campsite &amp; Water - 896</name>
     <desc><![CDATA[Stream, double log crossing, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.563618" lon="-119.033725">
     <ele>2778.2</ele>
-    <name>WACS0901</name>
+    <name>Campsite &amp; Water - 901</name>
     <desc><![CDATA[Deer Creek, double log crossing, large campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.568198" lon="-119.040342">
     <ele>2797.7</ele>
-    <name>WA0902</name>
+    <name>Water - 902</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.582407" lon="-119.049214">
     <ele>2729.6</ele>
-    <name>WA0903</name>
+    <name>Water - 903</name>
     <desc><![CDATA[Crater Creek, bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.585966" lon="-119.051376">
     <ele>2718.0</ele>
-    <name>WA0903B</name>
+    <name>Water - 903</name>
     <desc><![CDATA[Crater Creek, bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.586274" lon="-119.051574">
@@ -43398,14 +43431,14 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.587717" lon="-119.055078">
     <ele>2697.1</ele>
-    <name>WA0904</name>
+    <name>Water - 904</name>
     <desc><![CDATA[Crater Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.591035" lon="-119.058332">
     <ele>2637.9</ele>
-    <name>WACS0904B</name>
+    <name>Campsite &amp; Water - 904</name>
     <desc><![CDATA[Crater Creek, campsite]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.612999" lon="-119.020992">
     <ele>2741.4</ele>
     <name>HorseshoeLake</name>
@@ -43418,12 +43451,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.600224" lon="-119.062102">
     <ele>2501.6</ele>
-    <name>WA0905</name>
+    <name>Water - 905</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.609929" lon="-119.075400">
     <ele>2352.6</ele>
-    <name>TR0907</name>
+    <name>Trail Junction - 907</name>
     <desc><![CDATA[Trail junction to Red's Meadow Store and campground, 3/10 mile NE of PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.618873" lon="-119.073506">
@@ -43458,12 +43491,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.627194" lon="-119.085674">
     <ele>2301.0</ele>
-    <name>WA0907B</name>
+    <name>Water - 907</name>
     <desc><![CDATA[Middle Fork San Joaquin River, bridge, 1.1 N of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.614569" lon="-119.083483">
     <ele>2279.2</ele>
-    <name>WA0907</name>
+    <name>Water - 907</name>
     <desc><![CDATA[Middle Fork San Joaquin River, bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.632902" lon="-119.088957">
@@ -43473,17 +43506,17 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="37.693988" lon="-119.137521">
     <ele>2692.4</ele>
-    <name>CS0909L</name>
+    <name>Campsite - 909</name>
     <desc><![CDATA[Campsite, 8.1 miles N on JMT alternate.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.692101" lon="-119.146331">
     <ele>2773.6</ele>
-    <name>CS0909O</name>
+    <name>Campsite - 909</name>
     <desc><![CDATA[Campsite, 8.9 miles N on JMT alternate.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.694345" lon="-119.148352">
     <ele>2803.6</ele>
-    <name>CS0909P</name>
+    <name>Campsite - 909</name>
     <desc><![CDATA[Campsite, 9.2 miles N on JMT alternate.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.647072" lon="-119.099794">
@@ -43498,104 +43531,104 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.641827" lon="-119.096206">
     <ele>2470.2</ele>
-    <name>WA0909B</name>
+    <name>Water - 909</name>
     <desc><![CDATA[Minaret Creek, double log bridge, 1 mile N on JMT alternate.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.645899" lon="-119.098748">
     <ele>2478.6</ele>
-    <name>WA0909C</name>
+    <name>Water - 909</name>
     <desc><![CDATA[Johnson Lake, 1.4 miles N on JMT alternate route.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.673672" lon="-119.113703">
     <ele>2875.9</ele>
-    <name>WA0909E</name>
+    <name>Water - 909</name>
     <desc><![CDATA[Vivian Lake, 4.6 miles N on JMT alternate route.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.674763" lon="-119.116503">
     <ele>2878.3</ele>
-    <name>WA0909F</name>
+    <name>Water - 909</name>
     <desc><![CDATA[Seasonal stream, bridge, 4.8 miles N on JMT alternate route.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.693382" lon="-119.136654">
     <ele>2671.6</ele>
-    <name>WA0909K</name>
+    <name>Water - 909</name>
     <desc><![CDATA[Shadow Creek, bridge, Agnew Meadow trail junction nearby, 8 miles N on JMT alternate.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.724491" lon="-119.165674">
     <ele>3020.2</ele>
-    <name>WA0909V</name>
+    <name>Water - 909</name>
     <desc><![CDATA[Emerald Lake, 13.6 miles N on JMT alternate.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.669634" lon="-119.109546">
     <ele>2839.0</ele>
-    <name>WACS0909D</name>
+    <name>Campsite &amp; Water - 909</name>
     <desc><![CDATA[Campsite near the Trinity Lakes, 4.2 mile N on JMT alternate route.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.681148" lon="-119.118626">
     <ele>2920.2</ele>
-    <name>WACS0909G</name>
+    <name>Campsite &amp; Water - 909</name>
     <desc><![CDATA[Gladys Lake, campsite, 5.5 miles N on JMT alternate.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.683238" lon="-119.118921">
     <ele>2918.5</ele>
-    <name>WACS0909H</name>
+    <name>Campsite &amp; Water - 909</name>
     <desc><![CDATA[Gladys Lake, 2nd campsite, 5.7 miles N on JMT alternate route.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.687840" lon="-119.121032">
     <ele>2848.7</ele>
-    <name>WACS0909I</name>
+    <name>Campsite &amp; Water - 909</name>
     <desc><![CDATA[Rosalie Lake, campsite 6.3 miles N on JMT alternate route, another campsite 200 feet N past the lake outflow.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.692111" lon="-119.134978">
     <ele>2680.4</ele>
-    <name>WACS0909J</name>
+    <name>Campsite &amp; Water - 909</name>
     <desc><![CDATA[Shadow Lake, campsite, 7.8 miles N on JMT alternate.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.692958" lon="-119.140077">
     <ele>2700.3</ele>
-    <name>WACS0909M</name>
+    <name>Campsite &amp; Water - 909</name>
     <desc><![CDATA[Campsite near Shadow Creek, 8.3 miles N on JMT alternate.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.690456" lon="-119.143561">
     <ele>2744.9</ele>
-    <name>WACS0909N</name>
+    <name>Campsite &amp; Water - 909</name>
     <desc><![CDATA[Campsite near Shadow Creek at the Ediza Lake trail junction, 8.7 miles N on the JMT alternate.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.710342" lon="-119.152664">
     <ele>2978.4</ele>
-    <name>WACS0909Q</name>
+    <name>Campsite &amp; Water - 909</name>
     <desc><![CDATA[Garnet Lake, campsite, 11.2 miles N on JMT alternate.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.711653" lon="-119.151770">
     <ele>2958.9</ele>
-    <name>WACS0909R</name>
+    <name>Campsite &amp; Water - 909</name>
     <desc><![CDATA[Garnet Lake, campsite, 11.3 miles N on JMT alternate. No camping within 1/4 mile of the outlet of Garnet Lake.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.713484" lon="-119.154439">
     <ele>2968.9</ele>
-    <name>WACS0909S</name>
+    <name>Campsite &amp; Water - 909</name>
     <desc><![CDATA[Garnet Lake, campsite, 12 miles N on JMT alternate. No camping within 1/4 mile of the outlet of Garnet Lake.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.720913" lon="-119.159309">
     <ele>3041.2</ele>
-    <name>WACS0909T</name>
+    <name>Campsite &amp; Water - 909</name>
     <desc><![CDATA[Ruby Lake, campsite, 13 miles N on JMT alternate.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.722562" lon="-119.161850">
     <ele>3035.4</ele>
-    <name>WACS0909U</name>
+    <name>Campsite &amp; Water - 909</name>
     <desc><![CDATA[Ruby Lake, campsite, 13.3 miles N on JMT alternate.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.653818" lon="-119.079993">
     <ele>2344.1</ele>
-    <name>WA0911</name>
+    <name>Water - 911</name>
     <desc><![CDATA[Middle Fork San Joaquin River, bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.653447" lon="-119.078754">
     <ele>2343.2</ele>
-    <name>WACSBB0911</name>
+    <name>Campsite, Water &amp; Bear Locker - 911</name>
     <desc><![CDATA[Soda Springs Campground, bear box.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.681969" lon="-119.086320">
     <ele>2533.3</ele>
     <name>AgnewMdwTR</name>
@@ -43613,7 +43646,7 @@
     <sym>Restroom</sym>
   </wpt><wpt lat="37.722294" lon="-119.130571">
     <ele>2949.5</ele>
-    <name>CS0920</name>
+    <name>Campsite - 920</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.729846" lon="-119.145688">
@@ -43633,7 +43666,7 @@
     <sym>Summit</sym>
   </wpt><wpt lat="37.739737" lon="-119.198609">
     <ele>3089.1</ele>
-    <name>WA0925</name>
+    <name>Water - 925</name>
     <desc><![CDATA[Small pond]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.741986" lon="-119.208427">
@@ -43643,7 +43676,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.742360" lon="-119.210373">
     <ele>2949.6</ele>
-    <name>WA0926</name>
+    <name>Water - 926</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.743823" lon="-119.211150">
@@ -43653,7 +43686,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.744052" lon="-119.212569">
     <ele>2941.7</ele>
-    <name>WA0926B</name>
+    <name>Water - 926</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.749325" lon="-119.220301">
@@ -43663,27 +43696,27 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.749618" lon="-119.220425">
     <ele>3069.1</ele>
-    <name>WACS0927</name>
+    <name>Campsite &amp; Water - 927</name>
     <desc><![CDATA[Rush Creek ford, small campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.754936" lon="-119.223709">
     <ele>3095.3</ele>
-    <name>WA0927B</name>
+    <name>Water - 927</name>
     <desc><![CDATA[Small lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.760347" lon="-119.227825">
     <ele>3152.0</ele>
-    <name>WA0928</name>
+    <name>Water - 928</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.761206" lon="-119.228784">
     <ele>3156.5</ele>
-    <name>WA0928B</name>
+    <name>Water - 928</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.764140" lon="-119.239166">
     <ele>3199.7</ele>
-    <name>WA0929</name>
+    <name>Water - 929</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.760877" lon="-119.248082">
@@ -43693,47 +43726,47 @@
     <sym>Summit</sym>
   </wpt><wpt lat="37.764187" lon="-119.253561">
     <ele>3260.1</ele>
-    <name>BV0930</name>
+    <name>Bivy - 930</name>
     <desc><![CDATA[Small bivy campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.762712" lon="-119.257521">
     <ele>3193.1</ele>
-    <name>WA0931</name>
+    <name>Water - 931</name>
     <desc><![CDATA[Small lake outlet]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.763398" lon="-119.259248">
     <ele>3197.3</ele>
-    <name>WA0931B</name>
+    <name>Water - 931</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.765698" lon="-119.258627">
     <ele>3161.6</ele>
-    <name>WA0931C</name>
+    <name>Water - 931</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.767959" lon="-119.256596">
     <ele>3104.7</ele>
-    <name>WACS0931D</name>
+    <name>Campsite &amp; Water - 931</name>
     <desc><![CDATA[Lyell Fork ford, several campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.773444" lon="-119.259236">
     <ele>3012.6</ele>
-    <name>WA0932</name>
+    <name>Water - 932</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.777687" lon="-119.262113">
     <ele>2941.6</ele>
-    <name>WACS0932B</name>
+    <name>Campsite &amp; Water - 932</name>
     <desc><![CDATA[Lyell Fork, bridge, several campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.796443" lon="-119.262434">
     <ele>2740.6</ele>
-    <name>WACS0934</name>
+    <name>Campsite &amp; Water - 934</name>
     <desc><![CDATA[Small stream, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.825547" lon="-119.279659">
     <ele>2720.9</ele>
-    <name>WA0936</name>
+    <name>Water - 936</name>
     <desc><![CDATA[Ireland Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.826493" lon="-119.279165">
@@ -43748,7 +43781,7 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="37.866607" lon="-119.322616">
     <ele>2658.9</ele>
-    <name>WA0940</name>
+    <name>Water - 940</name>
     <desc><![CDATA[Seasonal Rafferty Creek, bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.866792" lon="-119.323090">
@@ -43758,17 +43791,17 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.868774" lon="-119.333623">
     <ele>2642.3</ele>
-    <name>TR0941</name>
+    <name>Trail Junction - 941</name>
     <desc><![CDATA[Tuolumne Campground Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.869728" lon="-119.332958">
     <ele>2641.2</ele>
-    <name>WA0941</name>
+    <name>Water - 941</name>
     <desc><![CDATA[Lyell Fork, bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.875861" lon="-119.335342">
     <ele>2648.1</ele>
-    <name>WA0941B</name>
+    <name>Water - 941</name>
     <desc><![CDATA[Dana Fork, bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.877606" lon="-119.339261">
@@ -43776,6 +43809,14 @@
     <name>TuolumneLdgTR</name>
     <desc><![CDATA[Tuolumne Meadows Lodge Trail junction]]></desc>
     <sym>Trail Head</sym>
+  </wpt><wpt lat="36.875210" lon="-118.437674">
+    <ele>2633.7</ele>
+    <name>0800</name>
+    <sym>Flag, Green</sym>
+  </wpt><wpt lat="37.551308" lon="-119.028353">
+    <ele>2888.1</ele>
+    <name>0900</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>CA Sec I</name>
     <extensions>
@@ -43783,7 +43824,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section I</desc><cmt/><trkseg>
       <trkpt lat="37.877025" lon="-119.353072"><ele>2620.23</ele></trkpt>
       <trkpt lat="37.877450" lon="-119.353990"><ele>2618.79</ele></trkpt>
       <trkpt lat="37.878221" lon="-119.356107"><ele>2619.01</ele></trkpt>
@@ -46331,7 +46372,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section I. Off-Track: Yosemite Valley Trail</desc><cmt/><trkseg>
       <trkpt lat="37.878760" lon="-119.365210"><ele>2622.39</ele></trkpt>
       <trkpt lat="37.878272" lon="-119.365840"><ele>2620.74</ele></trkpt>
       <trkpt lat="37.877917" lon="-119.366140"><ele>2619.85</ele></trkpt>
@@ -46950,7 +46991,7 @@
     </trkseg>
   </trk><wpt lat="37.877018" lon="-119.353069">
     <ele>2620.2</ele>
-    <name>Hwy120</name>
+    <name>Highway 120</name>
     <desc><![CDATA[Highway 120]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="37.872699" lon="-119.353435">
@@ -46965,7 +47006,7 @@
     <sym>Shopping Center</sym>
   </wpt><wpt lat="37.878894" lon="-119.358496">
     <ele>2618.5</ele>
-    <name>GT0943</name>
+    <name>Gate - 943</name>
     <desc><![CDATA[Trail gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="37.878806" lon="-119.365185">
@@ -46990,17 +47031,17 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.789654" lon="-119.434616">
     <ele>2845.1</ele>
-    <name>JMTCS09B</name>
+    <name>Campsite - JMT - 9</name>
     <desc><![CDATA[Campsite, 9.4 miles S of PCT on the JMT.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.743549" lon="-119.505880">
     <ele>2163.3</ele>
-    <name>JMTCS15B</name>
+    <name>Campsite - JMT - 15</name>
     <desc><![CDATA[Campsite, 15.7 miles S of PCT on the JMT.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.744218" lon="-119.508488">
     <ele>2150.6</ele>
-    <name>JMTCS15C</name>
+    <name>Campsite - JMT - 15</name>
     <desc><![CDATA[Campsite, 15.9 miles S of PCT on the JMT.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.757382" lon="-119.478607">
@@ -47020,7 +47061,7 @@
     <sym>Ground Transportation</sym>
   </wpt><wpt lat="37.872054" lon="-119.370677">
     <ele>2617.4</ele>
-    <name>HWY120B</name>
+    <name>Highway 120</name>
     <desc><![CDATA[Highway 120, paved, 6/10 mile S of PCT on JMT.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="37.722438" lon="-119.535426">
@@ -47075,9 +47116,9 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.877377" lon="-119.366200">
     <ele>2618.6</ele>
-    <name>JMTWA01</name>
+    <name>Water - JMT - 1</name>
     <desc><![CDATA[Tuolumne River, bridge, 3/10 mile S of PCT on the JMT.]]></desc>
-    <sym>Drinking Water</sym>
+    <sym>Water Source</sym>
   </wpt><wpt lat="37.871729" lon="-119.383407">
     <ele>2620.8</ele>
     <name>BuddCreek</name>
@@ -47090,162 +47131,162 @@
     <sym>Drinking Water</sym>
   </wpt><wpt lat="37.860254" lon="-119.406072">
     <ele>2841.7</ele>
-    <name>JMTWA03</name>
+    <name>Water - JMT - 3</name>
     <desc><![CDATA[Trailside spring, 3.3 miles S of PCT on the JMT.]]></desc>
-    <sym>Drinking Water</sym>
+    <sym>Water Source</sym>
   </wpt><wpt lat="37.804870" lon="-119.430113">
     <ele>2849.7</ele>
-    <name>JMTWA08</name>
+    <name>Water - JMT - 8</name>
     <desc><![CDATA[Stream, 8 miles S of PCT on the JMT.]]></desc>
-    <sym>Drinking Water</sym>
+    <sym>Water Source</sym>
   </wpt><wpt lat="37.794056" lon="-119.432907">
     <ele>2839.9</ele>
-    <name>JMTWA09</name>
+    <name>Water - JMT - 9</name>
     <desc><![CDATA[Seasonal stream, 9 miles S of PCT on the JMT.]]></desc>
-    <sym>Drinking Water</sym>
+    <sym>Water Source</sym>
   </wpt><wpt lat="37.788749" lon="-119.435292">
     <ele>2836.1</ele>
-    <name>JMTWA09B</name>
+    <name>Water - JMT - 9</name>
     <desc><![CDATA[Stream, water, 9.4 miles S of PCT on the JMT.]]></desc>
-    <sym>Drinking Water</sym>
+    <sym>Water Source</sym>
   </wpt><wpt lat="37.772092" lon="-119.447094">
     <ele>2803.7</ele>
-    <name>JMTWA11</name>
+    <name>Water - JMT - 11</name>
     <desc><![CDATA[Trailside stream, 11 miles S of PCT on the JMT.]]></desc>
-    <sym>Drinking Water</sym>
+    <sym>Water Source</sym>
   </wpt><wpt lat="37.747231" lon="-119.492274">
     <ele>2293.4</ele>
-    <name>JMTWA14B</name>
+    <name>Water - JMT - 14</name>
     <desc><![CDATA[Sunrise Creek, 14.8 miles S of PCT on the JMT.]]></desc>
-    <sym>Drinking Water</sym>
+    <sym>Water Source</sym>
   </wpt><wpt lat="37.724722" lon="-119.533102">
     <ele>1806.8</ele>
-    <name>JMTWA18</name>
+    <name>Water - JMT - 18</name>
     <desc><![CDATA[Merced River, bridge above Nevada Fall, 18.9 miles S of PCT on the JMT.]]></desc>
-    <sym>Drinking Water</sym>
+    <sym>Water Source</sym>
   </wpt><wpt lat="37.726072" lon="-119.551607">
     <ele>1337.5</ele>
-    <name>JMTWA21</name>
+    <name>Water - JMT - 21</name>
     <desc><![CDATA[Merced River, bridge, drinking fountain, restroom nearby, 21.5 miles S of PCT on the JMT.]]></desc>
-    <sym>Drinking Water</sym>
+    <sym>Water Source</sym>
   </wpt><wpt lat="37.841264" lon="-119.413576">
     <ele>2927.4</ele>
-    <name>JMTWACS05</name>
+    <name>Campsite &amp; Water - JMT - 5</name>
     <desc><![CDATA[Campsite, 5 miles S of PCT on the JMT.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.765272" lon="-119.452951">
     <ele>2606.3</ele>
-    <name>JMTWACS11B</name>
+    <name>Campsite &amp; Water - JMT - 11</name>
     <desc><![CDATA[Seasonal Sunrise Creek, campsite, 11.8 miles S of JMT on the JMT.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.751316" lon="-119.482450">
     <ele>2380.1</ele>
-    <name>JMTWACS14</name>
+    <name>Campsite &amp; Water - JMT - 14</name>
     <desc><![CDATA[Campsite, nearby stream, 14.1 miles S of PCT on the JMT.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.744321" lon="-119.503274">
     <ele>2187.1</ele>
-    <name>JMTWACS15</name>
+    <name>Campsite &amp; Water - JMT - 15</name>
     <desc><![CDATA[Water, campsites, 15.5 miles S of PCT on the JMT.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.733432" lon="-119.515456">
     <ele>1868.1</ele>
-    <name>JMTWACS17</name>
+    <name>Campsite &amp; Water - JMT - 17</name>
     <desc><![CDATA[Little Yosemite Valley Backpacker Campground, 17.6 miles S of PCT on the JMT.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="37.888575" lon="-119.380772">
     <ele>2627.5</ele>
-    <name>TR0945</name>
+    <name>Trail Junction - 945</name>
     <desc><![CDATA[Young Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.901070" lon="-119.412990">
     <ele>2698.4</ele>
-    <name>WA0947</name>
+    <name>Water - 947</name>
     <desc><![CDATA[Wooden bridge over Tuolumne River.]]></desc>
-    <sym>Trail Head</sym>
+    <sym>Water Source</sym>
   </wpt><wpt lat="37.908138" lon="-119.421127">
     <ele>2430.9</ele>
-    <name>TR0948</name>
+    <name>Trail Junction - 948</name>
     <desc><![CDATA[McGee Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.910149" lon="-119.417920">
     <ele>2404.8</ele>
-    <name>WACS0948</name>
+    <name>Campsite &amp; Water - 948</name>
     <desc><![CDATA[Glen Aulin backpacker campground. Water from nearby creek, bear lockers, outhouse nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="37.909678" lon="-119.419839">
     <ele>2402.9</ele>
-    <name>TR0948B</name>
+    <name>Trail Junction - 948</name>
     <desc><![CDATA[Trail junction to Glen Aulin campground over a wooden bridge. Water, bear lockers, outhouse nearby.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.995943" lon="-119.378818">
     <ele>2775.5</ele>
-    <name>TR0955</name>
+    <name>Trail Junction - 955</name>
     <desc><![CDATA[McCabe Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.006750" lon="-119.376487">
     <ele>2600.1</ele>
-    <name>WA0956</name>
+    <name>Water - 956</name>
     <desc><![CDATA[Ford a creek. In dry years this may be the first water N of Glen Aulin.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.006659" lon="-119.376902">
     <ele>2600.8</ele>
-    <name>TR0956</name>
+    <name>Trail Junction - 956</name>
     <desc><![CDATA[Summit Pass, Virginia Pass trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.006909" lon="-119.390535">
     <ele>2667.3</ele>
-    <name>WA0957</name>
+    <name>Water - 957</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="37.993891" lon="-119.418793">
     <ele>2885.6</ele>
-    <name>WA0960</name>
+    <name>Water - 960</name>
     <desc><![CDATA[Miller Lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.015204" lon="-119.413186">
     <ele>2590.4</ele>
-    <name>TR0962</name>
+    <name>Trail Junction - 962</name>
     <desc><![CDATA[Burro Pass trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.014178" lon="-119.414449">
     <ele>2583.0</ele>
-    <name>WA0962</name>
+    <name>Water - 962</name>
     <desc><![CDATA[Ford a creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.013507" lon="-119.414945">
     <ele>2582.5</ele>
-    <name>WA0962B</name>
+    <name>Water - 962</name>
     <desc><![CDATA[Small stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.010453" lon="-119.419478">
     <ele>2577.5</ele>
-    <name>WA0962C</name>
+    <name>Water - 962</name>
     <desc><![CDATA[Stream next to trail.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.003864" lon="-119.427444">
     <ele>2574.2</ele>
-    <name>WACS0963</name>
+    <name>Campsite &amp; Water - 963</name>
     <desc><![CDATA[Campsite near small stream.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.004377" lon="-119.434700">
     <ele>2717.9</ele>
-    <name>WA0964</name>
+    <name>Water - 964</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.007676" lon="-119.438669">
     <ele>2738.0</ele>
-    <name>WA0964B</name>
+    <name>Water - 964</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.019805" lon="-119.448247">
     <ele>2886.0</ele>
-    <name>WACS0965</name>
+    <name>Campsite &amp; Water - 965</name>
     <desc><![CDATA[Last ford of Wilson Creek, small tent site nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.018533" lon="-119.449880">
     <ele>2896.1</ele>
-    <name>WA0965</name>
+    <name>Water - 965</name>
     <desc><![CDATA[Creek near switchback.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.015117" lon="-119.461160">
@@ -47255,154 +47296,154 @@
     <sym>Summit</sym>
   </wpt><wpt lat="38.010865" lon="-119.470878">
     <ele>2972.9</ele>
-    <name>WA0967</name>
+    <name>Water - 967</name>
     <desc><![CDATA[Small trail side creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.008843" lon="-119.479161">
     <ele>2836.2</ele>
-    <name>CS0968</name>
+    <name>Campsite - 968</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="38.008876" lon="-119.479958">
     <ele>2829.5</ele>
-    <name>WA0968</name>
+    <name>Water - 968</name>
     <desc><![CDATA[Ford a small creek.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.012152" lon="-119.485834">
     <ele>2809.8</ele>
-    <name>WACS0968</name>
+    <name>Campsite &amp; Water - 968</name>
     <desc><![CDATA[Smedberg Lake, dispersed camping nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.005993" lon="-119.493040">
     <ele>2881.5</ele>
-    <name>TR0970</name>
+    <name>Trail Junction - 970</name>
     <desc><![CDATA[Rodgers Lake, Neill Lake trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.005785" lon="-119.497578">
     <ele>2861.3</ele>
-    <name>TR0970B</name>
+    <name>Trail Junction - 970</name>
     <desc><![CDATA[Pleasant Valley, Pate Valley trail junctions.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.015991" lon="-119.509718">
     <ele>2513.6</ele>
-    <name>WACS0972</name>
+    <name>Campsite &amp; Water - 972</name>
     <desc><![CDATA[Creek, several campsites nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.019681" lon="-119.517826">
     <ele>2341.4</ele>
-    <name>WA0972</name>
+    <name>Water - 972</name>
     <desc><![CDATA[Ford a creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.022795" lon="-119.519657">
     <ele>2316.7</ele>
-    <name>WA0973</name>
+    <name>Water - 973</name>
     <desc><![CDATA[Piute Creek, may be a difficult ford early in the season.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.023130" lon="-119.520415">
     <ele>2316.8</ele>
-    <name>TR0973</name>
+    <name>Trail Junction - 973</name>
     <desc><![CDATA[Benson Lake Trail, lake and campsites 4/10 mile SW.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.028170" lon="-119.526896">
     <ele>2438.0</ele>
-    <name>WA0973B</name>
+    <name>Water - 973</name>
     <desc><![CDATA[Ford a creek.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.038624" lon="-119.527658">
     <ele>2743.8</ele>
-    <name>WA0975</name>
+    <name>Water - 975</name>
     <desc><![CDATA[Small lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.043876" lon="-119.523061">
     <ele>2779.5</ele>
-    <name>WA0975B</name>
+    <name>Water - 975</name>
     <desc><![CDATA[Small lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.051488" lon="-119.518058">
     <ele>2688.9</ele>
-    <name>TR0976</name>
+    <name>Trail Junction - 976</name>
     <desc><![CDATA[Rock Island Pass, Buckeye Pass trail junctions.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.045662" lon="-119.548738">
     <ele>2529.5</ele>
-    <name>WA0978</name>
+    <name>Water - 978</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.044839" lon="-119.572537">
     <ele>2431.8</ele>
-    <name>TR0980</name>
+    <name>Trail Junction - 980</name>
     <desc><![CDATA[Bear Valley, Yosemite Valley, Pleasant Valley trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.045240" lon="-119.572620">
     <ele>2919.7</ele>
-    <name>WA0980</name>
+    <name>Water - 980</name>
     <desc><![CDATA[Ford Kerrick Creek (sometimes difficult early season).]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.055090" lon="-119.584360">
     <ele>2537.7</ele>
-    <name>WA0981</name>
+    <name>Water - 981</name>
     <desc><![CDATA[Seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.058877" lon="-119.590628">
     <ele>2362.8</ele>
-    <name>WACS0982</name>
+    <name>Campsite &amp; Water - 982</name>
     <desc><![CDATA[Stream, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.062640" lon="-119.624270">
     <ele>1093.6</ele>
-    <name>WA0985</name>
+    <name>Water - 985</name>
     <desc><![CDATA[Small lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.063240" lon="-119.624560">
     <ele>2549.1</ele>
-    <name>TR0986</name>
+    <name>Trail Junction - 986</name>
     <desc><![CDATA[Tiltill Valley trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.064515" lon="-119.623564">
     <ele>2555.5</ele>
-    <name>TR0986B</name>
+    <name>Trail Junction - 986</name>
     <desc><![CDATA[Bond Pass trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.066259" lon="-119.625003">
     <ele>2561.2</ele>
-    <name>WA0986</name>
+    <name>Water - 986</name>
     <desc><![CDATA[Small lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.069012" lon="-119.639788">
     <ele>2425.7</ele>
-    <name>WACS0987</name>
+    <name>Campsite &amp; Water - 987</name>
     <desc><![CDATA[Wilma Lake [sometimes incorrectly named Wilmer Lake], campsites. This lake has a history of name changes on maps and trail signs. The lake is named after Wilma Seavey, daughter of Clyde L. Seavey.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.073618" lon="-119.646105">
     <ele>2425.8</ele>
-    <name>WACS0987B</name>
+    <name>Campsite &amp; Water - 987</name>
     <desc><![CDATA[Ford Falls Creek, campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.073872" lon="-119.646775">
     <ele>2425.9</ele>
-    <name>TR0987</name>
+    <name>Trail Junction - 987</name>
     <desc><![CDATA[Laurel Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.088081" lon="-119.633950">
     <ele>2490.7</ele>
-    <name>TR0989</name>
+    <name>Trail Junction - 989</name>
     <desc><![CDATA[Tilden Lake trail junction (lake is 1.5 mi E).]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.162384" lon="-119.605942">
     <ele>2742.6</ele>
-    <name>WA0995</name>
+    <name>Water - 995</name>
     <desc><![CDATA[Trailside stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.169783" lon="-119.601482">
     <ele>2846.0</ele>
-    <name>TR0996</name>
+    <name>Trail Junction - 996</name>
     <desc><![CDATA[Bond Pass trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.176955" lon="-119.592308">
     <ele>2867.6</ele>
-    <name>WACS0996</name>
+    <name>Campsite &amp; Water - 996</name>
     <desc><![CDATA[Dorothy Lake, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.180174" lon="-119.581621">
     <ele>2905.0</ele>
     <name>YosemiteNP</name>
@@ -47410,52 +47451,52 @@
     <sym>Forest</sym>
   </wpt><wpt lat="38.187328" lon="-119.569827">
     <ele>2818.4</ele>
-    <name>WA0998</name>
+    <name>Water - 998</name>
     <desc><![CDATA[Lake Harriet]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.189123" lon="-119.569323">
     <ele>2800.6</ele>
-    <name>WA0998B</name>
+    <name>Water - 998</name>
     <desc><![CDATA[Seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.189523" lon="-119.569293">
     <ele>2797.8</ele>
-    <name>CS0998</name>
+    <name>Campsite - 998</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="38.194580" lon="-119.570750">
     <ele>1002.3</ele>
-    <name>WA0999</name>
+    <name>Water - 999</name>
     <desc><![CDATA[Second crossing, Cascade Creek, single log bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.199181" lon="-119.569501">
     <ele>2756.6</ele>
-    <name>WA0999B</name>
+    <name>Water - 999</name>
     <desc><![CDATA[Small lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.200119" lon="-119.568486">
     <ele>2755.8</ele>
-    <name>TR0999</name>
+    <name>Trail Junction - 999</name>
     <desc><![CDATA[West Walker River trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.205882" lon="-119.574565">
     <ele>2721.5</ele>
-    <name>TR1000</name>
+    <name>Trail Junction - 1000</name>
     <desc><![CDATA[Cinko Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.224230" lon="-119.578502">
     <ele>2644.1</ele>
-    <name>TR1002</name>
+    <name>Trail Junction - 1002</name>
     <desc><![CDATA[2nd trail to Cinko Lake.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.226333" lon="-119.576706">
     <ele>2618.4</ele>
-    <name>WA1002</name>
+    <name>Water - 1002</name>
     <desc><![CDATA[Creek with a wooden bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.227706" lon="-119.580908">
     <ele>2621.0</ele>
-    <name>CS1003</name>
+    <name>Campsite - 1003</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="38.230871" lon="-119.580518">
@@ -47465,32 +47506,32 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="38.234654" lon="-119.581858">
     <ele>2616.3</ele>
-    <name>WA1003</name>
+    <name>Water - 1003</name>
     <desc><![CDATA[Seasonal water uphill from the trail.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.241386" lon="-119.578018">
     <ele>2606.5</ele>
-    <name>CS1004</name>
+    <name>Campsite - 1004</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="38.253412" lon="-119.598261">
     <ele>2762.5</ele>
-    <name>WACS1006</name>
+    <name>Campsite &amp; Water - 1006</name>
     <desc><![CDATA[Stream, campsites nearby. Last creek northbound in Kennedy Canyon.<br/>---<br/>WATER ALERT: Next northbound water after the Last creek northbound in Kennedy Canyon may be Sardine Creek in 10.4 miles.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.251208" lon="-119.606639">
     <ele>2818.0</ele>
-    <name>WA1006</name>
+    <name>Water - 1006</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.245718" lon="-119.614307">
     <ele>2960.5</ele>
-    <name>TR1007</name>
+    <name>Trail Junction - 1007</name>
     <desc><![CDATA[Emigrant Pass trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.260716" lon="-119.614514">
     <ele>3225.6</ele>
-    <name>TR1009</name>
+    <name>Trail Junction - 1009</name>
     <desc><![CDATA[Leavitt Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.316459" lon="-119.643801">
@@ -47500,9 +47541,13 @@
     <sym>Forest</sym>
   </wpt><wpt lat="38.322901" lon="-119.638461">
     <ele>2998.9</ele>
-    <name>WA1016</name>
+    <name>Water - 1016</name>
     <desc><![CDATA[Sardine Creek, the first creek after Kennedy Canyon.<br/>---<br/>WATER ALERT: Next southbound water after Sardine Creek may be the creek in 10.4 miles.]]></desc>
     <sym>Water Source</sym>
+  </wpt><wpt lat="38.205751" lon="-119.571582">
+    <ele>2743.2</ele>
+    <name>1000</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>CA Sec J</name>
     <extensions>
@@ -47510,7 +47555,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section J</desc><cmt/><trkseg>
       <trkpt lat="38.327988" lon="-119.637278"><ele>2943.82</ele></trkpt>
       <trkpt lat="38.328131" lon="-119.637123"><ele>2942.09</ele></trkpt>
       <trkpt lat="38.328901" lon="-119.637142"><ele>2928.63</ele></trkpt>
@@ -49984,12 +50029,12 @@
     </trkseg>
   </trk><wpt lat="38.327968" lon="-119.637183">
     <ele>1015.1</ele>
-    <name>Hwy108</name>
+    <name>Highway 108</name>
     <desc><![CDATA[Highway 108, Sonora Pass.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="38.329900" lon="-119.635856">
     <ele>2931.5</ele>
-    <name>TH1017</name>
+    <name>Trailhead - 1017</name>
     <desc><![CDATA[Paved road to Sonora Pass trailhead parking.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.330403" lon="-119.635969">
@@ -49999,22 +50044,22 @@
     <sym>Forest</sym>
   </wpt><wpt lat="38.343547" lon="-119.635744">
     <ele>3022.1</ele>
-    <name>WA1018</name>
+    <name>Water - 1018</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.346062" lon="-119.638498">
     <ele>3071.0</ele>
-    <name>WA1019</name>
+    <name>Water - 1019</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.346510" lon="-119.633291">
     <ele>3145.2</ele>
-    <name>WA1019B</name>
+    <name>Water - 1019</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.356801" lon="-119.625069">
     <ele>3179.8</ele>
-    <name>WA1021</name>
+    <name>Water - 1021</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.361432" lon="-119.623085">
@@ -50024,127 +50069,127 @@
     <sym>Forest</sym>
   </wpt><wpt lat="38.371496" lon="-119.632182">
     <ele>2893.9</ele>
-    <name>WA1022</name>
+    <name>Water - 1022</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.377445" lon="-119.636340">
     <ele>2823.6</ele>
-    <name>WA1023</name>
+    <name>Water - 1023</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.385266" lon="-119.641624">
     <ele>2725.5</ele>
-    <name>WA1024</name>
+    <name>Water - 1024</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.394041" lon="-119.653497">
     <ele>2642.6</ele>
-    <name>WACS1025</name>
+    <name>Campsite &amp; Water - 1025</name>
     <desc><![CDATA[Creek, small campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.411616" lon="-119.666353">
     <ele>2477.3</ele>
-    <name>WACS1026</name>
+    <name>Campsite &amp; Water - 1026</name>
     <desc><![CDATA[Creek, small campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.414788" lon="-119.672074">
     <ele>2646.1</ele>
-    <name>WA1027</name>
+    <name>Water - 1027</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.423338" lon="-119.675983">
     <ele>2691.3</ele>
-    <name>WACS1028</name>
+    <name>Campsite &amp; Water - 1028</name>
     <desc><![CDATA[Creek, several campsites nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.438430" lon="-119.679639">
     <ele>2614.1</ele>
-    <name>TR1029</name>
+    <name>Trail Junction - 1029</name>
     <desc><![CDATA[Boulder Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.448919" lon="-119.716286">
     <ele>2815.0</ele>
-    <name>GT1033</name>
+    <name>Gate - 1033</name>
     <desc><![CDATA[Barb wire gate and fallen fence line.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="38.453283" lon="-119.724944">
     <ele>2777.5</ele>
-    <name>WACS1034</name>
+    <name>Campsite &amp; Water - 1034</name>
     <desc><![CDATA[Stream, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.458515" lon="-119.727067">
     <ele>2795.9</ele>
-    <name>CS1034</name>
+    <name>Campsite - 1034</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="38.459441" lon="-119.726712">
     <ele>2802.5</ele>
-    <name>TR1034</name>
+    <name>Trail Junction - 1034</name>
     <desc><![CDATA[Paradise Valley, Golden Canyon trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.465389" lon="-119.720003">
     <ele>2814.3</ele>
-    <name>CS1035</name>
+    <name>Campsite - 1035</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="38.467591" lon="-119.723324">
     <ele>2777.1</ele>
-    <name>WACS1035</name>
+    <name>Campsite &amp; Water - 1035</name>
     <desc><![CDATA[Small creek, camping nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.471297" lon="-119.728179">
     <ele>2729.8</ele>
-    <name>WA1036</name>
+    <name>Water - 1036</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.476975" lon="-119.731350">
     <ele>2764.6</ele>
-    <name>TR1036</name>
+    <name>Trail Junction - 1036</name>
     <desc><![CDATA[Murray Canyon trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.480282" lon="-119.743796">
     <ele>2538.8</ele>
-    <name>WACS1038</name>
+    <name>Campsite &amp; Water - 1038</name>
     <desc><![CDATA[Creek, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.482005" lon="-119.750326">
     <ele>2531.2</ele>
-    <name>WA1039</name>
+    <name>Water - 1039</name>
     <desc><![CDATA[Large stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.485321" lon="-119.754636">
     <ele>2561.6</ele>
-    <name>WACS1039</name>
+    <name>Campsite &amp; Water - 1039</name>
     <desc><![CDATA[Wolf Creek, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.498162" lon="-119.770054">
     <ele>2564.7</ele>
-    <name>TR1041</name>
+    <name>Trail Junction - 1041</name>
     <desc><![CDATA[Highland Lake, Wolf Creek trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.501325" lon="-119.770956">
     <ele>2586.8</ele>
-    <name>GT1041</name>
+    <name>Gate - 1041</name>
     <desc><![CDATA[Barb wire gate and fallen fence line.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="38.501824" lon="-119.770760">
     <ele>2593.1</ele>
-    <name>TR1041B</name>
+    <name>Trail Junction - 1041</name>
     <desc><![CDATA[Asa Lake trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.503218" lon="-119.768079">
     <ele>2597.8</ele>
-    <name>WA1041</name>
+    <name>Water - 1041</name>
     <desc><![CDATA[Asa Lake outlet.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.504162" lon="-119.768457">
     <ele>2618.4</ele>
-    <name>WACS1041</name>
+    <name>Campsite &amp; Water - 1041</name>
     <desc><![CDATA[Campsites near Asa Lake.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.503845" lon="-119.772199">
     <ele>2668.0</ele>
-    <name>GT1042</name>
+    <name>Gate - 1042</name>
     <desc><![CDATA[Barb wire gate and fallen fence.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="38.504297" lon="-119.773864">
@@ -50154,44 +50199,44 @@
     <sym>Forest</sym>
   </wpt><wpt lat="38.523292" lon="-119.775446">
     <ele>2777.4</ele>
-    <name>TR1044</name>
+    <name>Trail Junction - 1044</name>
     <desc><![CDATA[Bull Canyon trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.526569" lon="-119.776625">
     <ele>2730.8</ele>
-    <name>WACS1044</name>
+    <name>Campsite &amp; Water - 1044</name>
     <desc><![CDATA[Noble Lake, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.535223" lon="-119.781725">
     <ele>2560.2</ele>
-    <name>TR1045</name>
+    <name>Trail Junction - 1045</name>
     <desc><![CDATA[Noble Canyon trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.533674" lon="-119.782890">
     <ele>2533.3</ele>
-    <name>WA1046</name>
+    <name>Water - 1046</name>
     <desc><![CDATA[Noble Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.544487" lon="-119.792276">
     <ele>2652.8</ele>
-    <name>CS1047</name>
+    <name>Campsite - 1047</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="38.545948" lon="-119.807391">
     <ele>2664.8</ele>
-    <name>TR1048</name>
+    <name>Trail Junction - 1048</name>
     <desc><![CDATA[Ebbetts Pass trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.545741" lon="-119.811263">
     <ele>2652.2</ele>
-    <name>Hwy4</name>
+    <name>Highway 4</name>
     <desc><![CDATA[Highway 4, narrow paved road, Ebbetts Pass.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="38.549706" lon="-119.814879">
     <ele>2672.9</ele>
-    <name>WACS1049</name>
+    <name>Campsite &amp; Water - 1049</name>
     <desc><![CDATA[Small Sherrold Lake, campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.555816" lon="-119.828822">
     <ele>2678.2</ele>
     <name>KinneyLake</name>
@@ -50204,34 +50249,34 @@
     <sym>Forest</sym>
   </wpt><wpt lat="38.584607" lon="-119.833227">
     <ele>2581.3</ele>
-    <name>CS1053</name>
+    <name>Campsite - 1053</name>
     <desc><![CDATA[Campsite near seasonal Eagle Creek.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="38.596669" lon="-119.821656">
     <ele>2481.1</ele>
-    <name>WACS1055</name>
+    <name>Campsite &amp; Water - 1055</name>
     <desc><![CDATA[Pennsylvania Creek, small campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.608909" lon="-119.824400">
     <ele>2560.9</ele>
-    <name>WA1057</name>
+    <name>Water - 1057</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.616832" lon="-119.831683">
     <ele>2637.5</ele>
-    <name>TR1058</name>
+    <name>Trail Junction - 1058</name>
     <desc><![CDATA[Raymond Lake trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.617148" lon="-119.836900">
     <ele>2473.9</ele>
-    <name>WA1059</name>
+    <name>Water - 1059</name>
     <desc><![CDATA[Creek from Raymond Lake.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.616917" lon="-119.853106">
     <ele>2399.0</ele>
-    <name>WACS1060</name>
+    <name>Campsite &amp; Water - 1060</name>
     <desc><![CDATA[Tributary of Pleasant Valley Creek, small campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.611770" lon="-119.858410">
     <ele>2464.0</ele>
     <name>MokelumneWild2</name>
@@ -50239,67 +50284,67 @@
     <sym>Forest</sym>
   </wpt><wpt lat="38.607603" lon="-119.875220">
     <ele>2411.7</ele>
-    <name>RD1062</name>
+    <name>Road Crossing - 1062</name>
     <desc><![CDATA[Unpaved Road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="38.606043" lon="-119.876985">
     <ele>2401.7</ele>
-    <name>RD1062B</name>
+    <name>Road Crossing - 1062</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="38.605948" lon="-119.886211">
     <ele>2396.0</ele>
-    <name>WACS1063</name>
+    <name>Campsite &amp; Water - 1063</name>
     <desc><![CDATA[Lilly Pad Lake, a few campsites nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.615595" lon="-119.898441">
     <ele>2390.7</ele>
-    <name>WA1064</name>
+    <name>Water - 1064</name>
     <desc><![CDATA[Tamarack Lake outlet]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.621432" lon="-119.907303">
     <ele>2439.4</ele>
-    <name>TR1065</name>
+    <name>Trail Junction - 1065</name>
     <desc><![CDATA[Tamarack Trailhead trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.624667" lon="-119.908801">
     <ele>2479.9</ele>
-    <name>RD1065</name>
+    <name>Road Crossing - 1065</name>
     <desc><![CDATA[Paved Blue Lakes Road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="38.647739" lon="-119.952117">
     <ele>2639.3</ele>
-    <name>RD1070</name>
+    <name>Road Crossing - 1070</name>
     <desc><![CDATA[Unpaved Lost Lakes spur road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="38.649263" lon="-119.957482">
     <ele>2694.0</ele>
-    <name>CS1070</name>
+    <name>Campsite - 1070</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="38.660564" lon="-119.962622">
     <ele>2703.7</ele>
-    <name>RD1071</name>
+    <name>Road Crossing - 1071</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="38.664167" lon="-119.972398">
     <ele>2623.7</ele>
-    <name>WA1072</name>
+    <name>Water - 1072</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.665261" lon="-119.975092">
     <ele>2596.2</ele>
-    <name>WACS1073</name>
+    <name>Campsite &amp; Water - 1073</name>
     <desc><![CDATA[Creek, campsites nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.671159" lon="-119.977301">
     <ele>2535.3</ele>
-    <name>CS1073</name>
+    <name>Campsite - 1073</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="38.671844" lon="-119.977427">
     <ele>2541.1</ele>
-    <name>WA1073</name>
+    <name>Water - 1073</name>
     <desc><![CDATA[Creek under some willows.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.683214" lon="-119.983251">
@@ -50309,12 +50354,12 @@
     <sym>Forest</sym>
   </wpt><wpt lat="38.685027" lon="-119.987199">
     <ele>2712.6</ele>
-    <name>TR1075</name>
+    <name>Trail Junction - 1075</name>
     <desc><![CDATA[Winnemucca Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.686441" lon="-119.986681">
     <ele>2699.3</ele>
-    <name>WA1075</name>
+    <name>Water - 1075</name>
     <desc><![CDATA[Frog Lake. Camping is not permitted at Frog Lake due to shoreline restoration.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.690455" lon="-119.991973">
@@ -50324,22 +50369,22 @@
     <sym>Forest</sym>
   </wpt><wpt lat="38.695867" lon="-119.989674">
     <ele>2618.2</ele>
-    <name>Hwy88</name>
+    <name>Highway 88</name>
     <desc><![CDATA[Highway 88, Carson Pass, visitor area, outhouse, garbage cans, parking area.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.696776" lon="-119.991551">
     <ele>2609.3</ele>
-    <name>TH1077</name>
+    <name>Trailhead - 1077</name>
     <desc><![CDATA[Carson Pass trailhead parking area]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.704564" lon="-120.003550">
     <ele>2671.3</ele>
-    <name>WA1078</name>
+    <name>Water - 1078</name>
     <desc><![CDATA[Pond]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.719171" lon="-120.011499">
     <ele>2557.2</ele>
-    <name>WA1079</name>
+    <name>Water - 1079</name>
     <desc><![CDATA[Headwaters of the Upper Truckee River]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.720776" lon="-120.011960">
@@ -50354,42 +50399,42 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.728173" lon="-120.018618">
     <ele>2539.0</ele>
-    <name>WA1080</name>
+    <name>Water - 1080</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.732662" lon="-120.021223">
     <ele>2536.3</ele>
-    <name>WA1081</name>
+    <name>Water - 1081</name>
     <desc><![CDATA[Small lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.742704" lon="-120.034408">
     <ele>2637.6</ele>
-    <name>WACS1082</name>
+    <name>Campsite &amp; Water - 1082</name>
     <desc><![CDATA[Showers Lake, campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.741221" lon="-120.042892">
     <ele>2664.6</ele>
-    <name>WA1083</name>
+    <name>Water - 1083</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.769430" lon="-120.048917">
     <ele>2630.5</ele>
-    <name>TR1085</name>
+    <name>Trail Junction - 1085</name>
     <desc><![CDATA[Sayles Canyon trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.779587" lon="-120.051816">
     <ele>2596.0</ele>
-    <name>TR1086</name>
+    <name>Trail Junction - 1086</name>
     <desc><![CDATA[Trail junction to Highway 50.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.788312" lon="-120.042351">
     <ele>2542.2</ele>
-    <name>WACS1087</name>
+    <name>Campsite &amp; Water - 1087</name>
     <desc><![CDATA[Small creek, several campsites nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.798069" lon="-120.036009">
     <ele>2316.0</ele>
-    <name>WA1088</name>
+    <name>Water - 1088</name>
     <desc><![CDATA[Small creek with wooden bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.814070" lon="-120.034244">
@@ -50399,12 +50444,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.822959" lon="-120.039859">
     <ele>1805.7</ele>
-    <name>Hwy50</name>
+    <name>Highway 50</name>
     <desc><![CDATA[Highway 50. Overnight camping is prohibited for approximately 4.7 miles from Hwy 50/Echo Summit N to the Desolation Wilderness boundary.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="38.834284" lon="-120.042752">
     <ele>2285.2</ele>
-    <name>TH1092</name>
+    <name>Trailhead - 1092</name>
     <desc><![CDATA[Unpaved parking area]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.834584" lon="-120.043836">
@@ -50419,7 +50464,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section K</desc><cmt/><trkseg>
       <trkpt lat="38.834580" lon="-120.043948"><ele>2263.54</ele></trkpt>
       <trkpt lat="38.834829" lon="-120.044276"><ele>2259.94</ele></trkpt>
       <trkpt lat="38.834918" lon="-120.044674"><ele>2260.09</ele></trkpt>
@@ -52329,7 +52374,7 @@
     </trkseg>
   </trk><wpt lat="38.847406" lon="-120.078958">
     <ele>2278.0</ele>
-    <name>TR1095</name>
+    <name>Trail Junction - 1095</name>
     <desc><![CDATA[Trail to a public phone and boat taxi.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.847148" lon="-120.087472">
@@ -52339,87 +52384,87 @@
     <sym>Forest</sym>
   </wpt><wpt lat="38.848773" lon="-120.095386">
     <ele>2400.9</ele>
-    <name>TR1096</name>
+    <name>Trail Junction - 1096</name>
     <desc><![CDATA[Tamarack Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.852912" lon="-120.103054">
     <ele>2507.3</ele>
-    <name>TR1097</name>
+    <name>Trail Junction - 1097</name>
     <desc><![CDATA[Triangle Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.854943" lon="-120.108990">
     <ele>2535.3</ele>
-    <name>TR1097B</name>
+    <name>Trail Junction - 1097</name>
     <desc><![CDATA[Lake of the Woods trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.856040" lon="-120.111658">
     <ele>2541.4</ele>
-    <name>TR1097C</name>
+    <name>Trail Junction - 1097</name>
     <desc><![CDATA[Second trail junction to Lake of the Woods.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.856492" lon="-120.113139">
     <ele>2532.2</ele>
-    <name>TR1097D</name>
+    <name>Trail Junction - 1097</name>
     <desc><![CDATA[Lake Lucille trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.857633" lon="-120.118719">
     <ele>2539.2</ele>
-    <name>TR1098</name>
+    <name>Trail Junction - 1098</name>
     <desc><![CDATA[Lake Aloha trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.864156" lon="-120.128490">
     <ele>2479.2</ele>
-    <name>WACS1098</name>
+    <name>Campsite &amp; Water - 1098</name>
     <desc><![CDATA[Aloha Lake, several campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.876293" lon="-120.146222">
     <ele>2477.5</ele>
-    <name>TR1100</name>
+    <name>Trail Junction - 1100</name>
     <desc><![CDATA[Mosquito Pass trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.878169" lon="-120.142423">
     <ele>2439.6</ele>
-    <name>WA1100</name>
+    <name>Water - 1100</name>
     <desc><![CDATA[Small creek, and a small lake.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.878287" lon="-120.138632">
     <ele>2409.8</ele>
-    <name>WACS1101</name>
+    <name>Campsite &amp; Water - 1101</name>
     <desc><![CDATA[Heather Lake, campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.879075" lon="-120.126827">
     <ele>2376.6</ele>
-    <name>CS1101</name>
+    <name>Campsite - 1101</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="38.879516" lon="-120.124136">
     <ele>2370.1</ele>
-    <name>WACS1102</name>
+    <name>Campsite &amp; Water - 1102</name>
     <desc><![CDATA[Susie Lake outlet, campsites. Campsites also south and north of the outlet.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.884637" lon="-120.120744">
     <ele>2341.6</ele>
-    <name>TR1102</name>
+    <name>Trail Junction - 1102</name>
     <desc><![CDATA[Glen Alpine trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.886142" lon="-120.117091">
     <ele>2414.1</ele>
-    <name>TR1103</name>
+    <name>Trail Junction - 1103</name>
     <desc><![CDATA[Glen Alpine, Half Moon Lake trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.889498" lon="-120.113780">
     <ele>2508.1</ele>
-    <name>WA1103</name>
+    <name>Water - 1103</name>
     <desc><![CDATA[Trail side stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.890920" lon="-120.113435">
     <ele>2526.1</ele>
-    <name>TR1103B</name>
+    <name>Trail Junction - 1103</name>
     <desc><![CDATA[Gilmore Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.902721" lon="-120.134977">
     <ele>2731.4</ele>
-    <name>WA1105</name>
+    <name>Water - 1105</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.905773" lon="-120.134970">
@@ -52429,52 +52474,52 @@
     <sym>Summit</sym>
   </wpt><wpt lat="38.918355" lon="-120.144343">
     <ele>2587.6</ele>
-    <name>TR1107</name>
+    <name>Trail Junction - 1107</name>
     <desc><![CDATA[Fontanillis trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.915848" lon="-120.145758">
     <ele>2566.4</ele>
-    <name>TR1108</name>
+    <name>Trail Junction - 1108</name>
     <desc><![CDATA[Dicks Lake trail junction, camping nearby.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.924430" lon="-120.156280">
     <ele>2526.1</ele>
-    <name>WACS1109</name>
+    <name>Campsite &amp; Water - 1109</name>
     <desc><![CDATA[Fontanillis Lake, campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="38.933490" lon="-120.149480">
     <ele>2430.0</ele>
-    <name>TR1109</name>
+    <name>Trail Junction - 1109</name>
     <desc><![CDATA[Bay View trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.934131" lon="-120.154391">
     <ele>2416.1</ele>
-    <name>TR1110</name>
+    <name>Trail Junction - 1110</name>
     <desc><![CDATA[Camper Flat trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.935990" lon="-120.154752">
     <ele>2406.2</ele>
-    <name>WA1110</name>
+    <name>Water - 1110</name>
     <desc><![CDATA[Middle Velma Lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="38.944993" lon="-120.159232">
     <ele>2466.4</ele>
-    <name>TR1111</name>
+    <name>Trail Junction - 1111</name>
     <desc><![CDATA[Meeks Bay trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.961906" lon="-120.170623">
     <ele>2325.8</ele>
-    <name>CS1113</name>
+    <name>Campsite - 1113</name>
     <desc><![CDATA[Seasonal Phipps Creek (often dry), campsite.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="38.970195" lon="-120.169939">
     <ele>2409.6</ele>
-    <name>CS1113B</name>
+    <name>Campsite - 1113</name>
     <desc><![CDATA[Seasonal Creek and campsite.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="38.991922" lon="-120.191627">
     <ele>2398.5</ele>
-    <name>TR1115</name>
+    <name>Trail Junction - 1115</name>
     <desc><![CDATA[General Creek trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.007380" lon="-120.209990">
@@ -52484,82 +52529,82 @@
     <sym>Forest</sym>
   </wpt><wpt lat="39.018232" lon="-120.216510">
     <ele>2300.1</ele>
-    <name>CS1118</name>
+    <name>Campsite - 1118</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.019427" lon="-120.215811">
     <ele>2308.6</ele>
-    <name>RD1118</name>
+    <name>Road Crossing - 1118</name>
     <desc><![CDATA[Jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.024597" lon="-120.212352">
     <ele>2257.7</ele>
-    <name>WACS1119</name>
+    <name>Campsite &amp; Water - 1119</name>
     <desc><![CDATA[Richardson Lake, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="39.032013" lon="-120.231665">
     <ele>2140.1</ele>
-    <name>CS1120</name>
+    <name>Campsite - 1120</name>
     <desc><![CDATA[Seasonal Miller Creek, campsite nearby.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.033414" lon="-120.233226">
     <ele>2140.3</ele>
-    <name>RD1121</name>
+    <name>Road Crossing - 1121</name>
     <desc><![CDATA[Jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.049284" lon="-120.244262">
     <ele>2125.3</ele>
-    <name>CS1122</name>
+    <name>Campsite - 1122</name>
     <desc><![CDATA[Seasonal stream below Bear Lake, campsite nearby.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.053825" lon="-120.246304">
     <ele>2159.2</ele>
-    <name>RD1122</name>
+    <name>Road Crossing - 1122</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.062944" lon="-120.248989">
     <ele>2214.2</ele>
-    <name>WACS1123</name>
+    <name>Campsite &amp; Water - 1123</name>
     <desc><![CDATA[Seasonal creek and campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="39.063258" lon="-120.248393">
     <ele>2223.3</ele>
-    <name>CS1123</name>
+    <name>Campsite - 1123</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.076624" lon="-120.235221">
     <ele>2334.3</ele>
-    <name>RD1125</name>
+    <name>Road Crossing - 1125</name>
     <desc><![CDATA[Barker Pass, trailhead parking, outhouse, unpaved Forest Road 3.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.081800" lon="-120.245384">
     <ele>2451.2</ele>
-    <name>RD1126</name>
+    <name>Road Crossing - 1126</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.082139" lon="-120.245401">
     <ele>2453.7</ele>
-    <name>CS1126</name>
+    <name>Campsite - 1126</name>
     <desc><![CDATA[Campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.091361" lon="-120.246384">
     <ele>2469.8</ele>
-    <name>WA1127</name>
+    <name>Water - 1127</name>
     <desc><![CDATA[Small stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.091946" lon="-120.243263">
     <ele>2424.4</ele>
-    <name>WACS1127</name>
+    <name>Campsite &amp; Water - 1127</name>
     <desc><![CDATA[North Fork Blackwood Creek, campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="39.093428" lon="-120.243159">
     <ele>2411.4</ele>
-    <name>WA1127B</name>
+    <name>Water - 1127</name>
     <desc><![CDATA[Spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.096665" lon="-120.241754">
     <ele>2372.2</ele>
-    <name>WA1128</name>
+    <name>Water - 1128</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.105838" lon="-120.236812">
@@ -52569,62 +52614,62 @@
     <sym>Forest</sym>
   </wpt><wpt lat="39.109153" lon="-120.236898">
     <ele>2561.0</ele>
-    <name>TR1130</name>
+    <name>Trail Junction - 1130</name>
     <desc><![CDATA[Tahoe Rim trail departs the PCT, campsites nearby.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.172529" lon="-120.257289">
     <ele>2263.4</ele>
-    <name>WACS1136</name>
+    <name>Campsite &amp; Water - 1136</name>
     <desc><![CDATA[Five Lakes Creek, several campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="39.171990" lon="-120.259014">
     <ele>2267.1</ele>
-    <name>TR1136</name>
+    <name>Trail Junction - 1136</name>
     <desc><![CDATA[Five Lakes trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.170858" lon="-120.259848">
     <ele>2259.6</ele>
-    <name>WA1136</name>
+    <name>Water - 1136</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.166967" lon="-120.268467">
     <ele>2167.1</ele>
-    <name>TR1137</name>
+    <name>Trail Junction - 1137</name>
     <desc><![CDATA[Whisky Creek trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.172170" lon="-120.275299">
     <ele>2196.3</ele>
-    <name>WA1137</name>
+    <name>Water - 1137</name>
     <desc><![CDATA[Trailside creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.173105" lon="-120.277014">
     <ele>2213.4</ele>
-    <name>CS1138</name>
+    <name>Campsite - 1138</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.174682" lon="-120.280769">
     <ele>2222.5</ele>
-    <name>CS1138B</name>
+    <name>Campsite - 1138</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.184854" lon="-120.288606">
     <ele>2422.8</ele>
-    <name>TR1139</name>
+    <name>Trail Junction - 1139</name>
     <desc><![CDATA[Tevis trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.188598" lon="-120.286246">
     <ele>2464.5</ele>
-    <name>TR1139B</name>
+    <name>Trail Junction - 1139</name>
     <desc><![CDATA[Mountain Meadow Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.189744" lon="-120.285515">
     <ele>2474.9</ele>
-    <name>WA1140</name>
+    <name>Water - 1140</name>
     <desc><![CDATA[Small creek, headwaters of the Middle Fork American River.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.193959" lon="-120.283299">
     <ele>2566.1</ele>
-    <name>TR1140</name>
+    <name>Trail Junction - 1140</name>
     <desc><![CDATA[Squaw Valley trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.195359" lon="-120.283075">
@@ -52639,37 +52684,37 @@
     <sym>Ski Resort</sym>
   </wpt><wpt lat="39.199602" lon="-120.280957">
     <ele>2516.9</ele>
-    <name>WACS1141</name>
+    <name>Campsite &amp; Water - 1141</name>
     <desc><![CDATA[Squaw Creek, campsite]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="39.210645" lon="-120.276405">
     <ele>2494.8</ele>
-    <name>TR1142</name>
+    <name>Trail Junction - 1142</name>
     <desc><![CDATA[Another trail to Squaw Valley.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.225430" lon="-120.276662">
     <ele>2301.9</ele>
-    <name>TR1143</name>
+    <name>Trail Junction - 1143</name>
     <desc><![CDATA[Painted Rock trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.236310" lon="-120.278983">
     <ele>2421.5</ele>
-    <name>CS1144</name>
+    <name>Campsite - 1144</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.238276" lon="-120.281358">
     <ele>2429.1</ele>
-    <name>WA1145</name>
+    <name>Water - 1145</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.244689" lon="-120.280483">
     <ele>2633.3</ele>
-    <name>TR1146</name>
+    <name>Trail Junction - 1146</name>
     <desc><![CDATA[Cold Stream trail to Truckee.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.253674" lon="-120.291053">
     <ele>2602.0</ele>
-    <name>CS1147</name>
+    <name>Campsite - 1147</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.286484" lon="-120.322498">
@@ -52679,12 +52724,12 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="39.293795" lon="-120.320458">
     <ele>2401.4</ele>
-    <name>TR1151</name>
+    <name>Trail Junction - 1151</name>
     <desc><![CDATA[Emigrant trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.304520" lon="-120.322426">
     <ele>2314.4</ele>
-    <name>RD1152</name>
+    <name>Road Crossing - 1152</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.305550" lon="-120.322357">
@@ -52694,28 +52739,32 @@
     <sym>Ski Resort</sym>
   </wpt><wpt lat="39.306091" lon="-120.322900">
     <ele>2300.4</ele>
-    <name>TR1152</name>
+    <name>Trail Junction - 1152</name>
     <desc><![CDATA[Mount Judah trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.316788" lon="-120.326044">
     <ele>1805.7</ele>
-    <name>RD1153</name>
+    <name>Road Crossing - 1153</name>
     <desc><![CDATA[Paved Highway 40 near Donner Pass.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.320955" lon="-120.321522">
     <ele>2144.1</ele>
-    <name>PL1154</name>
+    <name>Powerline - 1154</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="39.325619" lon="-120.321212">
     <ele>2194.8</ele>
-    <name>WA1155</name>
+    <name>Water - 1155</name>
     <desc><![CDATA[Small lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.329708" lon="-120.320543">
     <ele>2137.7</ele>
-    <name>PL1155</name>
+    <name>Powerline - 1155</name>
     <desc><![CDATA[High voltage power line]]></desc>
+    <sym>Powerline</sym>
+  </wpt><wpt lat="38.877556" lon="-120.145931">
+    <ele>2456.1</ele>
+    <name>1100</name>
     <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>CA Sec L</name>
@@ -52724,7 +52773,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section L</desc><cmt/><trkseg>
       <trkpt lat="39.342430" lon="-120.335954"><ele>2194.62</ele></trkpt>
       <trkpt lat="39.342877" lon="-120.336217"><ele>2194.92</ele></trkpt>
       <trkpt lat="39.343628" lon="-120.336117"><ele>2194.95</ele></trkpt>
@@ -53872,7 +53921,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section L. Off-Track: Rest Area Trail</desc><cmt/><trkseg>
       <trkpt lat="39.345212" lon="-120.338387"><ele>2207.33</ele></trkpt>
       <trkpt lat="39.344920" lon="-120.338791"><ele>2214.43</ele></trkpt>
       <trkpt lat="39.344718" lon="-120.338847"><ele>2217.09</ele></trkpt>
@@ -53889,12 +53938,12 @@
     </trkseg>
   </trk><wpt lat="39.343450" lon="-120.336213">
     <ele>2194.7</ele>
-    <name>Hwy80</name>
+    <name>Highway 80</name>
     <desc><![CDATA[Highway 80]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="39.345150" lon="-120.338359">
     <ele>2206.9</ele>
-    <name>TR1157</name>
+    <name>Trail Junction - 1157</name>
     <desc><![CDATA[Trail junction to highway rest area.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.342671" lon="-120.340220">
@@ -53904,17 +53953,17 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="39.350647" lon="-120.352837">
     <ele>2264.9</ele>
-    <name>RD1159</name>
+    <name>Road Crossing - 1159</name>
     <desc><![CDATA[Jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.352438" lon="-120.352918">
     <ele>2279.3</ele>
-    <name>WA1159</name>
+    <name>Water - 1159</name>
     <desc><![CDATA[Upper Castle Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.357150" lon="-120.355081">
     <ele>2322.8</ele>
-    <name>WA1159B</name>
+    <name>Water - 1159</name>
     <desc><![CDATA[Seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.358707" lon="-120.364943">
@@ -53929,187 +53978,187 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="39.382843" lon="-120.371753">
     <ele>2550.4</ele>
-    <name>WA1162</name>
+    <name>Water - 1162</name>
     <desc><![CDATA[Seasonal Basin Peak Spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.389718" lon="-120.376814">
     <ele>2470.0</ele>
-    <name>WA1163</name>
+    <name>Water - 1163</name>
     <desc><![CDATA[Creek at the end of a switchback.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.397344" lon="-120.376637">
     <ele>2304.0</ele>
-    <name>WA1164</name>
+    <name>Water - 1164</name>
     <desc><![CDATA[Wooden bridge over a seasonal stream. ]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.397929" lon="-120.376206">
     <ele>2306.2</ele>
-    <name>CS1164</name>
+    <name>Campsite - 1164</name>
     <desc><![CDATA[Several campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.401084" lon="-120.377347">
     <ele>2313.6</ele>
-    <name>TR1165</name>
+    <name>Trail Junction - 1165</name>
     <desc><![CDATA[Paradise Lake Trail]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.410682" lon="-120.397398">
     <ele>2326.3</ele>
-    <name>TR1167</name>
+    <name>Trail Junction - 1167</name>
     <desc><![CDATA[Mount Lola trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.410557" lon="-120.399107">
     <ele>2315.6</ele>
-    <name>WACS1167</name>
+    <name>Campsite &amp; Water - 1167</name>
     <desc><![CDATA[White Rock Creek, wooden bridge, several campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="39.413548" lon="-120.400372">
     <ele>2329.1</ele>
-    <name>WA1167</name>
+    <name>Water - 1167</name>
     <desc><![CDATA[Small stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.415215" lon="-120.402176">
     <ele>2343.0</ele>
-    <name>RD1167</name>
+    <name>Road Crossing - 1167</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.417916" lon="-120.402401">
     <ele>2375.5</ele>
-    <name>RD1168</name>
+    <name>Road Crossing - 1168</name>
     <desc><![CDATA[Unpaved White Rock Lake Road 19N11A.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.420870" lon="-120.417171">
     <ele>2455.0</ele>
-    <name>WA1169</name>
+    <name>Water - 1169</name>
     <desc><![CDATA[Snowbank spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.423740" lon="-120.419388">
     <ele>2448.2</ele>
-    <name>RD1169</name>
+    <name>Road Crossing - 1169</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.425492" lon="-120.447956">
     <ele>2292.9</ele>
-    <name>WACS1172</name>
+    <name>Campsite &amp; Water - 1172</name>
     <desc><![CDATA[Seasonal Lacey Creek, campsites nearby, sign says "Always water 3/10 mile downstream."]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="39.425567" lon="-120.448424">
     <ele>2295.0</ele>
-    <name>RD1172</name>
+    <name>Road Crossing - 1172</name>
     <desc><![CDATA[Well graded unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.439437" lon="-120.464536">
     <ele>2373.2</ele>
-    <name>CS1175</name>
+    <name>Campsite - 1175</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.447321" lon="-120.462231">
     <ele>2323.9</ele>
-    <name>RD1176</name>
+    <name>Road Crossing - 1176</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.470173" lon="-120.493718">
     <ele>2218.1</ele>
-    <name>WA1179</name>
+    <name>Water - 1179</name>
     <desc><![CDATA[Mule Ears Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.469755" lon="-120.494007">
     <ele>2224.3</ele>
-    <name>TR1179</name>
+    <name>Trail Junction - 1179</name>
     <desc><![CDATA[Mule Ears Creek trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.469883" lon="-120.498740">
     <ele>2178.4</ele>
-    <name>RD1180</name>
+    <name>Road Crossing - 1180</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.477320" lon="-120.518877">
     <ele>2092.6</ele>
-    <name>RD1182</name>
+    <name>Road Crossing - 1182</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.480985" lon="-120.520982">
     <ele>2063.0</ele>
-    <name>TR1182</name>
+    <name>Trail Junction - 1182</name>
     <desc><![CDATA[Lasier Meadow trail junction, unpaved road nearby.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.502222" lon="-120.528087">
     <ele>1888.2</ele>
-    <name>RD1184</name>
+    <name>Road Crossing - 1184</name>
     <desc><![CDATA[PCT joins a paved Pass Creek Loop Road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.502735" lon="-120.527623">
     <ele>1881.2</ele>
-    <name>WA1184</name>
+    <name>Water - 1184</name>
     <desc><![CDATA[Road bridge over a creek.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.504162" lon="-120.527150">
     <ele>1885.8</ele>
-    <name>RD1184B</name>
+    <name>Road Crossing - 1184</name>
     <desc><![CDATA[PCT departs paved Pass Creek Loop road on a trail.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.505969" lon="-120.529498">
     <ele>1889.0</ele>
-    <name>RD1184C</name>
+    <name>Road Crossing - 1184</name>
     <desc><![CDATA[Cross paved Henness Pass Road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.509072" lon="-120.532457">
     <ele>1912.4</ele>
-    <name>WA1184B</name>
+    <name>Water - 1184</name>
     <desc><![CDATA[Bald Ridge Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.513106" lon="-120.540245">
     <ele>1972.1</ele>
-    <name>CS1185</name>
+    <name>Campsite - 1185</name>
     <desc><![CDATA[Several campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.518321" lon="-120.548672">
     <ele>1898.3</ele>
-    <name>WA1186</name>
+    <name>Water - 1186</name>
     <desc><![CDATA[Bear Valley Springs trail junction (1/10 mile off trail).]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.523119" lon="-120.556315">
     <ele>1886.4</ele>
-    <name>RD1186</name>
+    <name>Road Crossing - 1186</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.538556" lon="-120.565531">
     <ele>1693.6</ele>
-    <name>TR1190</name>
+    <name>Trail Junction - 1190</name>
     <desc><![CDATA[Milton Spring trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.543565" lon="-120.572586">
     <ele>1596.5</ele>
-    <name>WACS1191</name>
+    <name>Campsite &amp; Water - 1191</name>
     <desc><![CDATA[Milton Creek, wooden bridge, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="39.550755" lon="-120.576923">
     <ele>1527.4</ele>
-    <name>WACS1192</name>
+    <name>Campsite &amp; Water - 1192</name>
     <desc><![CDATA[2nd crossing of Milton Creek, wooden bridge, small campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="39.564128" lon="-120.585533">
     <ele>1477.7</ele>
-    <name>RD1193</name>
+    <name>Road Crossing - 1193</name>
     <desc><![CDATA[Unpaved Wild Plum Road, small power line nearby.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.565336" lon="-120.588243">
     <ele>1442.6</ele>
-    <name>WA1193</name>
+    <name>Water - 1193</name>
     <desc><![CDATA[Haypress Creek, steel bridge. Trail junction to Wild Plum Campground and side trail into Sierra City nearby.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.566311" lon="-120.589974">
     <ele>1467.7</ele>
-    <name>TR1193</name>
+    <name>Trail Junction - 1193</name>
     <desc><![CDATA[Haypress Creek Trail number 14E05.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.568312" lon="-120.592890">
     <ele>1465.6</ele>
-    <name>TR1193B</name>
+    <name>Trail Junction - 1193</name>
     <desc><![CDATA[Wild Plum loop trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.580019" lon="-120.608038">
     <ele>1402.3</ele>
-    <name>WA1195</name>
+    <name>Water - 1195</name>
     <desc><![CDATA[North Yuba River, steel bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
@@ -54119,7 +54168,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section M</desc><cmt/><trkseg>
       <trkpt lat="39.576523" lon="-120.612550"><ele>1398.57</ele></trkpt>
       <trkpt lat="39.576762" lon="-120.612501"><ele>1404.71</ele></trkpt>
       <trkpt lat="39.576886" lon="-120.611796"><ele>1405.56</ele></trkpt>
@@ -56580,7 +56629,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section M. Off-Track: Black Rock Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="39.768497" lon="-120.989500"><ele>1670.30</ele></trkpt>
       <trkpt lat="39.768529" lon="-120.989888"><ele>1663.46</ele></trkpt>
       <trkpt lat="39.768159" lon="-120.989854"><ele>1665.72</ele></trkpt>
@@ -56607,7 +56656,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section M. Off-Track: Bucks Lake Alternate</desc><cmt/><trkseg>
       <trkpt lat="39.858658" lon="-121.131335"><ele>1676.18</ele></trkpt>
       <trkpt lat="39.858666" lon="-121.132167"><ele>1678.13</ele></trkpt>
       <trkpt lat="39.858782" lon="-121.132919"><ele>1679.00</ele></trkpt>
@@ -56710,7 +56759,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section M. Off-Track: N Fowler Creek Trail</desc><cmt/><trkseg>
       <trkpt lat="39.787017" lon="-121.012598"><ele>1506.52</ele></trkpt>
       <trkpt lat="39.786956" lon="-121.012636"><ele>1503.39</ele></trkpt>
       <trkpt lat="39.786697" lon="-121.012367"><ele>1493.23</ele></trkpt>
@@ -56726,7 +56775,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section M. Off-Track: WA1216 trail</desc><cmt/><trkseg>
       <trkpt lat="39.696873" lon="-120.705374"><ele>2149.71</ele></trkpt>
       <trkpt lat="39.697111" lon="-120.704538"><ele>2144.63</ele></trkpt>
       <trkpt lat="39.696620" lon="-120.703699"><ele>2171.61</ele></trkpt>
@@ -56734,7 +56783,7 @@
     </trkseg>
   </trk><wpt lat="39.576553" lon="-120.612561">
     <ele>1093.6</ele>
-    <name>Hwy49</name>
+    <name>Highway 49</name>
     <desc><![CDATA[Highway 49]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="39.566128" lon="-120.635744">
@@ -56744,9 +56793,9 @@
     <sym>Church</sym>
   </wpt><wpt lat="39.581272" lon="-120.609890">
     <ele>1483.3</ele>
-    <name>PL1196</name>
+    <name>Powerline - 1196</name>
     <desc><![CDATA[Low voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="39.588209" lon="-120.615761">
     <ele>1640.0</ele>
     <name>SwitchbackSpring</name>
@@ -56754,12 +56803,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="39.583087" lon="-120.642331">
     <ele>1982.2</ele>
-    <name>WA1201</name>
+    <name>Water - 1201</name>
     <desc><![CDATA[Seasonal spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.588783" lon="-120.661801">
     <ele>2177.1</ele>
-    <name>RD1202</name>
+    <name>Road Crossing - 1202</name>
     <desc><![CDATA[Sierra Buttes Jeep Road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.592202" lon="-120.662251">
@@ -56769,7 +56818,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="39.599359" lon="-120.664275">
     <ele>2239.3</ele>
-    <name>RD1203</name>
+    <name>Road Crossing - 1203</name>
     <desc><![CDATA[Jeep road.<br/>---<br/>In the fall of 2017 the PCT was rerouted northbound from mile 1203.4. Approximately 4.4 miles of old trail [mostly along unpaved roads] was bypassed by 6.9 miles of new trail. This reroute increased the length of the PCT by approximately 2.5 miles. The new route is shown on these maps.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.602161" lon="-120.661923">
@@ -56789,12 +56838,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="39.675150" lon="-120.681207">
     <ele>2235.2</ele>
-    <name>RD1213</name>
+    <name>Road Crossing - 1213</name>
     <desc><![CDATA[PCT joins an unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.675598" lon="-120.680727">
     <ele>2230.8</ele>
-    <name>RD1213B</name>
+    <name>Road Crossing - 1213</name>
     <desc><![CDATA[PCT departs the unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.686869" lon="-120.693534">
@@ -56804,7 +56853,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="39.692111" lon="-120.697633">
     <ele>2240.0</ele>
-    <name>CS1215</name>
+    <name>Campsite - 1215</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.690814" lon="-120.701004">
@@ -56814,7 +56863,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.696011" lon="-120.703855">
     <ele>2174.2</ele>
-    <name>WA1216</name>
+    <name>Water - 1216</name>
     <desc><![CDATA[Piped spring 1/10 mile E of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.696916" lon="-120.705431">
@@ -56824,17 +56873,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="39.696620" lon="-120.706995">
     <ele>2150.8</ele>
-    <name>WACS1216</name>
+    <name>Campsite &amp; Water - 1216</name>
     <desc><![CDATA[Small pond, campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="39.705782" lon="-120.716092">
     <ele>2242.2</ele>
-    <name>CS1217</name>
+    <name>Campsite - 1217</name>
     <desc><![CDATA[Several campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.705715" lon="-120.716501">
     <ele>2241.1</ele>
-    <name>RD1217</name>
+    <name>Road Crossing - 1217</name>
     <desc><![CDATA[Jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.707313" lon="-120.720918">
@@ -56844,7 +56893,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.715030" lon="-120.745287">
     <ele>1999.1</ele>
-    <name>RD1220</name>
+    <name>Road Crossing - 1220</name>
     <desc><![CDATA[Unpaved road near A Tree spring.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.714828" lon="-120.745570">
@@ -56854,7 +56903,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="39.715128" lon="-120.785140">
     <ele>1947.8</ele>
-    <name>WA1224</name>
+    <name>Water - 1224</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.714247" lon="-120.787396">
@@ -56904,12 +56953,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.771962" lon="-120.864079">
     <ele>2038.6</ele>
-    <name>CS1232</name>
+    <name>Campsite - 1232</name>
     <desc><![CDATA[Several campsites, metal fire ring.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.787058" lon="-120.877315">
     <ele>2027.9</ele>
-    <name>CS1234</name>
+    <name>Campsite - 1234</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.782399" lon="-120.891617">
@@ -56944,12 +56993,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="39.778782" lon="-120.940778">
     <ele>1798.6</ele>
-    <name>RD1238</name>
+    <name>Road Crossing - 1238</name>
     <desc><![CDATA[Gravel road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.772403" lon="-120.961590">
     <ele>1827.0</ele>
-    <name>CS1239</name>
+    <name>Campsite - 1239</name>
     <desc><![CDATA[Several campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.770395" lon="-120.961522">
@@ -56969,12 +57018,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="39.768582" lon="-120.989447">
     <ele>1669.9</ele>
-    <name>RD1241</name>
+    <name>Road Crossing - 1241</name>
     <desc><![CDATA[Narrow paved road, Fowler Peak Trailhead nearby.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="39.779405" lon="-121.006502">
     <ele>1616.8</ele>
-    <name>CS1243</name>
+    <name>Campsite - 1243</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.784725" lon="-121.003164">
@@ -57009,7 +57058,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="39.808219" lon="-121.056064">
     <ele>1117.3</ele>
-    <name>CS1251</name>
+    <name>Campsite - 1251</name>
     <desc><![CDATA[Campsite near an unpaved road.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.817842" lon="-121.066869">
@@ -57034,12 +57083,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="39.822790" lon="-121.098858">
     <ele>1661.9</ele>
-    <name>CS1259</name>
+    <name>Campsite - 1259</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.822591" lon="-121.104738">
     <ele>1708.2</ele>
-    <name>CS1259B</name>
+    <name>Campsite - 1259</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.830506" lon="-121.112183">
@@ -57054,7 +57103,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="39.842590" lon="-121.117727">
     <ele>1785.9</ele>
-    <name>CS1261</name>
+    <name>Campsite - 1261</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.852595" lon="-121.133677">
@@ -57094,12 +57143,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="39.870212" lon="-121.126371">
     <ele>1718.7</ele>
-    <name>WA1265</name>
+    <name>Water - 1265</name>
     <desc><![CDATA[Seasonal spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.872267" lon="-121.121764">
     <ele>1698.9</ele>
-    <name>WA1265B</name>
+    <name>Water - 1265</name>
     <desc><![CDATA[Seasonal spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.875598" lon="-121.119794">
@@ -57129,7 +57178,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="39.910106" lon="-121.130885">
     <ele>1981.1</ele>
-    <name>CS1270</name>
+    <name>Campsite - 1270</name>
     <desc><![CDATA[Several campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.932377" lon="-121.132328">
@@ -57149,7 +57198,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.954938" lon="-121.160263">
     <ele>2111.4</ele>
-    <name>CS1275</name>
+    <name>Campsite - 1275</name>
     <desc><![CDATA[Several small campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.961696" lon="-121.179076">
@@ -57164,7 +57213,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="39.963094" lon="-121.179874">
     <ele>2026.0</ele>
-    <name>CS1276</name>
+    <name>Campsite - 1276</name>
     <desc><![CDATA[Several campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.966277" lon="-121.184736">
@@ -57184,7 +57233,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.972864" lon="-121.203249">
     <ele>1912.0</ele>
-    <name>WA1278</name>
+    <name>Water - 1278</name>
     <desc><![CDATA[Shallow lily pond]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.975111" lon="-121.218321">
@@ -57199,17 +57248,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="39.976509" lon="-121.238927">
     <ele>1890.2</ele>
-    <name>CS1280</name>
+    <name>Campsite - 1280</name>
     <desc><![CDATA[Several small campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.981374" lon="-121.247941">
     <ele>1814.9</ele>
-    <name>CS1281</name>
+    <name>Campsite - 1281</name>
     <desc><![CDATA[Exposed campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="39.978313" lon="-121.251166">
     <ele>1722.9</ele>
-    <name>WA1282</name>
+    <name>Water - 1282</name>
     <desc><![CDATA[Seasonal spring. Watch for POISON OAK as you descend to Belden.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="39.980562" lon="-121.251164">
@@ -57239,9 +57288,13 @@
     <sym>Shopping Center</sym>
   </wpt><wpt lat="40.006965" lon="-121.249470">
     <ele>687.1</ele>
-    <name>Hwy70</name>
+    <name>Highway 70</name>
     <desc><![CDATA[Paved Highway 70 near Belden Town bridge.]]></desc>
     <sym>Car</sym>
+  </wpt><wpt lat="39.577432" lon="-120.638274">
+    <ele>1919.0</ele>
+    <name>1200</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>CA Sec N</name>
     <extensions>
@@ -57249,7 +57302,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section N</desc><cmt/><trkseg>
       <trkpt lat="40.006979" lon="-121.249469"><ele>687.50</ele></trkpt>
       <trkpt lat="40.007058" lon="-121.250017"><ele>676.89</ele></trkpt>
       <trkpt lat="40.007007" lon="-121.250784"><ele>678.06</ele></trkpt>
@@ -60691,7 +60744,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section N. Off-Track: Boiling Spring Alternate</desc><cmt/><trkseg>
       <trkpt lat="40.422427" lon="-121.379619"><ele>1838.37</ele></trkpt>
       <trkpt lat="40.422933" lon="-121.380984"><ele>1851.82</ele></trkpt>
       <trkpt lat="40.423090" lon="-121.381643"><ele>1858.00</ele></trkpt>
@@ -60759,7 +60812,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section N. Off-Track: Burney Falls Trail</desc><cmt/><trkseg>
       <trkpt lat="41.010811" lon="-121.653021"><ele>896.01</ele></trkpt>
       <trkpt lat="41.010804" lon="-121.652820"><ele>893.55</ele></trkpt>
       <trkpt lat="41.010979" lon="-121.652753"><ele>891.51</ele></trkpt>
@@ -60786,7 +60839,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section N. Off-Track: Carter Creek Trail</desc><cmt/><trkseg>
       <trkpt lat="40.195175" lon="-121.417420"><ele>2017.59</ele></trkpt>
       <trkpt lat="40.195460" lon="-121.417273"><ele>2012.46</ele></trkpt>
       <trkpt lat="40.196264" lon="-121.417111"><ele>1997.76</ele></trkpt>
@@ -60808,7 +60861,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section N. Off-Track: Old Station Trail</desc><cmt/><trkseg>
       <trkpt lat="40.647683" lon="-121.459376"><ele>1398.75</ele></trkpt>
       <trkpt lat="40.648131" lon="-121.459527"><ele>1396.69</ele></trkpt>
       <trkpt lat="40.648516" lon="-121.459474"><ele>1395.38</ele></trkpt>
@@ -60827,7 +60880,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section N. Off-Track: Subway Cave Trail</desc><cmt/><trkseg>
       <trkpt lat="40.681048" lon="-121.418424"><ele>1329.88</ele></trkpt>
       <trkpt lat="40.681319" lon="-121.418568"><ele>1329.80</ele></trkpt>
       <trkpt lat="40.681555" lon="-121.418554"><ele>1329.68</ele></trkpt>
@@ -60859,9 +60912,9 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="40.004493" lon="-121.269405">
     <ele>745.4</ele>
-    <name>PL1289</name>
+    <name>Powerline - 1289</name>
     <desc><![CDATA[High voltage power line ]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="40.008469" lon="-121.273677">
     <ele>738.3</ele>
     <name>ChipsCreekTR</name>
@@ -60869,12 +60922,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.008817" lon="-121.273861">
     <ele>753.9</ele>
-    <name>WA1289</name>
+    <name>Water - 1289</name>
     <desc><![CDATA[Small seasonal creek.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="40.021627" lon="-121.283643">
     <ele>1058.7</ele>
-    <name>WA1291</name>
+    <name>Water - 1291</name>
     <desc><![CDATA[Small seasonal creek.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="40.028374" lon="-121.299427">
@@ -60889,12 +60942,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="40.031097" lon="-121.304333">
     <ele>1110.9</ele>
-    <name>WA1292</name>
+    <name>Water - 1292</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="40.029637" lon="-121.309765">
     <ele>1110.6</ele>
-    <name>WA1292B</name>
+    <name>Water - 1292</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="40.029060" lon="-121.312875">
@@ -60914,22 +60967,22 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="40.030720" lon="-121.351039">
     <ele>1403.9</ele>
-    <name>WA1295</name>
+    <name>Water - 1295</name>
     <desc><![CDATA[Large creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="40.031276" lon="-121.356750">
     <ele>1444.4</ele>
-    <name>CS1295</name>
+    <name>Campsite - 1295</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="40.032111" lon="-121.357966">
     <ele>1465.1</ele>
-    <name>WA1295B</name>
+    <name>Water - 1295</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="40.031643" lon="-121.358375">
     <ele>1452.7</ele>
-    <name>CS1296</name>
+    <name>Campsite - 1296</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="40.031016" lon="-121.358391">
@@ -60944,12 +60997,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="40.033291" lon="-121.365734">
     <ele>1523.1</ele>
-    <name>WA1296</name>
+    <name>Water - 1296</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="40.033905" lon="-121.375783">
     <ele>1608.1</ele>
-    <name>WA1297</name>
+    <name>Water - 1297</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="40.034661" lon="-121.383180">
@@ -61004,7 +61057,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="40.120564" lon="-121.395950">
     <ele>2169.1</ele>
-    <name>CS1307</name>
+    <name>Campsite - 1307</name>
     <desc><![CDATA[Large campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="40.126666" lon="-121.402918">
@@ -61024,7 +61077,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="40.152703" lon="-121.438382">
     <ele>2025.9</ele>
-    <name>CS1312</name>
+    <name>Campsite - 1312</name>
     <desc><![CDATA[Several campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="40.160377" lon="-121.444124">
@@ -61034,17 +61087,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="40.183398" lon="-121.438408">
     <ele>1909.1</ele>
-    <name>CS1315</name>
+    <name>Campsite - 1315</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="40.188340" lon="-121.440524">
     <ele>1884.3</ele>
-    <name>TR1316</name>
+    <name>Trail Junction - 1316</name>
     <desc><![CDATA[Trail junction to a spring, 3/10 mile off-trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.185269" lon="-121.443251">
     <ele>1810.0</ele>
-    <name>WA1316</name>
+    <name>Water - 1316</name>
     <desc><![CDATA[Spring, 3/10 mile W of the PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="40.201189" lon="-121.418685">
@@ -61059,7 +61112,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.204581" lon="-121.389342">
     <ele>2243.0</ele>
-    <name>CS1321</name>
+    <name>Campsite - 1321</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="40.210046" lon="-121.382869">
@@ -61069,7 +61122,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.210249" lon="-121.379604">
     <ele>2312.2</ele>
-    <name>CS1322</name>
+    <name>Campsite - 1322</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="40.210019" lon="-121.355900">
@@ -61084,17 +61137,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="40.242188" lon="-121.343798">
     <ele>1592.3</ele>
-    <name>RD1329</name>
+    <name>Road Crossing - 1329</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="40.241490" lon="-121.340549">
     <ele>1566.3</ele>
-    <name>RD1329B</name>
+    <name>Road Crossing - 1329</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="40.244204" lon="-121.338909">
     <ele>1502.3</ele>
-    <name>RD1330</name>
+    <name>Road Crossing - 1330</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="40.247028" lon="-121.338370">
@@ -61114,7 +61167,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="40.261505" lon="-121.338872">
     <ele>1715.4</ele>
-    <name>HWY36</name>
+    <name>Highway 36</name>
     <desc><![CDATA[Highway 36, the town of Chester is 7.5 miles E.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="40.274708" lon="-121.342657">
@@ -61179,7 +61232,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="40.359781" lon="-121.353696">
     <ele>1557.9</ele>
-    <name>RD1342</name>
+    <name>Road Crossing - 1342</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="40.360843" lon="-121.354427">
@@ -61214,7 +61267,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.441758" lon="-121.403524">
     <ele>1744.1</ele>
-    <name>TR1350</name>
+    <name>Trail Junction - 1350</name>
     <desc><![CDATA[Drakesbad Guest Ranch spur trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.442448" lon="-121.400296">
@@ -61324,7 +61377,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="40.603369" lon="-121.471558">
     <ele>1510.6</ele>
-    <name>CS1369</name>
+    <name>Campsite - 1369</name>
     <desc><![CDATA[Several campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="40.606823" lon="-121.472586">
@@ -61364,7 +61417,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="40.653303" lon="-121.454757">
     <ele>1385.1</ele>
-    <name>GT1374</name>
+    <name>Gate - 1374</name>
     <desc><![CDATA[Trail gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.659660" lon="-121.448320">
@@ -61384,12 +61437,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.668343" lon="-121.429048">
     <ele>1376.3</ele>
-    <name>GT1376</name>
+    <name>Gate - 1376</name>
     <desc><![CDATA[Trail gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.667718" lon="-121.423154">
     <ele>1340.0</ele>
-    <name>RD1376</name>
+    <name>Road Crossing - 1376</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="40.669823" lon="-121.422735">
@@ -61399,12 +61452,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="40.674064" lon="-121.418544">
     <ele>1340.5</ele>
-    <name>GT1377</name>
+    <name>Gate - 1377</name>
     <desc><![CDATA[Trail gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.679876" lon="-121.420274">
     <ele>1330.7</ele>
-    <name>Hwy44</name>
+    <name>Highway 44</name>
     <desc><![CDATA[Paved Highway 44]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="40.676656" lon="-121.427971">
@@ -61424,7 +61477,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="40.680935" lon="-121.418166">
     <ele>1329.9</ele>
-    <name>CS1378</name>
+    <name>Campsite - 1378</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="40.701957" lon="-121.406075">
@@ -61434,27 +61487,27 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="40.703330" lon="-121.403197">
     <ele>1487.2</ele>
-    <name>TR1380</name>
+    <name>Trail Junction - 1380</name>
     <desc><![CDATA[Trailhead with shade, picnic tables, outhouse, trash cans, grills, hitching post, information kiosk, unpaved road [no water].]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.704238" lon="-121.402929">
     <ele>1486.2</ele>
-    <name>GT1380</name>
+    <name>Gate - 1380</name>
     <desc><![CDATA[Trail gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.719947" lon="-121.404962">
     <ele>1454.7</ele>
-    <name>GT1382</name>
+    <name>Gate - 1382</name>
     <desc><![CDATA[Fence with a wire gate.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.752534" lon="-121.406782">
     <ele>1467.7</ele>
-    <name>CS1385</name>
+    <name>Campsite - 1385</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="40.753272" lon="-121.406920">
     <ele>1462.5</ele>
-    <name>GT1385</name>
+    <name>Gate - 1385</name>
     <desc><![CDATA[Trail Gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.758291" lon="-121.396807">
@@ -61464,12 +61517,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.755759" lon="-121.388912">
     <ele>1455.5</ele>
-    <name>GT1386</name>
+    <name>Gate - 1386</name>
     <desc><![CDATA[Fence and wire gate.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.755910" lon="-121.386749">
     <ele>1479.2</ele>
-    <name>GT1387</name>
+    <name>Gate - 1387</name>
     <desc><![CDATA[Large gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.768019" lon="-121.393822">
@@ -61484,14 +61537,14 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="40.824073" lon="-121.416103">
     <ele>1495.9</ele>
-    <name>GT1392</name>
+    <name>Gate - 1392</name>
     <desc><![CDATA[Fence and wire gate.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.841055" lon="-121.421784">
     <ele>1436.8</ele>
-    <name>PL1393</name>
+    <name>Powerline - 1393</name>
     <desc><![CDATA[Low voltage power line.]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="40.843306" lon="-121.423911">
     <ele>1420.0</ele>
     <name>Road22</name>
@@ -61499,37 +61552,37 @@
     <sym>Truck</sym>
   </wpt><wpt lat="40.866594" lon="-121.425372">
     <ele>1263.5</ele>
-    <name>GT1396</name>
+    <name>Gate - 1396</name>
     <desc><![CDATA[Trail gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.905772" lon="-121.449587">
     <ele>1202.2</ele>
-    <name>GT1399</name>
+    <name>Gate - 1399</name>
     <desc><![CDATA[Fence and wire gate.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.912119" lon="-121.452624">
     <ele>1182.3</ele>
-    <name>PL1400</name>
+    <name>Powerline - 1400</name>
     <desc><![CDATA[Small power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="40.911506" lon="-121.455703">
     <ele>1124.5</ele>
-    <name>CS1400</name>
+    <name>Campsite - 1400</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="40.916337" lon="-121.466851">
     <ele>1142.4</ele>
-    <name>RD1401</name>
+    <name>Road Crossing - 1401</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="40.918676" lon="-121.483110">
     <ele>1094.5</ele>
-    <name>PL1402</name>
+    <name>Powerline - 1402</name>
     <desc><![CDATA[Unpaved road and low voltage power line.]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="40.921589" lon="-121.493805">
     <ele>1056.0</ele>
-    <name>RD1403</name>
+    <name>Road Crossing - 1403</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="40.922214" lon="-121.497226">
@@ -61539,17 +61592,17 @@
     <sym>Truck</sym>
   </wpt><wpt lat="40.921678" lon="-121.502387">
     <ele>1043.4</ele>
-    <name>PL1404</name>
+    <name>Powerline - 1404</name>
     <desc><![CDATA[Power Line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="40.932837" lon="-121.525409">
     <ele>998.0</ele>
-    <name>RD1405</name>
+    <name>Road Crossing - 1405</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="40.936808" lon="-121.531037">
     <ele>997.8</ele>
-    <name>GT1406</name>
+    <name>Gate - 1406</name>
     <desc><![CDATA[Fence and wire gate.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.926602" lon="-121.541466">
@@ -61564,12 +61617,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="40.928130" lon="-121.543637">
     <ele>914.7</ele>
-    <name>GT1407</name>
+    <name>Gate - 1407</name>
     <desc><![CDATA[Trail gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.928668" lon="-121.544125">
     <ele>911.9</ele>
-    <name>RD1407</name>
+    <name>Road Crossing - 1407</name>
     <desc><![CDATA[Trail joins a paved road near a hydroelectric plant.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="40.929667" lon="-121.544386">
@@ -61579,7 +61632,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="40.930200" lon="-121.544782">
     <ele>914.2</ele>
-    <name>RD1407B</name>
+    <name>Road Crossing - 1407</name>
     <desc><![CDATA[PCT departs the paved road at a parking lot.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="40.931253" lon="-121.546777">
@@ -61604,24 +61657,24 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="40.941869" lon="-121.546773">
     <ele>914.7</ele>
-    <name>GT1408</name>
+    <name>Gate - 1408</name>
     <desc><![CDATA[Trail gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.945091" lon="-121.546452">
     <ele>924.6</ele>
-    <name>CS1408</name>
+    <name>Campsite - 1408</name>
     <desc><![CDATA[Several small campsites.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="40.955815" lon="-121.551595">
     <ele>1001.1</ele>
-    <name>PL1409</name>
+    <name>Powerline - 1409</name>
     <desc><![CDATA[Small power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="40.958111" lon="-121.555877">
     <ele>1009.4</ele>
-    <name>PL1410</name>
+    <name>Powerline - 1410</name>
     <desc><![CDATA[High voltage power line, trail nearby to Burney Mountain Guest Ranch [3/10 mile SW of PCT, burneymountainguestranch.com, 530-335-2544] is a Country Inn that offers camping, lodging, hot meals, showers, laundry, shade, swimming, wifi, water and resupply [including fuel canisters] and they accept resupply packages [$].]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="40.961788" lon="-121.567989">
     <ele>988.1</ele>
     <name>Road36N33B</name>
@@ -61634,7 +61687,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="40.963529" lon="-121.577208">
     <ele>1015.1</ele>
-    <name>Hwy299</name>
+    <name>Highway 299</name>
     <desc><![CDATA[Paved Highway 299.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="40.965981" lon="-121.581538">
@@ -61644,14 +61697,14 @@
     <sym>Truck</sym>
   </wpt><wpt lat="40.966082" lon="-121.583690">
     <ele>951.1</ele>
-    <name>RD1412</name>
+    <name>Road Crossing - 1412</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="40.985649" lon="-121.593126">
     <ele>951.7</ele>
-    <name>PL1414</name>
+    <name>Powerline - 1414</name>
     <desc><![CDATA[Gas pipeline with warning signs.]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="40.988937" lon="-121.592929">
     <ele>949.1</ele>
     <name>Road36N09</name>
@@ -61679,7 +61732,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.005565" lon="-121.608904">
     <ele>918.6</ele>
-    <name>RD1415</name>
+    <name>Road Crossing - 1415</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="41.009994" lon="-121.611865">
@@ -61699,7 +61752,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.008421" lon="-121.642309">
     <ele>913.2</ele>
-    <name>Hwy89</name>
+    <name>Highway 89</name>
     <desc><![CDATA[Paved Highway 89.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="41.006270" lon="-121.641281">
@@ -61712,6 +61765,14 @@
     <name>BurneyGroupCamp</name>
     <desc><![CDATA[Burney Falls State Park Headwaters Group Campground, reservation from State Park required, $35 fee, outhouse, picnic tables, trash cans. [Camping in the $5/night hiker/biker campsites in the main campground 7/10 mile N is a better hiker option].]]></desc>
     <sym>Water Source</sym>
+  </wpt><wpt lat="40.051179" lon="-121.394998">
+    <ele>2097.8</ele>
+    <name>1300</name>
+    <sym>Flag, Green</sym>
+  </wpt><wpt lat="40.910720" lon="-121.454888">
+    <ele>1128.2</ele>
+    <name>1400</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>CA Sec O</name>
     <extensions>
@@ -61719,7 +61780,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section O</desc><cmt/><trkseg>
       <trkpt lat="41.010640" lon="-121.653056"><ele>897.37</ele></trkpt>
       <trkpt lat="41.011581" lon="-121.653445"><ele>899.21</ele></trkpt>
       <trkpt lat="41.011981" lon="-121.653278"><ele>897.87</ele></trkpt>
@@ -64172,7 +64233,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section O. Off-Track: Alder Creek Trail</desc><cmt/><trkseg>
       <trkpt lat="41.157899" lon="-121.920673"><ele>1647.01</ele></trkpt>
       <trkpt lat="41.158025" lon="-121.920604"><ele>1645.18</ele></trkpt>
       <trkpt lat="41.158366" lon="-121.920777"><ele>1643.95</ele></trkpt>
@@ -64196,7 +64257,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section O. Off-Track: Deer Creek Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="41.135189" lon="-121.985956"><ele>1559.45</ele></trkpt>
       <trkpt lat="41.135428" lon="-121.985838"><ele>1562.17</ele></trkpt>
       <trkpt lat="41.135613" lon="-121.986064"><ele>1564.00</ele></trkpt>
@@ -64208,7 +64269,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section O. Off-Track: Moosehead Creek Trail</desc><cmt/><trkseg>
       <trkpt lat="41.176589" lon="-121.831262"><ele>1614.28</ele></trkpt>
       <trkpt lat="41.176858" lon="-121.831390"><ele>1609.06</ele></trkpt>
       <trkpt lat="41.177108" lon="-121.831800"><ele>1607.23</ele></trkpt>
@@ -64265,7 +64326,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.019426" lon="-121.684128">
     <ele>907.7</ele>
-    <name>RD1422</name>
+    <name>Road Crossing - 1422</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="41.025079" lon="-121.713634">
@@ -64275,7 +64336,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.022934" lon="-121.714881">
     <ele>931.4</ele>
-    <name>CS1425</name>
+    <name>Campsite - 1425</name>
     <desc><![CDATA[Several campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.024350" lon="-121.715193">
@@ -64290,7 +64351,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.031744" lon="-121.750333">
     <ele>1266.9</ele>
-    <name>CS1428</name>
+    <name>Campsite - 1428</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.030683" lon="-121.751364">
@@ -64320,7 +64381,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.058936" lon="-121.784437">
     <ele>1456.9</ele>
-    <name>CS1433</name>
+    <name>Campsite - 1433</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.059537" lon="-121.784877">
@@ -64340,22 +64401,22 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.060513" lon="-121.785391">
     <ele>1450.6</ele>
-    <name>CS1433B</name>
+    <name>Campsite - 1433</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.075595" lon="-121.801423">
     <ele>1584.8</ele>
-    <name>PL1434</name>
+    <name>Powerline - 1434</name>
     <desc><![CDATA[Large high voltage power line.]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="41.079577" lon="-121.799038">
     <ele>1632.7</ele>
-    <name>CS1435</name>
+    <name>Campsite - 1435</name>
     <desc><![CDATA[Exposed campsite with a view of Mount Shasta.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.090513" lon="-121.801013">
     <ele>1648.6</ele>
-    <name>RD1436</name>
+    <name>Road Crossing - 1436</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="41.098216" lon="-121.795261">
@@ -64380,7 +64441,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.120814" lon="-121.776441">
     <ele>1567.6</ele>
-    <name>RD1439</name>
+    <name>Road Crossing - 1439</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="41.135817" lon="-121.771317">
@@ -64390,12 +64451,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.162965" lon="-121.780326">
     <ele>1605.8</ele>
-    <name>CS1443</name>
+    <name>Campsite - 1443</name>
     <desc><![CDATA[Small campsite on the saddle.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.171692" lon="-121.794295">
     <ele>1560.1</ele>
-    <name>RD1444</name>
+    <name>Road Crossing - 1444</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="41.170134" lon="-121.819228">
@@ -64425,17 +64486,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.179193" lon="-121.844514">
     <ele>1768.2</ele>
-    <name>CS1449</name>
+    <name>Campsite - 1449</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.172998" lon="-121.859338">
     <ele>1867.9</ele>
-    <name>CS1450</name>
+    <name>Campsite - 1450</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.176723" lon="-121.879465">
     <ele>1853.8</ele>
-    <name>CS1451</name>
+    <name>Campsite - 1451</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.176785" lon="-121.880834">
@@ -64450,7 +64511,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.157895" lon="-121.920214">
     <ele>1645.1</ele>
-    <name>CS1455</name>
+    <name>Campsite - 1455</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.157895" lon="-121.920605">
@@ -64485,9 +64546,9 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.140228" lon="-121.983501">
     <ele>1682.4</ele>
-    <name>PL1461</name>
+    <name>Powerline - 1461</name>
     <desc><![CDATA[High voltage power line.]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="41.135210" lon="-121.985915">
     <ele>1559.5</ele>
     <name>DeerCreekSpringTR</name>
@@ -64510,7 +64571,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.127003" lon="-122.002410">
     <ele>1287.4</ele>
-    <name>CS1464</name>
+    <name>Campsite - 1464</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.125277" lon="-122.025134">
@@ -64520,7 +64581,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.129422" lon="-122.026677">
     <ele>1007.3</ele>
-    <name>CS1467</name>
+    <name>Campsite - 1467</name>
     <desc><![CDATA[Campsite near Butcherknife Creek.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.129714" lon="-122.026529">
@@ -64530,17 +64591,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.127722" lon="-122.028461">
     <ele>1015.5</ele>
-    <name>WA1467</name>
+    <name>Water - 1467</name>
     <desc><![CDATA[Small spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.126221" lon="-122.029590">
     <ele>1000.0</ele>
-    <name>WA1467B</name>
+    <name>Water - 1467</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.123071" lon="-122.032107">
     <ele>968.0</ele>
-    <name>WA1468</name>
+    <name>Water - 1468</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.117038" lon="-122.057948">
@@ -64565,7 +64626,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.115405" lon="-122.084740">
     <ele>738.1</ele>
-    <name>WA1473</name>
+    <name>Water - 1473</name>
     <desc><![CDATA[Small spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.115462" lon="-122.089818">
@@ -64580,17 +64641,17 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.104598" lon="-122.122038">
     <ele>1044.1</ele>
-    <name>CS1477</name>
+    <name>Campsite - 1477</name>
     <desc><![CDATA[Small campsites in the abandoned roadbed.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.110194" lon="-122.125003">
     <ele>1080.7</ele>
-    <name>CS1477B</name>
+    <name>Campsite - 1477</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.115546" lon="-122.123907">
     <ele>1077.4</ele>
-    <name>CS1478</name>
+    <name>Campsite - 1478</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.121931" lon="-122.132311">
@@ -64605,7 +64666,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.130006" lon="-122.148232">
     <ele>966.0</ele>
-    <name>CS1482</name>
+    <name>Campsite - 1482</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.129877" lon="-122.148834">
@@ -64625,27 +64686,27 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.136699" lon="-122.178958">
     <ele>929.8</ele>
-    <name>CS1486</name>
+    <name>Campsite - 1486</name>
     <desc><![CDATA[Campsites between unpaved roads.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.137286" lon="-122.179342">
     <ele>945.3</ele>
-    <name>GT1486</name>
+    <name>Gate - 1486</name>
     <desc><![CDATA[Pipe gate on the old roadbed.]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="41.137995" lon="-122.179529">
     <ele>947.0</ele>
-    <name>RD1486</name>
+    <name>Road Crossing - 1486</name>
     <desc><![CDATA[PCT departs the old roadbed.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="41.138971" lon="-122.196544">
     <ele>1187.6</ele>
-    <name>CS1487</name>
+    <name>Campsite - 1487</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.142142" lon="-122.212984">
     <ele>1373.5</ele>
-    <name>CS1489</name>
+    <name>Campsite - 1489</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.148438" lon="-122.221821">
@@ -64670,22 +64731,22 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.155490" lon="-122.266407">
     <ele>1140.6</ele>
-    <name>RD1496</name>
+    <name>Road Crossing - 1496</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="41.155674" lon="-122.267436">
     <ele>1138.6</ele>
-    <name>CS1496</name>
+    <name>Campsite - 1496</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.159609" lon="-122.280021">
     <ele>865.6</ele>
-    <name>CS1499</name>
+    <name>Campsite - 1499</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.162246" lon="-122.285006">
     <ele>695.3</ele>
-    <name>WA1500</name>
+    <name>Water - 1500</name>
     <desc><![CDATA[Small spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.160542" lon="-122.288830">
@@ -64715,14 +64776,18 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.162599" lon="-122.296290">
     <ele>1048.7</ele>
-    <name>RD1501</name>
+    <name>Road Crossing - 1501</name>
     <desc><![CDATA[Frontage road to Castella, Post Office, Market.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="41.162611" lon="-122.297251">
     <ele>1064.6</ele>
-    <name>Hwy5</name>
+    <name>Highway 5</name>
     <desc><![CDATA[Interstate Highway 5]]></desc>
     <sym>Car</sym>
+  </wpt><wpt lat="41.163320" lon="-122.282803">
+    <ele>718.0</ele>
+    <name>1500</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>CA Sec P</name>
     <extensions>
@@ -64730,7 +64795,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section P</desc><cmt/><trkseg>
       <trkpt lat="41.162606" lon="-122.297460"><ele>658.12</ele></trkpt>
       <trkpt lat="41.162441" lon="-122.298442"><ele>658.79</ele></trkpt>
       <trkpt lat="41.161720" lon="-122.298147"><ele>665.88</ele></trkpt>
@@ -67086,17 +67151,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.190549" lon="-122.378821">
     <ele>1083.5</ele>
-    <name>TR1511</name>
+    <name>Trail Junction - 1511</name>
     <desc><![CDATA[Trail junction to a small spring.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.191060" lon="-122.378515">
     <ele>1091.6</ele>
-    <name>WA1511</name>
+    <name>Water - 1511</name>
     <desc><![CDATA[Small spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.212344" lon="-122.377035">
     <ele>1713.9</ele>
-    <name>CS1515</name>
+    <name>Campsite - 1515</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.215493" lon="-122.382798">
@@ -67116,17 +67181,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.215244" lon="-122.396649">
     <ele>1797.9</ele>
-    <name>CS1516</name>
+    <name>Campsite - 1516</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.216316" lon="-122.404562">
     <ele>1828.2</ele>
-    <name>CS1517</name>
+    <name>Campsite - 1517</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.198067" lon="-122.422242">
     <ele>1926.2</ele>
-    <name>CS1519</name>
+    <name>Campsite - 1519</name>
     <desc><![CDATA[Several small campsites with views of Castle Crags and Mount Shasta.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.193721" lon="-122.428212">
@@ -67136,17 +67201,17 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.189101" lon="-122.434210">
     <ele>2039.1</ele>
-    <name>CS1520</name>
+    <name>Campsite - 1520</name>
     <desc><![CDATA[Campsite at the top of a ridge.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.188980" lon="-122.453736">
     <ele>1981.2</ele>
-    <name>CS1521</name>
+    <name>Campsite - 1521</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.191556" lon="-122.467467">
     <ele>1980.0</ele>
-    <name>WA1522</name>
+    <name>Water - 1522</name>
     <desc><![CDATA[Spring 1/3 mile off-trail.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.187464" lon="-122.497331">
@@ -67156,7 +67221,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.206573" lon="-122.516334">
     <ele>1980.1</ele>
-    <name>CS1525</name>
+    <name>Campsite - 1525</name>
     <desc><![CDATA[Large campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.209013" lon="-122.518993">
@@ -67251,7 +67316,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.317032" lon="-122.646410">
     <ele>1880.9</ele>
-    <name>CS1552</name>
+    <name>Campsite - 1552</name>
     <desc><![CDATA[Several small campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.293499" lon="-122.647744">
@@ -67281,12 +67346,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.275582" lon="-122.697606">
     <ele>1648.1</ele>
-    <name>Hwy3</name>
+    <name>Highway 3</name>
     <desc><![CDATA[Paved Highway 3 at Scott Mountain Summit (no water).]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="41.272787" lon="-122.713247">
     <ele>1809.3</ele>
-    <name>CS1562</name>
+    <name>Campsite - 1562</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.262143" lon="-122.725493">
@@ -67296,27 +67361,27 @@
     <sym>Forest</sym>
   </wpt><wpt lat="41.239269" lon="-122.732745">
     <ele>1976.8</ele>
-    <name>WA1565</name>
+    <name>Water - 1565</name>
     <desc><![CDATA[Spring just below the PCT]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.237214" lon="-122.733212">
     <ele>1955.9</ele>
-    <name>CS1565</name>
+    <name>Campsite - 1565</name>
     <desc><![CDATA[Several small campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.235502" lon="-122.734300">
     <ele>1944.8</ele>
-    <name>WA1565B</name>
+    <name>Water - 1565</name>
     <desc><![CDATA[Spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.228610" lon="-122.742725">
     <ele>1900.0</ele>
-    <name>RD1566</name>
+    <name>Road Crossing - 1566</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="41.228705" lon="-122.743626">
     <ele>1905.8</ele>
-    <name>WA1566</name>
+    <name>Water - 1566</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.228157" lon="-122.745665">
@@ -67331,7 +67396,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.218595" lon="-122.774349">
     <ele>2172.5</ele>
-    <name>CS1569</name>
+    <name>Campsite - 1569</name>
     <desc><![CDATA[Several small campsites.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.212612" lon="-122.789797">
@@ -67361,7 +67426,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.201771" lon="-122.813666">
     <ele>2224.7</ele>
-    <name>CS1572</name>
+    <name>Campsite - 1572</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.206411" lon="-122.824118">
@@ -67376,7 +67441,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.206675" lon="-122.836890">
     <ele>2176.4</ele>
-    <name>CS1574</name>
+    <name>Campsite - 1574</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.198002" lon="-122.856606">
@@ -67386,7 +67451,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.205062" lon="-122.871714">
     <ele>2065.0</ele>
-    <name>CS1577</name>
+    <name>Campsite - 1577</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.204562" lon="-122.873543">
@@ -67396,7 +67461,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.210668" lon="-122.878337">
     <ele>2034.6</ele>
-    <name>CS1577B</name>
+    <name>Campsite - 1577</name>
     <desc><![CDATA[Several small campsites.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.208988" lon="-122.883404">
@@ -67421,7 +67486,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="41.220390" lon="-122.899205">
     <ele>1883.0</ele>
-    <name>Hwy93</name>
+    <name>Highway 93</name>
     <desc><![CDATA[Paved Highway 93 at Carter Meadows Summit, trailhead, parking.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="41.222295" lon="-122.899904">
@@ -67431,7 +67496,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.228932" lon="-122.911337">
     <ele>2048.2</ele>
-    <name>CS1581</name>
+    <name>Campsite - 1581</name>
     <desc><![CDATA[Campsite near an unpaved jeep road.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.255814" lon="-122.955512">
@@ -67441,7 +67506,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.255938" lon="-122.954336">
     <ele>2168.4</ele>
-    <name>WA1585</name>
+    <name>Water - 1585</name>
     <desc><![CDATA[Spring, 100 yards E of the PCT on a jeep road.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.263385" lon="-122.953164">
@@ -67501,7 +67566,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section Q</desc><cmt/><trkseg>
       <trkpt lat="41.395732" lon="-122.995579"><ele>1822.68</ele></trkpt>
       <trkpt lat="41.395865" lon="-122.995859"><ele>1826.89</ele></trkpt>
       <trkpt lat="41.396005" lon="-122.997094"><ele>1825.74</ele></trkpt>
@@ -68873,7 +68938,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section Q. Off-Track: Cold Spring trail</desc><cmt/><trkseg>
       <trkpt lat="41.543238" lon="-123.163597"><ele>1940.93</ele></trkpt>
       <trkpt lat="41.542454" lon="-123.163064"><ele>1930.14</ele></trkpt>
       <trkpt lat="41.541345" lon="-123.160946"><ele>1899.23</ele></trkpt>
@@ -68891,7 +68956,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section Q. Off-Track: Cub Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="41.454097" lon="-123.036698"><ele>1923.28</ele></trkpt>
       <trkpt lat="41.453816" lon="-123.036502"><ele>1928.19</ele></trkpt>
       <trkpt lat="41.453730" lon="-123.036299"><ele>1923.29</ele></trkpt>
@@ -68912,7 +68977,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="41.411718" lon="-123.043256">
     <ele>2046.6</ele>
-    <name>CS1603</name>
+    <name>Campsite - 1603</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.452447" lon="-123.034360">
@@ -68927,12 +68992,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.455480" lon="-123.037000">
     <ele>1925.7</ele>
-    <name>CS1607</name>
+    <name>Campsite - 1607</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.466633" lon="-123.052157">
     <ele>1959.7</ele>
-    <name>CS1609</name>
+    <name>Campsite - 1609</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.478561" lon="-123.071095">
@@ -68942,17 +69007,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.478834" lon="-123.069864">
     <ele>1901.8</ele>
-    <name>CS1610</name>
+    <name>Campsite - 1610</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.484273" lon="-123.067020">
     <ele>1930.2</ele>
-    <name>CS1611</name>
+    <name>Campsite - 1611</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.494504" lon="-123.100863">
     <ele>1931.3</ele>
-    <name>CS1613</name>
+    <name>Campsite - 1613</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.495106" lon="-123.101272">
@@ -68962,9 +69027,9 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.497049" lon="-123.105501">
     <ele>1889.2</ele>
-    <name>WACS1614</name>
+    <name>Campsite &amp; Water - 1614</name>
     <desc><![CDATA[Small lake, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="41.497649" lon="-123.109431">
     <ele>1928.5</ele>
     <name>MartenLake</name>
@@ -68972,12 +69037,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.508934" lon="-123.119856">
     <ele>1974.6</ele>
-    <name>WA1615</name>
+    <name>Water - 1615</name>
     <desc><![CDATA[Seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.534438" lon="-123.133815">
     <ele>2007.1</ele>
-    <name>CS1618</name>
+    <name>Campsite - 1618</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.534742" lon="-123.134690">
@@ -69032,12 +69097,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.574491" lon="-123.196688">
     <ele>1919.0</ele>
-    <name>WA1625</name>
+    <name>Water - 1625</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.578983" lon="-123.198335">
     <ele>1995.1</ele>
-    <name>CS1625</name>
+    <name>Campsite - 1625</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.588696" lon="-123.196606">
@@ -69077,7 +69142,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.671367" lon="-123.253938">
     <ele>1981.8</ele>
-    <name>CS1635</name>
+    <name>Campsite - 1635</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.696680" lon="-123.246091">
@@ -69087,12 +69152,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.700319" lon="-123.244424">
     <ele>1467.9</ele>
-    <name>CS1639</name>
+    <name>Campsite - 1639</name>
     <desc><![CDATA[Campsite at the end of a Road 45N78. Watch for poison oak as you drop to Grider Creek and Seiad Valley.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.710952" lon="-123.241965">
     <ele>1120.6</ele>
-    <name>WA1641</name>
+    <name>Water - 1641</name>
     <desc><![CDATA[Seasonal creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.719387" lon="-123.243270">
@@ -69102,12 +69167,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.720112" lon="-123.242323">
     <ele>971.9</ele>
-    <name>WACS1642</name>
+    <name>Campsite &amp; Water - 1642</name>
     <desc><![CDATA[Creek, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="41.721012" lon="-123.242099">
     <ele>969.2</ele>
-    <name>CS1642</name>
+    <name>Campsite - 1642</name>
     <desc><![CDATA[Campsite at the end of a road.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.729189" lon="-123.236123">
@@ -69137,7 +69202,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.790805" lon="-123.224856">
     <ele>611.0</ele>
-    <name>WA1648</name>
+    <name>Water - 1648</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.806689" lon="-123.216670">
@@ -69157,7 +69222,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.835201" lon="-123.172386">
     <ele>432.7</ele>
-    <name>Hwy96</name>
+    <name>Highway 96</name>
     <desc><![CDATA[West on paved Hwy 96.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="41.834674" lon="-123.181637">
@@ -69165,6 +69230,10 @@
     <name>KlamathRiver</name>
     <desc><![CDATA[Highway crosses the Klamath River on a large highway bridge.]]></desc>
     <sym>Water Source</sym>
+  </wpt><wpt lat="41.396672" lon="-123.000097">
+    <ele>1859.4</ele>
+    <name>1600</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>CA Sec R</name>
     <extensions>
@@ -69172,7 +69241,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section R</desc><cmt/><trkseg>
       <trkpt lat="41.842107" lon="-123.196137"><ele>418.33</ele></trkpt>
       <trkpt lat="41.842306" lon="-123.196889"><ele>418.30</ele></trkpt>
       <trkpt lat="41.844708" lon="-123.202658"><ele>417.89</ele></trkpt>
@@ -70732,7 +70801,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section R. Off-Track: Callahan's Road</desc><cmt/><trkseg>
       <trkpt lat="42.066565" lon="-122.602985"><ele>1283.69</ele></trkpt>
       <trkpt lat="42.066794" lon="-122.602912"><ele>1276.88</ele></trkpt>
       <trkpt lat="42.067216" lon="-122.603135"><ele>1278.39</ele></trkpt>
@@ -70754,7 +70823,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>California Section R. Off-Track: Mud Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="41.956115" lon="-122.954432"><ele>2052.51</ele></trkpt>
       <trkpt lat="41.956750" lon="-122.954913"><ele>2050.03</ele></trkpt>
       <trkpt lat="41.957642" lon="-122.955072"><ele>2035.10</ele></trkpt>
@@ -70767,12 +70836,12 @@
     <sym>Post Office</sym>
   </wpt><wpt lat="41.844399" lon="-123.210040">
     <ele>418.3</ele>
-    <name>Hwy96B</name>
+    <name>Highway 96</name>
     <desc><![CDATA[PCT departs paved Highway 96 on a trail.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="41.848339" lon="-123.212302">
     <ele>575.7</ele>
-    <name>CS1658</name>
+    <name>Campsite - 1658</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.848860" lon="-123.211140">
@@ -70782,7 +70851,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.865733" lon="-123.211334">
     <ele>1151.6</ele>
-    <name>CS1661</name>
+    <name>Campsite - 1661</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.877234" lon="-123.203748">
@@ -70817,12 +70886,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.927752" lon="-123.178826">
     <ele>1724.3</ele>
-    <name>WA1668</name>
+    <name>Water - 1668</name>
     <desc><![CDATA[Seasonal creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.928699" lon="-123.178697">
     <ele>1729.3</ele>
-    <name>RD1668</name>
+    <name>Road Crossing - 1668</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="41.933825" lon="-123.172236">
@@ -70852,12 +70921,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.948770" lon="-123.089383">
     <ele>1846.7</ele>
-    <name>CS1675</name>
+    <name>Campsite - 1675</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.949741" lon="-123.085281">
     <ele>1832.9</ele>
-    <name>CS1675B</name>
+    <name>Campsite - 1675</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.953718" lon="-123.078823">
@@ -70877,17 +70946,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.950656" lon="-123.046272">
     <ele>1808.5</ele>
-    <name>TR1678</name>
+    <name>Trail Junction - 1678</name>
     <desc><![CDATA[Trail junction with old PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.950506" lon="-123.047547">
     <ele>1785.5</ele>
-    <name>WA1678</name>
+    <name>Water - 1678</name>
     <desc><![CDATA[Spring, 1/10 mile SW of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.947362" lon="-123.022079">
     <ele>1890.2</ele>
-    <name>CS1679</name>
+    <name>Campsite - 1679</name>
     <desc><![CDATA[Several small campsites in a saddle.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.942684" lon="-123.009347">
@@ -70907,7 +70976,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.955984" lon="-122.954571">
     <ele>2054.2</ele>
-    <name>RD1685</name>
+    <name>Road Crossing - 1685</name>
     <desc><![CDATA[Unpaved jeep road, campsite.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="41.957880" lon="-122.955427">
@@ -70917,7 +70986,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.956043" lon="-122.954307">
     <ele>2051.9</ele>
-    <name>TR1685</name>
+    <name>Trail Junction - 1685</name>
     <desc><![CDATA[Unpaved abandoned road to a seasonal Mud Spring.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.964660" lon="-122.937666">
@@ -70927,32 +70996,32 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.964012" lon="-122.936496">
     <ele>1891.9</ele>
-    <name>CS1687</name>
+    <name>Campsite - 1687</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.962996" lon="-122.935829">
     <ele>1868.6</ele>
-    <name>WA1687</name>
+    <name>Water - 1687</name>
     <desc><![CDATA[Spring above Bearground Gulch.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.963187" lon="-122.935565">
     <ele>1873.8</ele>
-    <name>TR1687</name>
+    <name>Trail Junction - 1687</name>
     <desc><![CDATA[Trail junction to a spring.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.966979" lon="-122.931117">
     <ele>1822.6</ele>
-    <name>WA1688</name>
+    <name>Water - 1688</name>
     <desc><![CDATA[Small spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.968305" lon="-122.930601">
     <ele>1820.5</ele>
-    <name>WA1688B</name>
+    <name>Water - 1688</name>
     <desc><![CDATA[Another small spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="41.969093" lon="-122.930623">
     <ele>1825.0</ele>
-    <name>CS1688</name>
+    <name>Campsite - 1688</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="41.976378" lon="-122.923727">
@@ -70962,7 +71031,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.981705" lon="-122.920429">
     <ele>1663.0</ele>
-    <name>RD1689</name>
+    <name>Road Crossing - 1689</name>
     <desc><![CDATA[Narrow unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="41.983894" lon="-122.917615">
@@ -70997,7 +71066,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.017240" lon="-122.897218">
     <ele>2051.5</ele>
-    <name>CS1694</name>
+    <name>Campsite - 1694</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.021353" lon="-122.878107">
@@ -71012,7 +71081,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.037557" lon="-122.856904">
     <ele>2017.7</ele>
-    <name>WA1697</name>
+    <name>Water - 1697</name>
     <desc><![CDATA[Small stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="42.048466" lon="-122.849563">
@@ -71037,7 +71106,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.046461" lon="-122.798673">
     <ele>1821.2</ele>
-    <name>CS1703</name>
+    <name>Campsite - 1703</name>
     <desc><![CDATA[Campsite in the wooded saddle.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.054596" lon="-122.795776">
@@ -71062,7 +71131,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.080024" lon="-122.728004">
     <ele>2019.1</ele>
-    <name>WA1709</name>
+    <name>Water - 1709</name>
     <desc><![CDATA[Seasonal creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="42.074234" lon="-122.716891">
@@ -71082,7 +71151,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.069686" lon="-122.685813">
     <ele>1794.9</ele>
-    <name>CS1712</name>
+    <name>Campsite - 1712</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.069364" lon="-122.679301">
@@ -71092,17 +71161,17 @@
     <sym>Forest</sym>
   </wpt><wpt lat="42.075547" lon="-122.652048">
     <ele>1558.4</ele>
-    <name>RD1715</name>
+    <name>Road Crossing - 1715</name>
     <desc><![CDATA[Narrow paved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="42.076355" lon="-122.622175">
     <ele>1480.0</ele>
-    <name>PL1717</name>
+    <name>Powerline - 1717</name>
     <desc><![CDATA[Small power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="42.073802" lon="-122.615672">
     <ele>1390.0</ele>
-    <name>RD1718</name>
+    <name>Road Crossing - 1718</name>
     <desc><![CDATA[Unpaved jeep road, Toll Road Gap.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="42.073348" lon="-122.614753">
@@ -71112,7 +71181,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.071203" lon="-122.609838">
     <ele>1318.2</ele>
-    <name>RD1718B</name>
+    <name>Road Crossing - 1718</name>
     <desc><![CDATA[Narrow unpaved gravel road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="42.073236" lon="-122.602556">
@@ -71125,6 +71194,10 @@
     <name>OldHwy99</name>
     <desc><![CDATA[PCT joins paved Old Highway 99.]]></desc>
     <sym>Truck</sym>
+  </wpt><wpt lat="42.052970" lon="-122.837061">
+    <ele>2052.2</ele>
+    <name>1700</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>OR Sec B</name>
     <extensions>
@@ -71132,7 +71205,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section B</desc><cmt/><trkseg>
       <trkpt lat="42.063892" lon="-122.602584"><ele>1301.65</ele></trkpt>
       <trkpt lat="42.060208" lon="-122.602194"><ele>1316.37</ele></trkpt>
       <trkpt lat="42.059596" lon="-122.602207"><ele>1319.26</ele></trkpt>
@@ -72553,7 +72626,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section B. Off-Track: Brown Mtn Shelter Trail</desc><cmt/><trkseg>
       <trkpt lat="42.313304" lon="-122.262887"><ele>1617.19</ele></trkpt>
       <trkpt lat="42.313209" lon="-122.263271"><ele>1619.29</ele></trkpt>
       <trkpt lat="42.313573" lon="-122.264262"><ele>1623.35</ele></trkpt>
@@ -72566,7 +72639,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section B. Off-Track: Green Springs Inn Trail</desc><cmt/><trkseg>
       <trkpt lat="42.127704" lon="-122.481136"><ele>1382.30</ele></trkpt>
       <trkpt lat="42.127781" lon="-122.481051"><ele>1380.46</ele></trkpt>
       <trkpt lat="42.128294" lon="-122.481051"><ele>1373.59</ele></trkpt>
@@ -72611,7 +72684,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section B. Off-Track: Hyatt Lake CG Trail</desc><cmt/><trkseg>
       <trkpt lat="42.164428" lon="-122.465103"><ele>1556.06</ele></trkpt>
       <trkpt lat="42.164607" lon="-122.465101"><ele>1556.87</ele></trkpt>
       <trkpt lat="42.164754" lon="-122.464936"><ele>1553.31</ele></trkpt>
@@ -72630,7 +72703,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section B. Off-Track: Hyatt Lake Resort Road</desc><cmt/><trkseg>
       <trkpt lat="42.164443" lon="-122.465199"><ele>1556.49</ele></trkpt>
       <trkpt lat="42.164564" lon="-122.465196"><ele>1557.63</ele></trkpt>
       <trkpt lat="42.164905" lon="-122.465780"><ele>1549.34</ele></trkpt>
@@ -72663,14 +72736,14 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section B. Off-Track: Piped Spring Access</desc><cmt/><trkseg>
       <trkpt lat="42.068391" lon="-122.482411"><ele>1679.58</ele></trkpt>
       <trkpt lat="42.068831" lon="-122.482687"><ele>1671.35</ele></trkpt>
       <trkpt lat="42.069095" lon="-122.483172"><ele>1668.88</ele></trkpt>
     </trkseg>
   </trk><wpt lat="42.063879" lon="-122.602595">
     <ele>1301.7</ele>
-    <name>Hwy5B</name>
+    <name>Highway 5</name>
     <desc><![CDATA[Interstate Highway 5]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="42.058467" lon="-122.602566">
@@ -72680,22 +72753,22 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.059578" lon="-122.599383">
     <ele>1319.6</ele>
-    <name>PL1719</name>
+    <name>Powerline - 1719</name>
     <desc><![CDATA[Low voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="42.059073" lon="-122.591514">
     <ele>1335.7</ele>
     <name>Bridge1720</name>
     <desc><![CDATA[Small wooden hiker bridge over a usually dry creek bed. ]]></desc>
-    <sym>Flag, Blue</sym>
+    <sym>Bridge</sym>
   </wpt><wpt lat="42.055093" lon="-122.584745">
     <ele>1481.9</ele>
-    <name>GT1721</name>
+    <name>Gate - 1721</name>
     <desc><![CDATA[Pipe gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="42.049886" lon="-122.585802">
     <ele>1492.7</ele>
-    <name>RD1721</name>
+    <name>Road Crossing - 1721</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="42.047403" lon="-122.583923">
@@ -72705,7 +72778,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.039954" lon="-122.581535">
     <ele>1531.6</ele>
-    <name>GT1722</name>
+    <name>Gate - 1722</name>
     <desc><![CDATA[Pipe gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="42.031260" lon="-122.567307">
@@ -72715,7 +72788,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.041354" lon="-122.548688">
     <ele>1530.0</ele>
-    <name>CS1725</name>
+    <name>Campsite - 1725</name>
     <desc><![CDATA[Campsite, pit privy behind a tree.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.039144" lon="-122.543922">
@@ -72735,24 +72808,24 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.053570" lon="-122.507690">
     <ele>1624.6</ele>
-    <name>WA1728</name>
+    <name>Water - 1728</name>
     <desc><![CDATA[Piped spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="42.068356" lon="-122.482413">
     <ele>1680.1</ele>
-    <name>TR1730</name>
+    <name>Trail Junction - 1730</name>
     <desc><![CDATA[Trail junction to a piped spring and a pond.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.069098" lon="-122.483190">
     <ele>1668.8</ele>
-    <name>WA1730</name>
+    <name>Water - 1730</name>
     <desc><![CDATA[Piped spring near a small pond, 100 yards NW of PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="42.083175" lon="-122.481116">
     <ele>1638.4</ele>
-    <name>PL1731</name>
+    <name>Powerline - 1731</name>
     <desc><![CDATA[Several high voltage power lines.]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="42.085376" lon="-122.481866">
     <ele>1612.6</ele>
     <name>SodaMountainRD</name>
@@ -72765,7 +72838,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.116356" lon="-122.478600">
     <ele>1409.0</ele>
-    <name>GT1734</name>
+    <name>Gate - 1734</name>
     <desc><![CDATA[Trail gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="42.122704" lon="-122.464166">
@@ -72775,32 +72848,32 @@
     <sym>Lodging</sym>
   </wpt><wpt lat="42.130085" lon="-122.482737">
     <ele>1389.4</ele>
-    <name>Hwy66</name>
+    <name>Highway 66</name>
     <desc><![CDATA[Highway 66 at Green Springs Mountain Summit, near the junction of Old Hyatt Prairie Road, trail gate nearby.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="42.130525" lon="-122.482557">
     <ele>1395.6</ele>
-    <name>RD1736</name>
+    <name>Road Crossing - 1736</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="42.134191" lon="-122.482354">
     <ele>1393.1</ele>
-    <name>GT1736</name>
+    <name>Gate - 1736</name>
     <desc><![CDATA[Pipe gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="42.139437" lon="-122.487516">
     <ele>1413.3</ele>
-    <name>GT1736B</name>
+    <name>Gate - 1736</name>
     <desc><![CDATA[Pipe gate]]></desc>
     <sym>Flag, Green</sym>
   </wpt><wpt lat="42.142514" lon="-122.489451">
     <ele>1430.5</ele>
-    <name>PL1737</name>
+    <name>Powerline - 1737</name>
     <desc><![CDATA[Power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="42.142882" lon="-122.490390">
     <ele>1432.6</ele>
-    <name>RD1737</name>
+    <name>Road Crossing - 1737</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="42.143579" lon="-122.494068">
@@ -72810,7 +72883,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.142263" lon="-122.495954">
     <ele>1441.9</ele>
-    <name>WA1737</name>
+    <name>Water - 1737</name>
     <desc><![CDATA[Small pond]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="42.140881" lon="-122.500344">
@@ -72830,12 +72903,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.156370" lon="-122.503035">
     <ele>1427.0</ele>
-    <name>CS1740</name>
+    <name>Campsite - 1740</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.158024" lon="-122.486602">
     <ele>1407.7</ele>
-    <name>CS1741</name>
+    <name>Campsite - 1741</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.158715" lon="-122.485680">
@@ -72850,14 +72923,14 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.157843" lon="-122.475993">
     <ele>1508.6</ele>
-    <name>RD1742</name>
+    <name>Road Crossing - 1742</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="42.161867" lon="-122.467708">
     <ele>1550.0</ele>
-    <name>PL1742</name>
+    <name>Powerline - 1742</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="42.180148" lon="-122.466227">
     <ele>1532.0</ele>
     <name>CampersCove</name>
@@ -72875,7 +72948,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="42.163939" lon="-122.462742">
     <ele>1554.0</ele>
-    <name>WA1743</name>
+    <name>Water - 1743</name>
     <desc><![CDATA[Water fountain and spigot.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="42.176702" lon="-122.451888">
@@ -72885,7 +72958,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.178711" lon="-122.444987">
     <ele>1560.9</ele>
-    <name>RD1745</name>
+    <name>Road Crossing - 1745</name>
     <desc><![CDATA[Unpaved jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="42.186475" lon="-122.436947">
@@ -72895,7 +72968,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.190747" lon="-122.432548">
     <ele>1584.4</ele>
-    <name>RD1746</name>
+    <name>Road Crossing - 1746</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="42.200710" lon="-122.387235">
@@ -72915,7 +72988,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.208618" lon="-122.371071">
     <ele>1434.0</ele>
-    <name>RD1750</name>
+    <name>Road Crossing - 1750</name>
     <desc><![CDATA[Unpaved road, left to Klum Campground.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="42.208734" lon="-122.374904">
@@ -72925,7 +72998,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.211323" lon="-122.368871">
     <ele>1412.8</ele>
-    <name>RD1751</name>
+    <name>Road Crossing - 1751</name>
     <desc><![CDATA[Unpaved road, campsite nearby.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="42.217077" lon="-122.367949">
@@ -72940,7 +73013,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.217115" lon="-122.365245">
     <ele>1365.3</ele>
-    <name>RD1751B</name>
+    <name>Road Crossing - 1751</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="42.218698" lon="-122.359949">
@@ -72955,22 +73028,22 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.231433" lon="-122.339155">
     <ele>1520.0</ele>
-    <name>RD1753</name>
+    <name>Road Crossing - 1753</name>
     <desc><![CDATA[Unpaved gravel road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="42.235875" lon="-122.315364">
     <ele>1676.6</ele>
-    <name>RD1755</name>
+    <name>Road Crossing - 1755</name>
     <desc><![CDATA[Another badly paved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="42.241163" lon="-122.308194">
     <ele>1739.8</ele>
-    <name>TR1755</name>
+    <name>Trail Junction - 1755</name>
     <desc><![CDATA[Trail junction to a spring.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.240949" lon="-122.306848">
     <ele>1731.9</ele>
-    <name>WA1755</name>
+    <name>Water - 1755</name>
     <desc><![CDATA[Piped spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="42.242776" lon="-122.307527">
@@ -73030,7 +73103,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.395858" lon="-122.291469">
     <ele>1715.4</ele>
-    <name>Hwy140</name>
+    <name>Highway 140</name>
     <desc><![CDATA[Highway 140]]></desc>
     <sym>Car</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
@@ -73040,7 +73113,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section C</desc><cmt/><trkseg>
       <trkpt lat="42.395874" lon="-122.291457"><ele>1514.82</ele></trkpt>
       <trkpt lat="42.396044" lon="-122.291272"><ele>1515.22</ele></trkpt>
       <trkpt lat="42.396089" lon="-122.290838"><ele>1517.72</ele></trkpt>
@@ -74945,7 +75018,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section C. Off-Track: Annie Springs Trail</desc><cmt/><trkseg>
       <trkpt lat="42.879675" lon="-122.172449"><ele>1931.22</ele></trkpt>
       <trkpt lat="42.879384" lon="-122.172422"><ele>1931.06</ele></trkpt>
       <trkpt lat="42.879228" lon="-122.172259"><ele>1930.56</ele></trkpt>
@@ -74986,7 +75059,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section C. Off-Track: Crater Lake Alternate</desc><cmt/><trkseg>
       <trkpt lat="42.891451" lon="-122.169626"><ele>1857.11</ele></trkpt>
       <trkpt lat="42.891677" lon="-122.169616"><ele>1857.92</ele></trkpt>
       <trkpt lat="42.892361" lon="-122.169275"><ele>1859.44</ele></trkpt>
@@ -75351,7 +75424,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section C. Off-Track: Jack Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="42.736897" lon="-122.195762"><ele>1891.85</ele></trkpt>
       <trkpt lat="42.737110" lon="-122.196293"><ele>1890.22</ele></trkpt>
       <trkpt lat="42.737357" lon="-122.196622"><ele>1890.78</ele></trkpt>
@@ -75444,7 +75517,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.397147" lon="-122.288602">
     <ele>1533.6</ele>
-    <name>CS1774</name>
+    <name>Campsite - 1774</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.399115" lon="-122.285974">
@@ -75459,7 +75532,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="42.423620" lon="-122.272501">
     <ele>1761.3</ele>
-    <name>CS1776</name>
+    <name>Campsite - 1776</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.431610" lon="-122.261625">
@@ -75474,7 +75547,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.434534" lon="-122.270183">
     <ele>1916.2</ele>
-    <name>CS1778</name>
+    <name>Campsite - 1778</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.471831" lon="-122.280178">
@@ -75484,7 +75557,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.503731" lon="-122.255761">
     <ele>1919.4</ele>
-    <name>CS1785</name>
+    <name>Campsite - 1785</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.505433" lon="-122.253428">
@@ -75504,7 +75577,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.547898" lon="-122.229215">
     <ele>1844.6</ele>
-    <name>CS1789</name>
+    <name>Campsite - 1789</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.549030" lon="-122.229328">
@@ -75519,27 +75592,27 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.558508" lon="-122.218496">
     <ele>1876.5</ele>
-    <name>CS1790</name>
+    <name>Campsite - 1790</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.565724" lon="-122.220486">
     <ele>1889.2</ele>
-    <name>CS1791</name>
+    <name>Campsite - 1791</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.578243" lon="-122.226500">
     <ele>1989.0</ele>
-    <name>CS1792</name>
+    <name>Campsite - 1792</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.584437" lon="-122.227983">
     <ele>2011.7</ele>
-    <name>CS1793</name>
+    <name>Campsite - 1793</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.592577" lon="-122.220295">
     <ele>2005.7</ele>
-    <name>CS1794</name>
+    <name>Campsite - 1794</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.605599" lon="-122.214505">
@@ -75559,17 +75632,17 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.649076" lon="-122.207398">
     <ele>2059.1</ele>
-    <name>WACS1799</name>
+    <name>Campsite &amp; Water - 1799</name>
     <desc><![CDATA[Seasonal Creek, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="42.653750" lon="-122.205003">
     <ele>2015.5</ele>
-    <name>WA1800</name>
+    <name>Water - 1800</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="42.654714" lon="-122.211471">
     <ele>1914.4</ele>
-    <name>WA1801</name>
+    <name>Water - 1801</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="42.656526" lon="-122.213806">
@@ -75579,7 +75652,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.657254" lon="-122.213266">
     <ele>1896.3</ele>
-    <name>CS1801</name>
+    <name>Campsite - 1801</name>
     <desc><![CDATA[Horse Camp]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.657625" lon="-122.212078">
@@ -75599,7 +75672,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.676629" lon="-122.186477">
     <ele>1805.2</ele>
-    <name>CS1803</name>
+    <name>Campsite - 1803</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.683254" lon="-122.172109">
@@ -75614,7 +75687,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.703383" lon="-122.181099">
     <ele>1885.4</ele>
-    <name>CS1806</name>
+    <name>Campsite - 1806</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.708627" lon="-122.188033">
@@ -75634,7 +75707,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.737139" lon="-122.195489">
     <ele>1890.4</ele>
-    <name>CS1809</name>
+    <name>Campsite - 1809</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.756917" lon="-122.196731">
@@ -75644,12 +75717,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.774644" lon="-122.188967">
     <ele>1953.2</ele>
-    <name>CS1812</name>
+    <name>Campsite - 1812</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.777157" lon="-122.178790">
     <ele>2027.7</ele>
-    <name>CS1813</name>
+    <name>Campsite - 1813</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="42.801102" lon="-122.175759">
@@ -75674,7 +75747,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.871380" lon="-122.179965">
     <ele>1882.8</ele>
-    <name>Hwy62</name>
+    <name>Highway 62</name>
     <desc><![CDATA[Highway 62, near Mazama Village, trailhead parking.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="42.879683" lon="-122.172490">
@@ -75714,7 +75787,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.891719" lon="-122.177620">
     <ele>1828.9</ele>
-    <name>WA1823</name>
+    <name>Water - 1823</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="42.900667" lon="-122.183015">
@@ -75729,7 +75802,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.918424" lon="-122.209036">
     <ele>1801.6</ele>
-    <name>WA1827</name>
+    <name>Water - 1827</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="42.926300" lon="-122.217470">
@@ -75779,9 +75852,13 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.089042" lon="-122.091799">
     <ele>1805.4</ele>
-    <name>Hwy138C</name>
+    <name>Highway 138</name>
     <desc><![CDATA[Highway 138, Crater Lake National Park northern boundary.]]></desc>
     <sym>Car</sym>
+  </wpt><wpt lat="42.655502" lon="-122.206307">
+    <ele>1992.6</ele>
+    <name>1800</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>OR Sec D</name>
     <extensions>
@@ -75789,7 +75866,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section D</desc><cmt/><trkseg>
       <trkpt lat="43.089194" lon="-122.091775"><ele>1804.83</ele></trkpt>
       <trkpt lat="43.089616" lon="-122.091542"><ele>1803.20</ele></trkpt>
       <trkpt lat="43.089917" lon="-122.090547"><ele>1800.99</ele></trkpt>
@@ -77382,7 +77459,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section D. Off-Track: Oregon Skyline Trail</desc><cmt/><trkseg>
       <trkpt lat="43.367597" lon="-122.033313"><ele>1774.78</ele></trkpt>
       <trkpt lat="43.367624" lon="-122.032946"><ele>1774.82</ele></trkpt>
       <trkpt lat="43.367871" lon="-122.032357"><ele>1775.74</ele></trkpt>
@@ -77909,7 +77986,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section D. Off-Track: Shelter Cove Trail</desc><cmt/><trkseg>
       <trkpt lat="43.592432" lon="-122.050838"><ele>1543.83</ele></trkpt>
       <trkpt lat="43.592243" lon="-122.051657"><ele>1543.82</ele></trkpt>
       <trkpt lat="43.591929" lon="-122.051755"><ele>1538.32</ele></trkpt>
@@ -78004,7 +78081,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section D. Off-Track: Six Horse Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="43.304927" lon="-122.002548"><ele>1893.79</ele></trkpt>
       <trkpt lat="43.304992" lon="-122.002372"><ele>1890.94</ele></trkpt>
       <trkpt lat="43.305376" lon="-122.002242"><ele>1886.77</ele></trkpt>
@@ -78039,7 +78116,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.161567" lon="-122.065608">
     <ele>2126.5</ele>
-    <name>CS1856</name>
+    <name>Campsite - 1856</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="43.161149" lon="-122.064581">
@@ -78054,7 +78131,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.188647" lon="-122.053763">
     <ele>2174.3</ele>
-    <name>CS1858</name>
+    <name>Campsite - 1858</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="43.196263" lon="-122.048780">
@@ -78074,7 +78151,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.304863" lon="-122.002628">
     <ele>1895.1</ele>
-    <name>CS1872</name>
+    <name>Campsite - 1872</name>
     <desc><![CDATA[Campsite by Six Horse Spring Trail, 4/10 mile to water below.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="43.304949" lon="-122.002631">
@@ -78099,12 +78176,12 @@
     <sym>Forest</sym>
   </wpt><wpt lat="43.328736" lon="-122.011872">
     <ele>1950.1</ele>
-    <name>CS1875</name>
+    <name>Campsite - 1875</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="43.340938" lon="-122.010039">
     <ele>1905.0</ele>
-    <name>CS1876</name>
+    <name>Campsite - 1876</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="43.367511" lon="-122.033179">
@@ -78154,17 +78231,17 @@
     <sym>Campground</sym>
   </wpt><wpt lat="43.369523" lon="-122.036764">
     <ele>1823.0</ele>
-    <name>CS1879</name>
+    <name>Campsite - 1879</name>
     <desc><![CDATA[Small campsite. Water can be found about 4/10 mile N of this campsite and 2/10 mile cross country off trail to the E at Windigo Lake.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="43.382345" lon="-122.058640">
     <ele>2010.4</ele>
-    <name>WA1881</name>
+    <name>Water - 1881</name>
     <desc><![CDATA[Small pond just off trail, through the trees.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="43.382083" lon="-122.056857">
     <ele>2020.1</ele>
-    <name>CS1881</name>
+    <name>Campsite - 1881</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="43.402129" lon="-122.061629">
@@ -78174,7 +78251,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.422125" lon="-122.085543">
     <ele>1935.8</ele>
-    <name>CS1885</name>
+    <name>Campsite - 1885</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="43.446604" lon="-122.132741">
@@ -78209,14 +78286,14 @@
     <sym>Forest</sym>
   </wpt><wpt lat="43.468800" lon="-122.140260">
     <ele>1721.0</ele>
-    <name>WA1891</name>
+    <name>Water - 1891</name>
     <desc><![CDATA[Large pond]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="43.480865" lon="-122.142009">
     <ele>1788.7</ele>
-    <name>WACS1892</name>
+    <name>Campsite &amp; Water - 1892</name>
     <desc><![CDATA[Large pond, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="43.493339" lon="-122.134742">
     <ele>1884.8</ele>
     <name>CraterButteTR</name>
@@ -78229,17 +78306,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.527766" lon="-122.119863">
     <ele>2112.9</ele>
-    <name>CS1898</name>
+    <name>Campsite - 1898</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="43.540887" lon="-122.133185">
     <ele>2119.4</ele>
-    <name>WA1899</name>
+    <name>Water - 1899</name>
     <desc><![CDATA[Small seasonal creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="43.542582" lon="-122.133874">
     <ele>2130.9</ele>
-    <name>WA1899B</name>
+    <name>Water - 1899</name>
     <desc><![CDATA[Small pond]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="43.553213" lon="-122.131679">
@@ -78264,7 +78341,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.568976" lon="-122.099104">
     <ele>1774.8</ele>
-    <name>WA1903</name>
+    <name>Water - 1903</name>
     <desc><![CDATA[Large pond]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="43.570501" lon="-122.097013">
@@ -78284,7 +78361,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.591058" lon="-122.057624">
     <ele>1530.4</ele>
-    <name>TR1906</name>
+    <name>Trail Junction - 1906</name>
     <desc><![CDATA[Trail junction, wilderness permit self issue station.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.591381" lon="-122.057758">
@@ -78294,7 +78371,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="43.579384" lon="-122.043850">
     <ele>1479.3</ele>
-    <name>CS1907</name>
+    <name>Campsite - 1907</name>
     <desc><![CDATA[Campsite near railroad tracks, W of Shelter Cove Resort.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="43.581561" lon="-122.040216">
@@ -78319,7 +78396,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.597156" lon="-122.033700">
     <ele>1550.7</ele>
-    <name>Hwy58B</name>
+    <name>Highway 58</name>
     <desc><![CDATA[Highway 58 near Willamette Pass.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="43.599753" lon="-122.036715">
@@ -78327,6 +78404,10 @@
     <name>WillametteSki</name>
     <desc><![CDATA[Willamette Ski Resort [willamettepass.com, 541-345-7669] has a pizza restaurant that is sometimes open on summer weekends, 2/10 miles NW of PCT.]]></desc>
     <sym>Ski Resort</sym>
+  </wpt><wpt lat="43.550744" lon="-122.133056">
+    <ele>2064.7</ele>
+    <name>1900</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>OR Sec E</name>
     <extensions>
@@ -78334,7 +78415,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section E</desc><cmt/><trkseg>
       <trkpt lat="43.597168" lon="-122.033652"><ele>1550.48</ele></trkpt>
       <trkpt lat="43.597806" lon="-122.033168"><ele>1556.01</ele></trkpt>
       <trkpt lat="43.597716" lon="-122.032679"><ele>1556.64</ele></trkpt>
@@ -80635,7 +80716,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section E. Off-Track: Lava Camp Trail</desc><cmt/><trkseg>
       <trkpt lat="44.257543" lon="-121.790034"><ele>1611.48</ele></trkpt>
       <trkpt lat="44.257687" lon="-121.789751"><ele>1611.55</ele></trkpt>
       <trkpt lat="44.257677" lon="-121.789356"><ele>1612.65</ele></trkpt>
@@ -80738,7 +80819,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.700172" lon="-121.994745">
     <ele>1951.4</ele>
-    <name>CS1921</name>
+    <name>Campsite - 1921</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="43.744369" lon="-121.979207">
@@ -80808,7 +80889,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.881842" lon="-121.951086">
     <ele>1731.7</ele>
-    <name>WA1938</name>
+    <name>Water - 1938</name>
     <desc><![CDATA[Small lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="43.899959" lon="-121.924570">
@@ -80818,7 +80899,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.911232" lon="-121.915305">
     <ele>1598.5</ele>
-    <name>WA1941</name>
+    <name>Water - 1941</name>
     <desc><![CDATA[Small lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="43.912477" lon="-121.915547">
@@ -80938,7 +81019,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.078016" lon="-121.817187">
     <ele>1743.2</ele>
-    <name>CS1963</name>
+    <name>Campsite - 1963</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="44.079519" lon="-121.817973">
@@ -80948,7 +81029,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.081618" lon="-121.820399">
     <ele>1754.5</ele>
-    <name>WA1963</name>
+    <name>Water - 1963</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="44.084177" lon="-121.820583">
@@ -81008,7 +81089,7 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="44.189397" lon="-121.802119">
     <ele>1984.8</ele>
-    <name>CS1975</name>
+    <name>Campsite - 1975</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="44.196220" lon="-121.792602">
@@ -81023,7 +81104,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.225627" lon="-121.775487">
     <ele>1848.1</ele>
-    <name>CS1979</name>
+    <name>Campsite - 1979</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="44.231265" lon="-121.772578">
@@ -81043,7 +81124,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.250585" lon="-121.783288">
     <ele>1670.1</ele>
-    <name>WA1982</name>
+    <name>Water - 1982</name>
     <desc><![CDATA[Large pond]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="44.250302" lon="-121.784708">
@@ -81063,7 +81144,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.259832" lon="-121.805197">
     <ele>2420.5</ele>
-    <name>Hwy242</name>
+    <name>Highway 242</name>
     <desc><![CDATA[Hwy 242, near McKenzie Pass, Dee Wright Observatory 2/10 mile E of PCT.]]></desc>
     <sym>Car</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
@@ -81073,7 +81154,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section F</desc><cmt/><trkseg>
       <trkpt lat="44.259851" lon="-121.805201"><ele>1617.56</ele></trkpt>
       <trkpt lat="44.260050" lon="-121.805647"><ele>1612.86</ele></trkpt>
       <trkpt lat="44.260140" lon="-121.805672"><ele>1611.92</ele></trkpt>
@@ -84062,7 +84143,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section F. Off-Track: Brettenbush CG Trail</desc><cmt/><trkseg>
       <trkpt lat="44.765319" lon="-121.787069"><ele>1680.71</ele></trkpt>
       <trkpt lat="44.765860" lon="-121.786936"><ele>1682.47</ele></trkpt>
       <trkpt lat="44.766072" lon="-121.786753"><ele>1682.20</ele></trkpt>
@@ -84081,7 +84162,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section F. Off-Track: Frog Lake CG Trail</desc><cmt/><trkseg>
       <trkpt lat="45.229557" lon="-121.700009"><ele>1194.07</ele></trkpt>
       <trkpt lat="45.229326" lon="-121.699720"><ele>1194.61</ele></trkpt>
       <trkpt lat="45.229310" lon="-121.699234"><ele>1196.55</ele></trkpt>
@@ -84103,7 +84184,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section F. Off-Track: Little Crater Lake Trail</desc><cmt/><trkseg>
       <trkpt lat="45.147889" lon="-121.753478"><ele>989.20</ele></trkpt>
       <trkpt lat="45.147854" lon="-121.753388"><ele>989.08</ele></trkpt>
       <trkpt lat="45.148143" lon="-121.752512"><ele>988.55</ele></trkpt>
@@ -84119,7 +84200,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section F. Off-Track: Olallie Lake Trail</desc><cmt/><trkseg>
       <trkpt lat="44.814333" lon="-121.791140"><ele>1512.92</ele></trkpt>
       <trkpt lat="44.814171" lon="-121.790983"><ele>1512.80</ele></trkpt>
       <trkpt lat="44.814126" lon="-121.790580"><ele>1514.13</ele></trkpt>
@@ -84133,7 +84214,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section F. Off-Track: Trail to Spring</desc><cmt/><trkseg>
       <trkpt lat="45.005452" lon="-121.718318"><ele>1052.76</ele></trkpt>
       <trkpt lat="45.005297" lon="-121.717795"><ele>1050.64</ele></trkpt>
       <trkpt lat="45.005158" lon="-121.717594"><ele>1049.48</ele></trkpt>
@@ -84145,7 +84226,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section F. Off-Track: Youth Camp Trail</desc><cmt/><trkseg>
       <trkpt lat="44.361363" lon="-121.871529"><ele>1454.34</ele></trkpt>
       <trkpt lat="44.361816" lon="-121.871406"><ele>1451.13</ele></trkpt>
       <trkpt lat="44.362295" lon="-121.870971"><ele>1449.76</ele></trkpt>
@@ -84172,12 +84253,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.325838" lon="-121.854901">
     <ele>1755.2</ele>
-    <name>CS1992</name>
+    <name>Campsite - 1992</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="44.345282" lon="-121.867519">
     <ele>1589.1</ele>
-    <name>CS1994</name>
+    <name>Campsite - 1994</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="44.371728" lon="-121.865557">
@@ -84212,7 +84293,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.394345" lon="-121.848347">
     <ele>1447.0</ele>
-    <name>RD1998</name>
+    <name>Road Crossing - 1998</name>
     <desc><![CDATA[Unpaved jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="44.396619" lon="-121.849603">
@@ -84222,17 +84303,17 @@
     <sym>Truck</sym>
   </wpt><wpt lat="44.402165" lon="-121.848612">
     <ele>1461.8</ele>
-    <name>WA1999</name>
+    <name>Water - 1999</name>
     <desc><![CDATA[Large Pond<br/>---<br/>WATER ALERT: Next northbound water after the large pond may be the pond near Koko Lake in 11.6 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="44.403911" lon="-121.849582">
     <ele>1469.2</ele>
-    <name>RD1999</name>
+    <name>Road Crossing - 1999</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="44.423784" lon="-121.849713">
     <ele>1464.1</ele>
-    <name>Hwy20</name>
+    <name>Highway 20</name>
     <desc><![CDATA[Highway 20, Santiam Pass.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="44.425636" lon="-121.848602">
@@ -84257,17 +84338,17 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.460630" lon="-121.847127">
     <ele>1819.2</ele>
-    <name>CS2005</name>
+    <name>Campsite - 2005</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="44.488064" lon="-121.849131">
     <ele>1964.7</ele>
-    <name>CS2008</name>
+    <name>Campsite - 2008</name>
     <desc><![CDATA[Small Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="44.510384" lon="-121.818499">
     <ele>1657.7</ele>
-    <name>WA2011</name>
+    <name>Water - 2011</name>
     <desc><![CDATA[Pond near Koko Lake, in a burn area, pond may be stagnant late season.<br/>---<br/>WATER ALERT: Next southbound water after the pond near Koko Lake may be the large pond 11.6 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="44.513595" lon="-121.811954">
@@ -84282,7 +84363,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.598426" lon="-121.796721">
     <ele>1968.5</ele>
-    <name>CS2018</name>
+    <name>Campsite - 2018</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="44.616319" lon="-121.817091">
@@ -84297,7 +84378,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.649023" lon="-121.834678">
     <ele>1503.8</ele>
-    <name>WA2026</name>
+    <name>Water - 2026</name>
     <desc><![CDATA[Stream at the end of a switch back.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="44.663449" lon="-121.847939">
@@ -84317,9 +84398,9 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.683047" lon="-121.850290">
     <ele>1496.9</ele>
-    <name>WACS2030</name>
+    <name>Campsite &amp; Water - 2030</name>
     <desc><![CDATA[Campsites near a small pond.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="44.686175" lon="-121.839616">
     <ele>1510.5</ele>
     <name>JeffCreek</name>
@@ -84332,9 +84413,9 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.701189" lon="-121.826342">
     <ele>1696.6</ele>
-    <name>WACS2032</name>
+    <name>Campsite &amp; Water - 2032</name>
     <desc><![CDATA[Creek, campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="44.702946" lon="-121.824524">
     <ele>1695.7</ele>
     <name>WhitewaterCreekTrib</name>
@@ -84352,7 +84433,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.704788" lon="-121.817674">
     <ele>1744.3</ele>
-    <name>CS2033</name>
+    <name>Campsite - 2033</name>
     <desc><![CDATA[Several campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="44.706509" lon="-121.810903">
@@ -84387,7 +84468,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="44.765251" lon="-121.786792">
     <ele>1679.7</ele>
-    <name>WA2039</name>
+    <name>Water - 2039</name>
     <desc><![CDATA[Creek flowing under an unpaved road.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="44.766340" lon="-121.783766">
@@ -84407,7 +84488,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.769791" lon="-121.791643">
     <ele>1756.5</ele>
-    <name>WA2040</name>
+    <name>Water - 2040</name>
     <desc><![CDATA[Large pond]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="44.775944" lon="-121.796697">
@@ -84442,7 +84523,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.812500" lon="-121.800392">
     <ele>1573.9</ele>
-    <name>WA2045</name>
+    <name>Water - 2045</name>
     <desc><![CDATA[Small lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="44.814351" lon="-121.791218">
@@ -84467,9 +84548,9 @@
     <sym>Truck</sym>
   </wpt><wpt lat="44.842560" lon="-121.776235">
     <ele>1429.2</ele>
-    <name>PL2048</name>
+    <name>Powerline - 2048</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="44.854027" lon="-121.767375">
     <ele>1404.0</ele>
     <name>RussLakeTR</name>
@@ -84482,12 +84563,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.862125" lon="-121.764600">
     <ele>1450.7</ele>
-    <name>WA2050</name>
+    <name>Water - 2050</name>
     <desc><![CDATA[Seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="44.889051" lon="-121.746961">
     <ele>1413.0</ele>
-    <name>RD2053</name>
+    <name>Road Crossing - 2053</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="44.906647" lon="-121.748553">
@@ -84507,12 +84588,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.925505" lon="-121.745704">
     <ele>1423.0</ele>
-    <name>RD2057</name>
+    <name>Road Crossing - 2057</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="44.941549" lon="-121.756243">
     <ele>1552.1</ele>
-    <name>CS2058</name>
+    <name>Campsite - 2058</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="44.944053" lon="-121.755380">
@@ -84522,27 +84603,27 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.967842" lon="-121.732195">
     <ele>1300.1</ele>
-    <name>RD2061</name>
+    <name>Road Crossing - 2061</name>
     <desc><![CDATA[Narrow unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="44.981974" lon="-121.724593">
     <ele>1180.9</ele>
-    <name>RD2062</name>
+    <name>Road Crossing - 2062</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="44.983403" lon="-121.724682">
     <ele>1180.1</ele>
-    <name>TR2063</name>
+    <name>Trail Junction - 2063</name>
     <desc><![CDATA[Trail junction to a spring.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.983042" lon="-121.725356">
     <ele>1171.1</ele>
-    <name>WACS2063</name>
+    <name>Campsite &amp; Water - 2063</name>
     <desc><![CDATA[Small spring, 250 feet W of PCT, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="44.996587" lon="-121.717009">
     <ele>1017.8</ele>
-    <name>RD2064</name>
+    <name>Road Crossing - 2064</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="45.000932" lon="-121.716942">
@@ -84552,12 +84633,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.005429" lon="-121.718342">
     <ele>1052.8</ele>
-    <name>TR2065</name>
+    <name>Trail Junction - 2065</name>
     <desc><![CDATA[Trail junction to a small spring, campsite nearby.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.005147" lon="-121.717581">
     <ele>1049.4</ele>
-    <name>WA2065</name>
+    <name>Water - 2065</name>
     <desc><![CDATA[Small spring, 300 feet E or PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="45.021196" lon="-121.714201">
@@ -84567,12 +84648,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="45.047032" lon="-121.711095">
     <ele>1283.3</ele>
-    <name>PL2068</name>
+    <name>Powerline - 2068</name>
     <desc><![CDATA[High voltage power line, access road. ]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="45.071483" lon="-121.720616">
     <ele>1142.1</ele>
-    <name>RD2070</name>
+    <name>Road Crossing - 2070</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="45.077193" lon="-121.719234">
@@ -84607,27 +84688,27 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.110216" lon="-121.758258">
     <ele>1004.8</ele>
-    <name>WA2074</name>
+    <name>Water - 2074</name>
     <desc><![CDATA[Trailside spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="45.120359" lon="-121.765871">
     <ele>999.5</ele>
-    <name>CS2076</name>
+    <name>Campsite - 2076</name>
     <desc><![CDATA[Designated campsite. ]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="45.141891" lon="-121.764753">
     <ele>989.4</ele>
-    <name>WACS2078</name>
+    <name>Campsite &amp; Water - 2078</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="45.140541" lon="-121.761035">
     <ele>988.2</ele>
-    <name>WA2078</name>
+    <name>Water - 2078</name>
     <desc><![CDATA[Trailside spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="45.142371" lon="-121.759381">
     <ele>988.0</ele>
-    <name>WA2078B</name>
+    <name>Water - 2078</name>
     <desc><![CDATA[Trailside spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="45.142929" lon="-121.755532">
@@ -84682,7 +84763,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.229140" lon="-121.700688">
     <ele>1193.1</ele>
-    <name>Hwy26</name>
+    <name>Highway 26</name>
     <desc><![CDATA[Highway 26, Wapinitia Pass. Trailhead parking, outhouse, trash cans nearby. CJ's Foodmart and Chevron is 1.9 miles NW of the PCT on Hwy 26. [503-337-2277]. The small community of Government Camp is 7.2 miles NW of the PCT on Hwy 26.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="45.222680" lon="-121.694246">
@@ -84712,9 +84793,13 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.284354" lon="-121.681520">
     <ele>1269.2</ele>
-    <name>Hwy35</name>
+    <name>Highway 35</name>
     <desc><![CDATA[Highway 35, Barlow Pass. The small community of Government Camp is 2.1 miles W on Hwy 35, then 2.7 miles W on Hwy 26]]></desc>
     <sym>Car</sym>
+  </wpt><wpt lat="44.413947" lon="-121.852718">
+    <ele>1464.7</ele>
+    <name>2000</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>OR Sec G</name>
     <extensions>
@@ -84722,7 +84807,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section G</desc><cmt/><trkseg>
       <trkpt lat="45.284496" lon="-121.681364"><ele>1269.55</ele></trkpt>
       <trkpt lat="45.284907" lon="-121.680673"><ele>1275.96</ele></trkpt>
       <trkpt lat="45.284743" lon="-121.681196"><ele>1278.94</ele></trkpt>
@@ -86237,7 +86322,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section G. Off-Track: Eagle Creek Alternate</desc><cmt/><trkseg>
       <trkpt lat="45.557066" lon="-121.826889"><ele>1288.85</ele></trkpt>
       <trkpt lat="45.557296" lon="-121.826972"><ele>1283.56</ele></trkpt>
       <trkpt lat="45.557530" lon="-121.827429"><ele>1282.03</ele></trkpt>
@@ -86791,7 +86876,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section G. Off-Track: Ramona Falls Alternate</desc><cmt/><trkseg>
       <trkpt lat="45.379842" lon="-121.784047"><ele>1014.22</ele></trkpt>
       <trkpt lat="45.379830" lon="-121.783687"><ele>1016.23</ele></trkpt>
       <trkpt lat="45.379512" lon="-121.783265"><ele>1021.94</ele></trkpt>
@@ -86864,7 +86949,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Oregon Section G. Off-Track: Timberline Lodge Trail</desc><cmt/><trkseg>
       <trkpt lat="45.332829" lon="-121.711225"><ele>1840.94</ele></trkpt>
       <trkpt lat="45.331382" lon="-121.710200"><ele>1812.33</ele></trkpt>
       <trkpt lat="45.331054" lon="-121.710287"><ele>1807.98</ele></trkpt>
@@ -86873,9 +86958,9 @@
     </trkseg>
   </trk><wpt lat="45.314247" lon="-121.692592">
     <ele>1469.8</ele>
-    <name>WACS2095</name>
+    <name>Campsite &amp; Water - 2095</name>
     <desc><![CDATA[Stream, campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="45.316838" lon="-121.696491">
     <ele>1538.2</ele>
     <name>KohnstammArea</name>
@@ -86933,7 +87018,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.342073" lon="-121.745505">
     <ele>1544.0</ele>
-    <name>WA2100</name>
+    <name>Water - 2100</name>
     <desc><![CDATA[Spring flowing across the trail.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="45.343329" lon="-121.746637">
@@ -86973,7 +87058,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.372874" lon="-121.777791">
     <ele>1062.2</ele>
-    <name>CS2106</name>
+    <name>Campsite - 2106</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="45.374515" lon="-121.778782">
@@ -86988,9 +87073,9 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.378401" lon="-121.783489">
     <ele>992.9</ele>
-    <name>WACS2107</name>
+    <name>Campsite &amp; Water - 2107</name>
     <desc><![CDATA[Trailside stream, large campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="45.379957" lon="-121.776140">
     <ele>1070.2</ele>
     <name>RamonaFalls</name>
@@ -87038,7 +87123,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.405404" lon="-121.778502">
     <ele>1321.4</ele>
-    <name>CS2111</name>
+    <name>Campsite - 2111</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="45.405653" lon="-121.778854">
@@ -87058,9 +87143,9 @@
     <sym>Truck</sym>
   </wpt><wpt lat="45.428753" lon="-121.797884">
     <ele>1062.7</ele>
-    <name>PL2114</name>
+    <name>Powerline - 2114</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="45.432162" lon="-121.798757">
     <ele>1100.0</ele>
     <name>WForkHoodRiverTrib</name>
@@ -87073,7 +87158,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.467912" lon="-121.829398">
     <ele>1225.2</ele>
-    <name>CS2118</name>
+    <name>Campsite - 2118</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="45.470298" lon="-121.830139">
@@ -87088,7 +87173,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.488980" lon="-121.858711">
     <ele>1293.9</ele>
-    <name>CS2121</name>
+    <name>Campsite - 2121</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="45.499816" lon="-121.862195">
@@ -87125,7 +87210,7 @@
     <ele>168.0</ele>
     <name>HighBridge</name>
     <desc><![CDATA[High Bridge]]></desc>
-    <sym>Flag, Red</sym>
+    <sym>Bridge</sym>
   </wpt><wpt lat="45.584153" lon="-121.852872">
     <ele>332.9</ele>
     <name>TunnelFalls</name>
@@ -87143,7 +87228,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="45.579292" lon="-121.794379">
     <ele>1151.4</ele>
-    <name>TR2131</name>
+    <name>Trail Junction - 2131</name>
     <desc><![CDATA[Keep left at the unsigned trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.579328" lon="-121.794388">
@@ -87163,7 +87248,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.613632" lon="-121.841591">
     <ele>1157.5</ele>
-    <name>CS2135</name>
+    <name>Campsite - 2135</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="45.630504" lon="-121.841774">
@@ -87183,12 +87268,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.647919" lon="-121.840799">
     <ele>1148.3</ele>
-    <name>CS2138</name>
+    <name>Campsite - 2138</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="45.654919" lon="-121.842461">
     <ele>1140.0</ele>
-    <name>CS2139</name>
+    <name>Campsite - 2139</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="45.657293" lon="-121.842333">
@@ -87203,7 +87288,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="45.674202" lon="-121.831344">
     <ele>446.3</ele>
-    <name>CS2142</name>
+    <name>Campsite - 2142</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="45.671730" lon="-121.839072">
@@ -87228,9 +87313,9 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.659405" lon="-121.882997">
     <ele>212.7</ele>
-    <name>PL2146</name>
+    <name>Powerline - 2146</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="45.661818" lon="-121.894452">
     <ele>73.7</ele>
     <name>SWMoodyAV</name>
@@ -87238,9 +87323,13 @@
     <sym>Truck</sym>
   </wpt><wpt lat="45.662839" lon="-121.894894">
     <ele>3046.8</ele>
-    <name>Hwy84</name>
+    <name>Highway 84</name>
     <desc><![CDATA[Unpaved road crosses under Highway 84, then departs the unpaved road on a trail.]]></desc>
     <sym>Car</sym>
+  </wpt><wpt lat="45.341973" lon="-121.747632">
+    <ele>1503.8</ele>
+    <name>2100</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>WA Sec H</name>
     <extensions>
@@ -87248,7 +87337,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Washington Section H</desc><cmt/><trkseg>
       <trkpt lat="45.661811" lon="-121.897502"><ele>66.79</ele></trkpt>
       <trkpt lat="45.661775" lon="-121.897693"><ele>65.41</ele></trkpt>
       <trkpt lat="45.662915" lon="-121.904614"><ele>53.12</ele></trkpt>
@@ -91747,7 +91836,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Washington Section H. Off-Track: Hidden Spring Trail</desc><cmt/><trkseg>
       <trkpt lat="46.575512" lon="-121.398075"><ele>1692.63</ele></trkpt>
       <trkpt lat="46.575632" lon="-121.397250"><ele>1686.98</ele></trkpt>
       <trkpt lat="46.575907" lon="-121.396574"><ele>1685.16</ele></trkpt>
@@ -91766,7 +91855,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Washington Section H. Off-Track: Old Snowy Alternate</desc><cmt/><trkseg>
       <trkpt lat="46.514327" lon="-121.460872"><ele>2186.85</ele></trkpt>
       <trkpt lat="46.514162" lon="-121.460782"><ele>2193.57</ele></trkpt>
       <trkpt lat="46.513851" lon="-121.460846"><ele>2197.02</ele></trkpt>
@@ -91805,20 +91894,20 @@
     <ele>66.8</ele>
     <name>BridgeOfGods</name>
     <desc><![CDATA[Bridge of the Gods, south end.]]></desc>
-    <sym>Flag, Red</sym>
+    <sym>Bridge</sym>
   </wpt><wpt lat="45.662916" lon="-121.905105">
     <ele>58.4</ele>
-    <name>Hwy14B</name>
+    <name>Highway 14</name>
     <desc><![CDATA[Follow paved Highway 14 left after crossing Bridge of the Gods.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="45.660833" lon="-121.906462">
     <ele>47.1</ele>
-    <name>Hwy14C</name>
+    <name>Highway 14</name>
     <desc><![CDATA[PCT departs Highway 14 on a trail to the right, 100 yards past small Ice House Lake.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="45.654469" lon="-121.915089">
     <ele>47.5</ele>
-    <name>WA2148</name>
+    <name>Water - 2148</name>
     <desc><![CDATA[Spring near a small building.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="45.654261" lon="-121.918882">
@@ -91833,7 +91922,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.667450" lon="-121.941811">
     <ele>128.0</ele>
-    <name>RD2151</name>
+    <name>Road Crossing - 2151</name>
     <desc><![CDATA[Unpaved road near a high voltage power line.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="45.668607" lon="-121.945424">
@@ -91843,17 +91932,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.668457" lon="-121.946853">
     <ele>95.9</ele>
-    <name>WACS2151</name>
+    <name>Campsite &amp; Water - 2151</name>
     <desc><![CDATA[Large stream on a log footbridge, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="45.667659" lon="-121.949157">
     <ele>120.9</ele>
-    <name>RD2151B</name>
+    <name>Road Crossing - 2151</name>
     <desc><![CDATA[PCT joins an unpaved road for about 100 yards near an underground natural gas pipeline a short distance to the left.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="45.668242" lon="-121.956671">
     <ele>156.5</ele>
-    <name>RD2152</name>
+    <name>Road Crossing - 2152</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="45.667976" lon="-121.957804">
@@ -91863,14 +91952,14 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.665168" lon="-121.969257">
     <ele>246.7</ele>
-    <name>TR2153</name>
+    <name>Trail Junction - 2153</name>
     <desc><![CDATA[Unmarked trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.666635" lon="-121.971080">
     <ele>243.8</ele>
-    <name>WACS2153</name>
+    <name>Campsite &amp; Water - 2153</name>
     <desc><![CDATA[Small seasonal creek, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="45.678215" lon="-121.978082">
     <ele>520.4</ele>
     <name>CedarCreekTrib</name>
@@ -91888,32 +91977,32 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.697329" lon="-121.990384">
     <ele>749.8</ele>
-    <name>CS2157</name>
+    <name>Campsite - 2157</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="45.699455" lon="-121.995803">
     <ele>811.5</ele>
-    <name>PL2157</name>
+    <name>Powerline - 2157</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="45.701536" lon="-121.999246">
     <ele>841.6</ele>
-    <name>RD2157</name>
+    <name>Road Crossing - 2157</name>
     <desc><![CDATA[Unpaved jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="45.725977" lon="-122.010601">
     <ele>922.2</ele>
-    <name>CS2160</name>
+    <name>Campsite - 2160</name>
     <desc><![CDATA[Campsite near an unpaved jeep road.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="45.733755" lon="-122.023356">
     <ele>923.5</ele>
-    <name>RD2161</name>
+    <name>Road Crossing - 2161</name>
     <desc><![CDATA[Intersection of unpaved roads.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="45.734080" lon="-122.037857">
     <ele>992.8</ele>
-    <name>CS2162</name>
+    <name>Campsite - 2162</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="45.736296" lon="-122.043075">
@@ -91923,7 +92012,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.733038" lon="-122.046197">
     <ele>1021.2</ele>
-    <name>WA2162</name>
+    <name>Water - 2162</name>
     <desc><![CDATA[Water trough near Three Corner Rock]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="45.749123" lon="-122.043182">
@@ -91983,12 +92072,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.807276" lon="-121.942459">
     <ele>352.2</ele>
-    <name>RD2177</name>
+    <name>Road Crossing - 2177</name>
     <desc><![CDATA[PCT joins an unpaved road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="45.807243" lon="-121.942016">
     <ele>351.1</ele>
-    <name>RD2177B</name>
+    <name>Road Crossing - 2177</name>
     <desc><![CDATA[PCT departs the unpaved road on a trail.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="45.807221" lon="-121.940585">
@@ -92028,12 +92117,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="45.819482" lon="-121.893902">
     <ele>364.3</ele>
-    <name>WA2181</name>
+    <name>Water - 2181</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="45.819421" lon="-121.888298">
     <ele>328.0</ele>
-    <name>WA2182</name>
+    <name>Water - 2182</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="45.817558" lon="-121.881208">
@@ -92043,7 +92132,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="45.817867" lon="-121.878714">
     <ele>274.9</ele>
-    <name>CS2182</name>
+    <name>Campsite - 2182</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="45.818086" lon="-121.877074">
@@ -92073,17 +92162,17 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.850593" lon="-121.786308">
     <ele>1234.3</ele>
-    <name>CS2191</name>
+    <name>Campsite - 2191</name>
     <desc><![CDATA[Campsite in a saddle.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="45.866699" lon="-121.787305">
     <ele>1083.8</ele>
-    <name>WACS2193</name>
+    <name>Campsite &amp; Water - 2193</name>
     <desc><![CDATA[Trail junction to a spring, campsites nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="45.886669" lon="-121.781170">
     <ele>1032.6</ele>
-    <name>WA2195</name>
+    <name>Water - 2195</name>
     <desc><![CDATA[Piped spring next to the PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="45.909192" lon="-121.802370">
@@ -92168,7 +92257,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="46.093085" lon="-121.761454">
     <ele>1305.0</ele>
-    <name>RD2215</name>
+    <name>Road Crossing - 2215</name>
     <desc><![CDATA[Unpaved jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="46.124847" lon="-121.753266">
@@ -92183,7 +92272,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.126111" lon="-121.749930">
     <ele>1189.8</ele>
-    <name>CS2219</name>
+    <name>Campsite - 2219</name>
     <desc><![CDATA[Large campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.123459" lon="-121.733815">
@@ -92228,7 +92317,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.163152" lon="-121.631062">
     <ele>1173.1</ele>
-    <name>CS2229</name>
+    <name>Campsite - 2229</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.170501" lon="-121.626713">
@@ -92253,17 +92342,17 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.179433" lon="-121.600501">
     <ele>1468.8</ele>
-    <name>TR2232</name>
+    <name>Trail Junction - 2232</name>
     <desc><![CDATA[Trail junction to water]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.179207" lon="-121.600405">
     <ele>1469.2</ele>
-    <name>WA2232</name>
+    <name>Water - 2232</name>
     <desc><![CDATA[Small spring below the trail.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.186708" lon="-121.576835">
     <ele>1718.6</ele>
-    <name>CS2235</name>
+    <name>Campsite - 2235</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.180606" lon="-121.576171">
@@ -92288,12 +92377,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.215763" lon="-121.566418">
     <ele>1752.9</ele>
-    <name>WA2239</name>
+    <name>Water - 2239</name>
     <desc><![CDATA[Small seasonal creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.226371" lon="-121.562595">
     <ele>1791.7</ele>
-    <name>CS2240</name>
+    <name>Campsite - 2240</name>
     <desc><![CDATA[Several campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.227079" lon="-121.562255">
@@ -92303,7 +92392,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.235120" lon="-121.551269">
     <ele>1852.6</ele>
-    <name>WA2241</name>
+    <name>Water - 2241</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.237419" lon="-121.548387">
@@ -92318,7 +92407,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.249857" lon="-121.536871">
     <ele>1871.1</ele>
-    <name>WA2243</name>
+    <name>Water - 2243</name>
     <desc><![CDATA[Small pond]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.250902" lon="-121.532727">
@@ -92338,7 +92427,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.261533" lon="-121.518330">
     <ele>1771.5</ele>
-    <name>WA2245</name>
+    <name>Water - 2245</name>
     <desc><![CDATA[Small lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.283842" lon="-121.504972">
@@ -92348,7 +92437,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.300154" lon="-121.504224">
     <ele>1460.8</ele>
-    <name>WA2248</name>
+    <name>Water - 2248</name>
     <desc><![CDATA[Small creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.301847" lon="-121.504251">
@@ -92373,7 +92462,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="46.350676" lon="-121.517895">
     <ele>1372.1</ele>
-    <name>RD2253</name>
+    <name>Road Crossing - 2253</name>
     <desc><![CDATA[Unpaved jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="46.353203" lon="-121.520817">
@@ -92388,27 +92477,27 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.356694" lon="-121.517680">
     <ele>1434.0</ele>
-    <name>CS2254</name>
+    <name>Campsite - 2254</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.364084" lon="-121.508241">
     <ele>1515.5</ele>
-    <name>WA2254</name>
+    <name>Water - 2254</name>
     <desc><![CDATA[Seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.377188" lon="-121.497757">
     <ele>1550.9</ele>
-    <name>WACS2256</name>
+    <name>Campsite &amp; Water - 2256</name>
     <desc><![CDATA[Pond, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="46.380144" lon="-121.502293">
     <ele>1548.6</ele>
-    <name>WA2256</name>
+    <name>Water - 2256</name>
     <desc><![CDATA[Lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.384644" lon="-121.497176">
     <ele>1562.7</ele>
-    <name>WA2257</name>
+    <name>Water - 2257</name>
     <desc><![CDATA[Small Lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.389106" lon="-121.486464">
@@ -92423,24 +92512,24 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.395230" lon="-121.481237">
     <ele>1610.9</ele>
-    <name>CS2258</name>
+    <name>Campsite - 2258</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.397326" lon="-121.471217">
     <ele>1666.6</ele>
-    <name>CS2259</name>
+    <name>Campsite - 2259</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.392069" lon="-121.452999">
     <ele>1606.8</ele>
-    <name>CS2260</name>
+    <name>Campsite - 2260</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.388722" lon="-121.451088">
     <ele>1570.7</ele>
-    <name>WACS2261</name>
+    <name>Campsite &amp; Water - 2261</name>
     <desc><![CDATA[Small stream, small campsites nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="46.410377" lon="-121.402486">
     <ele>1513.0</ele>
     <name>WaluptLakeTR</name>
@@ -92448,7 +92537,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.421686" lon="-121.402715">
     <ele>1644.8</ele>
-    <name>WA2266</name>
+    <name>Water - 2266</name>
     <desc><![CDATA[Small seasonal stream.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.456339" lon="-121.420287">
@@ -92488,12 +92577,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.485688" lon="-121.451353">
     <ele>1832.0</ele>
-    <name>CS2274</name>
+    <name>Campsite - 2274</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.487606" lon="-121.459562">
     <ele>1820.0</ele>
-    <name>CS2274B</name>
+    <name>Campsite - 2274</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.487646" lon="-121.459817">
@@ -92503,7 +92592,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.493320" lon="-121.464035">
     <ele>1873.9</ele>
-    <name>CS2275</name>
+    <name>Campsite - 2275</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.498638" lon="-121.464075">
@@ -92513,7 +92602,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.511939" lon="-121.465321">
     <ele>2138.2</ele>
-    <name>CS2276</name>
+    <name>Campsite - 2276</name>
     <desc><![CDATA[Several exposed campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.514381" lon="-121.460868">
@@ -92533,32 +92622,32 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.540492" lon="-121.449261">
     <ele>1900.3</ele>
-    <name>WA2279</name>
+    <name>Water - 2279</name>
     <desc><![CDATA[Seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.539767" lon="-121.444688">
     <ele>1840.8</ele>
-    <name>WA2280</name>
+    <name>Water - 2280</name>
     <desc><![CDATA[Seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.539561" lon="-121.443042">
     <ele>1830.6</ele>
-    <name>CS2280</name>
+    <name>Campsite - 2280</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.537900" lon="-121.442162">
     <ele>1801.8</ele>
-    <name>WA2280B</name>
+    <name>Water - 2280</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.539281" lon="-121.436054">
     <ele>1747.5</ele>
-    <name>CS2280B</name>
+    <name>Campsite - 2280</name>
     <desc><![CDATA[Two small campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.539167" lon="-121.427848">
     <ele>1696.6</ele>
-    <name>CS2281</name>
+    <name>Campsite - 2281</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.544343" lon="-121.418196">
@@ -92578,12 +92667,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.554066" lon="-121.417637">
     <ele>1458.6</ele>
-    <name>WA2283</name>
+    <name>Water - 2283</name>
     <desc><![CDATA[Small stream 120 yards E of PCT]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.555776" lon="-121.420716">
     <ele>1449.4</ele>
-    <name>WA2284</name>
+    <name>Water - 2284</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.575433" lon="-121.398327">
@@ -92608,7 +92697,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.602046" lon="-121.402978">
     <ele>1931.4</ele>
-    <name>CS2290</name>
+    <name>Campsite - 2290</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.606306" lon="-121.402918">
@@ -92643,7 +92732,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="46.632911" lon="-121.378181">
     <ele>1510.1</ele>
-    <name>WA2294</name>
+    <name>Water - 2294</name>
     <desc><![CDATA[Stream at the end of a switchback.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.643147" lon="-121.378760">
@@ -92651,6 +92740,10 @@
     <name>SForkClearCreek</name>
     <desc><![CDATA[South Fork Clear Creek, wooden bridge.]]></desc>
     <sym>Water Source</sym>
+  </wpt><wpt lat="45.933253" lon="-121.803844">
+    <ele>1267.4</ele>
+    <name>2200</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>WA Sec I</name>
     <extensions>
@@ -92658,7 +92751,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Washington Section I</desc><cmt/><trkseg>
       <trkpt lat="46.643641" lon="-121.379277"><ele>1343.79</ele></trkpt>
       <trkpt lat="46.643726" lon="-121.379467"><ele>1344.12</ele></trkpt>
       <trkpt lat="46.644047" lon="-121.379142"><ele>1344.50</ele></trkpt>
@@ -95473,7 +95566,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Washington Section I. Off-Track: Creek Access Trail</desc><cmt/><trkseg>
       <trkpt lat="47.199050" lon="-121.311278"><ele>1178.03</ele></trkpt>
       <trkpt lat="47.198938" lon="-121.311873"><ele>1168.29</ele></trkpt>
       <trkpt lat="47.198820" lon="-121.312071"><ele>1164.68</ele></trkpt>
@@ -95486,7 +95579,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Washington Section I. Off-Track: Snoqualmie Road</desc><cmt/><trkseg>
       <trkpt lat="47.425764" lon="-121.415750"><ele>914.00</ele></trkpt>
       <trkpt lat="47.424990" lon="-121.415278"><ele>915.90</ele></trkpt>
       <trkpt lat="47.422637" lon="-121.412650"><ele>919.79</ele></trkpt>
@@ -95494,7 +95587,7 @@
     </trkseg>
   </trk><wpt lat="46.643654" lon="-121.379292">
     <ele>1343.8</ele>
-    <name>Hwy12</name>
+    <name>Highway 12</name>
     <desc><![CDATA[Highway 12 near White Pass, trailhead parking both on north and south sides of the highway. White Pass is a small ski area 1/2 mile SW of the PCT on Hwy 12 with a motel [The Village Inn, whitepassvillageinn.com, 509-672-3131] and the Kracker Barrel convenience store [509-672-3105] with deli, laundry, and they accept hiker resupply packages. The town of Packwood is 20.5 miles W of the PCT on Hwy 12.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="46.639445" lon="-121.388503">
@@ -95524,7 +95617,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.652268" lon="-121.400618">
     <ele>1513.9</ele>
-    <name>WA2296</name>
+    <name>Water - 2296</name>
     <desc><![CDATA[Seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.659881" lon="-121.413736">
@@ -95534,7 +95627,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.665049" lon="-121.412525">
     <ele>1651.4</ele>
-    <name>WA2298</name>
+    <name>Water - 2298</name>
     <desc><![CDATA[Small pond, campsite.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.683403" lon="-121.403831">
@@ -95544,7 +95637,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.684062" lon="-121.403670">
     <ele>1668.2</ele>
-    <name>WA2300</name>
+    <name>Water - 2300</name>
     <desc><![CDATA[Small shallow pond]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.695453" lon="-121.397177">
@@ -95559,7 +95652,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.696579" lon="-121.388385">
     <ele>1570.0</ele>
-    <name>WA2301</name>
+    <name>Water - 2301</name>
     <desc><![CDATA[Small lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.702198" lon="-121.385314">
@@ -95619,7 +95712,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.773266" lon="-121.429971">
     <ele>1536.7</ele>
-    <name>WA2311</name>
+    <name>Water - 2311</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.771873" lon="-121.449952">
@@ -95659,12 +95752,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.847508" lon="-121.476144">
     <ele>1615.4</ele>
-    <name>WA2320</name>
+    <name>Water - 2320</name>
     <desc><![CDATA[Small stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.848197" lon="-121.478030">
     <ele>1604.3</ele>
-    <name>WA2320B</name>
+    <name>Water - 2320</name>
     <desc><![CDATA[Small stream, wooden bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.852846" lon="-121.480665">
@@ -95689,7 +95782,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="46.871879" lon="-121.515681">
     <ele>1656.2</ele>
-    <name>Hwy410</name>
+    <name>Highway 410</name>
     <desc><![CDATA[Highway 410, Chinook Pass, footbridge over the highway, trailhead nearby.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="46.875218" lon="-121.517897">
@@ -95719,12 +95812,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.959661" lon="-121.449125">
     <ele>1938.7</ele>
-    <name>CS2334</name>
+    <name>Campsite - 2334</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="46.961689" lon="-121.453196">
     <ele>1901.1</ele>
-    <name>WA2334</name>
+    <name>Water - 2334</name>
     <desc><![CDATA[Piped spring next to trail.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="46.962297" lon="-121.453036">
@@ -95799,14 +95892,14 @@
     <sym>Truck</sym>
   </wpt><wpt lat="47.106515" lon="-121.403169">
     <ele>1527.8</ele>
-    <name>RD2349</name>
+    <name>Road Crossing - 2349</name>
     <desc><![CDATA[End of an unpaved road, campsite, excellent view of Mount Rainier. ]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="47.131440" lon="-121.389289">
     <ele>1540.2</ele>
-    <name>WACS2352</name>
+    <name>Campsite &amp; Water - 2352</name>
     <desc><![CDATA[Small spring next to the trail, small campsite.<br/>---<br/>WATER ALERT: Next northbound water after the small spring may be the spring W of trail in 11.8 miles.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="47.132184" lon="-121.387228">
     <ele>1528.1</ele>
     <name>Road260</name>
@@ -95839,17 +95932,17 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.160716" lon="-121.304933">
     <ele>1514.0</ele>
-    <name>CS2359</name>
+    <name>Campsite - 2359</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.176797" lon="-121.314129">
     <ele>1421.3</ele>
-    <name>CS2361</name>
+    <name>Campsite - 2361</name>
     <desc><![CDATA[Campsite at the end of an unpaved road.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.177895" lon="-121.315101">
     <ele>1412.8</ele>
-    <name>RD2361</name>
+    <name>Road Crossing - 2361</name>
     <desc><![CDATA[Cross the narrow unpaved road to the nearby campsite.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="47.179416" lon="-121.311636">
@@ -95859,12 +95952,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="47.199070" lon="-121.311104">
     <ele>1179.9</ele>
-    <name>TR2363</name>
+    <name>Trail Junction - 2363</name>
     <desc><![CDATA[Use trail at the end of a switchback to water 500 feet SW of the PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.198607" lon="-121.312872">
     <ele>1152.8</ele>
-    <name>WA2363</name>
+    <name>Water - 2363</name>
     <desc><![CDATA[Reliable creek, 500 feet SW of the PCT.<br/>---<br/>WATER ALERT: Next southbound water after the creek may be the small spring in 11.8 miles.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.205080" lon="-121.310175">
@@ -95879,74 +95972,74 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.218650" lon="-121.344317">
     <ele>1374.8</ele>
-    <name>CS2367</name>
+    <name>Campsite - 2367</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.219140" lon="-121.347273">
     <ele>1385.6</ele>
-    <name>RD2367</name>
+    <name>Road Crossing - 2367</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="47.220879" lon="-121.354342">
     <ele>1420.2</ele>
-    <name>CS2368</name>
+    <name>Campsite - 2368</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.245448" lon="-121.345077">
     <ele>1380.4</ele>
-    <name>WA2371</name>
+    <name>Water - 2371</name>
     <desc><![CDATA[Spring next to the PCT.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.245592" lon="-121.343485">
     <ele>1396.4</ele>
-    <name>CS2371</name>
+    <name>Campsite - 2371</name>
     <desc><![CDATA[Campsite on an abandoned roadbed.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.255569" lon="-121.333946">
     <ele>1319.6</ele>
-    <name>RD2372</name>
+    <name>Road Crossing - 2372</name>
     <desc><![CDATA[Unpaved jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="47.260658" lon="-121.333434">
     <ele>1300.9</ele>
-    <name>RD2372B</name>
+    <name>Road Crossing - 2372</name>
     <desc><![CDATA[Unpaved jeep road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="47.261536" lon="-121.334502">
     <ele>1269.8</ele>
-    <name>WA2373</name>
+    <name>Water - 2373</name>
     <desc><![CDATA[Small seasonal spring, 50 feet from PCT on a use trail.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.264069" lon="-121.336428">
     <ele>1181.5</ele>
-    <name>CS2373</name>
+    <name>Campsite - 2373</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.268247" lon="-121.339415">
     <ele>1228.3</ele>
-    <name>PL2373</name>
+    <name>Powerline - 2373</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="47.275378" lon="-121.339359">
     <ele>1195.9</ele>
-    <name>RD2374</name>
+    <name>Road Crossing - 2374</name>
     <desc><![CDATA[Unpaved road to an abandoned weather station 500 feet NE of PCT.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="47.276317" lon="-121.340805">
     <ele>1184.5</ele>
-    <name>PL2374</name>
+    <name>Powerline - 2374</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="47.277092" lon="-121.340834">
     <ele>1183.2</ele>
-    <name>RD2374B</name>
+    <name>Road Crossing - 2374</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="47.281178" lon="-121.344672">
     <ele>1130.0</ele>
-    <name>PL2374B</name>
+    <name>Powerline - 2374</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="47.283240" lon="-121.351248">
     <ele>1118.8</ele>
     <name>StampedePass</name>
@@ -95954,12 +96047,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="47.290489" lon="-121.368583">
     <ele>1264.0</ele>
-    <name>RD2376</name>
+    <name>Road Crossing - 2376</name>
     <desc><![CDATA[Unpaved road]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="47.287349" lon="-121.377017">
     <ele>1173.9</ele>
-    <name>WA2377</name>
+    <name>Water - 2377</name>
     <desc><![CDATA[Small seasonal spring]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.291043" lon="-121.405034">
@@ -95969,7 +96062,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="47.292875" lon="-121.407011">
     <ele>1070.5</ele>
-    <name>WA2379</name>
+    <name>Water - 2379</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.299923" lon="-121.415510">
@@ -96034,7 +96127,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.350997" lon="-121.444530">
     <ele>1363.6</ele>
-    <name>WA2385</name>
+    <name>Water - 2385</name>
     <desc><![CDATA[Small stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.351737" lon="-121.450154">
@@ -96044,9 +96137,9 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.371443" lon="-121.448768">
     <ele>1187.5</ele>
-    <name>WACS2388</name>
+    <name>Campsite &amp; Water - 2388</name>
     <desc><![CDATA[Stream, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="47.373177" lon="-121.446862">
     <ele>1166.4</ele>
     <name>Road9070</name>
@@ -96064,9 +96157,9 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.389152" lon="-121.446801">
     <ele>1046.8</ele>
-    <name>PL2389</name>
+    <name>Powerline - 2389</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="47.390102" lon="-121.446342">
     <ele>1025.3</ele>
     <name>Road110</name>
@@ -96084,9 +96177,9 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.395299" lon="-121.440367">
     <ele>984.0</ele>
-    <name>PL2390</name>
+    <name>Powerline - 2390</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="47.408560" lon="-121.427511">
     <ele>1005.2</ele>
     <name>LodgeCreek</name>
@@ -96099,7 +96192,7 @@
     <sym>Ski Resort</sym>
   </wpt><wpt lat="47.427344" lon="-121.421483">
     <ele>920.2</ele>
-    <name>RD2393</name>
+    <name>Road Crossing - 2393</name>
     <desc><![CDATA[PCT joins a wide unpaved road at a trailhead parking area. ]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="47.425788" lon="-121.415644">
@@ -96114,9 +96207,13 @@
     <sym>Lodging</sym>
   </wpt><wpt lat="47.426634" lon="-121.415488">
     <ele>912.2</ele>
-    <name>Hwy90</name>
+    <name>Highway 90</name>
     <desc><![CDATA[Interstate Highway 90 overpass, Snoqualmie Pass]]></desc>
     <sym>Car</sym>
+  </wpt><wpt lat="46.687928" lon="-121.401966">
+    <ele>1633.6</ele>
+    <name>2300</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>WA Sec J</name>
     <extensions>
@@ -96124,7 +96221,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Washington Section J</desc><cmt/><trkseg>
       <trkpt lat="47.426668" lon="-121.415428"><ele>912.22</ele></trkpt>
       <trkpt lat="47.427174" lon="-121.415262"><ele>910.96</ele></trkpt>
       <trkpt lat="47.427714" lon="-121.414869"><ele>910.89</ele></trkpt>
@@ -98182,7 +98279,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Washington Section J. Off-Track: Cathedral Alternate</desc><cmt/><trkseg>
       <trkpt lat="47.550521" lon="-121.129206"><ele>1681.97</ele></trkpt>
       <trkpt lat="47.550029" lon="-121.128867"><ele>1680.38</ele></trkpt>
       <trkpt lat="47.549438" lon="-121.128694"><ele>1675.04</ele></trkpt>
@@ -98502,7 +98599,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Washington Section J. Off-Track: Goldmeyer Alternate</desc><cmt/><trkseg>
       <trkpt lat="47.427523" lon="-121.415208"><ele>910.15</ele></trkpt>
       <trkpt lat="47.428008" lon="-121.415295"><ele>908.73</ele></trkpt>
       <trkpt lat="47.428337" lon="-121.415533"><ele>906.91</ele></trkpt>
@@ -99521,7 +99618,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Washington Section J. Off-Track: Goldmeyer Spur Trail</desc><cmt/><trkseg>
       <trkpt lat="47.484222" lon="-121.391544"><ele>536.16</ele></trkpt>
       <trkpt lat="47.484199" lon="-121.390625"><ele>539.74</ele></trkpt>
       <trkpt lat="47.484227" lon="-121.390405"><ele>541.52</ele></trkpt>
@@ -99622,7 +99719,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.425535" lon="-121.407143">
     <ele>967.4</ele>
-    <name>WA2394</name>
+    <name>Water - 2394</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.433663" lon="-121.402633">
@@ -99647,17 +99744,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.434383" lon="-121.396907">
     <ele>1346.9</ele>
-    <name>CS2397</name>
+    <name>Campsite - 2397</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.434172" lon="-121.388986">
     <ele>1475.7</ele>
-    <name>CS2397B</name>
+    <name>Campsite - 2397</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.460860" lon="-121.368982">
     <ele>1643.0</ele>
-    <name>CS2400</name>
+    <name>Campsite - 2400</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.462300" lon="-121.367477">
@@ -99667,37 +99764,37 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.461986" lon="-121.366190">
     <ele>1623.5</ele>
-    <name>CS2400B</name>
+    <name>Campsite - 2400</name>
     <desc><![CDATA[Established trail camp]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.467947" lon="-121.345858">
     <ele>1545.3</ele>
-    <name>CS2402</name>
+    <name>Campsite - 2402</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.471477" lon="-121.340691">
     <ele>1575.4</ele>
-    <name>CS2403</name>
+    <name>Campsite - 2403</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.475916" lon="-121.328436">
     <ele>1706.4</ele>
-    <name>WA2404</name>
+    <name>Water - 2404</name>
     <desc><![CDATA[Three small ponds]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.455667" lon="-121.297627">
     <ele>1581.3</ele>
-    <name>CS2407</name>
+    <name>Campsite - 2407</name>
     <desc><![CDATA[Established stock and hiker camps.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.452993" lon="-121.295776">
     <ele>1500.3</ele>
-    <name>CS2408</name>
+    <name>Campsite - 2408</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.452537" lon="-121.295467">
     <ele>1498.4</ele>
-    <name>WA2408</name>
+    <name>Water - 2408</name>
     <desc><![CDATA[Small spring fed pools]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.452192" lon="-121.295338">
@@ -99707,7 +99804,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.453423" lon="-121.280264">
     <ele>1557.2</ele>
-    <name>CS2409</name>
+    <name>Campsite - 2409</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.456947" lon="-121.275653">
@@ -99722,7 +99819,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.460321" lon="-121.266503">
     <ele>1050.3</ele>
-    <name>WA2412</name>
+    <name>Water - 2412</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.469059" lon="-121.257565">
@@ -99752,17 +99849,17 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.490612" lon="-121.258708">
     <ele>1011.7</ele>
-    <name>WA2415</name>
+    <name>Water - 2415</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.492527" lon="-121.256406">
     <ele>1083.9</ele>
-    <name>WA2416</name>
+    <name>Water - 2416</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.498987" lon="-121.238268">
     <ele>1678.2</ele>
-    <name>WA2421</name>
+    <name>Water - 2421</name>
     <desc><![CDATA[Small lake]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.503580" lon="-121.237329">
@@ -99772,7 +99869,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.501721" lon="-121.217633">
     <ele>1601.6</ele>
-    <name>CS2423</name>
+    <name>Campsite - 2423</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.498740" lon="-121.213007">
@@ -99782,27 +99879,27 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.507558" lon="-121.215727">
     <ele>1406.8</ele>
-    <name>CS2424</name>
+    <name>Campsite - 2424</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.507649" lon="-121.213891">
     <ele>1357.8</ele>
-    <name>CS2425</name>
+    <name>Campsite - 2425</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.508747" lon="-121.209180">
     <ele>1127.4</ele>
-    <name>WA2426</name>
+    <name>Water - 2426</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.510796" lon="-121.206856">
     <ele>995.4</ele>
-    <name>WA2427</name>
+    <name>Water - 2427</name>
     <desc><![CDATA[Small stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.515897" lon="-121.210680">
     <ele>929.2</ele>
-    <name>CS2428</name>
+    <name>Campsite - 2428</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.516000" lon="-121.210669">
@@ -99817,7 +99914,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.516671" lon="-121.198330">
     <ele>943.3</ele>
-    <name>WA2428</name>
+    <name>Water - 2428</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.515881" lon="-121.196421">
@@ -99827,7 +99924,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.515830" lon="-121.195946">
     <ele>946.6</ele>
-    <name>CS2429</name>
+    <name>Campsite - 2429</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.515790" lon="-121.195729">
@@ -99837,7 +99934,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.510621" lon="-121.181964">
     <ele>996.8</ele>
-    <name>WA2429</name>
+    <name>Water - 2429</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.506722" lon="-121.171815">
@@ -99857,7 +99954,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.523856" lon="-121.136229">
     <ele>1286.9</ele>
-    <name>CS2433</name>
+    <name>Campsite - 2433</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.535635" lon="-121.137565">
@@ -99887,7 +99984,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.550627" lon="-121.129652">
     <ele>1688.4</ele>
-    <name>CS2438</name>
+    <name>Campsite - 2438</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.550520" lon="-121.129470">
@@ -99912,32 +100009,32 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.558138" lon="-121.130068">
     <ele>1618.0</ele>
-    <name>CS2438B</name>
+    <name>Campsite - 2438</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.564003" lon="-121.134468">
     <ele>1398.7</ele>
-    <name>CS2440</name>
+    <name>Campsite - 2440</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.577348" lon="-121.143721">
     <ele>1160.1</ele>
-    <name>WA2441</name>
+    <name>Water - 2441</name>
     <desc><![CDATA[Large creek with a potentially difficult ford.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.580931" lon="-121.146421">
     <ele>1208.8</ele>
-    <name>WA2441B</name>
+    <name>Water - 2441</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.587502" lon="-121.147081">
     <ele>1284.6</ele>
-    <name>CS2442</name>
+    <name>Campsite - 2442</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.589588" lon="-121.148420">
     <ele>1291.1</ele>
-    <name>WA2442</name>
+    <name>Water - 2442</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.593621" lon="-121.140524">
@@ -99957,7 +100054,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.600905" lon="-121.137402">
     <ele>1361.3</ele>
-    <name>WA2444</name>
+    <name>Water - 2444</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.607048" lon="-121.134029">
@@ -99967,17 +100064,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.611799" lon="-121.136576">
     <ele>1359.7</ele>
-    <name>WA2445</name>
+    <name>Water - 2445</name>
     <desc><![CDATA[Large creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.612325" lon="-121.137133">
     <ele>1361.4</ele>
-    <name>CS2445</name>
+    <name>Campsite - 2445</name>
     <desc><![CDATA[Large campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.619174" lon="-121.140533">
     <ele>1465.8</ele>
-    <name>WA2445B</name>
+    <name>Water - 2445</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.629085" lon="-121.148133">
@@ -100002,7 +100099,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.634345" lon="-121.143151">
     <ele>1553.1</ele>
-    <name>CS2447</name>
+    <name>Campsite - 2447</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.651570" lon="-121.151184">
@@ -100012,17 +100109,17 @@
     <sym>Summit</sym>
   </wpt><wpt lat="47.650447" lon="-121.145065">
     <ele>1684.8</ele>
-    <name>CS2449</name>
+    <name>Campsite - 2449</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.652599" lon="-121.141311">
     <ele>1534.9</ele>
-    <name>WACS2450</name>
+    <name>Campsite &amp; Water - 2450</name>
     <desc><![CDATA[Seasonal stream, campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="47.655386" lon="-121.140306">
     <ele>1522.2</ele>
-    <name>WA2450</name>
+    <name>Water - 2450</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.663333" lon="-121.139827">
@@ -100032,7 +100129,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.662619" lon="-121.137973">
     <ele>1464.8</ele>
-    <name>WA2451</name>
+    <name>Water - 2451</name>
     <desc><![CDATA[Seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.672134" lon="-121.133356">
@@ -100042,17 +100139,17 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.674099" lon="-121.128991">
     <ele>1762.5</ele>
-    <name>CS2452</name>
+    <name>Campsite - 2452</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.683178" lon="-121.118049">
     <ele>1604.3</ele>
-    <name>WACS2453</name>
+    <name>Campsite &amp; Water - 2453</name>
     <desc><![CDATA[Seasonal stream, several small campsites.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="47.686228" lon="-121.105693">
     <ele>1515.1</ele>
-    <name>WA2454</name>
+    <name>Water - 2454</name>
     <desc><![CDATA[Seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.698770" lon="-121.091119">
@@ -100082,14 +100179,14 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.725000" lon="-121.078134">
     <ele>1407.2</ele>
-    <name>WA2461</name>
+    <name>Water - 2461</name>
     <desc><![CDATA[Small seasonal creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.727715" lon="-121.080540">
     <ele>1416.4</ele>
-    <name>PL2461</name>
+    <name>Powerline - 2461</name>
     <desc><![CDATA[High voltage power line]]></desc>
-    <sym>Flag, Green</sym>
+    <sym>Powerline</sym>
   </wpt><wpt lat="47.731693" lon="-121.081030">
     <ele>1447.2</ele>
     <name>Ski2461</name>
@@ -100107,9 +100204,13 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.746224" lon="-121.088505">
     <ele>2158.7</ele>
-    <name>Hwy2J</name>
+    <name>Highway 2</name>
     <desc><![CDATA[Stevens Pass [Stevenspass.com, 206-812-7844 (summer only), 206-812-4510 ex 4350] is a ski resort next to the PCT with large trailhead parking, snacks, espresso service, and a restaurant. They accept resupply packages shipped via UPS or FedEx only. Stevens Pass has no overnight accommodations.]]></desc>
     <sym>Car</sym>
+  </wpt><wpt lat="47.458838" lon="-121.368885">
+    <ele>1669.2</ele>
+    <name>2400</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>WA Sec K</name>
     <extensions>
@@ -100117,7 +100218,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Washington Section K</desc><cmt/><trkseg>
       <trkpt lat="47.746219" lon="-121.088531"><ele>1235.58</ele></trkpt>
       <trkpt lat="47.747458" lon="-121.088174"><ele>1234.06</ele></trkpt>
       <trkpt lat="47.748108" lon="-121.088253"><ele>1228.49</ele></trkpt>
@@ -104211,14 +104312,14 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.779787" lon="-121.113381">
     <ele>1360.6</ele>
-    <name>CS2468</name>
+    <name>Campsite - 2468</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.792476" lon="-121.104295">
     <ele>1495.4</ele>
-    <name>WACS2470</name>
+    <name>Campsite &amp; Water - 2470</name>
     <desc><![CDATA[Small creek, campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="47.806927" lon="-121.086211">
     <ele>1428.9</ele>
     <name>SmithbrookTR</name>
@@ -104226,7 +104327,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.809668" lon="-121.090624">
     <ele>1353.1</ele>
-    <name>WA2472</name>
+    <name>Water - 2472</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.820881" lon="-121.094973">
@@ -104241,17 +104342,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.841164" lon="-121.132960">
     <ele>1540.8</ele>
-    <name>CS2477</name>
+    <name>Campsite - 2477</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.845634" lon="-121.154488">
     <ele>1701.3</ele>
-    <name>CS2479</name>
+    <name>Campsite - 2479</name>
     <desc><![CDATA[Small campsite near the summit of Grizzly Peak.]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.873565" lon="-121.156654">
     <ele>1293.9</ele>
-    <name>CS2481</name>
+    <name>Campsite - 2481</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.879059" lon="-121.158723">
@@ -104271,9 +104372,9 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.912799" lon="-121.177398">
     <ele>1456.0</ele>
-    <name>WACS2487</name>
+    <name>Campsite &amp; Water - 2487</name>
     <desc><![CDATA[Seasonal headwaters of West Cady Creek, large campsite.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="47.923717" lon="-121.185020">
     <ele>1502.8</ele>
     <name>SkykomishRoadTR</name>
@@ -104291,7 +104392,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.954565" lon="-121.157455">
     <ele>1649.5</ele>
-    <name>WA2493</name>
+    <name>Water - 2493</name>
     <desc><![CDATA[Small seasonal creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.960884" lon="-121.152314">
@@ -104306,7 +104407,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.969218" lon="-121.150693">
     <ele>1737.6</ele>
-    <name>CS2495</name>
+    <name>Campsite - 2495</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.984477" lon="-121.135024">
@@ -104321,12 +104422,12 @@
     <sym>Forest</sym>
   </wpt><wpt lat="47.989961" lon="-121.123902">
     <ele>1666.7</ele>
-    <name>WA2497</name>
+    <name>Water - 2497</name>
     <desc><![CDATA[Small seasonal stream.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="47.996623" lon="-121.121417">
     <ele>1516.6</ele>
-    <name>CS2498</name>
+    <name>Campsite - 2498</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="47.997403" lon="-121.121085">
@@ -104336,7 +104437,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.004532" lon="-121.124002">
     <ele>1643.2</ele>
-    <name>WA2499</name>
+    <name>Water - 2499</name>
     <desc><![CDATA[Seasonal creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.014759" lon="-121.128613">
@@ -104356,7 +104457,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.036451" lon="-121.156093">
     <ele>1823.3</ele>
-    <name>WA2502</name>
+    <name>Water - 2502</name>
     <desc><![CDATA[Small seasonal creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.036555" lon="-121.157857">
@@ -104366,7 +104467,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.051474" lon="-121.156358">
     <ele>1684.0</ele>
-    <name>CS2505</name>
+    <name>Campsite - 2505</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.053063" lon="-121.156630">
@@ -104401,12 +104502,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.086292" lon="-121.164708">
     <ele>1207.4</ele>
-    <name>CS2509</name>
+    <name>Campsite - 2509</name>
     <desc><![CDATA[Several small campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.094670" lon="-121.170916">
     <ele>1155.9</ele>
-    <name>WA2510</name>
+    <name>Water - 2510</name>
     <desc><![CDATA[Small stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.100014" lon="-121.174500">
@@ -104416,12 +104517,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.106330" lon="-121.176235">
     <ele>1160.5</ele>
-    <name>WA2511</name>
+    <name>Water - 2511</name>
     <desc><![CDATA[Large stream, pair of wooden bridges.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.106449" lon="-121.176776">
     <ele>1156.7</ele>
-    <name>CS2511</name>
+    <name>Campsite - 2511</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.108974" lon="-121.178496">
@@ -104441,7 +104542,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.120603" lon="-121.173893">
     <ele>1218.9</ele>
-    <name>WA2512</name>
+    <name>Water - 2512</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.124742" lon="-121.171085">
@@ -104456,7 +104557,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.131469" lon="-121.153475">
     <ele>1613.6</ele>
-    <name>CS2514</name>
+    <name>Campsite - 2514</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.131905" lon="-121.153430">
@@ -104506,22 +104607,22 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.169838" lon="-121.125581">
     <ele>1699.2</ele>
-    <name>CS2529</name>
+    <name>Campsite - 2529</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.165225" lon="-121.118279">
     <ele>1791.9</ele>
-    <name>CS2529B</name>
+    <name>Campsite - 2529</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.157092" lon="-121.115838">
     <ele>1763.4</ele>
-    <name>WA2530</name>
+    <name>Water - 2530</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.156720" lon="-121.113890">
     <ele>1763.5</ele>
-    <name>WA2530B</name>
+    <name>Water - 2530</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.156063" lon="-121.111166">
@@ -104531,7 +104632,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.161141" lon="-121.100834">
     <ele>1744.6</ele>
-    <name>CS2531</name>
+    <name>Campsite - 2531</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.165223" lon="-121.084788">
@@ -104551,7 +104652,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.198342" lon="-121.062662">
     <ele>769.7</ele>
-    <name>WA2539</name>
+    <name>Water - 2539</name>
     <desc><![CDATA[Small stream, wooden bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.202820" lon="-121.077190">
@@ -104561,7 +104662,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.207396" lon="-121.079481">
     <ele>708.5</ele>
-    <name>CS2541</name>
+    <name>Campsite - 2541</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.207499" lon="-121.079173">
@@ -104571,7 +104672,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.207880" lon="-121.078797">
     <ele>711.2</ele>
-    <name>CS2541B</name>
+    <name>Campsite - 2541</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.210517" lon="-121.081214">
@@ -104581,22 +104682,22 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.201413" lon="-121.060614">
     <ele>830.5</ele>
-    <name>WA2542</name>
+    <name>Water - 2542</name>
     <desc><![CDATA[Clear stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.199202" lon="-121.051569">
     <ele>858.2</ele>
-    <name>CS2543</name>
+    <name>Campsite - 2543</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.198613" lon="-121.049298">
     <ele>859.8</ele>
-    <name>WA2543</name>
+    <name>Water - 2543</name>
     <desc><![CDATA[Small stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.196496" lon="-121.044992">
     <ele>857.0</ele>
-    <name>CS2543B</name>
+    <name>Campsite - 2543</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.195907" lon="-121.043910">
@@ -104606,12 +104707,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.191919" lon="-121.040129">
     <ele>813.2</ele>
-    <name>WA2544</name>
+    <name>Water - 2544</name>
     <desc><![CDATA[Clear stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.189852" lon="-121.036465">
     <ele>815.0</ele>
-    <name>WA2544B</name>
+    <name>Water - 2544</name>
     <desc><![CDATA[Small stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.187042" lon="-121.029437">
@@ -104621,7 +104722,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.184777" lon="-120.988546">
     <ele>1308.3</ele>
-    <name>WA2548</name>
+    <name>Water - 2548</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.184342" lon="-120.972957">
@@ -104631,12 +104732,12 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.185500" lon="-120.969179">
     <ele>1401.6</ele>
-    <name>WA2549</name>
+    <name>Water - 2549</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.188416" lon="-120.967563">
     <ele>1369.2</ele>
-    <name>CS2549</name>
+    <name>Campsite - 2549</name>
     <desc><![CDATA[Large campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.188819" lon="-120.967808">
@@ -104646,7 +104747,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.193278" lon="-120.955549">
     <ele>1507.2</ele>
-    <name>WA2550</name>
+    <name>Water - 2550</name>
     <desc><![CDATA[Large creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.197639" lon="-120.953234">
@@ -104661,9 +104762,9 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.203169" lon="-120.943046">
     <ele>1769.6</ele>
-    <name>WACS2552</name>
+    <name>Campsite &amp; Water - 2552</name>
     <desc><![CDATA[Small stream in a meadow, campsite nearby.]]></desc>
-    <sym>Truck</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="48.202957" lon="-120.939713">
     <ele>1730.2</ele>
     <name>CloudyPassTR2</name>
@@ -104671,37 +104772,37 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.211526" lon="-120.943280">
     <ele>1629.8</ele>
-    <name>WA2553</name>
+    <name>Water - 2553</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.215370" lon="-120.950263">
     <ele>1538.2</ele>
-    <name>CS2554</name>
+    <name>Campsite - 2554</name>
     <desc><![CDATA[Established campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.230822" lon="-120.945145">
     <ele>1638.8</ele>
-    <name>WACS2555</name>
+    <name>Campsite &amp; Water - 2555</name>
     <desc><![CDATA[Small seasonal stream, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="48.232504" lon="-120.949921">
     <ele>1610.5</ele>
-    <name>WA2556</name>
+    <name>Water - 2556</name>
     <desc><![CDATA[A pair of streams]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.235877" lon="-120.953511">
     <ele>1490.9</ele>
-    <name>WA2556B</name>
+    <name>Water - 2556</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.242459" lon="-120.955640">
     <ele>1440.0</ele>
-    <name>CS2557</name>
+    <name>Campsite - 2557</name>
     <desc><![CDATA[Established campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.241997" lon="-120.950381">
     <ele>1370.7</ele>
-    <name>WA2557</name>
+    <name>Water - 2557</name>
     <desc><![CDATA[Seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.257065" lon="-120.928089">
@@ -104736,17 +104837,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.352932" lon="-120.888806">
     <ele>649.2</ele>
-    <name>CS2568</name>
+    <name>Campsite - 2568</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.356951" lon="-120.877897">
     <ele>683.4</ele>
-    <name>WA2568</name>
+    <name>Water - 2568</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.363027" lon="-120.868158">
     <ele>638.3</ele>
-    <name>WA2569</name>
+    <name>Water - 2569</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.368146" lon="-120.855781">
@@ -104778,7 +104879,7 @@
     <ele>2537.7</ele>
     <name>HighBridgeRanger</name>
     <desc><![CDATA[High Bridge Ranger Station, picnic table, shuttle service to Stehekin. PCT departs the unpaved road on a trail NE from the picnic table between two buildings. ]]></desc>
-    <sym>Flag, Blue</sym>
+    <sym>Bridge</sym>
   </wpt><wpt lat="48.381692" lon="-120.834606">
     <ele>564.1</ele>
     <name>CascadeCorralTR</name>
@@ -104816,7 +104917,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.425608" lon="-120.863046">
     <ele>679.7</ele>
-    <name>WA2576</name>
+    <name>Water - 2576</name>
     <desc><![CDATA[Stream, small wooden bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.429219" lon="-120.868036">
@@ -104831,12 +104932,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.429924" lon="-120.868708">
     <ele>639.2</ele>
-    <name>RD2577</name>
+    <name>Road Crossing - 2577</name>
     <desc><![CDATA[PCT joins an old road.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="48.432423" lon="-120.871672">
     <ele>662.9</ele>
-    <name>RD2577B</name>
+    <name>Road Crossing - 2577</name>
     <desc><![CDATA[PCT departs the old road on a trail to the right.]]></desc>
     <sym>Truck</sym>
   </wpt><wpt lat="48.448679" lon="-120.858856">
@@ -104891,7 +104992,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="48.485146" lon="-120.707305">
     <ele>1247.8</ele>
-    <name>WA2588</name>
+    <name>Water - 2588</name>
     <desc><![CDATA[Creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.496747" lon="-120.708276">
@@ -104906,7 +105007,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.504134" lon="-120.717541">
     <ele>1375.8</ele>
-    <name>TR2590</name>
+    <name>Trail Junction - 2590</name>
     <desc><![CDATA[Spur trail to a trailhead parking area.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.503873" lon="-120.718069">
@@ -104919,6 +105020,10 @@
     <name>RainyLakeOutlet</name>
     <desc><![CDATA[Rainy Lake Outlet]]></desc>
     <sym>Water Source</sym>
+  </wpt><wpt lat="48.016761" lon="-121.128105">
+    <ele>1675.7</ele>
+    <name>2500</name>
+    <sym>Flag, Green</sym>
   </wpt><trk xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
     <name>WA Sec L</name>
     <extensions>
@@ -104926,7 +105031,7 @@
         <gpxx:DisplayColor>DarkBlue</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <trkseg>
+    <desc>Washington Section L</desc><cmt/><trkseg>
       <trkpt lat="48.514763" lon="-120.733925"><ele>1479.22</ele></trkpt>
       <trkpt lat="48.514822" lon="-120.733422"><ele>1484.77</ele></trkpt>
       <trkpt lat="48.514927" lon="-120.733219"><ele>1487.59</ele></trkpt>
@@ -106820,7 +106925,7 @@
     </trkseg>
   </trk><wpt lat="48.514797" lon="-120.733883">
     <ele>1064.6</ele>
-    <name>Hwy20B</name>
+    <name>Highway 20</name>
     <desc><![CDATA[Highway 20, Rainy Pass, PCT crosses the highway, then joins a paved and unpaved road 3/10 mile N to a trailhead parking area.]]></desc>
     <sym>Car</sym>
   </wpt><wpt lat="48.518317" lon="-120.733300">
@@ -106840,17 +106945,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.542393" lon="-120.722343">
     <ele>1683.5</ele>
-    <name>CS2594</name>
+    <name>Campsite - 2594</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.544515" lon="-120.722501">
     <ele>1733.6</ele>
-    <name>WA2594</name>
+    <name>Water - 2594</name>
     <desc><![CDATA[Seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.552282" lon="-120.709065">
     <ele>1876.1</ele>
-    <name>CS2595</name>
+    <name>Campsite - 2595</name>
     <desc><![CDATA[Trail camp]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.554819" lon="-120.700588">
@@ -106870,14 +106975,14 @@
     <sym>Summit</sym>
   </wpt><wpt lat="48.581689" lon="-120.708374">
     <ele>1876.0</ele>
-    <name>WA2600</name>
+    <name>Water - 2600</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.585618" lon="-120.720115">
     <ele>1902.4</ele>
-    <name>WACS2601</name>
+    <name>Campsite &amp; Water - 2601</name>
     <desc><![CDATA[Small spring, campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="48.582192" lon="-120.732920">
     <ele>2009.6</ele>
     <name>MethowPass</name>
@@ -106885,12 +106990,12 @@
     <sym>Summit</sym>
   </wpt><wpt lat="48.585973" lon="-120.739198">
     <ele>1801.4</ele>
-    <name>WA2603</name>
+    <name>Water - 2603</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.587773" lon="-120.745581">
     <ele>1714.9</ele>
-    <name>WA2603B</name>
+    <name>Water - 2603</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.618335" lon="-120.757395">
@@ -106905,12 +107010,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.632295" lon="-120.748623">
     <ele>1341.6</ele>
-    <name>WA2607</name>
+    <name>Water - 2607</name>
     <desc><![CDATA[Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.648048" lon="-120.708976">
     <ele>1319.4</ele>
-    <name>CS2609</name>
+    <name>Campsite - 2609</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.648284" lon="-120.708156">
@@ -106920,7 +107025,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.663897" lon="-120.731031">
     <ele>1700.7</ele>
-    <name>CS2612</name>
+    <name>Campsite - 2612</name>
     <desc><![CDATA[Established campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.664257" lon="-120.730884">
@@ -106935,17 +107040,17 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.724154" lon="-120.664441">
     <ele>1920.9</ele>
-    <name>WA2622</name>
+    <name>Water - 2622</name>
     <desc><![CDATA[Seasonal Stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.732368" lon="-120.677093">
     <ele>2088.4</ele>
-    <name>TR2623</name>
+    <name>Trail Junction - 2623</name>
     <desc><![CDATA[Trail junction to a road and trailhead parking.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.756069" lon="-120.694291">
     <ele>2042.4</ele>
-    <name>CS2626</name>
+    <name>Campsite - 2626</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.760922" lon="-120.702820">
@@ -106965,9 +107070,9 @@
     <sym>Forest</sym>
   </wpt><wpt lat="48.776891" lon="-120.721379">
     <ele>1987.1</ele>
-    <name>WACS2628</name>
+    <name>Campsite &amp; Water - 2628</name>
     <desc><![CDATA[Seasonal stream at the foot of Tamarack Peak, large campsite nearby.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Campground</sym>
   </wpt><wpt lat="48.785108" lon="-120.734640">
     <ele>1884.2</ele>
     <name>FoggyPass</name>
@@ -106980,12 +107085,12 @@
     <sym>Summit</sym>
   </wpt><wpt lat="48.795231" lon="-120.736234">
     <ele>1916.8</ele>
-    <name>CS2630</name>
+    <name>Campsite - 2630</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.807646" lon="-120.724402">
     <ele>1884.4</ele>
-    <name>CS2631</name>
+    <name>Campsite - 2631</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.810555" lon="-120.732861">
@@ -106995,7 +107100,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.821342" lon="-120.734292">
     <ele>1811.7</ele>
-    <name>CS2633</name>
+    <name>Campsite - 2633</name>
     <desc><![CDATA[Several campsites]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.840291" lon="-120.737337">
@@ -107010,7 +107115,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.858013" lon="-120.744098">
     <ele>1889.9</ele>
-    <name>CS2638</name>
+    <name>Campsite - 2638</name>
     <desc><![CDATA[Campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.869790" lon="-120.753809">
@@ -107020,7 +107125,7 @@
     <sym>Summit</sym>
   </wpt><wpt lat="48.884840" lon="-120.765846">
     <ele>2019.1</ele>
-    <name>CS2642</name>
+    <name>Campsite - 2642</name>
     <desc><![CDATA[Small campsite]]></desc>
     <sym>Campground</sym>
   </wpt><wpt lat="48.885261" lon="-120.767406">
@@ -107045,7 +107150,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.945942" lon="-120.770167">
     <ele>1778.6</ele>
-    <name>WA2648</name>
+    <name>Water - 2648</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.957190" lon="-120.779279">
@@ -107060,17 +107165,17 @@
     <sym>Summit</sym>
   </wpt><wpt lat="48.973456" lon="-120.789453">
     <ele>1555.9</ele>
-    <name>WA2650</name>
+    <name>Water - 2650</name>
     <desc><![CDATA[Seasonal stream [larger than most in this area].]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.990646" lon="-120.801373">
     <ele>1439.4</ele>
-    <name>WA2652</name>
+    <name>Water - 2652</name>
     <desc><![CDATA[Seasonal creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="48.997471" lon="-120.800305">
     <ele>1374.2</ele>
-    <name>WA2652B</name>
+    <name>Water - 2652</name>
     <desc><![CDATA[Seasonal creek]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="49.000289" lon="-120.802121">
@@ -107085,12 +107190,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="49.012343" lon="-120.800218">
     <ele>1352.0</ele>
-    <name>WA2654</name>
+    <name>Water - 2654</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="49.033233" lon="-120.772629">
     <ele>1502.9</ele>
-    <name>WA2656</name>
+    <name>Water - 2656</name>
     <desc><![CDATA[Small seasonal stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="49.036599" lon="-120.763203">
@@ -107110,17 +107215,17 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="49.045546" lon="-120.766799">
     <ele>1433.0</ele>
-    <name>WA2658</name>
+    <name>Water - 2658</name>
     <desc><![CDATA[Small stream]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="49.058506" lon="-120.777608">
     <ele>1174.5</ele>
-    <name>WA2659</name>
+    <name>Water - 2659</name>
     <desc><![CDATA[Stream with wooden bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="49.059296" lon="-120.788596">
     <ele>1185.8</ele>
-    <name>WA2660</name>
+    <name>Water - 2660</name>
     <desc><![CDATA[Small stream, wooden bridge.]]></desc>
     <sym>Water Source</sym>
   </wpt><wpt lat="49.063973" lon="-120.798128">
@@ -107130,7 +107235,11 @@
     <sym>Truck</sym>
   </wpt><wpt lat="49.062823" lon="-120.782672">
     <ele>1191.7</ele>
-    <name>Hwy3B</name>
+    <name>Highway 3</name>
     <desc><![CDATA[Highway 3, near the Manning Park Lodge [manningpark.com]. The Manning Park offers lodging, restaurant, small store, and a Greyhound bus stop.]]></desc>
     <sym>Car</sym>
+  </wpt><wpt lat="48.580807" lon="-120.705674">
+    <ele>1873.9</ele>
+    <name>2600</name>
+    <sym>Flag, Green</sym>
   </wpt></gpx>