Change order of GPX waypoint names, to facilitate finding problems on devices that shorten the GPX wpt names