Enhanced tag name formatting.

https://github.com/AbleOpus wrote this pattern for me.