After some thinking, I think you are right. I will change the `motorway` back to `motorway_link`.

But the `primary` is staying since it just conveniently and accurately describes the extent of the tunnel area.