Simplify build process
Rename syntax nonterminals