Some renaming cleanup. Simplified the parser.