make parser names more consistent