Remove need for termination-point to have bridge-name