rename waypoints to waypoint