Changed parsing state names to corresponding tokens for easier extending