Rename syntax nonterminals, add type keyword