The current state is an example of good enough but not correct. There were two
issues. The first one is that I accidentally used the wrong kind of brackets.
Secondly we need to  escape only after matching because the name could contain
escaped dashes.


(cherry picked from commit 5af911ee)