make parser naming convention consistent