diff --git a/geo/pct.gpx b/geo/pct.gpx
index 0c8c2ba..2ae29ff 100644
--- a/geo/pct.gpx
+++ b/geo/pct.gpx
@@ -4158,12 +4158,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="32.888128" lon="-116.425853">
     <ele>1797.4</ele>
-    <name>BigLagunaTr</name>
+    <name>Big Laguna Trail Junction</name>
     <desc><![CDATA[Big Laguna trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="32.895064" lon="-116.439548">
     <ele>1747.9</ele>
-    <name>FosterPtTr</name>
+    <name>Foster Pt Trail Junction</name>
     <desc><![CDATA[Foster Point trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="32.896524" lon="-116.448683">
@@ -4178,7 +4178,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="32.905933" lon="-116.456501">
     <ele>1656.1</ele>
-    <name>NobleCynTr</name>
+    <name>Noble Cyn Trail Junction</name>
     <desc><![CDATA[Noble Canyon trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="32.905774" lon="-116.458263">
@@ -4188,7 +4188,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="32.919770" lon="-116.460738">
     <ele>1673.6</ele>
-    <name>GarnetPkTr</name>
+    <name>Garnet Pk Trail Junction</name>
     <desc><![CDATA[Garnet Peak trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="32.925106" lon="-116.482388">
@@ -4203,7 +4203,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="32.980363" lon="-116.522236">
     <ele>1522.8</ele>
-    <name>SunriseTr</name>
+    <name>Sunrise Trail Junction</name>
     <desc><![CDATA[Sunrise Trailhead Junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="32.977881" lon="-116.526924">
@@ -10675,7 +10675,7 @@
     <sym>Drinking Water</sym>
   </wpt><wpt lat="33.764699" lon="-116.687202">
     <ele>1956.8</ele>
-    <name>ErnieMaxwellTr</name>
+    <name>Ernie Maxwell Trail Junction</name>
     <desc><![CDATA[Earnie Maxwell trailhead, on Fern Valley Rd, just below Humber Park, start of 3.6 mile route to center of Idyllwild.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.742484" lon="-116.702448">
@@ -10900,7 +10900,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="33.666257" lon="-116.575298">
     <ele>1500.7</ele>
-    <name>CedarSprTr</name>
+    <name>Cedar Spr Trail Junction</name>
     <desc><![CDATA[Cedar Spring Trail Junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.676726" lon="-116.576572">
@@ -10920,7 +10920,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="33.690070" lon="-116.609559">
     <ele>1827.0</ele>
-    <name>FobesRanchTr</name>
+    <name>Fobes Ranch Trail Junction</name>
     <desc><![CDATA[Fobes Ranch Trail Junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.675912" lon="-116.675724">
@@ -11045,7 +11045,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="33.710008" lon="-116.622516">
     <ele>2136.3</ele>
-    <name>SpitlerTr</name>
+    <name>Spitler Trail Junction</name>
     <desc><![CDATA[Spitler Trail Junction<br/>---<br/>Many thru-hikers reach the San Jacinto Mountains early in the hiking season when snow and ice still cover parts of the trail. In 2005 a PCT hiker died in the San Jacinto's following a snowstorm. Snow often begins on the north side of Apache Peak and continues 21 miles through Fuller Ridge. If you reach Apache Peak and are uneasy traveling north you can backtrack 1 mile to the Spitler Peak Trail and hike the Spitler to Idyllwild Alternate [see Halfmile's maps]. Snow melts quickly, so trail reports more than a few days old may not be accurate following warm weather.<br/>---<br/>MOUNTAIN FIRE CLOSURE: 8.6 miles of the PCT from the Spitler Peak Trail N to Tahquitz Creek 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 [See Halfmile maps] bypasses this closure.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.719822" lon="-116.620367">
@@ -11055,7 +11055,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="33.716680" lon="-116.624513">
     <ele>2241.0</ele>
-    <name>ApacheSprTr</name>
+    <name>Apache Spr Trail Junction</name>
     <desc><![CDATA[Apache Spring Trail Junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.727728" lon="-116.632800">
@@ -11080,12 +11080,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="33.760705" lon="-116.665620">
     <ele>2479.1</ele>
-    <name>TqtzValTr</name>
+    <name>Tqtz Val Trail Junction</name>
     <desc><![CDATA[Tahquitz Valley Trail]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.770339" lon="-116.664696">
     <ele>2435.7</ele>
-    <name>SkunkLawsTr</name>
+    <name>Skunk Laws Trail Junction</name>
     <desc><![CDATA[Skunk Laws Trail Junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.768201" lon="-116.663562">
@@ -11095,7 +11095,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.757497" lon="-116.671598">
     <ele>2627.1</ele>
-    <name>TqtzPkTr</name>
+    <name>Tqtz Pk Trail Junction</name>
     <desc><![CDATA[Tahquitz Peak Trail]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.755402" lon="-116.677101">
@@ -11120,12 +11120,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="33.787250" lon="-116.652988">
     <ele>2407.6</ele>
-    <name>LawsTr</name>
+    <name>Laws Trail Junction</name>
     <desc><![CDATA[Laws Trail Junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.812466" lon="-116.644019">
     <ele>2560.9</ele>
-    <name>LongValleyTr</name>
+    <name>Long Valley Trail Junction</name>
     <desc><![CDATA[Long Valley Trail Junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.812997" lon="-116.638541">
@@ -11135,7 +11135,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.776877" lon="-116.665271">
     <ele>2436.5</ele>
-    <name>SkunkCabTr</name>
+    <name>Skunk Cab Trail Junction</name>
     <desc><![CDATA[Skunk Cabbage Junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.803041" lon="-116.643474">
@@ -11220,7 +11220,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="33.752766" lon="-116.721851">
     <ele>1712.3</ele>
-    <name>DeerSpringsTr</name>
+    <name>Deer Springs Trail Junction</name>
     <desc><![CDATA[Deer Springs Trail, across road from Idyllwild Nature Center]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.769968" lon="-116.696749">
@@ -11245,7 +11245,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="33.800730" lon="-116.705115">
     <ele>2653.5</ele>
-    <name>MarionMtnTr</name>
+    <name>Marion Mtn Trail Junction</name>
     <desc><![CDATA[Marion Mountain trail junction, Seven Pines Trail junction 100 feet N.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.800683" lon="-116.698779">
@@ -16890,7 +16890,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.991977" lon="-116.664406">
     <ele>704.8</ele>
-    <name>WhitewaterTr</name>
+    <name>Whitewater Trail Junction</name>
     <desc><![CDATA[Whitewater Preserve trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="33.989219" lon="-116.656203">
@@ -16970,12 +16970,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="34.126787" lon="-116.776656">
     <ele>2438.8</ele>
-    <name>AspenGroveTr</name>
+    <name>Aspen Grove Trail Junction</name>
     <desc><![CDATA[Aspen Grove trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.110477" lon="-116.819762">
     <ele>3001.0</ele>
-    <name>BigTreeTr</name>
+    <name>Big Tree Trail Junction</name>
     <desc><![CDATA[Big Tree Camp trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.099089" lon="-116.816494">
@@ -16990,7 +16990,7 @@
     <sym>Drinking Water</sym>
   </wpt><wpt lat="34.110172" lon="-116.823691">
     <ele>3034.2</ele>
-    <name>DryLakeTr</name>
+    <name>Dry Lake Trail Junction</name>
     <desc><![CDATA[Dry Lake Camp trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.124647" lon="-116.778009">
@@ -17010,7 +17010,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.124702" lon="-116.767057">
     <ele>2465.3</ele>
-    <name>FishCrkTr</name>
+    <name>Fish Crk Trail Junction</name>
     <desc><![CDATA[Fish Creek Trailhead]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.099252" lon="-116.824938">
@@ -17020,7 +17020,7 @@
     <sym>Summit</sym>
   </wpt><wpt lat="34.101212" lon="-116.830676">
     <ele>3466.2</ele>
-    <name>VivianCrkTr</name>
+    <name>Vivian Crk Trail Junction</name>
     <desc><![CDATA[Vivian Creek trail junction, signed San Gorgonio Mtn, Mineshaft Flat.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.130970" lon="-116.756670">
@@ -23608,7 +23608,7 @@
     <sym>Summit</sym>
   </wpt><wpt lat="34.362759" lon="-117.900183">
     <ele>1716.8</ele>
-    <name>BurkhartTr</name>
+    <name>Burkhart Trail Junction</name>
     <desc><![CDATA[Burkhart Trail, 1st PCT junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.413641" lon="-117.890028">
@@ -23618,7 +23618,7 @@
     <sym>Drinking Water</sym>
   </wpt><wpt lat="34.401314" lon="-117.843723">
     <ele>1513.4</ele>
-    <name>DevilsChairTr</name>
+    <name>Devils Chair Trail Junction</name>
     <desc><![CDATA[Devils Chair trail junction - detour mile 8.2.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.400434" lon="-117.839860">
@@ -23643,12 +23643,12 @@
     <sym>Picnic Area</sym>
   </wpt><wpt lat="34.405765" lon="-117.868750">
     <ele>1607.2</ele>
-    <name>PunchbowlPrkTr</name>
+    <name>Punchbowl Prk Trail Junction</name>
     <desc><![CDATA[Trail to Devils Punchbowl County Park [park is 9/10 mile SE of detour] - detour mile 10.8.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.396915" lon="-117.822178">
     <ele>1379.1</ele>
-    <name>PunchbowlTr</name>
+    <name>Punchbowl Trail Junction</name>
     <desc><![CDATA[Punchbowl Trail Junction - detour mile 5.4.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.366806" lon="-117.847986">
@@ -27825,7 +27825,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="34.688906" lon="-118.527883">
     <ele>1463.1</ele>
-    <name>ShakeCGTR</name>
+    <name>Shake CG Trail Junction</name>
     <desc><![CDATA[Upper Shake Campground Trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.691850" lon="-118.528910">
@@ -27850,7 +27850,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="34.703420" lon="-118.576145">
     <ele>1524.1</ele>
-    <name>SawmillCGTR</name>
+    <name>Sawmill CG Trail Junction</name>
     <desc><![CDATA[Sawmill Campground Trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="34.708894" lon="-118.587710">
@@ -35033,7 +35033,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="36.139137" lon="-118.140020">
     <ele>2459.9</ele>
-    <name>HaiweeTR</name>
+    <name>Haiwee Trail Junction</name>
     <desc><![CDATA[Haiwee Trail Junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.152432" lon="-118.145326">
@@ -35078,17 +35078,17 @@
     <sym>Campground</sym>
   </wpt><wpt lat="36.227402" lon="-118.134708">
     <ele>2717.5</ele>
-    <name>MonacheMdwTr</name>
+    <name>Monache Mdw Trail Junction</name>
     <desc><![CDATA[Monache Meadow Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.224206" lon="-118.128890">
     <ele>2775.4</ele>
-    <name>OlanchaPassTr</name>
+    <name>Olancha Pass Trail Junction</name>
     <desc><![CDATA[Olancha Pass Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.225386" lon="-118.127403">
     <ele>2800.8</ele>
-    <name>OlanchaPassTr2</name>
+    <name>Olancha Pass Trail Junction #2</name>
     <desc><![CDATA[Olancha Pass 2nd trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.232096" lon="-118.121977">
@@ -35221,11 +35221,6 @@
     <name>Campsite, Water &amp; Bear Locker - 767</name>
     <desc><![CDATA[Campsite, water, bear box, Crabtree Ranger, 1 mile NE of PCT.]]></desc>
     <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="35.663089" lon="-118.027357">
     <ele>1604.5</ele>
     <name>Milestone - 652</name>
@@ -41528,7 +41523,7 @@
         <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
       </gpxx:TrackExtension>
     </extensions>
-    <desc>California Section H. Off-Track: Bear Ridge Trail</desc><cmt/><trkseg>
+    <desc>California Section H. Off-Track: Bear Ridge Trail</desc><cmt>simplification:keep</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>
@@ -44137,7 +44132,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="36.574997" lon="-118.250497">
     <ele>3056.7</ele>
-    <name>LonePineLkTR</name>
+    <name>Lone Pine Lk Trail Junction</name>
     <desc><![CDATA[Lone Pine Lake trail junction, 5.5 miles E of Mt Whitney trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.578578" lon="-118.292144">
@@ -44147,7 +44142,7 @@
     <sym>Summit</sym>
   </wpt><wpt lat="36.564760" lon="-118.350371">
     <ele>3263.5</ele>
-    <name>RockCreekTR</name>
+    <name>Rock Creek Trail Junction</name>
     <desc><![CDATA[Rock Creek trail junction, 8/10 mile E of PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.559306" lon="-118.291512">
@@ -44227,7 +44222,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="36.560536" lon="-118.293099">
     <ele>4101.1</ele>
-    <name>WhitneyPtlTR</name>
+    <name>Whitney Ptl Trail Junction</name>
     <desc><![CDATA[Whitney Portal trail junction, 6.3 miles E of PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.590789" lon="-118.370358">
@@ -44242,7 +44237,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="36.594283" lon="-118.371148">
     <ele>3172.8</ele>
-    <name>JunctionMdwTR</name>
+    <name>Junction Mdw Trail Junction</name>
     <desc><![CDATA[Junction Meadow Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.598054" lon="-118.375016">
@@ -44267,7 +44262,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="36.639757" lon="-118.388285">
     <ele>3315.2</ele>
-    <name>TyndallRngrTR</name>
+    <name>Tyndall Rngr Trail Junction</name>
     <desc><![CDATA[Trail to Tyndall Creek Ranger Station.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.639910" lon="-118.388327">
@@ -44277,7 +44272,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="36.641318" lon="-118.387491">
     <ele>3329.4</ele>
-    <name>ShepherdPassTR</name>
+    <name>Shepherd Pass Trail Junction</name>
     <desc><![CDATA[Shepherd Pass Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.642122" lon="-118.387513">
@@ -44382,7 +44377,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="36.760230" lon="-118.412249">
     <ele>2914.5</ele>
-    <name>CedarGroveTR</name>
+    <name>Cedar Grove Trail Junction</name>
     <desc><![CDATA[Cedar Grove Trail junction to Road's End.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.764506" lon="-118.407986">
@@ -44397,7 +44392,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="36.768131" lon="-118.411467">
     <ele>3207.9</ele>
-    <name>BullFrogLkTR</name>
+    <name>Bull Frog Lk Trail Junction</name>
     <desc><![CDATA[Bullfrog Lake Trail junction, joins the Onion Valley trail near Kearsarge Pass.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.768246" lon="-118.411384">
@@ -44417,7 +44412,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="36.773681" lon="-118.381803">
     <ele>3474.0</ele>
-    <name>KearsargeLkTR</name>
+    <name>Kearsarge Lk Trail Junction</name>
     <desc><![CDATA[Kearsarge Lake, Bullfrog Lake trail junction, 2.5 miles E of PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.773012" lon="-118.376595">
@@ -44437,12 +44432,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="36.770610" lon="-118.416297">
     <ele>3275.4</ele>
-    <name>CharlotteLkTR</name>
+    <name>Charlotte Lk Trail Junction</name>
     <desc><![CDATA[Charlotte Lake Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.773290" lon="-118.417892">
     <ele>3284.1</ele>
-    <name>OnionValleyTR</name>
+    <name>Onion Valley Trail Junction</name>
     <desc><![CDATA[Onion Valley Trail junction to Kearsarge Pass.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.782932" lon="-118.422586">
@@ -44467,7 +44462,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="36.802766" lon="-118.402551">
     <ele>3219.5</ele>
-    <name>SixtyLkBasinTR</name>
+    <name>Sixty Lk Basin Trail Junction</name>
     <desc><![CDATA[Sixty Lakes Basin Trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.803584" lon="-118.402038">
@@ -44512,7 +44507,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="36.834616" lon="-118.408192">
     <ele>3114.3</ele>
-    <name>BaxterPassTR</name>
+    <name>Baxter Pass Trail Junction</name>
     <desc><![CDATA[Baxter Pass Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.849802" lon="-118.412590">
@@ -44537,7 +44532,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="36.873774" lon="-118.439193">
     <ele>2602.1</ele>
-    <name>ParadiseValTR</name>
+    <name>Paradise Val Trail Junction</name>
     <desc><![CDATA[Paradise Valley Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.879628" lon="-118.433491">
@@ -44572,7 +44567,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="36.902592" lon="-118.400413">
     <ele>3160.5</ele>
-    <name>SawmillPassTR</name>
+    <name>Sawmill Pass Trail Junction</name>
     <desc><![CDATA[Sawmill Pass Trail junction, trail not maintained.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.927529" lon="-118.406366">
@@ -44622,7 +44617,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="36.962155" lon="-118.438753">
     <ele>3285.1</ele>
-    <name>TaboosePassTR</name>
+    <name>Taboose Pass Trail Junction</name>
     <desc><![CDATA[Taboose Pass Trail]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.969124" lon="-118.441787">
@@ -44767,7 +44762,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="37.052793" lon="-118.579340">
     <ele>2450.1</ele>
-    <name>SimpsonMdwTR</name>
+    <name>Simpson Mdw Trail Junction</name>
     <desc><![CDATA[Simpson Meadow Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.052761" lon="-118.579433">
@@ -44837,7 +44832,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.094110" lon="-118.594325">
     <ele>2667.2</ele>
-    <name>BishopPassTR</name>
+    <name>Bishop Pass Trail Junction</name>
     <desc><![CDATA[Bishop Pass Trail Junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.099616" lon="-118.597659">
@@ -45157,7 +45152,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="37.225804" lon="-118.861256">
     <ele>2404.7</ele>
-    <name>FlorenceLakeTR</name>
+    <name>Florence Lake Trail Junction</name>
     <desc><![CDATA[Florence Lake Trail junction to Muir Ranch.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.234050" lon="-118.882512">
@@ -45167,7 +45162,7 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="37.237186" lon="-118.877662">
     <ele>2378.4</ele>
-    <name>KingsNPTR</name>
+    <name>Kings NP Trail Junction</name>
     <desc><![CDATA[Kings National Park trail junction, 1.3 miles NW of PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.236853" lon="-118.880076">
@@ -45187,7 +45182,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="37.242209" lon="-118.871757">
     <ele>2563.5</ele>
-    <name>FlorenceLakeTR2</name>
+    <name>Florence Lake Trail Junction #2</name>
     <desc><![CDATA[Trail to Florence Lake and Muir Ranch]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.253533" lon="-118.864398">
@@ -45252,7 +45247,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="37.316619" lon="-118.872172">
     <ele>3059.3</ele>
-    <name>RoseLakeTR</name>
+    <name>Rose Lake Trail Junction</name>
     <desc><![CDATA[Rose Lake Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.319557" lon="-118.869566">
@@ -45272,7 +45267,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="37.330297" lon="-118.867182">
     <ele>2919.3</ele>
-    <name>7GablesLakeTR</name>
+    <name>7 Gables Lake Trail Junction</name>
     <desc><![CDATA[Seven Gables Lake Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.344545" lon="-118.875128">
@@ -45282,7 +45277,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="37.345651" lon="-118.876151">
     <ele>2843.2</ele>
-    <name>LakeItalyTR</name>
+    <name>Lake Italy Trail Junction</name>
     <desc><![CDATA[Lake Italy Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.351065" lon="-118.877980">
@@ -45307,7 +45302,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="37.368113" lon="-118.888484">
     <ele>2726.2</ele>
-    <name>BearCreekTR</name>
+    <name>Bear Creek Trail Junction</name>
     <desc><![CDATA[Bear Creek Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.372645" lon="-118.896112">
@@ -45352,7 +45347,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.372780" lon="-119.007271">
     <ele>2372.1</ele>
-    <name>MonoMeadowTR</name>
+    <name>Mono Meadow Trail Junction</name>
     <desc><![CDATA[Mono Meadow Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.369239" lon="-118.979802">
@@ -45397,7 +45392,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="37.412557" lon="-118.924659">
     <ele>2407.7</ele>
-    <name>VVRFerryTR</name>
+    <name>VVRFerry Trail Junction</name>
     <desc><![CDATA[Lake Edison Ferry Trail junction to Vermilion Valley Resort.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.415591" lon="-118.915219">
@@ -45412,7 +45407,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="37.422261" lon="-118.910489">
     <ele>2546.8</ele>
-    <name>MonoPassTR</name>
+    <name>Mono Pass Trail Junction</name>
     <desc><![CDATA[Mono Pass Trail junction, campsites nearby.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.433611" lon="-118.908591">
@@ -45422,7 +45417,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="37.438441" lon="-118.907376">
     <ele>2745.7</ele>
-    <name>MottLakeTR</name>
+    <name>Mott Lake Trail Junction</name>
     <desc><![CDATA[Mott Lake Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.438706" lon="-118.907570">
@@ -45472,7 +45467,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="37.475055" lon="-118.929442">
     <ele>3211.9</ele>
-    <name>GoodalePassTR</name>
+    <name>Goodale Pass Trail Junction</name>
     <desc><![CDATA[Goodale Pass Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.475961" lon="-118.928301">
@@ -45502,7 +45497,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="37.491055" lon="-118.932884">
     <ele>2805.4</ele>
-    <name>CascadeValTR</name>
+    <name>Cascade Val Trail Junction</name>
     <desc><![CDATA[Cascade Valley Trail]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.491366" lon="-118.932909">
@@ -45537,7 +45532,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="37.501661" lon="-118.924643">
     <ele>2902.8</ele>
-    <name>McGeePassTR</name>
+    <name>Mc Gee Pass Trail Junction</name>
     <desc><![CDATA[McGee Pass Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.503900" lon="-118.922606">
@@ -45572,7 +45567,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="37.527472" lon="-118.949502">
     <ele>3028.4</ele>
-    <name>FishCrkTR2</name>
+    <name>Fish Crk Trail Junction #2</name>
     <desc><![CDATA[Fish Creek Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.528977" lon="-118.950095">
@@ -45582,12 +45577,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="37.528996" lon="-118.950295">
     <ele>3041.7</ele>
-    <name>RamLakeTR</name>
+    <name>Ram Lake Trail Junction</name>
     <desc><![CDATA[Ram Lake Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.538319" lon="-118.969102">
     <ele>3101.1</ele>
-    <name>DuckLakeTR</name>
+    <name>Duck Lake Trail Junction</name>
     <desc><![CDATA[Duck Lake Trail junction. No camping within 300 feet of the outlet of Duck Lake.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.539139" lon="-118.971318">
@@ -45617,7 +45612,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="37.586274" lon="-119.051574">
     <ele>2719.7</ele>
-    <name>HorseshoeLkTR</name>
+    <name>Horseshoe Lk Trail Junction</name>
     <desc><![CDATA[Horseshoe Lake Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.587717" lon="-119.055078">
@@ -45637,7 +45632,7 @@
     <sym>Car</sym>
   </wpt><wpt lat="37.591205" lon="-119.058482">
     <ele>2639.4</ele>
-    <name>MammothPassTR</name>
+    <name>Mammoth Pass Trail Junction</name>
     <desc><![CDATA[Horseshoe Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.600224" lon="-119.062102">
@@ -45662,22 +45657,22 @@
     <sym>Shopping Center</sym>
   </wpt><wpt lat="37.612044" lon="-119.076984">
     <ele>2325.4</ele>
-    <name>RainbowFallsTR</name>
+    <name>Rainbow Falls Trail Junction</name>
     <desc><![CDATA[Rainbow Falls Trail junction, trailhead parking 1/10 mile N.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.613987" lon="-119.082863">
     <ele>2279.8</ele>
-    <name>DevilsPostTR</name>
+    <name>Devils Post Trail Junction</name>
     <desc><![CDATA[Alternate route through Devils Postpile.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.621142" lon="-119.081971">
     <ele>2319.4</ele>
-    <name>RedsMdwTR3</name>
+    <name>Reds Mdw Trail Junction #3</name>
     <desc><![CDATA[One of several trails to Reds Meadow Store, Campground, 6/10 mile N of PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.627300" lon="-119.085958">
     <ele>2301.9</ele>
-    <name>SodaSpringsTR</name>
+    <name>Soda Springs Trail Junction</name>
     <desc><![CDATA[Soda Springs trail junction, King Crater trail junction 120 feet NW, 1.1 miles N of PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.627194" lon="-119.085674">
@@ -45690,11 +45685,6 @@
     <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">
-    <ele>2341.0</ele>
-    <name>JMT0909</name>
-    <desc><![CDATA[Pacific Crest Trail and John Muir Trail diverge to the north.]]></desc>
-    <sym>Flag, Blue</sym>
   </wpt><wpt lat="37.693988" lon="-119.137521">
     <ele>2692.4</ele>
     <name>Campsite - 909</name>
@@ -45712,12 +45702,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="37.647072" lon="-119.099794">
     <ele>2477.4</ele>
-    <name>MinaretLakeTR</name>
+    <name>Minaret Lake Trail Junction</name>
     <desc><![CDATA[Minaret Lake trail junction, 1.5 miles N on JMT alternate route.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.640342" lon="-119.093782">
     <ele>2468.1</ele>
-    <name>SuperiorLakeTR</name>
+    <name>Superior Lake Trail Junction</name>
     <desc><![CDATA[Superior Lake trail junction, on the JMT alternate route, 8/10 mile N of PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.641827" lon="-119.096206">
@@ -45822,7 +45812,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="37.681969" lon="-119.086320">
     <ele>2533.3</ele>
-    <name>AgnewMdwTR</name>
+    <name>Agnew Mdw Trail Junction</name>
     <desc><![CDATA[Agnew Meadow Trailhead]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.650746" lon="-119.036777">
@@ -45842,14 +45832,9 @@
     <sym>Campground</sym>
   </wpt><wpt lat="37.729846" lon="-119.145688">
     <ele>2897.7</ele>
-    <name>AgnewPassTR</name>
+    <name>Agnew Pass Trail Junction</name>
     <desc><![CDATA[Agnew Pass Trail junction]]></desc>
     <sym>Trail Head</sym>
-  </wpt><wpt lat="37.728520" lon="-119.171303">
-    <ele>3001.0</ele>
-    <name>JMT0923</name>
-    <desc><![CDATA[John Muir Trail rejoins PCT. No camping within 1/4 mile of the outlet of Thousand Island Lake.]]></desc>
-    <sym>Flag, Blue</sym>
   </wpt><wpt lat="37.736621" lon="-119.194337">
     <ele>3117.1</ele>
     <name>IslandPass</name>
@@ -45862,7 +45847,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="37.741986" lon="-119.208427">
     <ele>2956.3</ele>
-    <name>DavisLakesTR</name>
+    <name>Davis Lakes Trail Junction</name>
     <desc><![CDATA[Davis Lakes Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.742360" lon="-119.210373">
@@ -45872,7 +45857,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="37.743823" lon="-119.211150">
     <ele>2939.7</ele>
-    <name>RushCreekTR</name>
+    <name>Rush Creek Trail Junction</name>
     <desc><![CDATA[Rush Creek Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.744052" lon="-119.212569">
@@ -45882,7 +45867,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="37.749325" lon="-119.220301">
     <ele>3066.9</ele>
-    <name>MarieLakeTR</name>
+    <name>Marie Lake Trail Junction</name>
     <desc><![CDATA[Marie Lakes Trail]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.749618" lon="-119.220425">
@@ -45962,7 +45947,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="37.826493" lon="-119.279165">
     <ele>2709.1</ele>
-    <name>EvelynLakeTR</name>
+    <name>Evelyn Lake Trail Junction</name>
     <desc><![CDATA[Evelyn Lake Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.838821" lon="-119.285015">
@@ -45977,7 +45962,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="37.866792" lon="-119.323090">
     <ele>2658.6</ele>
-    <name>VogelsangTR</name>
+    <name>Vogelsang Trail Junction</name>
     <desc><![CDATA[Vogelsang Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.868774" lon="-119.333623">
@@ -45997,7 +45982,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="37.877606" lon="-119.339261">
     <ele>2642.9</ele>
-    <name>TuolumneLdgTR</name>
+    <name>Tuolumne Ldg Trail Junction</name>
     <desc><![CDATA[Tuolumne Meadows Lodge Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="36.558933" lon="-118.361780">
@@ -49896,24 +49881,19 @@
     <name>Gate - 943</name>
     <desc><![CDATA[Trail gate]]></desc>
     <sym>Flag, Green</sym>
-  </wpt><wpt lat="37.878806" lon="-119.365185">
-    <ele>2622.5</ele>
-    <name>JMT0943</name>
-    <desc><![CDATA[John Muir Trail to Yosemite Valley.]]></desc>
-    <sym>Flag, Blue</sym>
   </wpt><wpt lat="37.848263" lon="-119.414862">
     <ele>2875.8</ele>
-    <name>CathedralLkTR</name>
+    <name>Cathedral Lk Trail Junction</name>
     <desc><![CDATA[Cathedral Lake trail junction, 4.4 miles S of PCT on the JMT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.793446" lon="-119.433158">
     <ele>2839.4</ele>
-    <name>CloudsRestTR</name>
+    <name>Clouds Rest Trail Junction</name>
     <desc><![CDATA[Clouds Rest trail junction, 9 miles S of PCT on the JMT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.744124" lon="-119.503772">
     <ele>2184.1</ele>
-    <name>CloudsRestTR2</name>
+    <name>Clouds Rest Trail Junction #2</name>
     <desc><![CDATA[2nd trail junction to Clouds Rest, 15.6 miles S of PCT on the JMT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.789654" lon="-119.434616">
@@ -49933,12 +49913,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="37.757382" lon="-119.478607">
     <ele>2441.4</ele>
-    <name>ForsythTR</name>
+    <name>Forsyth Trail Junction</name>
     <desc><![CDATA[Forsyth trail junction, 13.5 miles S of PCT on the JMT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.745071" lon="-119.512716">
     <ele>2127.6</ele>
-    <name>HalfDomeTR</name>
+    <name>Half Dome Trail Junction</name>
     <desc><![CDATA[Half Dome trail junction, 16.2 miles S of PCT on the JMT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.732855" lon="-119.557873">
@@ -49953,27 +49933,27 @@
     <sym>Car</sym>
   </wpt><wpt lat="37.722438" lon="-119.535426">
     <ele>1831.5</ele>
-    <name>IllilouetteTR</name>
+    <name>Illilouette Trail Junction</name>
     <desc><![CDATA[Illilouette trail junction, 19.2 miles S of PCT on the JMT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.756253" lon="-119.478933">
     <ele>2424.5</ele>
-    <name>MercedLakeTR</name>
+    <name>Merced Lake Trail Junction</name>
     <desc><![CDATA[Merced Lake trail junction, 13.6 miles S of PCT on the JMT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.731986" lon="-119.515665">
     <ele>1865.7</ele>
-    <name>MercedLakeTR2</name>
+    <name>Merced Lake Trail Junction #2</name>
     <desc><![CDATA[2nd trail junction to Merced Lake, 17.7 miles S of PCT on the JMT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.726253" lon="-119.548618">
     <ele>1395.6</ele>
-    <name>MistTR</name>
+    <name>Mist Trail Junction</name>
     <desc><![CDATA[Mist Trail junction, 21.3 miles S of PCT on the JMT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.877958" lon="-119.366126">
     <ele>2620.0</ele>
-    <name>SodaSpringTR</name>
+    <name>Soda Spring Trail Junction</name>
     <desc><![CDATA[Soda Spring trail junction, 2/10 mi S of PCT on the JMT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.794764" lon="-119.432298">
@@ -49983,22 +49963,22 @@
     <sym>Campground</sym>
   </wpt><wpt lat="37.872062" lon="-119.383826">
     <ele>2621.5</ele>
-    <name>TenayaLakeTR</name>
+    <name>Tenaya Lake Trail Junction</name>
     <desc><![CDATA[Tenaya Lake trail junction, 1.6 miles S of PCT on the JMT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.726175" lon="-119.530475">
     <ele>1821.7</ele>
-    <name>VernalFallsTR</name>
+    <name>Vernal Falls Trail Junction</name>
     <desc><![CDATA[Vernal Falls trail junction, 18.7 miles S of PCT on the JMT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.725028" lon="-119.544958">
     <ele>1676.3</ele>
-    <name>VernalFallsTR2</name>
+    <name>Vernal Falls Trail Junction #2</name>
     <desc><![CDATA[2nd trail junction to Vernal Falls, 20 miles S of PCT on the JMT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.871104" lon="-119.371672">
     <ele>2621.9</ele>
-    <name>VisitorCntrTR</name>
+    <name>Visitor Cntr Trail Junction</name>
     <desc><![CDATA[Trail junction to Visitor Center, 7/10 mile S of PCT on the JMT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="37.877377" lon="-119.366200">
@@ -53573,7 +53553,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="38.722208" lon="-120.012136">
     <ele>2554.1</ele>
-    <name>TahoeRimTr</name>
+    <name>Tahoe Rim Trail Junction</name>
     <desc><![CDATA[Tahoe Rim Trail joins the Pacific Crest Trail. Round Lake trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="38.728173" lon="-120.018618">
@@ -60714,7 +60694,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="39.602161" lon="-120.661923">
     <ele>2255.4</ele>
-    <name>SierraButtesTR</name>
+    <name>Sierra Buttes Trail Junction</name>
     <desc><![CDATA[Trail junction to Sierra Buttes.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.662194" lon="-120.674393">
@@ -60749,7 +60729,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="39.690814" lon="-120.701004">
     <ele>2230.8</ele>
-    <name>SilverLakeTR</name>
+    <name>Silver Lake Trail Junction</name>
     <desc><![CDATA[Silver Lake trail junction, the lake is 1.75 miles off-trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.696011" lon="-120.703855">
@@ -60779,7 +60759,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="39.707313" lon="-120.720918">
     <ele>2209.6</ele>
-    <name>WadesLakeTR</name>
+    <name>Wades Lake Trail Junction</name>
     <desc><![CDATA[Wades Lake (1.25 miles), Mount Washington trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.715030" lon="-120.745287">
@@ -60839,7 +60819,7 @@
     <sym>Drinking Water</sym>
   </wpt><wpt lat="39.767428" lon="-120.858840">
     <ele>2032.5</ele>
-    <name>WhiskySpringTR</name>
+    <name>Whisky Spring Trail Junction</name>
     <desc><![CDATA[Whisky Spring trail junction, spring is 3/10 mile off trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.771962" lon="-120.864079">
@@ -60894,7 +60874,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="39.770395" lon="-120.961522">
     <ele>1795.6</ele>
-    <name>BaldMountainTR</name>
+    <name>Bald Mountain Trail Junction</name>
     <desc><![CDATA[Bald Mountain trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.767018" lon="-120.985217">
@@ -60924,7 +60904,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="39.786992" lon="-121.012570">
     <ele>1505.8</ele>
-    <name>FowlerCreekTR</name>
+    <name>Fowler Creek Trail Junction</name>
     <desc><![CDATA[Trail junction to Fowler Creek]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.786163" lon="-121.011290">
@@ -60939,7 +60919,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="39.804284" lon="-121.041753">
     <ele>954.9</ele>
-    <name>ButteBarTR</name>
+    <name>Butte Bar Trail Junction</name>
     <desc><![CDATA[Butte Bar trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.808315" lon="-121.045186">
@@ -61074,17 +61054,17 @@
     <sym>Campground</sym>
   </wpt><wpt lat="39.932377" lon="-121.132328">
     <ele>2102.4</ele>
-    <name>SpanishPeakTR</name>
+    <name>Spanish Peak Trail Junction</name>
     <desc><![CDATA[Spanish Peak trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.932131" lon="-121.137101">
     <ele>2093.2</ele>
-    <name>RightHandBranchTR</name>
+    <name>Right Hand Branch Trail Junction</name>
     <desc><![CDATA[Right Hand Branch trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.938212" lon="-121.147410">
     <ele>2092.7</ele>
-    <name>SilverLakeTR2</name>
+    <name>Silver Lake Trail Junction #2</name>
     <desc><![CDATA[Silver Lake trail junction (the lake is 2 miles E), large campsite nearby.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.954938" lon="-121.160263">
@@ -61094,7 +61074,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="39.961696" lon="-121.179076">
     <ele>2029.4</ele>
-    <name>ClearCreekSpringTR</name>
+    <name>Clear Creek Spring Trail Junction</name>
     <desc><![CDATA[Clear Creek Springs trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.961689" lon="-121.179562">
@@ -61119,7 +61099,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="39.972825" lon="-121.202968">
     <ele>1911.1</ele>
-    <name>MillCreekTR</name>
+    <name>Mill Creek Trail Junction</name>
     <desc><![CDATA[Mill Creek Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.972864" lon="-121.203249">
@@ -61129,7 +61109,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="39.975111" lon="-121.218321">
     <ele>1900.7</ele>
-    <name>ThreeLakesTR</name>
+    <name>Three Lakes Trail Junction</name>
     <desc><![CDATA[Three Lakes trail junction (the lake is 1/2 mile off trail).]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="39.975663" lon="-121.228621">
@@ -61159,7 +61139,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="39.981131" lon="-121.251285">
     <ele>1697.9</ele>
-    <name>CanyonViewSpringTR</name>
+    <name>Canyon View Spring Trail Junction</name>
     <desc><![CDATA[Canyon View Spring trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.002131" lon="-121.256799">
@@ -65168,7 +65148,7 @@
     <sym>Powerline</sym>
   </wpt><wpt lat="40.008469" lon="-121.273677">
     <ele>738.3</ele>
-    <name>ChipsCreekTR</name>
+    <name>Chips Creek Trail Junction</name>
     <desc><![CDATA[Chips Creek trail junction. Creek is 3/10 mi from the PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.008817" lon="-121.273861">
@@ -65278,7 +65258,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="40.053166" lon="-121.386689">
     <ele>2162.4</ele>
-    <name>FrogMountainTR</name>
+    <name>Frog Mountain Trail Junction</name>
     <desc><![CDATA[Frog Mountain trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.054633" lon="-121.382313">
@@ -65293,7 +65273,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="40.101953" lon="-121.386298">
     <ele>1977.9</ele>
-    <name>ColdSpringsTR</name>
+    <name>Cold Springs Trail Junction</name>
     <desc><![CDATA[Cold Springs trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.101550" lon="-121.387096">
@@ -65313,12 +65293,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="40.126666" lon="-121.402918">
     <ele>2186.4</ele>
-    <name>ButteCountyHighTR</name>
+    <name>Butte County High Trail Junction</name>
     <desc><![CDATA[Butte County High Point trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.156044" lon="-121.423757">
     <ele>2050.6</ele>
-    <name>HumboldtPeakTR</name>
+    <name>Humboldt Peak Trail Junction</name>
     <desc><![CDATA[Humboldt Peak trail]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.151889" lon="-121.436206">
@@ -65358,7 +65338,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="40.195122" lon="-121.417434">
     <ele>2017.9</ele>
-    <name>CarterMeadowTR</name>
+    <name>Carter Meadow Trail Junction</name>
     <desc><![CDATA[Carter Meadow trail junction, small campsites nearby.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.204581" lon="-121.389342">
@@ -65368,7 +65348,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="40.210046" lon="-121.382869">
     <ele>2325.9</ele>
-    <name>ButtMountainTR</name>
+    <name>Butt Mountain Trail Junction</name>
     <desc><![CDATA[Butt Mountain trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.210249" lon="-121.379604">
@@ -65493,7 +65473,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="40.409279" lon="-121.384069">
     <ele>1801.1</ele>
-    <name>BoundarySpringTR</name>
+    <name>Boundary Spring Trail Junction</name>
     <desc><![CDATA[Boundary Spring trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.408892" lon="-121.382727">
@@ -65508,12 +65488,12 @@
     <sym>Forest</sym>
   </wpt><wpt lat="40.422399" lon="-121.379519">
     <ele>1837.9</ele>
-    <name>TerminalGeyserTR</name>
+    <name>Terminal Geyser Trail Junction</name>
     <desc><![CDATA[Trail junction, PCT goes to the right, alternate Terminal Geyser Trail from Warner Valley to Terminal Geyser.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.439434" lon="-121.400726">
     <ele>1793.5</ele>
-    <name>BoilingSpringsTR</name>
+    <name>Boiling Springs Trail Junction</name>
     <desc><![CDATA[Boiling Springs Lake Circuit trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.441758" lon="-121.403524">
@@ -65543,7 +65523,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="40.460621" lon="-121.402610">
     <ele>1822.9</ele>
-    <name>KellyCampTR</name>
+    <name>Kelly Camp Trail Junction</name>
     <desc><![CDATA[Kelly Camp trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.463834" lon="-121.403944">
@@ -65558,12 +65538,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="40.478553" lon="-121.369149">
     <ele>1959.4</ele>
-    <name>HorseshoeLakeTR</name>
+    <name>Horseshoe Lake Trail Junction</name>
     <desc><![CDATA[Horseshoe Lake trail junction, the lake is 2 miles off-trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.493546" lon="-121.365190">
     <ele>2037.2</ele>
-    <name>HorseshoeLakeTR2</name>
+    <name>Horseshoe Lake Trail Junction #2</name>
     <desc><![CDATA[Another trail to Horseshoe Lake. Lake is 2.2 miles off-trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.499362" lon="-121.364862">
@@ -65578,37 +65558,37 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="40.505507" lon="-121.362249">
     <ele>1995.5</ele>
-    <name>UpperTwinLakeTR</name>
+    <name>Upper Twin Lake Trail Junction</name>
     <desc><![CDATA[Upper Twin Lake trail junction. The lake is 1/2 mile off-trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.508244" lon="-121.360919">
     <ele>1995.6</ele>
-    <name>RainbowLakeTR</name>
+    <name>Rainbow Lake Trail Junction</name>
     <desc><![CDATA[Rainbow Lake trail junction. The lake is 1/2 mile off-trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.510299" lon="-121.362788">
     <ele>1995.5</ele>
-    <name>EchoLakeTR</name>
+    <name>Echo Lake Trail Junction</name>
     <desc><![CDATA[Echo Lake trail junction. The lake is 2.2 miles off-trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.515657" lon="-121.364719">
     <ele>1992.2</ele>
-    <name>FeatherLakeTR</name>
+    <name>Feather Lake Trail Junction</name>
     <desc><![CDATA[Feather Lake trail junction. The lake is 1.1 miles off-trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.547123" lon="-121.365203">
     <ele>1937.9</ele>
-    <name>NoblesEmigrantTR</name>
+    <name>Nobles Emigrant Trail Junction</name>
     <desc><![CDATA[Nobles Emigrant Trail junction to Cinder Cone.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.561039" lon="-121.406505">
     <ele>1901.8</ele>
-    <name>ClusterLakeTR</name>
+    <name>Cluster Lake Trail Junction</name>
     <desc><![CDATA[Cluster Lake trail junction. The lake is 2 miles off-trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.561027" lon="-121.408891">
     <ele>1912.5</ele>
-    <name>BadgerFlatSpringTR</name>
+    <name>Badger Flat Spring Trail Junction</name>
     <desc><![CDATA[Badger Flat Spring trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.563179" lon="-121.443099">
@@ -65683,7 +65663,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="40.667043" lon="-121.440865">
     <ele>1374.4</ele>
-    <name>SpatterConesTR</name>
+    <name>Spatter Cones Trail Junction</name>
     <desc><![CDATA[Spatter Cones trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.668343" lon="-121.429048">
@@ -65718,7 +65698,7 @@
     <sym>Restaurant</sym>
   </wpt><wpt lat="40.680901" lon="-121.418420">
     <ele>1329.7</ele>
-    <name>SubwayCaveTR</name>
+    <name>Subway Cave Trail Junction</name>
     <desc><![CDATA[Subway Cave trail junction, water fountain 4/10 mile off trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.686058" lon="-121.418915">
@@ -65763,7 +65743,7 @@
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.758291" lon="-121.396807">
     <ele>1463.2</ele>
-    <name>LostCreekSpringTR</name>
+    <name>Lost Creek Spring Trail Junction</name>
     <desc><![CDATA[Trail junction to Lost Creek Spring, 3/10 mile NW, 388 foot vertical descent from trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.755759" lon="-121.388912">
@@ -65858,7 +65838,7 @@
     <sym>Flag, Green</sym>
   </wpt><wpt lat="40.926602" lon="-121.541466">
     <ele>925.3</ele>
-    <name>RockCreekTR2</name>
+    <name>Rock Creek Trail Junction #2</name>
     <desc><![CDATA[Rock Creek trail junction, no camping sign.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="40.927153" lon="-121.542357">
@@ -65988,9 +65968,9 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.009994" lon="-121.611865">
     <ele>916.3</ele>
-    <name>RimLakeSpringTR</name>
+    <name>Rim Lake Spring Trail Junction</name>
     <desc><![CDATA[Rim of the Lake Spring trail junction (1/4 mile off-trail). ]]></desc>
-    <sym>Water Source</sym>
+    <sym>Trail Head</sym>
   </wpt><wpt lat="41.013051" lon="-121.620800">
     <ele>920.5</ele>
     <name>Road36N10</name>
@@ -69051,7 +69031,7 @@
     </trkseg>
   </trk><wpt lat="41.010740" lon="-121.653106">
     <ele>897.4</ele>
-    <name>BurneyFallsTR</name>
+    <name>Burney Falls Trail Junction</name>
     <desc><![CDATA[Burney Falls trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.012642" lon="-121.650383">
@@ -69196,7 +69176,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.098216" lon="-121.795261">
     <ele>1644.5</ele>
-    <name>RedMountainPondTR</name>
+    <name>Red Mountain Pond Trail Junction</name>
     <desc><![CDATA[Red Mountain Pond trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.101559" lon="-121.788109">
@@ -69246,7 +69226,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.176567" lon="-121.831226">
     <ele>1615.5</ele>
-    <name>MooseheadCreekTR</name>
+    <name>Moosehead Creek Trail Junction</name>
     <desc><![CDATA[Moosehead Creek trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.177123" lon="-121.831842">
@@ -69291,7 +69271,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="41.157895" lon="-121.920605">
     <ele>1646.8</ele>
-    <name>AlderCreekTR</name>
+    <name>Alder Creek Trail Junction</name>
     <desc><![CDATA[Alder Creek trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.164606" lon="-121.920758">
@@ -69326,7 +69306,7 @@
     <sym>Powerline</sym>
   </wpt><wpt lat="41.135210" lon="-121.985915">
     <ele>1559.5</ele>
-    <name>DeerCreekSpringTR</name>
+    <name>Deer Creek Spring Trail Junction</name>
     <desc><![CDATA[Deer Creek Spring trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.135620" lon="-121.986078">
@@ -69491,7 +69471,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.149172" lon="-122.245692">
     <ele>1417.7</ele>
-    <name>GirardRidgeRoadTR</name>
+    <name>Girard Ridge Road Trail Junction</name>
     <desc><![CDATA[Girard Ridge Road trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.136339" lon="-122.254719">
@@ -72165,12 +72145,12 @@
     </trkseg>
   </trk><wpt lat="41.158167" lon="-122.297880">
     <ele>751.0</ele>
-    <name>KettlebellyTR</name>
+    <name>Kettlebelly Trail Junction</name>
     <desc><![CDATA[Kettlebelly Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.164000" lon="-122.310161">
     <ele>764.3</ele>
-    <name>FernSpringsTR</name>
+    <name>Fern Springs Trail Junction</name>
     <desc><![CDATA[Fern Springs trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.164110" lon="-122.310119">
@@ -72180,22 +72160,22 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.162298" lon="-122.312262">
     <ele>804.3</ele>
-    <name>RootCreekTR</name>
+    <name>Root Creek Trail Junction</name>
     <desc><![CDATA[Root Creek trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.161274" lon="-122.312177">
     <ele>803.1</ele>
-    <name>VistaPointTR</name>
+    <name>Vista Point Trail Junction</name>
     <desc><![CDATA[Vista Point trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.160180" lon="-122.312608">
     <ele>814.3</ele>
-    <name>CragsTR</name>
+    <name>Crags Trail Junction</name>
     <desc><![CDATA[Crags Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.158052" lon="-122.320655">
     <ele>861.9</ele>
-    <name>BobsHatTR</name>
+    <name>Bobs Hat Trail Junction</name>
     <desc><![CDATA[Bob's Hat trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.162168" lon="-122.327274">
@@ -72225,7 +72205,7 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="41.161979" lon="-122.349245">
     <ele>787.7</ele>
-    <name>FlumeTR</name>
+    <name>Flume Trail Junction</name>
     <desc><![CDATA[Flume Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.164535" lon="-122.358560">
@@ -72240,7 +72220,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.164263" lon="-122.366187">
     <ele>916.5</ele>
-    <name>DogTR</name>
+    <name>Dog Trail Junction</name>
     <desc><![CDATA[Dog Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.182480" lon="-122.374017">
@@ -72265,7 +72245,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="41.215493" lon="-122.382798">
     <ele>1746.2</ele>
-    <name>NForkSpringTR</name>
+    <name>NFork Spring Trail Junction</name>
     <desc><![CDATA[North Fork Spring use trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.214226" lon="-122.382599">
@@ -72295,7 +72275,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="41.193721" lon="-122.428212">
     <ele>1968.3</ele>
-    <name>SoapstoneTR</name>
+    <name>Soapstone Trail Junction</name>
     <desc><![CDATA[Soapstone Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.189101" lon="-122.434210">
@@ -72315,7 +72295,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.187464" lon="-122.497331">
     <ele>2062.6</ele>
-    <name>SevenLakesTR</name>
+    <name>Seven Lakes Trail Junction</name>
     <desc><![CDATA[Seven Lakes trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.206573" lon="-122.516334">
@@ -72345,27 +72325,27 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.274413" lon="-122.504042">
     <ele>2182.7</ele>
-    <name>PorcupineLakeTR</name>
+    <name>Porcupine Lake Trail Junction</name>
     <desc><![CDATA[Porcupine Lake trail junction. Lake is 2/10 mile W of PCT.]]></desc>
-    <sym>Water Source</sym>
+    <sym>Trail Head</sym>
   </wpt><wpt lat="41.277894" lon="-122.505475">
     <ele>2228.1</ele>
-    <name>ToadLakeTR</name>
+    <name>Toad Lake Trail Junction</name>
     <desc><![CDATA[Toad Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.279053" lon="-122.507170">
     <ele>2231.8</ele>
-    <name>ToadLakeTR2</name>
+    <name>Toad Lake Trail Junction #2</name>
     <desc><![CDATA[Toad Spring trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.301127" lon="-122.499700">
     <ele>2258.9</ele>
-    <name>SissonCalahanTR</name>
+    <name>Sisson Calahan Trail Junction</name>
     <desc><![CDATA[Sisson Calahan trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.306670" lon="-122.507517">
     <ele>2226.1</ele>
-    <name>RedRockSpringTR</name>
+    <name>Red Rock Spring Trail Junction</name>
     <desc><![CDATA[Red Rock Spring trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.306786" lon="-122.507865">
@@ -72395,12 +72375,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.318045" lon="-122.598631">
     <ele>2151.5</ele>
-    <name>SissonCalahanTR2</name>
+    <name>Sisson Calahan Trail Junction #2</name>
     <desc><![CDATA[Sisson Calahan Trail Junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.323332" lon="-122.618120">
     <ele>2063.4</ele>
-    <name>SissonCalahanTR3</name>
+    <name>Sisson Calahan Trail Junction #3</name>
     <desc><![CDATA[Another Sisson Calahan trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.324598" lon="-122.619121">
@@ -72410,7 +72390,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.317748" lon="-122.646642">
     <ele>1883.6</ele>
-    <name>CooperMeadowTR</name>
+    <name>Cooper Meadow Trail Junction</name>
     <desc><![CDATA[Cooper Meadow trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.317032" lon="-122.646410">
@@ -72430,7 +72410,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.291713" lon="-122.661484">
     <ele>1862.3</ele>
-    <name>GrouseCreekTR</name>
+    <name>Grouse Creek Trail Junction</name>
     <desc><![CDATA[Grouse Creek trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.276180" lon="-122.674552">
@@ -72490,7 +72470,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.225777" lon="-122.777139">
     <ele>2139.6</ele>
-    <name>MarshyLakeTR</name>
+    <name>Marshy Lake Trail Junction</name>
     <desc><![CDATA[Marshy Lake, E Boulder Lake trail junctions. Both lakes are well below the PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.218595" lon="-122.774349">
@@ -72500,12 +72480,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="41.212612" lon="-122.789797">
     <ele>2263.5</ele>
-    <name>ScottMountainTR</name>
+    <name>Scott Mountain Trail Junction</name>
     <desc><![CDATA[Scott Mountain Summit trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.206524" lon="-122.795407">
     <ele>2210.6</ele>
-    <name>TelephoneLakeTR</name>
+    <name>Telephone Lake Trail Junction</name>
     <desc><![CDATA[Telephone Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.201666" lon="-122.797276">
@@ -72520,7 +72500,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.198343" lon="-122.801526">
     <ele>2175.8</ele>
-    <name>BloodyRunTR</name>
+    <name>Bloody Run Trail Junction</name>
     <desc><![CDATA[Bloody Run trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.201771" lon="-122.813666">
@@ -72535,7 +72515,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.207113" lon="-122.835728">
     <ele>2173.8</ele>
-    <name>FoxCreekRidgeTR</name>
+    <name>Fox Creek Ridge Trail Junction</name>
     <desc><![CDATA[Fox Creek Ridge trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.206675" lon="-122.836890">
@@ -72555,7 +72535,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="41.204562" lon="-122.873543">
     <ele>2070.4</ele>
-    <name>EForkSaloonCreekTR</name>
+    <name>EFork Saloon Creek Trail Junction</name>
     <desc><![CDATA[East Fork of Saloon Creek trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.210668" lon="-122.878337">
@@ -72570,7 +72550,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.210175" lon="-122.890776">
     <ele>1780.2</ele>
-    <name>SForkLakesTR</name>
+    <name>SFork Lakes Trail Junction</name>
     <desc><![CDATA[South Fork Lakes trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.209367" lon="-122.893392">
@@ -72635,7 +72615,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.325690" lon="-122.966331">
     <ele>2043.0</ele>
-    <name>DuckLakesTR</name>
+    <name>Duck Lakes Trail Junction</name>
     <desc><![CDATA[Duck Lakes trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.343508" lon="-122.959452">
@@ -72655,7 +72635,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.382135" lon="-122.973431">
     <ele>2094.9</ele>
-    <name>RuffeyLakeTR</name>
+    <name>Ruffey Lake Trail Junction</name>
     <desc><![CDATA[Ruffey Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.159716" lon="-122.301984">
@@ -74478,7 +74458,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.454137" lon="-123.036758">
     <ele>1920.2</ele>
-    <name>CubBearSpringTR</name>
+    <name>Cub Bear Spring Trail Junction</name>
     <desc><![CDATA[Trail junction to Cub Bear Spring, small spring 2/10 mile E of PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.455480" lon="-123.037000">
@@ -74538,12 +74518,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="41.534742" lon="-123.134690">
     <ele>2008.7</ele>
-    <name>SummitLakeTR2</name>
+    <name>Summit Lake Trail Junction #2</name>
     <desc><![CDATA[Summit Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.543293" lon="-123.163569">
     <ele>1941.4</ele>
-    <name>ColdSpringTR</name>
+    <name>Cold Spring Trail Junction</name>
     <desc><![CDATA[Cold Spring trail junction. Cold Spring is 3/10 mile S of PCT, 230 ft elevation loss.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.540562" lon="-123.159135">
@@ -74553,27 +74533,27 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.544535" lon="-123.169765">
     <ele>1982.4</ele>
-    <name>ShadowLakeTR</name>
+    <name>Shadow Lake Trail Junction</name>
     <desc><![CDATA[Shadow Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.545704" lon="-123.181767">
     <ele>1993.0</ele>
-    <name>ShadowLakeTR2</name>
+    <name>Shadow Lake Trail Junction #2</name>
     <desc><![CDATA[A 2nd trail junction to Shadow Lake.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.550131" lon="-123.193139">
     <ele>1964.7</ele>
-    <name>SkyHighLakeTR</name>
+    <name>Sky High Lake Trail Junction</name>
     <desc><![CDATA[Sky High Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.550701" lon="-123.194239">
     <ele>1948.2</ele>
-    <name>SkyHighLakeTR2</name>
+    <name>Sky High Lake Trail Junction #2</name>
     <desc><![CDATA[A 2nd trail to Sky High Lakes.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.553887" lon="-123.201159">
     <ele>1898.6</ele>
-    <name>MarbleRimTR</name>
+    <name>Marble Rim Trail Junction</name>
     <desc><![CDATA[Marble Rim Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.563028" lon="-123.199444">
@@ -74583,7 +74563,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.566091" lon="-123.199624">
     <ele>1793.9</ele>
-    <name>MarbleGapTR</name>
+    <name>Marble Gap Trail Junction</name>
     <desc><![CDATA[Marble Gap trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.574491" lon="-123.196688">
@@ -74598,12 +74578,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="41.588696" lon="-123.196606">
     <ele>2029.0</ele>
-    <name>BoxCampTR</name>
+    <name>Box Camp Trail Junction</name>
     <desc><![CDATA[Box Camp trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.611375" lon="-123.208853">
     <ele>1885.5</ele>
-    <name>ParadiseTR</name>
+    <name>Paradise Trail Junction</name>
     <desc><![CDATA[ Paradise Trailhead trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.612465" lon="-123.209529">
@@ -74618,12 +74598,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.629717" lon="-123.217208">
     <ele>2000.7</ele>
-    <name>TurkLakeTR</name>
+    <name>Turk Lake Trail Junction</name>
     <desc><![CDATA[Turk Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.638514" lon="-123.219011">
     <ele>2053.9</ele>
-    <name>TylerMeadowsTR</name>
+    <name>Tyler Meadows Trail Junction</name>
     <desc><![CDATA[Tyler Meadows trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.670254" lon="-123.252142">
@@ -74688,7 +74668,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.789771" lon="-123.224350">
     <ele>610.8</ele>
-    <name>OldGriderCreekTR</name>
+    <name>Old Grider Creek Trail Junction</name>
     <desc><![CDATA[Old Grider Creek trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.790805" lon="-123.224856">
@@ -76567,7 +76547,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="41.877234" lon="-123.203748">
     <ele>1487.9</ele>
-    <name>LookoutSpringTR</name>
+    <name>Lookout Spring Trail Junction</name>
     <desc><![CDATA[Lookout Spring trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.877516" lon="-123.203926">
@@ -76577,17 +76557,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.883588" lon="-123.197879">
     <ele>1564.6</ele>
-    <name>DarkeyCreekTR</name>
+    <name>Darkey Creek Trail Junction</name>
     <desc><![CDATA[Darkey Creek trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.911887" lon="-123.200823">
     <ele>1796.4</ele>
-    <name>BoundaryTR</name>
+    <name>Boundary Trail Junction</name>
     <desc><![CDATA[Boundary Trail trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.916896" lon="-123.194537">
     <ele>1742.0</ele>
-    <name>KangarooSpringTR</name>
+    <name>Kangaroo Spring Trail Junction</name>
     <desc><![CDATA[Trail junction to Kangaroo Spring]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.916334" lon="-123.195117">
@@ -76607,7 +76587,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.933825" lon="-123.172236">
     <ele>1791.2</ele>
-    <name>EchoLakeTR2</name>
+    <name>Echo Lake Trail Junction #2</name>
     <desc><![CDATA[ Echo Lake trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.942749" lon="-123.146232">
@@ -76617,7 +76597,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="41.941842" lon="-123.145332">
     <ele>1444.3</ele>
-    <name>CookGreenPassSpgTR</name>
+    <name>Cook Green Pass Spg Trail Junction</name>
     <desc><![CDATA[Trail junction to Cook and Green Pass spring.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.941851" lon="-123.145103">
@@ -76627,7 +76607,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="41.935744" lon="-123.113919">
     <ele>1841.1</ele>
-    <name>CopperButteTR</name>
+    <name>Copper Butte Trail Junction</name>
     <desc><![CDATA[Copper Butte trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.948770" lon="-123.089383">
@@ -76642,12 +76622,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="41.953718" lon="-123.078823">
     <ele>1847.6</ele>
-    <name>TinCupTR</name>
+    <name>Tin Cup Trail Junction</name>
     <desc><![CDATA[Tin Cup trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.953616" lon="-123.074835">
     <ele>1864.1</ele>
-    <name>BearDogSpringTR</name>
+    <name>Bear Dog Spring Trail Junction</name>
     <desc><![CDATA[Bear Dog Spring trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="41.953503" lon="-123.074948">
@@ -76887,7 +76867,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.073348" lon="-122.614753">
     <ele>1365.8</ele>
-    <name>CallahansLodgeTR</name>
+    <name>Callahans Lodge Trail Junction</name>
     <desc><![CDATA[ Callahan's Lodge spur trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.071203" lon="-122.609838">
@@ -78742,7 +78722,7 @@
     <sym>Flag, Green</sym>
   </wpt><wpt lat="42.031260" lon="-122.567307">
     <ele>1571.3</ele>
-    <name>PilotRockTR</name>
+    <name>Pilot Rock Trail Junction</name>
     <desc><![CDATA[Pilot Rock trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.041354" lon="-122.548688">
@@ -78762,7 +78742,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="42.043679" lon="-122.521143">
     <ele>1617.5</ele>
-    <name>LonePilotTR</name>
+    <name>Lone Pilot Trail Junction</name>
     <desc><![CDATA[Lone Pilot trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.053570" lon="-122.507690">
@@ -78792,7 +78772,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.095102" lon="-122.473193">
     <ele>1610.5</ele>
-    <name>HobartBluffTR</name>
+    <name>Hobart Bluff Trail Junction</name>
     <desc><![CDATA[Hobart Bluff trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.116356" lon="-122.478600">
@@ -78847,12 +78827,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.140881" lon="-122.500344">
     <ele>1466.7</ele>
-    <name>GreenSpringsMtnTR</name>
+    <name>Green Springs Mtn Trail Junction</name>
     <desc><![CDATA[Unpaved road, Green Springs Mountain Loop Connector trail, Road 39-3E-32 nearby.]]></desc>
-    <sym>Truck</sym>
+    <sym>Trail Head</sym>
   </wpt><wpt lat="42.147304" lon="-122.506902">
     <ele>1507.9</ele>
-    <name>GreenSpringsMtnTR2</name>
+    <name>Green Springs Mtn Trail Junction #2</name>
     <desc><![CDATA[Green Springs Mountain Loop Connector, second trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.155485" lon="-122.504873">
@@ -78912,7 +78892,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.176702" lon="-122.451888">
     <ele>1586.9</ele>
-    <name>BLMHorseCampTR</name>
+    <name>BLMHorse Camp Trail Junction</name>
     <desc><![CDATA[BLM horse camp trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.178711" lon="-122.444987">
@@ -78942,7 +78922,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.200040" lon="-122.382097">
     <ele>1408.4</ele>
-    <name>HorseCampTR</name>
+    <name>Horse Camp Trail Junction</name>
     <desc><![CDATA[Sign for "Horse Camp"]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.208618" lon="-122.371071">
@@ -79012,7 +78992,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.242051" lon="-122.298346">
     <ele>1765.1</ele>
-    <name>VultureRockTR</name>
+    <name>Vulture Rock Trail Junction</name>
     <desc><![CDATA[Vulture Rock trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.250568" lon="-122.287646">
@@ -79032,7 +79012,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.313308" lon="-122.262816">
     <ele>1617.0</ele>
-    <name>BrownMtnShelterTR</name>
+    <name>Brown Mtn Shelter Trail Junction</name>
     <desc><![CDATA[South Brown Mountain Shelter trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.313573" lon="-122.264502">
@@ -79047,7 +79027,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.336658" lon="-122.261425">
     <ele>1595.4</ele>
-    <name>LakeOWoodsTR</name>
+    <name>Lake OWoods Trail Junction</name>
     <desc><![CDATA[Lake O' The Woods trail junction. Lake is 5 miles off trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.337552" lon="-122.263246">
@@ -79057,7 +79037,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.393852" lon="-122.290139">
     <ele>1509.3</ele>
-    <name>FishLakeTR</name>
+    <name>Fish Lake Trail Junction</name>
     <desc><![CDATA[Fish Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.395858" lon="-122.291469">
@@ -81671,7 +81651,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.943686" lon="-122.175490">
     <ele>2338.0</ele>
-    <name>WatchmanTR</name>
+    <name>Watchman Trail Junction</name>
     <desc><![CDATA[Watchman trail junction, alternate mile 5.9.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.966049" lon="-122.150860">
@@ -81716,12 +81696,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="42.431610" lon="-122.261625">
     <ele>1857.8</ele>
-    <name>MtMcLoughlinTR</name>
+    <name>Mt Mc Loughlin Trail Junction</name>
     <desc><![CDATA[Mount McLoughlin Trailhead trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.433364" lon="-122.269275">
     <ele>1905.2</ele>
-    <name>MtMcLoughlinTR2</name>
+    <name>Mt Mc Loughlin Trail Junction #2</name>
     <desc><![CDATA[Mount McLoughlin trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.434534" lon="-122.270183">
@@ -81731,7 +81711,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="42.471831" lon="-122.280178">
     <ele>1780.2</ele>
-    <name>TwinPondsTR</name>
+    <name>Twin Ponds Trail Junction</name>
     <desc><![CDATA[Twin Ponds Trail Junction, large shallow pond nearby, may be stagnant late season. ]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.503731" lon="-122.255761">
@@ -81741,7 +81721,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="42.505433" lon="-122.253428">
     <ele>1917.3</ele>
-    <name>ChristisSpringTR</name>
+    <name>Christis Spring Trail Junction</name>
     <desc><![CDATA[Trail junction to Christi's Spring.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.505705" lon="-122.254028">
@@ -81751,7 +81731,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.513919" lon="-122.230392">
     <ele>1839.5</ele>
-    <name>RedLakeTR</name>
+    <name>Red Lake Trail Junction</name>
     <desc><![CDATA[ Red Lake trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.547898" lon="-122.229215">
@@ -81761,12 +81741,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="42.549030" lon="-122.229328">
     <ele>1849.3</ele>
-    <name>RedLakeTR2</name>
+    <name>Red Lake Trail Junction #2</name>
     <desc><![CDATA[Another trail junction to Red Lake.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.558278" lon="-122.218396">
     <ele>1877.0</ele>
-    <name>SkyLakesTR</name>
+    <name>Sky Lakes Trail Junction</name>
     <desc><![CDATA[Sky Lakes Trail #3762 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.558508" lon="-122.218496">
@@ -81796,17 +81776,17 @@
     <sym>Campground</sym>
   </wpt><wpt lat="42.605599" lon="-122.214505">
     <ele>2077.1</ele>
-    <name>DivideTR</name>
+    <name>Divide Trail Junction</name>
     <desc><![CDATA[Divide Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.618926" lon="-122.214664">
     <ele>2039.9</ele>
-    <name>SnowLakeTR</name>
+    <name>Snow Lake Trail Junction</name>
     <desc><![CDATA[Snow Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.638091" lon="-122.222270">
     <ele>2204.5</ele>
-    <name>SevenLakesTR2</name>
+    <name>Seven Lakes Trail Junction #2</name>
     <desc><![CDATA[Trail junction to Seven Lakes Trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.649076" lon="-122.207398">
@@ -81826,7 +81806,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.656526" lon="-122.213806">
     <ele>1903.7</ele>
-    <name>SevenLakesTR3</name>
+    <name>Seven Lakes Trail Junction #3</name>
     <desc><![CDATA[Seven Lakes trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.657254" lon="-122.213266">
@@ -81841,7 +81821,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.664048" lon="-122.208635">
     <ele>1877.2</ele>
-    <name>SevenLakesTR4</name>
+    <name>Seven Lakes Trail Junction #4</name>
     <desc><![CDATA[Seven Lakes trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.668472" lon="-122.201228">
@@ -81856,12 +81836,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="42.683254" lon="-122.172109">
     <ele>1771.3</ele>
-    <name>SevenMileTR</name>
+    <name>Seven Mile Trail Junction</name>
     <desc><![CDATA[Seven Mile Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.685342" lon="-122.171519">
     <ele>1756.5</ele>
-    <name>RangerSpringTR</name>
+    <name>Ranger Spring Trail Junction</name>
     <desc><![CDATA[Trail to seasonal Ranger Spring [8/10 mile W of PCT], campsites nearby.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.703383" lon="-122.181099">
@@ -81871,7 +81851,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="42.708627" lon="-122.188033">
     <ele>1928.6</ele>
-    <name>McKieCampTR</name>
+    <name>Mc Kie Camp Trail Junction</name>
     <desc><![CDATA[McKie camp trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.739913" lon="-122.204260">
@@ -81881,7 +81861,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.736886" lon="-122.195681">
     <ele>1891.3</ele>
-    <name>JackSpringTR</name>
+    <name>Jack Spring Trail Junction</name>
     <desc><![CDATA[Jack Spring trail junction. Seasonal Jack Spring is 1/2 mile off trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.737139" lon="-122.195489">
@@ -81891,7 +81871,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="42.756917" lon="-122.196731">
     <ele>1847.5</ele>
-    <name>StuartFallsTR</name>
+    <name>Stuart Falls Trail Junction</name>
     <desc><![CDATA[Stuart Falls trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.774644" lon="-122.188967">
@@ -81911,17 +81891,17 @@
     <sym>Forest</sym>
   </wpt><wpt lat="42.816228" lon="-122.179384">
     <ele>1915.5</ele>
-    <name>PumiceFlatTR</name>
+    <name>Pumice Flat Trail Junction</name>
     <desc><![CDATA[Pumice Flat trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.816294" lon="-122.181238">
     <ele>1923.6</ele>
-    <name>StuartFallsTR2</name>
+    <name>Stuart Falls Trail Junction #2</name>
     <desc><![CDATA[Stuart Falls 2nd trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.841883" lon="-122.195039">
     <ele>1982.1</ele>
-    <name>UnionPeakTR</name>
+    <name>Union Peak Trail Junction</name>
     <desc><![CDATA[Union Peak trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.871380" lon="-122.179965">
@@ -81931,7 +81911,7 @@
     <sym>Car</sym>
   </wpt><wpt lat="42.879683" lon="-122.172490">
     <ele>1931.3</ele>
-    <name>AnnieSpringsTR</name>
+    <name>Annie Springs Trail Junction</name>
     <desc><![CDATA[Annie Springs trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.867247" lon="-122.167052">
@@ -81956,7 +81936,7 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="42.891438" lon="-122.169637">
     <ele>1857.0</ele>
-    <name>DuttonCreekTR</name>
+    <name>Dutton Creek Trail Junction</name>
     <desc><![CDATA[Dutton Creek trail junction, Dutton Camp nearby. PCT Crater Lake Rim alternate route begins here via Dutton Creek Trail to Rim Village, then Discovery Point Trail, and then the spectacular Crater Rim Trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.891755" lon="-122.170387">
@@ -81991,12 +81971,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.926335" lon="-122.218135">
     <ele>1788.7</ele>
-    <name>LightningSpringTR</name>
+    <name>Lightning Spring Trail Junction</name>
     <desc><![CDATA[Lightning Spring Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.938583" lon="-122.225549">
     <ele>1709.4</ele>
-    <name>BybeeStockCampTR</name>
+    <name>Bybee Stock Camp Trail Junction</name>
     <desc><![CDATA[Bybee Stock Camp Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.944420" lon="-122.232674">
@@ -82006,7 +81986,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="42.988737" lon="-122.202402">
     <ele>1855.6</ele>
-    <name>SphagnumBogTR</name>
+    <name>Sphagnum Bog Trail Junction</name>
     <desc><![CDATA[Sphagnum Bog Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.994521" lon="-122.187349">
@@ -82016,7 +81996,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.001454" lon="-122.189257">
     <ele>1868.2</ele>
-    <name>BoundarySpringsTR</name>
+    <name>Boundary Springs Trail Junction</name>
     <desc><![CDATA[Boundary Springs Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="42.995749" lon="-122.135791">
@@ -82026,7 +82006,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="42.995850" lon="-122.134331">
     <ele>1978.4</ele>
-    <name>RimTR</name>
+    <name>Rim Trail Junction</name>
     <desc><![CDATA[Rim Trail rejoins the PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.089042" lon="-122.091799">
@@ -84567,7 +84547,7 @@
     </trkseg>
   </trk><wpt lat="43.090405" lon="-122.090068">
     <ele>1797.7</ele>
-    <name>DiamondLakeTR</name>
+    <name>Diamond Lake Trail Junction</name>
     <desc><![CDATA[Diamond Lake trail junction. Diamond Lake is 9 miles W.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.095839" lon="-122.086477">
@@ -84582,7 +84562,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="43.153529" lon="-122.080775">
     <ele>2235.5</ele>
-    <name>MtThielsenTR</name>
+    <name>Mt Thielsen Trail Junction</name>
     <desc><![CDATA[Mount Thielsen Trail #1456 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.161567" lon="-122.065608">
@@ -84597,7 +84577,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.162373" lon="-122.064018">
     <ele>2118.5</ele>
-    <name>ThielsenCreekTR</name>
+    <name>Thielsen Creek Trail Junction</name>
     <desc><![CDATA[Thielsen Creek Trail #1449 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.188647" lon="-122.053763">
@@ -84607,7 +84587,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="43.196263" lon="-122.048780">
     <ele>2222.2</ele>
-    <name>HowlockMountainTR</name>
+    <name>Howlock Mountain Trail Junction</name>
     <desc><![CDATA[Howlock Mountain Trail #1448 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.211881" lon="-122.037855">
@@ -84617,7 +84597,7 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="43.242250" lon="-121.994202">
     <ele>1890.6</ele>
-    <name>NUmpquaTR</name>
+    <name>NUmpqua Trail Junction</name>
     <desc><![CDATA[North Umpqua Trail #1414 junction, Maidu Lake trail junction. Maidu Lake is 3/4 mile off-trail. The lake is a possible water option if Six Horse Spring [8.7 miles N] is dry.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.304863" lon="-122.002628">
@@ -84627,7 +84607,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="43.304949" lon="-122.002631">
     <ele>1894.9</ele>
-    <name>SixHorseSpringTR</name>
+    <name>Six Horse Spring Trail Junction</name>
     <desc><![CDATA[Six Horse Spring trail junction, campsites nearby. Six Horse Spring is 4/10 mile E of PCT and approximately 300 ft descent.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.304293" lon="-122.000222">
@@ -84637,7 +84617,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.325900" lon="-122.018740">
     <ele>2013.3</ele>
-    <name>BradleyCreekTR</name>
+    <name>Bradley Creek Trail Junction</name>
     <desc><![CDATA[Bradley Creek Trailhead trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.326185" lon="-122.018056">
@@ -84662,12 +84642,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="43.458770" lon="-122.030639">
     <ele>1500.7</ele>
-    <name>SummitLakeTR</name>
+    <name>Summit Lake Trail Junction</name>
     <desc><![CDATA[Summit Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.426982" lon="-122.005596">
     <ele>1661.7</ele>
-    <name>BinghamLakesTR</name>
+    <name>Bingham Lakes Trail Junction</name>
     <desc><![CDATA[Bingham Lakes Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.424903" lon="-122.005014">
@@ -84677,12 +84657,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.414018" lon="-122.002263">
     <ele>1674.6</ele>
-    <name>WindyLakeTR</name>
+    <name>Windy Lake Trail Junction</name>
     <desc><![CDATA[Windy Lake Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.387688" lon="-122.011651">
     <ele>1744.6</ele>
-    <name>NipTuckTR</name>
+    <name>Nip Tuck Trail Junction</name>
     <desc><![CDATA[Trail junction to Nip and Tuck lake.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.370742" lon="-122.028335">
@@ -84717,7 +84697,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="43.402129" lon="-122.061629">
     <ele>2128.1</ele>
-    <name>CowhornTraverseTR</name>
+    <name>Cowhorn Traverse Trail Junction</name>
     <desc><![CDATA[Cowhorn Traverse Trail #3641 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.422125" lon="-122.085543">
@@ -84767,7 +84747,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="43.493339" lon="-122.134742">
     <ele>1884.8</ele>
-    <name>CraterButteTR</name>
+    <name>Crater Butte Trail Junction</name>
     <desc><![CDATA[ Crater Butte Trail #3844 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.520954" lon="-122.132033">
@@ -84792,7 +84772,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.553213" lon="-122.131679">
     <ele>2031.1</ele>
-    <name>MountYoranTR</name>
+    <name>Mount Yoran Trail Junction</name>
     <desc><![CDATA[Mount Yoran Trail #3683 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.562666" lon="-122.107943">
@@ -84807,7 +84787,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.567361" lon="-122.102231">
     <ele>1782.6</ele>
-    <name>HiddenLakeTR</name>
+    <name>Hidden Lake Trail Junction</name>
     <desc><![CDATA[Trail junction to Hidden Lake.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.568976" lon="-122.099104">
@@ -84817,7 +84797,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.570501" lon="-122.097013">
     <ele>1755.5</ele>
-    <name>DeepCreekTR</name>
+    <name>Deep Creek Trail Junction</name>
     <desc><![CDATA[Deep Creek Trail #3672 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.576980" lon="-122.092100">
@@ -84852,17 +84832,17 @@
     <sym>Post Office</sym>
   </wpt><wpt lat="43.581078" lon="-122.051214">
     <ele>1504.9</ele>
-    <name>YoranLakeTR</name>
+    <name>Yoran Lake Trail Junction</name>
     <desc><![CDATA[Yoran Lake Trail]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.592472" lon="-122.050691">
     <ele>1544.0</ele>
-    <name>ShelterCoveTR</name>
+    <name>Shelter Cove Trail Junction</name>
     <desc><![CDATA[Trail junction to Shelter Cove.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.593532" lon="-122.044219">
     <ele>1587.0</ele>
-    <name>WestViewLoopTR</name>
+    <name>West View Loop Trail Junction</name>
     <desc><![CDATA[West View Loop trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.597156" lon="-122.033700">
@@ -87446,17 +87426,17 @@
     </trkseg>
   </trk><wpt lat="43.597864" lon="-122.033004">
     <ele>1556.9</ele>
-    <name>WillametteSkiTR</name>
+    <name>Willamette Ski Trail Junction</name>
     <desc><![CDATA[Trail junction to Willamette Pass Resort ski lodge.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.597677" lon="-122.031137">
     <ele>1564.3</ele>
-    <name>WillamettePassTR</name>
+    <name>Willamette Pass Trail Junction</name>
     <desc><![CDATA[Willamette Pass Trailhead, outhouse, parking.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.597462" lon="-122.000477">
     <ele>1728.1</ele>
-    <name>TaitsLoopNordicTR</name>
+    <name>Taits Loop Nordic Trail Junction</name>
     <desc><![CDATA[Taits Loop Nordic Ski Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.600827" lon="-121.996787">
@@ -87476,7 +87456,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.612396" lon="-122.001110">
     <ele>1826.9</ele>
-    <name>MaidenLakeTR</name>
+    <name>Maiden Lake Trail Junction</name>
     <desc><![CDATA[Maiden Lake Trail #3841 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.613248" lon="-122.005429">
@@ -87486,12 +87466,12 @@
     <sym>Forest</sym>
   </wpt><wpt lat="43.613272" lon="-122.005520">
     <ele>1881.3</ele>
-    <name>TaitsSkiTR</name>
+    <name>Taits Ski Trail Junction</name>
     <desc><![CDATA[Taits-WP ski trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.631247" lon="-122.004205">
     <ele>1840.8</ele>
-    <name>MaidenPeakLoopTR</name>
+    <name>Maiden Peak Loop Trail Junction</name>
     <desc><![CDATA[Maiden Peak Loop and ski shelter trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.632043" lon="-122.003512">
@@ -87501,17 +87481,17 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="43.639888" lon="-122.009939">
     <ele>1717.2</ele>
-    <name>MaidenPeakTR</name>
+    <name>Maiden Peak Trail Junction</name>
     <desc><![CDATA[Maiden Peak Trail #3681 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.662205" lon="-121.989403">
     <ele>1661.3</ele>
-    <name>EugeneTR</name>
+    <name>Eugene Trail Junction</name>
     <desc><![CDATA[Eugene to Pacific Crest Trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.662528" lon="-121.987876">
     <ele>1666.8</ele>
-    <name>BobbyLakeTR</name>
+    <name>Bobby Lake Trail Junction</name>
     <desc><![CDATA[Morre Creek Trail #40 junction to Bobby Lake. Bobby Lake is 3/10 mile E of PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.661900" lon="-121.982927">
@@ -87521,7 +87501,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.695034" lon="-121.993330">
     <ele>1909.4</ele>
-    <name>TwinsTR</name>
+    <name>Twins Trail Junction</name>
     <desc><![CDATA[The Twins Trail #3595 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.700172" lon="-121.994745">
@@ -87531,7 +87511,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="43.744369" lon="-121.979207">
     <ele>1748.7</ele>
-    <name>CharltonLakeTR</name>
+    <name>Charlton Lake Trail Junction</name>
     <desc><![CDATA[Charlton Lake Trail #19 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.743987" lon="-121.977973">
@@ -87541,7 +87521,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.745524" lon="-121.978147">
     <ele>1748.2</ele>
-    <name>CharltonLakeTR2</name>
+    <name>Charlton Lake Trail Junction #2</name>
     <desc><![CDATA[Charlton Lake Trail #19 second junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.745499" lon="-121.976271">
@@ -87556,7 +87536,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="43.772191" lon="-121.969677">
     <ele>1823.9</ele>
-    <name>HarralsonTR</name>
+    <name>Harralson Trail Junction</name>
     <desc><![CDATA[Harralson Trail #4363 junction to trailhead.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.804765" lon="-121.962245">
@@ -87601,7 +87581,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.899959" lon="-121.924570">
     <ele>1604.2</ele>
-    <name>WinopeeLakeTR</name>
+    <name>Winopee Lake Trail Junction</name>
     <desc><![CDATA[Winopee Lake Trail #16, Elk Creek Trail #3510 junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.911232" lon="-121.915305">
@@ -87611,7 +87591,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.912477" lon="-121.915547">
     <ele>1601.5</ele>
-    <name>SnowshoeLakeTR</name>
+    <name>Snowshoe Lake Trail Junction</name>
     <desc><![CDATA[Snowshoe Lake Trail #33 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.913578" lon="-121.915930">
@@ -87621,7 +87601,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.917562" lon="-121.916546">
     <ele>1573.2</ele>
-    <name>MinkLakeTR</name>
+    <name>Mink Lake Trail Junction</name>
     <desc><![CDATA[Mink Lake Trail #3526 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.917597" lon="-121.914758">
@@ -87646,12 +87626,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.934025" lon="-121.895944">
     <ele>1570.3</ele>
-    <name>PorkyLakeTR</name>
+    <name>Porky Lake Trail Junction</name>
     <desc><![CDATA[Porky Lake Trail #4338]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.942673" lon="-121.878271">
     <ele>1632.0</ele>
-    <name>VeraLakeTR</name>
+    <name>Vera Lake Trail Junction</name>
     <desc><![CDATA[Vera Lake Trail #3526, Six Lakes Trail #14 junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.950120" lon="-121.880454">
@@ -87666,7 +87646,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.977881" lon="-121.872400">
     <ele>1675.2</ele>
-    <name>RedHillTR</name>
+    <name>Red Hill Trail Junction</name>
     <desc><![CDATA[Red Hill Trail, Island Trail #4337 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.975052" lon="-121.858099">
@@ -87676,17 +87656,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="43.982563" lon="-121.846700">
     <ele>1610.7</ele>
-    <name>SunsetLakeTR</name>
+    <name>Sunset Lake Trail Junction</name>
     <desc><![CDATA[Sunset Lake Trail #3515.1 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.982003" lon="-121.825148">
     <ele>1423.2</ele>
-    <name>ElkLakeTR</name>
+    <name>Elk Lake Trail Junction</name>
     <desc><![CDATA[Elk Lake Trailhead #3 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="43.995378" lon="-121.827934">
     <ele>1614.8</ele>
-    <name>HorseLakeTR2</name>
+    <name>Horse Lake Trail Junction #2</name>
     <desc><![CDATA[Horse Lake TR 2 to the Elk Lake Trailhead 2nd trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.027205" lon="-121.826976">
@@ -87696,7 +87676,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="44.038100" lon="-121.829630">
     <ele>1829.4</ele>
-    <name>RedHillTR2</name>
+    <name>Red Hill Trail Junction #2</name>
     <desc><![CDATA[Red Hill Trail #3515 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.040561" lon="-121.826581">
@@ -87706,17 +87686,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.040098" lon="-121.822296">
     <ele>1825.6</ele>
-    <name>NashLakeTR</name>
+    <name>Nash Lake Trail Junction</name>
     <desc><![CDATA[Nash Lake Trail #3527 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.039645" lon="-121.817737">
     <ele>1834.1</ele>
-    <name>WickiupPlainTR</name>
+    <name>Wickiup Plain Trail Junction</name>
     <desc><![CDATA[Wickiup Plain TR 12.1]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.059828" lon="-121.808842">
     <ele>1878.2</ele>
-    <name>LeConteCraterTR</name>
+    <name>Le Conte Crater Trail Junction</name>
     <desc><![CDATA[Le Conte Crater trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.073413" lon="-121.816866">
@@ -87741,7 +87721,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.084177" lon="-121.820583">
     <ele>1805.2</ele>
-    <name>JamesCreekTR</name>
+    <name>James Creek Trail Junction</name>
     <desc><![CDATA[James Creek Trail #3546 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.104517" lon="-121.813033">
@@ -87751,12 +87731,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.125290" lon="-121.821093">
     <ele>1918.4</ele>
-    <name>FoleyRidgeTR</name>
+    <name>Foley Ridge Trail Junction</name>
     <desc><![CDATA[Foley Ridge Trail #3511 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.142476" lon="-121.820960">
     <ele>1969.2</ele>
-    <name>LintonMeadowTR</name>
+    <name>Linton Meadow Trail Junction</name>
     <desc><![CDATA[Linton Meadow Trail #3547 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.163754" lon="-121.818066">
@@ -87766,7 +87746,7 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="44.166783" lon="-121.818144">
     <ele>1971.6</ele>
-    <name>ObsidianTR</name>
+    <name>Obsidian Trail Junction</name>
     <desc><![CDATA[Obsidian Trail #3528 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.168550" lon="-121.816898">
@@ -87781,7 +87761,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.179048" lon="-121.818167">
     <ele>1950.5</ele>
-    <name>GlacierWayTR</name>
+    <name>Glacier Way Trail Junction</name>
     <desc><![CDATA[Glacier Way Trail #4336 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.178945" lon="-121.817110">
@@ -87806,7 +87786,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.208662" lon="-121.791887">
     <ele>1913.3</ele>
-    <name>ScottLakeTR</name>
+    <name>Scott Lake Trail Junction</name>
     <desc><![CDATA[Scott Lake Trailhead Trail #3531 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.225627" lon="-121.775487">
@@ -87816,7 +87796,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="44.231265" lon="-121.772578">
     <ele>1841.7</ele>
-    <name>ScottPassTR</name>
+    <name>Scott Pass Trail Junction</name>
     <desc><![CDATA[Scott Pass Trail #4068 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.231617" lon="-121.773174">
@@ -87826,7 +87806,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.232297" lon="-121.774595">
     <ele>1843.9</ele>
-    <name>MatthieuLakeTR</name>
+    <name>Matthieu Lake Trail Junction</name>
     <desc><![CDATA[Matthieu Lake Trail #4062 junction. Camping restricted at North Matthieu Lake to 7 first come first serve sites marked by a post in the ground. If occupied, camp at least a quarter mile away.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.250585" lon="-121.783288">
@@ -87836,7 +87816,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.250302" lon="-121.784708">
     <ele>1662.5</ele>
-    <name>MatthieuLakeTR2</name>
+    <name>Matthieu Lake Trail Junction #2</name>
     <desc><![CDATA[Matthieu Lake Trail #4062, second junction. Camping restricted at North Matthieu Lake to 7 first come first serve sites marked by a post in the ground. If occupied, camp at least a quarter mile away.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.261100" lon="-121.785694">
@@ -87846,7 +87826,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="44.257551" lon="-121.790035">
     <ele>1611.4</ele>
-    <name>LavaCampLakeTR</name>
+    <name>Lava Camp Lake Trail Junction</name>
     <desc><![CDATA[Lava Camp Lake Trail #4060 junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.259832" lon="-121.805197">
@@ -91259,7 +91239,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="44.282139" lon="-121.828837">
     <ele>1863.1</ele>
-    <name>LittleBelknapTR</name>
+    <name>Little Belknap Trail Junction</name>
     <desc><![CDATA[Little Belknap Trail #3003 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.325838" lon="-121.854901">
@@ -91279,7 +91259,7 @@
     <sym>Post Office</sym>
   </wpt><wpt lat="44.361409" lon="-121.871297">
     <ele>1455.6</ele>
-    <name>BigLakeYouthCampTR</name>
+    <name>Big Lake Youth Camp Trail Junction</name>
     <desc><![CDATA[Trail junction to Big Lake Youth Camp and road 960. Marked "User Trail."]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.379730" lon="-121.856085">
@@ -91299,7 +91279,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="44.390543" lon="-121.848795">
     <ele>1441.1</ele>
-    <name>SouthLoopSkiTR</name>
+    <name>South Loop Ski Trail Junction</name>
     <desc><![CDATA[South Loop Ski Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.394345" lon="-121.848347">
@@ -91334,7 +91314,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.427353" lon="-121.846634">
     <ele>1494.7</ele>
-    <name>SummitLakeTR3</name>
+    <name>Summit Lake Trail Junction #3</name>
     <desc><![CDATA[Summit Lake Trail #4014 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.428676" lon="-121.848354">
@@ -91344,7 +91324,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="44.437526" lon="-121.855044">
     <ele>1585.4</ele>
-    <name>SantiamLakeTR</name>
+    <name>Santiam Lake Trail Junction</name>
     <desc><![CDATA[Santiam Lake Trail #3491 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.460630" lon="-121.847127">
@@ -91364,7 +91344,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.513595" lon="-121.811954">
     <ele>1626.8</ele>
-    <name>MarionTrailheadTR</name>
+    <name>Marion Trailhead Trail Junction</name>
     <desc><![CDATA[Marion Trailhead, Wasco Lake trail junctions.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.552809" lon="-121.804289">
@@ -91379,7 +91359,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="44.616319" lon="-121.817091">
     <ele>1804.0</ele>
-    <name>HuntsCreekTR</name>
+    <name>Hunts Creek Trail Junction</name>
     <desc><![CDATA[Hunts Creek Trail #3440 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.636136" lon="-121.817070">
@@ -91394,7 +91374,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.663449" lon="-121.847939">
     <ele>1315.1</ele>
-    <name>HuntsCreekTR2</name>
+    <name>Hunts Creek Trail Junction #2</name>
     <desc><![CDATA[Hunts Creek Trail #3440 second junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.664662" lon="-121.846589">
@@ -91404,7 +91384,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.681121" lon="-121.855678">
     <ele>1539.6</ele>
-    <name>WoodpeckerTR</name>
+    <name>Woodpecker Trail Junction</name>
     <desc><![CDATA[Woodpecker Trailhead Trail #3442 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.683047" lon="-121.850290">
@@ -91434,7 +91414,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.703285" lon="-121.825775">
     <ele>1701.2</ele>
-    <name>WhitewaterCreekTR</name>
+    <name>Whitewater Creek Trail Junction</name>
     <desc><![CDATA[Whitewater Creek Trail #3429 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.704962" lon="-121.818470">
@@ -91454,7 +91434,7 @@
     <sym>Flag, Blue</sym>
   </wpt><wpt lat="44.714870" lon="-121.803857">
     <ele>1794.1</ele>
-    <name>SouthBreitenbushTR</name>
+    <name>South Breitenbush Trail Junction</name>
     <desc><![CDATA[South Breitenbush Trail #3375 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.716139" lon="-121.803381">
@@ -91504,12 +91484,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.775944" lon="-121.796697">
     <ele>1692.3</ele>
-    <name>GibsonLakeTR</name>
+    <name>Gibson Lake Trail Junction</name>
     <desc><![CDATA[Gibson Lake Trail #708 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.777110" lon="-121.798089">
     <ele>1682.8</ele>
-    <name>HorseshoeSaddleTR</name>
+    <name>Horseshoe Saddle Trail Junction</name>
     <desc><![CDATA[Horseshoe Saddle Trail #712 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.792329" lon="-121.806235">
@@ -91529,7 +91509,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.808119" lon="-121.810746">
     <ele>1613.5</ele>
-    <name>RedLakeTR3</name>
+    <name>Red Lake Trail Junction #3</name>
     <desc><![CDATA[Red Lake Trail #719 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.812500" lon="-121.800392">
@@ -91539,7 +91519,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.814351" lon="-121.791218">
     <ele>1512.7</ele>
-    <name>OlallieLakeTR</name>
+    <name>Olallie Lake Trail Junction</name>
     <desc><![CDATA[Trail to Olallie Lake.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.813766" lon="-121.789135">
@@ -91564,7 +91544,7 @@
     <sym>Powerline</sym>
   </wpt><wpt lat="44.854027" lon="-121.767375">
     <ele>1404.0</ele>
-    <name>RussLakeTR</name>
+    <name>Russ Lake Trail Junction</name>
     <desc><![CDATA[Russ Lake Trail #716 junction. Warm Springs Reservation next 23 miles to the N. Please stay on the PCT right-of-way, which is 200 feet wide. Trespassing and hunting are prohibited on tribal lands.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.854876" lon="-121.763238">
@@ -91589,7 +91569,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="44.904903" lon="-121.742704">
     <ele>1341.9</ele>
-    <name>TrooperSpringTR</name>
+    <name>Trooper Spring Trail Junction</name>
     <desc><![CDATA[Trooper Spring spur trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="44.904469" lon="-121.743274">
@@ -91679,12 +91659,12 @@
     <sym>Forest</sym>
   </wpt><wpt lat="45.095405" lon="-121.738632">
     <ele>1044.7</ele>
-    <name>MillerTR</name>
+    <name>Miller Trail Junction</name>
     <desc><![CDATA[Miller Trail #534, Headwaters Trail #522 junctions.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.100683" lon="-121.743585">
     <ele>1021.0</ele>
-    <name>JoeGrahamTR</name>
+    <name>Joe Graham Trail Junction</name>
     <desc><![CDATA[Joe Graham Trail #524 junction. Joe Graham Horse Camp campground with water spigots, outhouse, about 3/10 mile W.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.101825" lon="-121.746768">
@@ -91724,7 +91704,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.142929" lon="-121.755532">
     <ele>986.0</ele>
-    <name>TimothyLakeBikeTR</name>
+    <name>Timothy Lake Bike Trail Junction</name>
     <desc><![CDATA[Timothy Lake Bike Trail #537 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.143544" lon="-121.754616">
@@ -91734,12 +91714,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.144402" lon="-121.754509">
     <ele>986.8</ele>
-    <name>TimothyLakeTR</name>
+    <name>Timothy Lake Trail Junction</name>
     <desc><![CDATA[Timothy Lake Trail #528 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.147820" lon="-121.753506">
     <ele>989.1</ele>
-    <name>LittleCraterLakeTR</name>
+    <name>Little Crater Lake Trail Junction</name>
     <desc><![CDATA[Little Crater Lake and campground trail junction. Little Crater Lake is 1/4 mile E of PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.148399" lon="-121.751038">
@@ -91754,7 +91734,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="45.177370" lon="-121.758999">
     <ele>1118.1</ele>
-    <name>JackpotMeadowsTR</name>
+    <name>Jackpot Meadows Trail Junction</name>
     <desc><![CDATA[Jackpot Meadows Trail #492 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.186503" lon="-121.758631">
@@ -91784,22 +91764,22 @@
     <sym>Campground</sym>
   </wpt><wpt lat="45.236989" lon="-121.686465">
     <ele>1340.2</ele>
-    <name>TwinLakesTR</name>
+    <name>Twin Lakes Trail Junction</name>
     <desc><![CDATA[Twin Lakes Trail #495 junction, Mount Hood Wilderness boundary nearby.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.257869" lon="-121.691705">
     <ele>1327.6</ele>
-    <name>TwinLakesTR2</name>
+    <name>Twin Lakes Trail Junction #2</name>
     <desc><![CDATA[Twin Lakes Trail #495 second junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.264203" lon="-121.690950">
     <ele>1355.5</ele>
-    <name>PalmeteerTR</name>
+    <name>Palmeteer Trail Junction</name>
     <desc><![CDATA[Palmeteer Trail #482 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.282522" lon="-121.684955">
     <ele>1269.3</ele>
-    <name>BarlowPassTR</name>
+    <name>Barlow Pass Trail Junction</name>
     <desc><![CDATA[Barlow Pass Trailhead, paved parking, picnic table, trash cans, and outhouse.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.284354" lon="-121.681520">
@@ -94407,7 +94387,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="45.321960" lon="-121.696050">
     <ele>1629.2</ele>
-    <name>TimberlineTR</name>
+    <name>Timberline Trail Junction</name>
     <desc><![CDATA[Timberline Trail #600 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.334204" lon="-121.707267">
@@ -94422,7 +94402,7 @@
     <sym>Lodging</sym>
   </wpt><wpt lat="45.332882" lon="-121.711414">
     <ele>1843.3</ele>
-    <name>TimberlineLodgeTR</name>
+    <name>Timberline Lodge Trail Junction</name>
     <desc><![CDATA[Trail junction to Timberline Lodge]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.333565" lon="-121.713921">
@@ -94437,7 +94417,7 @@
     <sym>Ski Resort</sym>
   </wpt><wpt lat="45.336185" lon="-121.721908">
     <ele>1824.4</ele>
-    <name>MountaineerTR</name>
+    <name>Mountaineer Trail Junction</name>
     <desc><![CDATA[Mountaineer Trail #798 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.336190" lon="-121.722836">
@@ -94452,7 +94432,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.338658" lon="-121.733872">
     <ele>1742.1</ele>
-    <name>HiddenLakeTR2</name>
+    <name>Hidden Lake Trail Junction #2</name>
     <desc><![CDATA[Hidden Lake Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.342073" lon="-121.745505">
@@ -94467,12 +94447,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.343039" lon="-121.752483">
     <ele>1530.2</ele>
-    <name>ParadiseLoopTR</name>
+    <name>Paradise Loop Trail Junction</name>
     <desc><![CDATA[Paradise Loop Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.344073" lon="-121.754479">
     <ele>1599.4</ele>
-    <name>ParadiseParkTR</name>
+    <name>Paradise Park Trail Junction</name>
     <desc><![CDATA[Paradise Park Trail #778 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.351944" lon="-121.750303">
@@ -94492,7 +94472,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.361049" lon="-121.752072">
     <ele>1660.3</ele>
-    <name>ParadiseParkLoopTR</name>
+    <name>Paradise Park Loop Trail Junction</name>
     <desc><![CDATA[Paradise Park Loop Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.372874" lon="-121.777791">
@@ -94522,12 +94502,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.379867" lon="-121.784210">
     <ele>1012.7</ele>
-    <name>TimberlineTR2</name>
+    <name>Timberline Trail Junction #2</name>
     <desc><![CDATA[Timberline Trail #600 junction (Ramona Falls alternate trail).]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.391110" lon="-121.808115">
     <ele>843.4</ele>
-    <name>SandyRiverTR</name>
+    <name>Sandy River Trail Junction</name>
     <desc><![CDATA[Sandy River Trail junction to a trailhead.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.391840" lon="-121.805908">
@@ -94537,7 +94517,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.395558" lon="-121.800798">
     <ele>856.6</ele>
-    <name>RamonaFallsTR</name>
+    <name>Ramona Falls Trail Junction</name>
     <desc><![CDATA[Ramona Falls Trail #797 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.395916" lon="-121.800835">
@@ -94557,7 +94537,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.405288" lon="-121.778469">
     <ele>1323.2</ele>
-    <name>TimberlineTR3</name>
+    <name>Timberline Trail Junction #3</name>
     <desc><![CDATA[Timberline Trail #600 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.405404" lon="-121.778502">
@@ -94567,7 +94547,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="45.405653" lon="-121.778854">
     <ele>1319.0</ele>
-    <name>TopSpurTR</name>
+    <name>Top Spur Trail Junction</name>
     <desc><![CDATA[Top Spur Trail #785 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.426840" lon="-121.796218">
@@ -94592,7 +94572,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.467851" lon="-121.829269">
     <ele>1225.2</ele>
-    <name>HuckleberryMtnTR</name>
+    <name>Huckleberry Mtn Trail Junction</name>
     <desc><![CDATA[Huckleberry Mountain Trail #617 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.467912" lon="-121.829398">
@@ -94602,7 +94582,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="45.470298" lon="-121.830139">
     <ele>1254.9</ele>
-    <name>SalvationSpringTR</name>
+    <name>Salvation Spring Trail Junction</name>
     <desc><![CDATA[Salvation Spring Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.470706" lon="-121.830167">
@@ -94637,7 +94617,7 @@
     <sym>Flag, Red</sym>
   </wpt><wpt lat="45.579236" lon="-121.842621">
     <ele>782.3</ele>
-    <name>EagleCreekTR</name>
+    <name>Eagle Creek Trail Junction</name>
     <desc><![CDATA[Indian Springs Trail 435 meets Eagle Creek Trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.637495" lon="-121.919737">
@@ -94677,12 +94657,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.585521" lon="-121.807532">
     <ele>1304.0</ele>
-    <name>HermanCreekTR</name>
+    <name>Herman Creek Trail Junction</name>
     <desc><![CDATA[Herman Creek Trail #406 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.584109" lon="-121.809056">
     <ele>1301.4</ele>
-    <name>ChinidereCutoffTR</name>
+    <name>Chinidere Cutoff Trail Junction</name>
     <desc><![CDATA[Chinidere Cutoff Trail #406M junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.613632" lon="-121.841591">
@@ -94692,17 +94672,17 @@
     <sym>Campground</sym>
   </wpt><wpt lat="45.630504" lon="-121.841774">
     <ele>1248.7</ele>
-    <name>RuckelCreekTR</name>
+    <name>Ruckel Creek Trail Junction</name>
     <desc><![CDATA[Ruckel Creek Trail #405 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.639467" lon="-121.847660">
     <ele>1198.0</ele>
-    <name>BensonRuckelTR</name>
+    <name>Benson Ruckel Trail Junction</name>
     <desc><![CDATA[Benson Ruckel Trail #404A junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.647687" lon="-121.841252">
     <ele>1147.3</ele>
-    <name>BensonWayTR</name>
+    <name>Benson Way Trail Junction</name>
     <desc><![CDATA[Benson Way Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.647919" lon="-121.840799">
@@ -94732,7 +94712,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="45.671730" lon="-121.839072">
     <ele>298.1</ele>
-    <name>HermanBridgeTR</name>
+    <name>Herman Bridge Trail Junction</name>
     <desc><![CDATA[Herman Bridge Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.668977" lon="-121.845529">
@@ -94747,7 +94727,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.660134" lon="-121.869297">
     <ele>213.5</ele>
-    <name>DryCreekFallsTR</name>
+    <name>Dry Creek Falls Trail Junction</name>
     <desc><![CDATA[Dry Creek Falls Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.659405" lon="-121.882997">
@@ -99572,7 +99552,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="45.653304" lon="-121.926222">
     <ele>113.5</ele>
-    <name>TamanousTR</name>
+    <name>Tamanous Trail Junction</name>
     <desc><![CDATA[Tamanous Trail #27 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.667450" lon="-121.941811">
@@ -99662,7 +99642,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="45.736296" lon="-122.043075">
     <ele>992.0</ele>
-    <name>ThreeCornerRockTR</name>
+    <name>Three Corner Rock Trail Junction</name>
     <desc><![CDATA[Three Corner Rock Trail, Washougal River Trail junctions.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.733038" lon="-122.046197">
@@ -99747,7 +99727,7 @@
     <sym>Truck</sym>
   </wpt><wpt lat="45.810862" lon="-121.933359">
     <ele>370.8</ele>
-    <name>BunkerHillTR</name>
+    <name>Bunker Hill Trail Junction</name>
     <desc><![CDATA[Bunker Hill Trail #145 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.819938" lon="-121.921580">
@@ -99807,12 +99787,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="45.840991" lon="-121.797454">
     <ele>1090.2</ele>
-    <name>CedarCreekTR</name>
+    <name>Cedar Creek Trail Junction</name>
     <desc><![CDATA[Cedar Creek Trail #149 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.846734" lon="-121.786890">
     <ele>1211.5</ele>
-    <name>GrassyKnollTR</name>
+    <name>Grassy Knoll Trail Junction</name>
     <desc><![CDATA[Grassy Knoll Trail #149 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.850593" lon="-121.786308">
@@ -99847,7 +99827,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="45.945725" lon="-121.812176">
     <ele>1291.9</ele>
-    <name>IndianRaceTrackTR</name>
+    <name>Indian Race Track Trail Junction</name>
     <desc><![CDATA[Indian Race Track Shortcut Trail #171A junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="45.983011" lon="-121.796263">
@@ -99862,12 +99842,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.003535" lon="-121.788197">
     <ele>1455.5</ele>
-    <name>EastCraterTR</name>
+    <name>East Crater Trail Junction</name>
     <desc><![CDATA[East Crater Trail #48 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.005321" lon="-121.788692">
     <ele>1445.5</ele>
-    <name>LemeiLakeTR</name>
+    <name>Lemei Lake Trail Junction</name>
     <desc><![CDATA[Lemei Lake Trail #179 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.017953" lon="-121.787806">
@@ -99877,27 +99857,27 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.025259" lon="-121.786232">
     <ele>1492.7</ele>
-    <name>IndianHeavenTR</name>
+    <name>Indian Heaven Trail Junction</name>
     <desc><![CDATA[Indian Heaven Trail #33 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.038027" lon="-121.786006">
     <ele>1523.9</ele>
-    <name>PlacidLakeTR</name>
+    <name>Placid Lake Trail Junction</name>
     <desc><![CDATA[Placid Lake Trail #29 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.046673" lon="-121.777854">
     <ele>1566.6</ele>
-    <name>WoodLakeTR</name>
+    <name>Wood Lake Trail Junction</name>
     <desc><![CDATA[ Wood Lake Trail #185, Cultus Creek Trail #108 junctions.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.061134" lon="-121.774115">
     <ele>1479.0</ele>
-    <name>SawtoothMountainTR</name>
+    <name>Sawtooth Mountain Trail Junction</name>
     <desc><![CDATA[Sawtooth Mountain Trail #107 Junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.078432" lon="-121.771924">
     <ele>1399.2</ele>
-    <name>SawtoothMountainTR2</name>
+    <name>Sawtooth Mountain Trail Junction #2</name>
     <desc><![CDATA[Sawtooth Mountain Trail #107 second junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.079054" lon="-121.772870">
@@ -99992,7 +99972,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="46.187236" lon="-121.620370">
     <ele>1368.8</ele>
-    <name>RileyShortcutTR</name>
+    <name>Riley Shortcut Trail Junction</name>
     <desc><![CDATA[Riley Shortcut Trail #644 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.179433" lon="-121.600501">
@@ -100012,7 +99992,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="46.180606" lon="-121.576171">
     <ele>1771.6</ele>
-    <name>StagmanRidgeTR</name>
+    <name>Stagman Ridge Trail Junction</name>
     <desc><![CDATA[Stagman Ridge Trail #12 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.212575" lon="-121.570453">
@@ -100027,7 +100007,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.215101" lon="-121.567499">
     <ele>1750.5</ele>
-    <name>RileyCampTR</name>
+    <name>Riley Camp Trail Junction</name>
     <desc><![CDATA[Riley Camp Trail #64 junction. Camp is 1/2 mile off-trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.215763" lon="-121.566418">
@@ -100057,7 +100037,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.240495" lon="-121.545608">
     <ele>1835.3</ele>
-    <name>DivideCampTR</name>
+    <name>Divide Camp Trail Junction</name>
     <desc><![CDATA[Divide Camp Trail #112 junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.249857" lon="-121.536871">
@@ -100067,7 +100047,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.250902" lon="-121.532727">
     <ele>1863.7</ele>
-    <name>HighCampTR</name>
+    <name>High Camp Trail Junction</name>
     <desc><![CDATA[High Camp Trail #10 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.255397" lon="-121.521969">
@@ -100077,7 +100057,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.256710" lon="-121.518886">
     <ele>1804.0</ele>
-    <name>HighlineTR</name>
+    <name>Highline Trail Junction</name>
     <desc><![CDATA[Highline Trail #114 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.261533" lon="-121.518330">
@@ -100087,7 +100067,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.283842" lon="-121.504972">
     <ele>1596.1</ele>
-    <name>MuddyMeadowsTR</name>
+    <name>Muddy Meadows Trail Junction</name>
     <desc><![CDATA[Muddy Meadows Trail #1, Highline Trail #114 junctions]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.300154" lon="-121.504224">
@@ -100162,7 +100142,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="46.396205" lon="-121.485280">
     <ele>1591.8</ele>
-    <name>ColemanWeedpatchTR</name>
+    <name>Coleman Weedpatch Trail Junction</name>
     <desc><![CDATA[Coleman Weedpatch Trail #121 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.395230" lon="-121.481237">
@@ -100187,7 +100167,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="46.410377" lon="-121.402486">
     <ele>1513.0</ele>
-    <name>WaluptLakeTR</name>
+    <name>Walupt Lake Trail Junction</name>
     <desc><![CDATA[Walupt Lake Trail #101 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.421686" lon="-121.402715">
@@ -100207,7 +100187,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.453063" lon="-121.431476">
     <ele>1757.3</ele>
-    <name>NannieRidgeTR</name>
+    <name>Nannie Ridge Trail Junction</name>
     <desc><![CDATA[Nannie Ridge Trail #98 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.472152" lon="-121.431199">
@@ -100242,7 +100222,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="46.487646" lon="-121.459817">
     <ele>1817.8</ele>
-    <name>BypassTR</name>
+    <name>Bypass Trail Junction</name>
     <desc><![CDATA[Bypass Trail #97 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.493320" lon="-121.464035">
@@ -100252,7 +100232,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="46.498638" lon="-121.464075">
     <ele>1951.8</ele>
-    <name>SnowgrassTR</name>
+    <name>Snowgrass Trail Junction</name>
     <desc><![CDATA[Snowgrass Trail #96 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.511939" lon="-121.465321">
@@ -100262,17 +100242,17 @@
     <sym>Campground</sym>
   </wpt><wpt lat="46.514381" lon="-121.460868">
     <ele>2184.7</ele>
-    <name>OldSnowyTR</name>
+    <name>Old Snowy Trail Junction</name>
     <desc><![CDATA[Old Snowy PCT Alternate Trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.518827" lon="-121.455243">
     <ele>2162.5</ele>
-    <name>OldSnowyTR2</name>
+    <name>Old Snowy Trail Junction #2</name>
     <desc><![CDATA[PCT Old Snowy Alternate rejoins the PCT.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.538306" lon="-121.454993">
     <ele>2039.0</ele>
-    <name>CoyoteTR</name>
+    <name>Coyote Trail Junction</name>
     <desc><![CDATA[Coyote Trail #79 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.540492" lon="-121.449261">
@@ -100317,7 +100297,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.553932" lon="-121.420023">
     <ele>1456.3</ele>
-    <name>NForkTietonTR</name>
+    <name>NFork Tieton Trail Junction</name>
     <desc><![CDATA[North Fork Tieton Trail #1118, Clear Fork Trail #61 junctions]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.554066" lon="-121.417637">
@@ -100332,7 +100312,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.575433" lon="-121.398327">
     <ele>1693.6</ele>
-    <name>HiddenSpringTR</name>
+    <name>Hidden Spring Trail Junction</name>
     <desc><![CDATA[Hidden Spring Trail #1117 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.574637" lon="-121.394048">
@@ -100342,12 +100322,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.585050" lon="-121.400735">
     <ele>1860.7</ele>
-    <name>ShoeLakeTR</name>
+    <name>Shoe Lake Trail Junction</name>
     <desc><![CDATA[Shoe Lake Trail #1119 junction. No camping or fires in Shoe Lake Basin. Grazing, hitching, or tethering of stock within 200 ft of lake is prohibited.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.592250" lon="-121.400102">
     <ele>1995.5</ele>
-    <name>ShoeLakeTR2</name>
+    <name>Shoe Lake Trail Junction #2</name>
     <desc><![CDATA[Shoe Lake Trail #1119 second junction. No camping or fires in Shoe Lake Basin. Grazing, hitching, or tethering of stock within 200 ft of lake is prohibited.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.602046" lon="-121.402978">
@@ -100367,12 +100347,12 @@
     <sym>Forest</sym>
   </wpt><wpt lat="46.617714" lon="-121.386757">
     <ele>1769.2</ele>
-    <name>ChairliftTR</name>
+    <name>Chairlift Trail Junction</name>
     <desc><![CDATA[Chair Lift Trail #1112 junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.625547" lon="-121.372389">
     <ele>1656.2</ele>
-    <name>TwinPeaksTR</name>
+    <name>Twin Peaks Trail Junction</name>
     <desc><![CDATA[Twin Peaks Trail #1144 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.627729" lon="-121.374948">
@@ -103855,7 +103835,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="46.652372" lon="-121.393716">
     <ele>1468.0</ele>
-    <name>DarkMeadowTR</name>
+    <name>Dark Meadow Trail Junction</name>
     <desc><![CDATA[Dark Meadow Trail #1107 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.652268" lon="-121.400618">
@@ -103875,7 +103855,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.683403" lon="-121.403831">
     <ele>1670.8</ele>
-    <name>CortrightCreekTR</name>
+    <name>Cortright Creek Trail Junction</name>
     <desc><![CDATA[Cortright Creek Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.684062" lon="-121.403670">
@@ -103890,7 +103870,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.696397" lon="-121.388807">
     <ele>1565.5</ele>
-    <name>DumbbellTR</name>
+    <name>Dumbbell Trail Junction</name>
     <desc><![CDATA[Dumbbell Trail #1156 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.696579" lon="-121.388385">
@@ -103905,12 +103885,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.707745" lon="-121.383785">
     <ele>1575.2</ele>
-    <name>CowlitzTR</name>
+    <name>Cowlitz Trail Junction</name>
     <desc><![CDATA[Cowlitz Trail #44 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.709593" lon="-121.387142">
     <ele>1562.9</ele>
-    <name>CowlitzTR2</name>
+    <name>Cowlitz Trail Junction #2</name>
     <desc><![CDATA[Cowlitz Trail #44 second junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.723096" lon="-121.403988">
@@ -103920,17 +103900,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.732279" lon="-121.403327">
     <ele>1486.0</ele>
-    <name>TwinSistersTR</name>
+    <name>Twin Sisters Trail Junction</name>
     <desc><![CDATA[Twin Sisters Trail #980 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.732364" lon="-121.405175">
     <ele>1477.9</ele>
-    <name>PotholeTR</name>
+    <name>Pothole Trail Junction</name>
     <desc><![CDATA[Pothole Trail #45 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.743342" lon="-121.415285">
     <ele>1421.8</ele>
-    <name>JugLakeTR</name>
+    <name>Jug Lake Trail Junction</name>
     <desc><![CDATA[Jug Lake Trail #43 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.748359" lon="-121.418981">
@@ -103945,7 +103925,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.764026" lon="-121.425996">
     <ele>1251.5</ele>
-    <name>BumpingLakeTR</name>
+    <name>Bumping Lake Trail Junction</name>
     <desc><![CDATA[Bumping Lake Trail #971 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.771429" lon="-121.427308">
@@ -103960,12 +103940,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.771873" lon="-121.449952">
     <ele>1741.0</ele>
-    <name>LaughingwaterTR</name>
+    <name>Laughingwater Trail Junction</name>
     <desc><![CDATA[ Laughingwater Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.790844" lon="-121.447855">
     <ele>1707.8</ele>
-    <name>TwoLakesTR</name>
+    <name>Two Lakes Trail Junction</name>
     <desc><![CDATA[Two Lakes Trail #990 junction, several small campsites nearby.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.786876" lon="-121.448018">
@@ -103980,7 +103960,7 @@
     <sym>Forest</sym>
   </wpt><wpt lat="46.817116" lon="-121.468659">
     <ele>1630.7</ele>
-    <name>AmericanRidgeTR</name>
+    <name>American Ridge Trail Junction</name>
     <desc><![CDATA[American Ridge Trail #958 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.831625" lon="-121.474418">
@@ -104015,7 +103995,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.862230" lon="-121.496312">
     <ele>1777.0</ele>
-    <name>TipsooLakeTR</name>
+    <name>Tipsoo Lake Trail Junction</name>
     <desc><![CDATA[Tipsoo Lake Trail junction. ]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.872263" lon="-121.511474">
@@ -104040,17 +104020,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.916625" lon="-121.472347">
     <ele>1793.6</ele>
-    <name>BearGapTR</name>
+    <name>Bear Gap Trail Junction</name>
     <desc><![CDATA[Bear Gap Trail #967 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.921619" lon="-121.460858">
     <ele>1804.7</ele>
-    <name>FogCityTR</name>
+    <name>Fog City Trail Junction</name>
     <desc><![CDATA[Fog City Trail #967A junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.955657" lon="-121.449329">
     <ele>1945.8</ele>
-    <name>BasinTR</name>
+    <name>Basin Trail Junction</name>
     <desc><![CDATA[Basin Trail #987 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.959661" lon="-121.449125">
@@ -104065,7 +104045,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="46.962297" lon="-121.453036">
     <ele>1895.1</ele>
-    <name>CrowLakeWayTR</name>
+    <name>Crow Lake Way Trail Junction</name>
     <desc><![CDATA[Crow Lake Way Trail #953 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="46.962892" lon="-121.452493">
@@ -104080,12 +104060,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.012716" lon="-121.405582">
     <ele>1810.7</ele>
-    <name>ArchRockTR</name>
+    <name>Arch Rock Trail Junction</name>
     <desc><![CDATA[Arch Rock Trail #1187 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.018844" lon="-121.397221">
     <ele>1773.8</ele>
-    <name>RavenRoostTR</name>
+    <name>Raven Roost Trail Junction</name>
     <desc><![CDATA[Raven Roost Trail #951 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.035655" lon="-121.396911">
@@ -104100,17 +104080,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.049895" lon="-121.383285">
     <ele>1582.1</ele>
-    <name>LouisianaSaddleTR</name>
+    <name>Louisiana Saddle Trail Junction</name>
     <desc><![CDATA[Louisiana Saddle Trail #945A junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.081886" lon="-121.385807">
     <ele>1480.0</ele>
-    <name>MaggieCreekTR</name>
+    <name>Maggie Creek Trail Junction</name>
     <desc><![CDATA[Maggie Creek Trail #1186 junction, Norse Peak Wilderness boundary.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.082763" lon="-121.388139">
     <ele>1481.0</ele>
-    <name>Road70TR</name>
+    <name>Road70 Trail Junction</name>
     <desc><![CDATA[Trail junction to Road 70 and horse camp.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.088847" lon="-121.396410">
@@ -104165,12 +104145,12 @@
     <sym>Truck</sym>
   </wpt><wpt lat="47.136484" lon="-121.309761">
     <ele>1624.4</ele>
-    <name>BearCreekTR2</name>
+    <name>Bear Creek Trail Junction #2</name>
     <desc><![CDATA[Bear Creek Trail #943 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.147900" lon="-121.299068">
     <ele>1600.5</ele>
-    <name>BlowoutMountainTR</name>
+    <name>Blowout Mountain Trail Junction</name>
     <desc><![CDATA[Blowout Mountain Trail #1318 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.160716" lon="-121.304933">
@@ -104310,7 +104290,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.299923" lon="-121.415510">
     <ele>1052.8</ele>
-    <name>MeadowCreekTR</name>
+    <name>Meadow Creek Trail Junction</name>
     <desc><![CDATA[Meadow Creek Trail #1338 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.300116" lon="-121.416013">
@@ -104360,12 +104340,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.347979" lon="-121.438922">
     <ele>1289.5</ele>
-    <name>MirrorLakeTR</name>
+    <name>Mirror Lake Trail Junction</name>
     <desc><![CDATA[Mirror Lake Trail #1302 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.351674" lon="-121.442353">
     <ele>1378.8</ele>
-    <name>ColdCreekTR</name>
+    <name>Cold Creek Trail Junction</name>
     <desc><![CDATA[Cold Creek Trail #1303 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.350997" lon="-121.444530">
@@ -108309,17 +108289,17 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.468553" lon="-121.448044">
     <ele>1250.7</ele>
-    <name>GemLakeTR</name>
+    <name>Gem Lake Trail Junction</name>
     <desc><![CDATA[Gem Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.484412" lon="-121.391595">
     <ele>536.5</ele>
-    <name>GoldmyerTR</name>
+    <name>Goldmyer Trail Junction</name>
     <desc><![CDATA[Goldmyer Hot Springs trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.509161" lon="-121.350737">
     <ele>847.9</ele>
-    <name>MiddleForkTR</name>
+    <name>Middle Fork Trail Junction</name>
     <desc><![CDATA[Middle Fork Trail junction, alternate joins unpaved road for 4/10 mile.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.487800" lon="-121.388594">
@@ -108334,7 +108314,7 @@
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.458111" lon="-121.447855">
     <ele>1179.5</ele>
-    <name>SourceLakeTR</name>
+    <name>Source Lake Trail Junction</name>
     <desc><![CDATA[Source Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.483063" lon="-121.418704">
@@ -108344,7 +108324,7 @@
     <sym>Drinking Water</sym>
   </wpt><wpt lat="47.543670" lon="-121.252290">
     <ele>1333.2</ele>
-    <name>WilliamsLakeTR</name>
+    <name>Williams Lake Trail Junction</name>
     <desc><![CDATA[Williams Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.427507" lon="-121.413374">
@@ -108369,7 +108349,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.439436" lon="-121.397398">
     <ele>1153.9</ele>
-    <name>CommonwealthTR</name>
+    <name>Commonwealth Trail Junction</name>
     <desc><![CDATA[Commonwealth Basin Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.437384" lon="-121.393815">
@@ -108434,7 +108414,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.452192" lon="-121.295338">
     <ele>1497.0</ele>
-    <name>MineralCreekTR</name>
+    <name>Mineral Creek Trail Junction</name>
     <desc><![CDATA[Mineral Creek Trail #1331 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.453423" lon="-121.280264">
@@ -108444,7 +108424,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.456947" lon="-121.275653">
     <ele>1350.3</ele>
-    <name>SpectacleLakeTR</name>
+    <name>Spectacle Lake Trail Junction</name>
     <desc><![CDATA[Spectacle Lake Trail #1306 junction, Spectacle Lake is 1/2 mile off-trail.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.459716" lon="-121.271606">
@@ -108459,7 +108439,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.469059" lon="-121.257565">
     <ele>989.2</ele>
-    <name>PeteLakeTR</name>
+    <name>Pete Lake Trail Junction</name>
     <desc><![CDATA[Pete Lake Trail #1323 trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.476586" lon="-121.261784">
@@ -108474,7 +108454,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.484143" lon="-121.259296">
     <ele>983.9</ele>
-    <name>LemahMeadowTR</name>
+    <name>Lemah Meadow Trail Junction</name>
     <desc><![CDATA[Lemah Meadow Trail #1323B junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.485145" lon="-121.259155">
@@ -108509,7 +108489,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.498740" lon="-121.213007">
     <ele>1576.2</ele>
-    <name>WaptusBurnTR</name>
+    <name>Waptus Burn Trail Junction</name>
     <desc><![CDATA[Waptus Burn Trail #1329C junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.507558" lon="-121.215727">
@@ -108539,7 +108519,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.516000" lon="-121.210669">
     <ele>928.1</ele>
-    <name>DutchMillerGapTR</name>
+    <name>Dutch Miller Gap Trail Junction</name>
     <desc><![CDATA[Dutch Miller Gap Trail #1362 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.516922" lon="-121.208731">
@@ -108564,7 +108544,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.515790" lon="-121.195729">
     <ele>948.3</ele>
-    <name>WaptusRiverTR</name>
+    <name>Waptus River Trail Junction</name>
     <desc><![CDATA[Waptus River Trail #1310 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.510621" lon="-121.181964">
@@ -108574,7 +108554,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.506722" lon="-121.171815">
     <ele>987.8</ele>
-    <name>SpadeLakeTR</name>
+    <name>Spade Lake Trail Junction</name>
     <desc><![CDATA[Spade Lake Trail #1337 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.506573" lon="-121.170196">
@@ -108584,7 +108564,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.507738" lon="-121.154275">
     <ele>1020.6</ele>
-    <name>SpinolaCreekTR</name>
+    <name>Spinola Creek Trail Junction</name>
     <desc><![CDATA[Spinola Creek Trail #1310.1 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.523856" lon="-121.136229">
@@ -108594,7 +108574,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.535635" lon="-121.137565">
     <ele>1353.7</ele>
-    <name>DeerLakeTR</name>
+    <name>Deer Lake Trail Junction</name>
     <desc><![CDATA[Deer Lake, Vicente Lake Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.536806" lon="-121.137682">
@@ -108614,7 +108594,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.550716" lon="-121.134025">
     <ele>1684.4</ele>
-    <name>PeggysPondTR</name>
+    <name>Peggys Pond Trail Junction</name>
     <desc><![CDATA[Peggy's Pond Trail #1375 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.550627" lon="-121.129652">
@@ -108624,22 +108604,22 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.550520" lon="-121.129470">
     <ele>1684.5</ele>
-    <name>CathedralPassTR</name>
+    <name>Cathedral Pass Trail Junction</name>
     <desc><![CDATA[Cathedral Pass Trail #1345 junction. Sign warns about a difficult ford 2 miles ahead, actual distance to the potentially difficult ford is 3.3 miles.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.533343" lon="-121.104594">
     <ele>1402.6</ele>
-    <name>CathedralPassTR2</name>
+    <name>Cathedral Pass Trail Junction #2</name>
     <desc><![CDATA[Cathedral Pass trail junction.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.593660" lon="-121.140442">
     <ele>1361.9</ele>
-    <name>HyasLakeTR</name>
+    <name>Hyas Lake Trail Junction</name>
     <desc><![CDATA[Hyas Lake Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.588065" lon="-121.136381">
     <ele>1286.9</ele>
-    <name>RobinLakeTR</name>
+    <name>Robin Lake Trail Junction</name>
     <desc><![CDATA[Robin Lake trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.558138" lon="-121.130068">
@@ -108674,17 +108654,17 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.593621" lon="-121.140524">
     <ele>1362.3</ele>
-    <name>HyasLakeTR2</name>
+    <name>Hyas Lake Trail Junction #2</name>
     <desc><![CDATA[Hyas Lake Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.593915" lon="-121.140683">
     <ele>1364.9</ele>
-    <name>MarmotLakeTR</name>
+    <name>Marmot Lake Trail Junction</name>
     <desc><![CDATA[Marmot Lake Trail #1066 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.594701" lon="-121.140976">
     <ele>1356.4</ele>
-    <name>DeceptionCreekTR</name>
+    <name>Deception Creek Trail Junction</name>
     <desc><![CDATA[Deception Creek Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.600905" lon="-121.137402">
@@ -108714,7 +108694,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.629085" lon="-121.148133">
     <ele>1510.9</ele>
-    <name>DeceptionCreekTR2</name>
+    <name>Deception Creek Trail Junction #2</name>
     <desc><![CDATA[Another trail to Deception Creek.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.630405" lon="-121.145743">
@@ -108729,7 +108709,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.634051" lon="-121.142703">
     <ele>1543.8</ele>
-    <name>SurpriseMountainTR</name>
+    <name>Surprise Mountain Trail Junction</name>
     <desc><![CDATA[Surprise Mountain Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.634345" lon="-121.143151">
@@ -108759,7 +108739,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.663333" lon="-121.139827">
     <ele>1482.4</ele>
-    <name>SurpriseCreekTR</name>
+    <name>Surprise Creek Trail Junction</name>
     <desc><![CDATA[Surprise Creek Trail #1060 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.662619" lon="-121.137973">
@@ -108769,7 +108749,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.672134" lon="-121.133356">
     <ele>1549.7</ele>
-    <name>SurpriseLakeTR</name>
+    <name>Surprise Lake Trail Junction</name>
     <desc><![CDATA[Surprise Lake Trail #1060A junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.674099" lon="-121.128991">
@@ -108789,7 +108769,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.698770" lon="-121.091119">
     <ele>1336.3</ele>
-    <name>TunnelCreekTR</name>
+    <name>Tunnel Creek Trail Junction</name>
     <desc><![CDATA[Tunnel Creek Trail #1061 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.698951" lon="-121.091013">
@@ -108804,7 +108784,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.719149" lon="-121.060863">
     <ele>1505.6</ele>
-    <name>IcicleCreekTR</name>
+    <name>Icicle Creek Trail Junction</name>
     <desc><![CDATA[Icicle Creek Trail #1551 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.722129" lon="-121.066772">
@@ -108834,7 +108814,7 @@
     <sym>Ski Resort</sym>
   </wpt><wpt lat="47.744001" lon="-121.087365">
     <ele>1280.8</ele>
-    <name>GranitePeaksLodgeTR</name>
+    <name>Granite Peaks Lodge Trail Junction</name>
     <desc><![CDATA[Use trail to Granite Peaks Lodge at Stevens Pass. The lodge has dining only, no overnight lodging. ]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.746224" lon="-121.088505">
@@ -113237,7 +113217,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.806927" lon="-121.086211">
     <ele>1428.9</ele>
-    <name>SmithbrookTR</name>
+    <name>Smithbrook Trail Junction</name>
     <desc><![CDATA[Smithbrook Trail #1590 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.809668" lon="-121.090624">
@@ -113272,12 +113252,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.879059" lon="-121.158723">
     <ele>1396.2</ele>
-    <name>TopLakeTR</name>
+    <name>Top Lake Trail Junction</name>
     <desc><![CDATA[Top Lake Trail #1506 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.879067" lon="-121.166056">
     <ele>1481.4</ele>
-    <name>MeadowCreekTR2</name>
+    <name>Meadow Creek Trail Junction #2</name>
     <desc><![CDATA[Meadow Creek Trail #1057 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.879507" lon="-121.168341">
@@ -113292,7 +113272,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.923717" lon="-121.185020">
     <ele>1502.8</ele>
-    <name>SkykomishRoadTR</name>
+    <name>Skykomish Road Trail Junction</name>
     <desc><![CDATA[Trail junction to the North fork of the Skykomish Road.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.928532" lon="-121.176981">
@@ -113302,7 +113282,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.932443" lon="-121.172684">
     <ele>1311.5</ele>
-    <name>CadyCreekTR</name>
+    <name>Cady Creek Trail Junction</name>
     <desc><![CDATA[Cady Creek Trail #1501 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.954565" lon="-121.157455">
@@ -113317,7 +113297,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="47.963918" lon="-121.146362">
     <ele>1641.2</ele>
-    <name>CadyRidgeTR</name>
+    <name>Cady Ridge Trail Junction</name>
     <desc><![CDATA[Cady Ridge Trail #1532 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.969218" lon="-121.150693">
@@ -113327,7 +113307,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.984477" lon="-121.135024">
     <ele>1675.1</ele>
-    <name>LittleWenatcheeTR</name>
+    <name>Little Wenatchee Trail Junction</name>
     <desc><![CDATA[Little Wenatchee Trail #1525 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="47.985632" lon="-121.122001">
@@ -113347,7 +113327,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="47.997403" lon="-121.121085">
     <ele>1515.6</ele>
-    <name>IndianCreekTR</name>
+    <name>Indian Creek Trail Junction</name>
     <desc><![CDATA[Indian Creek Trail #1502 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.004532" lon="-121.124002">
@@ -113357,7 +113337,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.014759" lon="-121.128613">
     <ele>1649.1</ele>
-    <name>WhiteRiverTR</name>
+    <name>White River Trail Junction</name>
     <desc><![CDATA[White River Trail #1507 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.017826" lon="-121.128600">
@@ -113367,7 +113347,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.034421" lon="-121.148920">
     <ele>1814.6</ele>
-    <name>FoamCreekTR</name>
+    <name>Foam Creek Trail Junction</name>
     <desc><![CDATA[Foam Creek Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.036451" lon="-121.156093">
@@ -113377,7 +113357,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.036555" lon="-121.157857">
     <ele>1832.1</ele>
-    <name>NForkSaukTR</name>
+    <name>NFork Sauk Trail Junction</name>
     <desc><![CDATA[North Fork Sauk Trail #649 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.051474" lon="-121.156358">
@@ -113442,7 +113422,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="48.108974" lon="-121.178496">
     <ele>1180.4</ele>
-    <name>WhiteChuckTR</name>
+    <name>White Chuck Trail Junction</name>
     <desc><![CDATA[White Chuck Trail #463 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.114622" lon="-121.175556">
@@ -113467,7 +113447,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.122335" lon="-121.177575">
     <ele>1270.3</ele>
-    <name>KennedyHotSpringTR</name>
+    <name>Kennedy Hot Spring Trail Junction</name>
     <desc><![CDATA[Kennedy Hot Spring trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.131469" lon="-121.153475">
@@ -113497,7 +113477,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.158795" lon="-121.164250">
     <ele>1933.1</ele>
-    <name>LaslaihCreekTR</name>
+    <name>Laslaih Creek Trail Junction</name>
     <desc><![CDATA[Laslaih Creek Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.166395" lon="-121.157617">
@@ -113562,7 +113542,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.183477" lon="-121.050376">
     <ele>879.2</ele>
-    <name>UpperSuiattleTR</name>
+    <name>Upper Suiattle Trail Junction</name>
     <desc><![CDATA[Upper Suiattle Trail #798, old PCT, not maintained.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.198342" lon="-121.062662">
@@ -113592,7 +113572,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="48.210517" lon="-121.081214">
     <ele>764.3</ele>
-    <name>SuiattleTR</name>
+    <name>Suiattle Trail Junction</name>
     <desc><![CDATA[Suiattle Trail #784 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.201413" lon="-121.060614">
@@ -113617,7 +113597,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="48.195907" lon="-121.043910">
     <ele>859.3</ele>
-    <name>ImageLakeTR</name>
+    <name>Image Lake Trail Junction</name>
     <desc><![CDATA[Image Lake Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.191919" lon="-121.040129">
@@ -113642,7 +113622,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.184342" lon="-120.972957">
     <ele>1410.7</ele>
-    <name>BuckCreekPassTR</name>
+    <name>Buck Creek Pass Trail Junction</name>
     <desc><![CDATA[Buck Creek Pass Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.185500" lon="-120.969179">
@@ -113667,12 +113647,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.197639" lon="-120.953234">
     <ele>1672.0</ele>
-    <name>MinersRidgeTR</name>
+    <name>Miners Ridge Trail Junction</name>
     <desc><![CDATA[Miners Ridge Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.198660" lon="-120.941838">
     <ele>1800.1</ele>
-    <name>CloudyPassTR</name>
+    <name>Cloudy Pass Trail Junction</name>
     <desc><![CDATA[Cloudy Pass Hiker Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.203169" lon="-120.943046">
@@ -113682,7 +113662,7 @@
     <sym>Campground</sym>
   </wpt><wpt lat="48.202957" lon="-120.939713">
     <ele>1730.2</ele>
-    <name>CloudyPassTR2</name>
+    <name>Cloudy Pass Trail Junction #2</name>
     <desc><![CDATA[Cloudy Pass Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.211526" lon="-120.943280">
@@ -113727,7 +113707,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.257049" lon="-120.927177">
     <ele>1085.8</ele>
-    <name>SForkAgnesCreekTR</name>
+    <name>SFork Agnes Creek Trail Junction</name>
     <desc><![CDATA[South Fork Agnes Creek Trail junction [not maintained].]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.257237" lon="-120.927272">
@@ -113797,7 +113777,7 @@
     <sym>Bridge</sym>
   </wpt><wpt lat="48.381692" lon="-120.834606">
     <ele>564.1</ele>
-    <name>CascadeCorralTR</name>
+    <name>Cascade Corral Trail Junction</name>
     <desc><![CDATA[Cascade Corral Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.388613" lon="-120.836982">
@@ -113807,12 +113787,12 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.389252" lon="-120.837564">
     <ele>661.4</ele>
-    <name>McGregorMountainTR</name>
+    <name>Mc Gregor Mountain Trail Junction</name>
     <desc><![CDATA[McGregor Mountain Summit Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.397284" lon="-120.846905">
     <ele>594.2</ele>
-    <name>StehekinRoadTR</name>
+    <name>Stehekin Road Trail Junction</name>
     <desc><![CDATA[Trail junction to Stehekin Road.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.402795" lon="-120.850163">
@@ -113827,7 +113807,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.419864" lon="-120.862884">
     <ele>656.6</ele>
-    <name>ShadyCampTR</name>
+    <name>Shady Camp Trail Junction</name>
     <desc><![CDATA[Trail junction to Old Road, Shady Camp.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.425608" lon="-120.863046">
@@ -113837,7 +113817,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.429219" lon="-120.868036">
     <ele>642.1</ele>
-    <name>ShadyCampTR2</name>
+    <name>Shady Camp Trail Junction #2</name>
     <desc><![CDATA[Another trail junction to Old Road, Shady Camp.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.429472" lon="-120.868353">
@@ -113872,7 +113852,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.457261" lon="-120.840612">
     <ele>858.0</ele>
-    <name>NorthForkTR</name>
+    <name>North Fork Trail Junction</name>
     <desc><![CDATA[North Fork Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.464312" lon="-120.816511">
@@ -113887,7 +113867,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.464620" lon="-120.771439">
     <ele>993.1</ele>
-    <name>SouthForkTR</name>
+    <name>South Fork Trail Junction</name>
     <desc><![CDATA[South Fork Trail, Rainbow Lake Trail junctions.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.465516" lon="-120.741232">
@@ -113897,7 +113877,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.467674" lon="-120.722932">
     <ele>1107.0</ele>
-    <name>TwispPassTR</name>
+    <name>Twisp Pass Trail Junction</name>
     <desc><![CDATA[Trail junction to Fireweed Trail Camp, Twisp Pass, McAlester Pass. Note that the PCT continues on the left trail and does not cross Bridge Creek here. The old Wilderness Press Guidebook follows the incorrect trail here.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.483444" lon="-120.707857">
@@ -113917,7 +113897,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.497062" lon="-120.706944">
     <ele>1333.6</ele>
-    <name>StilettoPeakTR</name>
+    <name>Stiletto Peak Trail Junction</name>
     <desc><![CDATA[Trail junction to Copper Pass, Stiletto Peak.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.504134" lon="-120.717541">
@@ -116349,7 +116329,7 @@
     <sym>Car</sym>
   </wpt><wpt lat="48.518317" lon="-120.733300">
     <ele>1488.0</ele>
-    <name>RainyPassTR</name>
+    <name>Rainy Pass Trail Junction</name>
     <desc><![CDATA[Rainy Pass Trailhead, parking, outhouse, trail register.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.526008" lon="-120.731375">
@@ -116384,7 +116364,7 @@
     <sym>Summit</sym>
   </wpt><wpt lat="48.555047" lon="-120.699970">
     <ele>2084.3</ele>
-    <name>CutthroatTR</name>
+    <name>Cutthroat Trail Junction</name>
     <desc><![CDATA[Cutthroat Trail #483 junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.570578" lon="-120.688184">
@@ -116554,7 +116534,7 @@
     <sym>Summit</sym>
   </wpt><wpt lat="48.926705" lon="-120.765503">
     <ele>1906.1</ele>
-    <name>HopkinsLakeTR</name>
+    <name>Hopkins Lake Trail Junction</name>
     <desc><![CDATA[Unmarked spur trail to Hopkins Lake. Lake is 1/10 mile S of PCT with camping, water.]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.928659" lon="-120.762146">
@@ -116574,7 +116554,7 @@
     <sym>Water Source</sym>
   </wpt><wpt lat="48.957190" lon="-120.779279">
     <ele>1681.5</ele>
-    <name>PasaytenRiverTR</name>
+    <name>Pasayten River Trail Junction</name>
     <desc><![CDATA[Pasayten River Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="48.957000" lon="-120.780776">
@@ -116624,12 +116604,12 @@
     <sym>Campground</sym>
   </wpt><wpt lat="49.038238" lon="-120.763684">
     <ele>1557.6</ele>
-    <name>MountFrostyTR</name>
+    <name>Mount Frosty Trail Junction</name>
     <desc><![CDATA[Mount Frosty Trail junction]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="49.047545" lon="-120.764362">
     <ele>1550.3</ele>
-    <name>WindyJoeTR</name>
+    <name>Windy Joe Trail Junction</name>
     <desc><![CDATA[Follow Windy Joe pathway]]></desc>
     <sym>Trail Head</sym>
   </wpt><wpt lat="49.045546" lon="-120.766799">
@@ -116938,6 +116918,287 @@
     <name>Milestone - 2661</name>
     <sym>Flag, Green</sym>
   </wpt><trk xmlns:ql="http://www.qlandkarte.org/xmlschemas/v1.1" xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
+  <name>CA Sec E - Access to Green Valley</name>
+  <extensions>
+   <ql:key>9f0888372d0b1c4816a969d496cfc7e9</ql:key>
+   <ql:flags>3</ql:flags>
+   <ql:history>
+    <ql:event>
+     <ql:icon>://icons/48x48/Start.png</ql:icon>
+     <ql:time>2021-12-12T12:42:25.161Z</ql:time>
+     <ql:comment>Initial version.</ql:comment>
+    </ql:event>
+    <ql:event>
+     <ql:icon>://icons/48x48/EditText.png</ql:icon>
+     <ql:time>2021-12-12T12:42:43.379Z</ql:time>
+     <ql:comment>Changed name</ql:comment>
+    </ql:event>
+   </ql:history>
+   <gpxx:TrackExtension>
+    <gpxx:DisplayColor>Magenta</gpxx:DisplayColor>
+   </gpxx:TrackExtension>
+  </extensions>
+  <trkseg>
+   <trkpt lat="34.62656554" lon="-118.39307428">
+    <extensions>
+     <ql:flags>16</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62644313" lon="-118.39328330">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62564400" lon="-118.39447175">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62539128" lon="-118.39504549">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62480388" lon="-118.39665741">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62471168" lon="-118.39678036">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62407305" lon="-118.39709454">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62381009" lon="-118.39729945">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62352322" lon="-118.39779122">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62336271" lon="-118.39822836">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62334905" lon="-118.39888405">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62314415" lon="-118.39947145">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62300071" lon="-118.40086481">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62287777" lon="-118.40147953">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62278898" lon="-118.40172541">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62264554" lon="-118.40188934">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62246454" lon="-118.40221719">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62253968" lon="-118.40264066">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62295290" lon="-118.40436187">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62292217" lon="-118.40468972">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62279922" lon="-118.40519515">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62263530" lon="-118.40542738">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62254651" lon="-118.40576889">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62272751" lon="-118.40718956">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62181909" lon="-118.40723055">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62171322" lon="-118.40727153">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62148441" lon="-118.40755839">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62117022" lon="-118.40776330">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62017985" lon="-118.40824141">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.62005007" lon="-118.40859658">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.61987249" lon="-118.40882881">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.61975637" lon="-118.40889711">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.61936364" lon="-118.40889711">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.61904945" lon="-118.40906104">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.61874551" lon="-118.40910202">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.61814786" lon="-118.40638360">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.61803517" lon="-118.40600111">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.61766634" lon="-118.40542738">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.61765951" lon="-118.40346028">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.61702430" lon="-118.40350126">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.61630371" lon="-118.40351492">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.61620126" lon="-118.40332368">
+    <extensions>
+     <ql:flags>8</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+   <trkpt lat="34.61603128" lon="-118.40323422">
+    <extensions>
+     <ql:flags>16</ql:flags>
+     <ql:activity>0</ql:activity>
+    </extensions>
+   </trkpt>
+  </trkseg>
+ </trk><trk xmlns:ql="http://www.qlandkarte.org/xmlschemas/v1.1" xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
   <name>CA Sec G - Grumpy Bears Trail</name>
   <extensions>
    <ql:key>fe25d749ceaa9270110b17357fda264c</ql:key>