refactor parser names