Add support for underscores in keys
Change names of key lexing functions