change grammar type tokens to consistent naming convention