renamed some non-terminals