added unique waypoint names for each type of template