renamed some non-terminals
Merge branch 'kast-in-K' of https://github.com/grosu/k into kast-in-K