Unify naming in parser