Nonterminal

Consistency for nonterminal/terminal combinator class names.