Move cap/space prettification from lex to grm in order to only manipulate names, rather than rules