change grammar types to consistent naming convention