You can use the new GPX (offline) format which supports waypoint names (until the server is updated).