Seperated terminals

This release separates terminals and other symbols in the symbol provider. This makes it possible to use the same name for a terminal and non-terminal without ambiguity.