Fixes terminology!
Initial draft of formal grammar.