OK, done.

(I am not aware of a rule about whether it's better to put the name on the outer outline or the main way across it; we’ll change it here but I spotted many exceptions + the wiki is not clear about this either.)