(maint) Remove support for hyphen in name in lexer2
(squash) W.I.P Query